biran 0.1.12 → 0.1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d14217aa3698d0cf75e5ca704c0601debc6c49768668251af03fa552130666f
-  data.tar.gz: b99edeb48b785ba764c9cb9ab67a2fb403f3216b20b8c95d315592249a6fd417
+  metadata.gz: ec150cd74d08598ecb7d3bfb1324bf57c15e20806c0143b042b257569f430bf6
+  data.tar.gz: 7863cf3face519ede43bb1ca24f569112ad83fe8e686c467141c81a13a0b981d
 SHA512:
-  metadata.gz: 9d660b2a71857448b2cc1508ba8ee250b850a27f5a14c54b47f0c3fc4d9e200d3ddd6546efd134def3c895e3a010a12389a5cb4a004f539ab13983b75386eb5c
-  data.tar.gz: 6abba1cd95045a1fb5923edb0d7b360728109d1a3e46ea3736fba9153e8a76234806983803a9cd722ab28669f5bbedd0874d49a55b5940ed4bdf5696172623b7
+  metadata.gz: 5464720ba0f9989e9941b77ca1fd54a17388eedd3d044e180689ce58fb7a1da87252e0ccfa09fab514410077ffe18b0a7fbbb52a56a35fce0ebc8ed6b5fb4964
+  data.tar.gz: 1edb42ac1ebc49f45d6c60e312a4bd089495fdc11c2c96be0f1f2328f4a8d6bbdb5d14b11dbfe16fae34b8c1ab086b6ee48c82bfe4d0c3d0e8a0400e73a4b907

data/config/_my_config.yml.erb

@@ -0,0 +1,2 @@
+my_config:
+  key: value

data/config/app_config.yml

@@ -0,0 +1,13 @@
+defaults: &defaults
+  app:
+    base_path: <%= Dir.pwd %>
+    use_capistrano: false
+    files_to_generate:
+      my_config:
+        extension: '.yml'
+
+test:
+  <<: *defaults
+
+development:
+  <<: *defaults

data/lib/biran/configurinator.rb

@@ -114,7 +114,7 @@ module Biran
     end
 
     def sanitize_config_files files_list
-      lambda do |file, _|
+      lambda do |(file, _)|
         files_list[file] ||=  {extension: ''}
         ext = files_list[file].fetch(:extension, '').strip
         ext.prepend('.') unless ext.start_with?('.') || ext.empty?

data/lib/biran/version.rb

@@ -1,3 +1,3 @@
 module Biran
-  VERSION = '0.1.12'
+  VERSION = '0.1.13.1'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: biran
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13.1
 platform: ruby
 authors:
 - javierg
 - brlanier
 - seancookr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,6 +44,9 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
@@ -51,6 +54,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.7
@@ -58,58 +64,58 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: tapout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec-ontap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 description: Biran is the guy that will help you generate config files for your rail
   app.
 email:
@@ -121,14 +127,14 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- config/_my_config.yml.erb
+- config/app_config.yml
 - lib/biran.rb
 - lib/biran/config.rb
 - lib/biran/config_defaults.rb
 - lib/biran/configurinator.rb
-- 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
@@ -136,7 +142,7 @@ homepage: https://github.com/amco/biran
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +157,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Helper for generating config generate tasks.
 test_files: []

data/lib/biran/configurinator.rb.test_changes

@@ -1,155 +0,0 @@
-require 'biran/hash_refinement'
-
-module Biran
-  class Configurinator
-    include ConfigDefaults
-    using HashRefinement
-
-    DEFAULT_ENV = 'development'
-
-    attr_reader :config, :db_config, :env
-
-    class << self
-      attr_accessor :config
-
-      def configure
-        self.config ||= Config.instance
-        yield config
-      end
-    end
-
-    def initialize(env: nil)
-      @env = env || app_env
-      @config = build_app_config
-    end
-
-    def file_tasks
-      files_to_generate.keys
-    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, output_name: nil)
-      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!
-    end
-
-    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,
-        app_base_dir: app_base,
-        env: env,
-        local_config_file: local_config_file,
-        secrets_file_path: secrets_file,
-        vhost: config_vhost_dirs
-      }
-
-      app_config.deep_merge! app_config_defaults
-      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
-      default_db_config = base_db_config
-      return default_db_config unless File.exist? db_config_override_file
-      default_db_config.deep_merge! process_config_file(db_config_override_file)
-    end
-
-    def base_db_config
-      return @base_db_config if @base_db_config
-      return @base_db_config = {} unless File.exists? default_db_config_file
-      @base_db_config ||= process_config_file(default_db_config_file)
-    end
-
-    def app_config_defaults
-      return @app_config_defaults if @app_config_defaults
-      app_config_file = File.join(configuration.config_dirname, configuration.config_filename)
-      app_defaults = app_defaults_init.dup
-      config_properties = process_config_file(app_config_file)
-      @app_config_defaults = app_defaults.deep_merge! config_properties
-    end
-
-    def process_config_file(config_file)
-      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)
-      #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
-
-    def config_vhost_dirs
-      {
-        public_dir: File.join(app_root, vhost_public_dirname),
-        shared_dir: app_shared_dir.to_s,
-        log_dir: File.join(app_root, 'log'),
-        pids_dir: File.join(app_root, 'tmp', 'pids')
-      }
-    end
-
-    def local_config_file_contents
-      return @local_config_contents if @local_config_contents
-      return @local_config_conents = {} unless File.exists? local_config_file
-      @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
-    end
-
-    def sanitize_config_files files_list
-      lambda do |file, _|
-        files_list[file] ||=  {extension: ''}
-        ext = files_list[file].fetch(:extension, '').strip
-        ext.prepend('.') unless ext.start_with?('.') || ext.empty?
-        files_list[file][:extension] = ext
-      end
-    end
-
-    def filtered_config
-      @filtered_config ||= config.except(*configuration.app_setup_blocks)
-    end
-
-    def use_capistrano?
-      app_config_defaults[:app][:use_capistrano]
-    end
-  end
-end

data/lib/biran/hash_refinement.rb

@@ -1,19 +0,0 @@
-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