biran 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67e7f787cbdfa09727e1214e5668cfc20ca239a6765c538b46884f70436cb10
-  data.tar.gz: c48aaf4d46a5a7a1130a14191113ed9db8ec9e8cbac2d71b6e1f74548fd5db32
+  metadata.gz: 4d14217aa3698d0cf75e5ca704c0601debc6c49768668251af03fa552130666f
+  data.tar.gz: b99edeb48b785ba764c9cb9ab67a2fb403f3216b20b8c95d315592249a6fd417
 SHA512:
-  metadata.gz: c878c531325e65bf3d0ec59b7d5b9b2f41921165d4390839c24c5aa78b94b654ab9af45934e0d3242a5031bc19ba7a9afc7e3be294acb14b141e69c438a01c8a
-  data.tar.gz: 185b07e2b09bd9fd2d0f666b814a9bb6ba8f5bd0c1e8943031d98cd8bb1fae588d12e59edcba4879df95c120e62a0f208153370621b54e2c0a11c07698ef5f2c
+  metadata.gz: 9d660b2a71857448b2cc1508ba8ee250b850a27f5a14c54b47f0c3fc4d9e200d3ddd6546efd134def3c895e3a010a12389a5cb4a004f539ab13983b75386eb5c
+  data.tar.gz: 6abba1cd95045a1fb5923edb0d7b360728109d1a3e46ea3736fba9153e8a76234806983803a9cd722ab28669f5bbedd0874d49a55b5940ed4bdf5696172623b7

data/README.md

@@ -231,7 +231,7 @@ Availble in: environment, initializer, instance**
 
 Generally not needed to specify unless you are not using rails or do not want to use `Rails.env` for lookups in config blocks.  
 You can set the app_env during instance creation by passing an environment string.  
-The following example will use the default or any of the built in environment vairables(BIRAN_APP_ENV, RACK_ENV, RAILS_ENV) or fall back to default.
+The following example will use the value of one of the built in environment variable found, checked in the following order: BIRAN_APP_ENV, RAILS_ENV, RACK_ENV. If one of the environment variables is not found, the default value will be used.
 ```
 config = Biran::Configurinator.new
 ```
@@ -302,7 +302,39 @@ app:
       extension: ‘.yml’
       output_dir: ‘/srv/app/current/reports’
       output_name: ‘user_report’
+```  
+
+In a more advanced example, you can generate multiple files from the same template by setting the `config_index_list` option. If you set this as a list of indexes, then a file will be generated for each index. The index number 
+will get passed to the template as an instance variable (`@config_index`) and can be used to look up a specific version of values from the config file. The file that is generated will respect the normal naming, including using the `output_name` option, however, it will append the 
+index number to the end of the file name. If the name was going to be special_file, and you add an index list of `[1,2]`, two files will get generated named `special_file-1` and `special_file-2`.  
+Advanced example from `config/app:.yml`:
+```
+app:
+  files_to_generate:
+    reports:
+      extension: '.yml'
+      config_index_list:
+        - one
+        - two
+reports:
+  default: &reports_default_values
+    some_value: 'some_value'
+    other_value: 'other_value'
+  one:
+    <<: *reports_default_values
+  two:
+    <<: *reports_default_values
+    some_value: 'my_value'
+```  
+Then in your template file you can use the index to get the proper config for each generated file. This allows you to reuse the same template to generate multiple files, each with different content. This is useful for generating service config files, like for sidekiq workers.
+The config above would generate two files: `config/reports-one.yml` and `config/reports-two.yml`, using the content from each index block as specified in the following simple template example.
 ```
