biran 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1a9587486a601454672e7e3756f05f0e91f42000ab77f109d86eceb8c58729
-  data.tar.gz: d4b1c75531689dea324602cd28a4619002846af2e198eb9b7cd667329457232a
+  metadata.gz: 3f486fa4aeeff2d2ec22b1a15a553fc044235c8f15b6c1f4e54e968ad5b1c648
+  data.tar.gz: df47f776ed09799f9e71d8b3ddb5ad1c8cb80178326a987fe5231e5f6c2b030c
 SHA512:
-  metadata.gz: 94fdbc6e574f3616e4fa49a50cd17ca357dc8790eb1122eeef1d288847144f4c30ff6f7f6757716d44cd78f4d469d5e929bdfd79c01810bc309b3a72b32008cf
-  data.tar.gz: 5649a2ca6a258fe966aa4062cc07759597fb6f637ba7ee61929c32495243d9f2c181f812a65f86c40502d83daf406adf56b0e70073d862b6b74b0fcd2c4f8f58
+  metadata.gz: ca3af8fb137ff99fdbd6bab2682bf7c8d3231ad4914cb81eba76fa8533e04b35448dfdee22729888e4165e6039b8c36c68a603ddb72ad85b77ea48f7f840d30f
+  data.tar.gz: 2a466ac6a681c5b64878bcb3bf145584cdfa95dcab0670e57d414525d56650683bab7e6d2513e323bcbf189735fec63d0d6bd8419dbc60b9620cec3ca7a8e1bf

data/lib/biran/configurinator.rb

@@ -53,7 +53,7 @@ module Biran
       }
 
       app_config.deep_merge! app_config_defaults
-      app_config[:secrets] = get_secret_contents(app_config)
+      app_config[:secrets].deep_merge! get_secret_contents(app_config)
       app_config[:db_config] = build_db_config
 
       app_config.deep_merge! local_config_file_contents

data/lib/biran/{configurinator.rb.debug → configurinator.rb.test_changes}

@@ -1,10 +1,13 @@
+require 'biran/hash_refinement'
+
 module Biran
   class Configurinator
     include ConfigDefaults
+    using HashRefinement
 
     DEFAULT_ENV = 'development'
 
-    attr_reader :config, :db_config
+    attr_reader :config, :db_config, :env
 
     class << self
       attr_accessor :config
@@ -13,18 +16,10 @@ module Biran
         self.config ||= Config.instance
         yield config
       end
-
-      def env= env
-        @env = env
-      end
-    end
-
-    def env
-      return @env if @env
-      @env = app_env
     end
 
-    def initialize
+    def initialize(env: nil)
+      @env = env || app_env
       @config = build_app_config
     end
 
@@ -32,23 +27,16 @@ module Biran
       files_to_generate.keys
     end
 
-    def debug_stuff
-      puts "app env2 is: #{app_env}"
-      puts "instance @env is #{@env}"
-      puts "env from method is #{env}"
-      puts "rack env is #{ENV['RACK_ENV']}"
-    end
-
     def files_to_generate
       @files_to_generate ||= config.fetch(:app, {})
         .fetch(:files_to_generate, configuration.files_to_generate)
         .tap { |files_list| files_list.each(&sanitize_config_files(files_list)) }
     end
 
-    def create(name:, extension:, output_dir: nil)
+    def create(name:, extension:, output_dir: nil, output_name: nil)
       output_dir ||= config_dir
-      #debug_stuff
-      generated_file = ERBConfig.new(filtered_config, name, extension, config_dir, output_dir)
+      output_name ||= name
+      generated_file = ERBConfig.new(filtered_config, name, extension, config_dir, output_dir, output_name)
       generated_file.bindings = bindings
       generated_file.save!
     end
@@ -56,6 +44,7 @@ module Biran
     private
 
     def build_app_config
+      raise 'Environment not set to build the application config' unless @env
       app_config = {
         app_root_dir: app_root,
         app_shared_dir: app_shared_dir,
@@ -67,10 +56,13 @@ module Biran
       }
 
       app_config.deep_merge! app_config_defaults
-      app_config[:secrets] = get_secret_contents(app_config)
+      app_config[:secrets].deep_merge! get_secret_contents(app_config)
       app_config[:db_config] = build_db_config
 
       app_config.deep_merge! local_config_file_contents
+
+      puts "app config final is #{app_config.inspect}"
+      app_config
     end
 
     def build_db_config
@@ -97,7 +89,25 @@ module Biran
       config_file_contents = File.read(config_file)
       config_file_contents = ERB.new(config_file_contents).result
       config_file_contents = YAML.safe_load(config_file_contents, [], [], true)
-      config_file_contents[env].deep_symbolize_keys!
+      #puts "Config file contents after yaml load before env grab #{config_file_contents.inspect}"
+      config_file_contents_for_test = config_file_contents['test']
+      config_file_contents_for_env = config_file_contents[env]
+      puts "Config file contents for test:"
+      puts config_file_contents_for_test.to_yaml
+      puts
+      puts "Config file contents for #{env}:"
+      puts config_file_contents_for_env.to_yaml
+      puts
+      config_file_diff = config_file_contents_for_test.deep_diff(config_file_contents_for_env)
+      puts "diff hash is:"
+      puts config_file_diff.to_yaml
+      puts
+      config_file_diff_r = config_file_contents_for_env.deep_diff(config_file_contents_for_test)
+      puts "diff hash reversed is:"
+      puts config_file_diff_r.to_yaml
+      puts
+
+      config_file_contents_for_env.deep_symbolize_keys!
     rescue Errno::ENOENT
       raise "Missing config file: #{config_file}"
     end

data/lib/biran/hash_refinement.rb

@@ -0,0 +1,19 @@
+module HashRefinement
+
+  refine Hash do
+    def deep_diff(b)
+      a = self
+      (a.keys | b.keys).inject({}) do |diff, k|
+        if a[k] != b[k]
+          if a[k].respond_to?(:deep_diff) && b[k].respond_to?(:deep_diff)
+            diff[k] = a[k].deep_diff(b[k])
+          else
+            #diff[k] = b[k] || a[k]
+            diff[k] = b.keys.exclude?(k) ? a[k] : b[k]
+          end
+        end
+        diff
+      end
+    end
+  end
+end

data/lib/biran/version.rb

@@ -1,3 +1,3 @@
 module Biran
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biran
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - javierg
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -125,8 +125,9 @@ files:
 - lib/biran/config.rb
 - lib/biran/config_defaults.rb
 - lib/biran/configurinator.rb
-- lib/biran/configurinator.rb.debug
+- lib/biran/configurinator.rb.test_changes
 - lib/biran/erb_config.rb
+- lib/biran/hash_refinement.rb
 - lib/biran/railtie.rb
 - lib/biran/version.rb
 - lib/tasks/biran_tasks.rake