+<% index = "{@config_index}" -%>
+defaults:
+  :some_value: <%= @app_config[:reports][index.to_sym][:some_value] %>
+  :other_value: <%= @app_config[:reports][index.to_sym][:other_value] %>
+```  
+
 ### vhost_public_dirname
 **Type: string  
 Default: 'public'  

data/lib/biran.rb

@@ -5,6 +5,7 @@ require 'biran/config_defaults'
 require 'biran/config'
 require 'biran/erb_config'
 require 'biran/configurinator'
+require 'biran/exceptions'
 require 'biran/railtie' if defined?(Rails)
 
 module Biran

data/lib/biran/config_defaults.rb

@@ -11,16 +11,16 @@ module Biran
           shared_dir: configuration.shared_dir,
           base_dir: configuration.base_dir,
           use_capistrano: configuration.use_capistrano,
-          db_config: configuration.db_config,
-          secrets: configuration.secrets,
           bindings: configuration.bindings,
           vhost_public_dirname: configuration.vhost_public_dirname
-        }
+        },
+        db_config: configuration.db_config,
+        secrets: configuration.secrets,
       }
     end
 
     def app_env
-      ENV['BIRAN_APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || configuration.app_env
+      ENV['BIRAN_APP_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || configuration.app_env
     end
 
     def app_base
@@ -47,7 +47,11 @@ module Biran
 
     def local_config_file
       ENV['BIRAN_LOCAL_CONFIG_FILE'] ||
-        File.join(app_shared_dir, configuration.config_dirname, configuration.local_config_filename)
+        File.join(app_shared_dir, configuration.config_dirname, local_config_filename)
+    end
+
+    def local_config_filename
+      ENV['BIRAN_LOCAL_CONFIG_FILENAME'] || app_config_defaults[:app][:local_config_filename] || configuration.local_config_filename
     end
 
     def vhost_public_dirname
@@ -55,15 +59,23 @@ module Biran
     end
 
     def db_config_override_file
-      File.join(app_shared_dir, configuration.config_dirname, configuration.db_config_filename)
+      File.join(app_shared_dir, configuration.config_dirname, db_config_filename)
+    end
+
+    def db_config_filename
+       app_config_defaults[:app][:db_config_filename] || configuration.db_config_filename
     end
 
     def secrets_file
-      File.join(configuration.base_path, configuration.config_dirname, configuration.secrets_filename)
+      File.join(configuration.base_path, configuration.config_dirname, secrets_filename)
+    end
+
+    def secrets_filename
+      app_config_defaults[:app][:secrets_filename] || configuration.secrets_filename
     end
 
     def default_db_config_file
-      File.join(config_dir, configuration.db_config_filename)
+      File.join(config_dir, db_config_filename)
     end
 
     def use_capistrano?

data/lib/biran/configurinator.rb

@@ -30,12 +30,17 @@ module Biran
         .tap { |files_list| files_list.each(&sanitize_config_files(files_list)) }
     end
 
-    def create(name:, extension:, output_dir: nil, output_name: nil)
+    def create(name:, extension:, output_dir: nil, output_name: nil, config_index_list: [])
       output_dir ||= config_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!
+      return generated_file.save! unless config_index_list.any?
+      config_index_list.each do |config_index|
+        generated_file.output_name = "#{output_name}-#{config_index}"
+        generated_file.template_config_index = config_index
+        generated_file.save!
+      end
     end
 
     private
@@ -53,8 +58,8 @@ module Biran
       }
 
       app_config.deep_merge! app_config_defaults
-      app_config[:secrets] = get_secret_contents(app_config)
-      app_config[:db_config] = build_db_config
+      app_config[:secrets].deep_merge! get_secrets_content(app_config[:secrets_file_path])
+      app_config[:db_config].deep_merge! build_db_config
 
       app_config.deep_merge! local_config_file_contents
     end
@@ -103,12 +108,9 @@ module Biran
       @local_config_contents = process_config_file(local_config_file)
     end
 
-    def get_secret_contents(app_config)
-      secrets_file_contents = {}
-      if File.exist? app_config[:secrets_file_path]
-        secrets_file_contents = process_config_file app_config[:secrets_file_path]
-      end
-      secrets_file_contents
+    def get_secrets_content(secrets_file)
+      return {} unless File.exists? secrets_file
+      process_config_file secrets_file
     end
 
     def sanitize_config_files files_list

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/erb_config.rb

@@ -1,34 +1,56 @@
 module Biran
   class ERBConfig
-    attr_reader :output_dir, :source_dir, :name, :extension, :config, :output_name
-    attr_accessor :bindings
+    attr_reader :output_dir, :source_dir, :name, :extension, :config, :template_contents
+    attr_accessor :bindings, :output_name, :template_config_index
+
+    DEFAULT_TEMPLATE_CONFIG_INDEX = 1
 
     def initialize(config, name, extension, source, output_dir, output_name)
-      @name       = name
-      @extension  = extension
-      @config     = config
-      @source_dir = source
-      @output_dir = output_dir
-      @output_name = output_name
+      before_process_erb do
+        @name       = name
+        @extension  = extension
+        @config     = config
+        @source_dir = source
+        @output_dir = output_dir
+        @output_name = output_name
+      end
     end
 
     def save!
       File.open(File.join(output_dir, "#{output_name}#{extension}"), 'w') do |f|
-        f.print process_erb.result(build_erb_env.call)
+        f.print template_contents.result(build_erb_env.call)
       end
     end
 
     private
 
+    def before_process_erb
+      yield
+      raise ArgumentError unless process_erb_ready?
+      @template_contents = process_erb
+    rescue ArgumentError
+      e_message = "Settings required to determine template name for #{name} are not configured"
+      raise Biran::ConfigSyntaxError, e_message
+    end
+
+    def process_erb_ready?
+      @name &&
+      @extension &&
+      @source_dir
+    end
+
     def process_erb
       config_erb_file = File.join(source_dir, "_#{name}#{extension}.erb")
       ERB.new(File.read(config_erb_file), nil, '-')
+    rescue Errno::ENOENT
+      raise Biran::ConfigSyntaxError, "Missing template file for #{name}: #{config_erb_file}"
     end
 
     def build_erb_env
       proc do
         @environment = config[:env]
         @app_config  = config
+        @config_index =  template_config_index || DEFAULT_TEMPLATE_CONFIG_INDEX
 
         @bindings.each(&assign_instance_vars) unless @bindings.nil?
 

data/lib/biran/exceptions.rb

@@ -0,0 +1,16 @@
+module Biran
+  class ConfigSyntaxError < ::StandardError
+    def initialize(msg=nil)
+      @msg = msg || 'Missing required argument or bad formatting in config file'
+      set_backtrace []
+    end
+
+    def to_s
+      @msg
+    end
+
+    def p_warning
+      "Warning: #{@msg}"
+    end
+  end
+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.7'
+  VERSION = '0.1.12'
 end

data/lib/tasks/biran_tasks.rake

@@ -1,18 +1,39 @@
 namespace :config do
   config = Biran::Configurinator.new
 
-  desc 'Generate new config files'
-  task :generate do
+  desc 'Legacy - Generate all new config files'
+  task :generate_legacy do
     Rake::Task['config:generate_with_deps'].enhance config.file_tasks
     Rake::Task['config:generate_with_deps'].invoke
   end
 
   task :generate_with_deps
 
+  desc 'Generate all new config files'
+  task :generate do
+    error_count = 0
+    config.file_tasks.each do |task|
+      Rake::Task["config:#{task}"].invoke
+    rescue Biran::ConfigSyntaxError => e
+      error_count += 1
+      puts e.p_warning
+      next
+    end
+
+    abort 'Errors in creating config files' unless error_count == 0
+  end
+
   config.files_to_generate.each do |file_name, options|
     desc %(Generate the #{file_name}#{options.fetch(:extension, '')} config file)
     task file_name do
       config.create name: file_name, **options
+    rescue ArgumentError => e
+      e_message = "Missing required argument or bad formatting in config file for #{file_name}"
+      e.set_backtrace([])
+      raise Biran::ConfigSyntaxError, e_message
+    rescue Biran::ConfigSyntaxError => e
+      e.set_backtrace([])
+      raise Biran::ConfigSyntaxError, e.message
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biran
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - javierg
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
 - !ruby/object:Gem::Dependency
@@ -125,8 +125,10 @@ 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/exceptions.rb
+- lib/biran/hash_refinement.rb
 - lib/biran/railtie.rb
 - lib/biran/version.rb
 - lib/tasks/biran_tasks.rake