fillparams 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b395cba7ab792ed4a1c11c26891e67e0634ae97d
-  data.tar.gz: 92e789e987fe7a5b00f5a7ac4315f1dcbd7f9912
+SHA256:
+  metadata.gz: 626edd4bcbbc93f3aa0c6fcdbd419199b618e4b36f5f3414a8318fe7cf9f0089
+  data.tar.gz: bc92f306c837c684738a0da419a934e63648ad5291bbd504e7cf7bd75b57b7b9
 SHA512:
-  metadata.gz: 2264445d52e0804dbb99c58c71815c32b0b95ea59f29eb10722a2e2f6b48f9c6b6e2e8d11ca350deec135523ae5a332fb89495119e00a73bbeb8573d74d82baa
-  data.tar.gz: 660590e02a7bb2ff1e2e13e4a3587ad28a2619dccca9d4dbf011c3d1e8c924def998a629204b4c4606f824b6966429342b2e430a2618b1eaf3fcb5144b7bb499
+  metadata.gz: 9e577a6ceb9be2a13a544a117984a5d59a5622e9b184de116dd23b4a9b9e0f529d9b694fc17d547ed3a3f65f065f71bfd592f603ce4fd74f2d3118b657efffa5
+  data.tar.gz: 18fa85856d136aaa337a193e61858e4a4ae8e4ed0796872487f29db741df5f2e96d69b19949f0336acd2d4002a3f654e9458248172b515818f895472b50de9f5

data/.travis.yml

@@ -0,0 +1,12 @@
+---
+language: ruby
+notifications:
+  email:
+  - krzysztof.hasinski+fillparams@gmail.com
+rvm:
+  - 2.6.9
+  - 2.7.6
+  - 3.1.2
+  - ruby-head
+  - jruby
+

data/FillParams.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Krzysztof Hasiński
+Copyright (c) 2014 Krzysztof Hasiński, Justyna Wojtczak
 
 MIT License
 

data/README.md

@@ -1,8 +1,10 @@
 # FillParams
 
 [![Gem Version](https://badge.fury.io/rb/fillparams.svg)](http://badge.fury.io/rb/fillparams)
-[![Code Climate](https://codeclimate.com/github/khasinski/fillparams.png)](https://codeclimate.com/github/khasinski/fillparams)
-[![Build Status](https://travis-ci.org/khasinski/fillparams.svg?branch=master)](https://travis-ci.org/khasinski/fillparams)
+
+# ⚠️ Deprecated 
+
+# Please use [ENVs](https://github.com/bkeepers/dotenv) or [encrypted credentials](https://edgeguides.rubyonrails.org/security.html#custom-credentials) instead
 
 This tool allows you to manage ignored YAML parameters in your config files. 
 It is inspired by [Incenteev ParameterHandler](https://github.com/Incenteev/ParameterHandler).

data/lib/FillParams/version.rb

@@ -1,3 +1,3 @@
 module FillParams
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/parameter_filler.rb

@@ -14,9 +14,7 @@ class ParameterFiller
 
   def fill_file_list
     @config_files.each do |file_name|
-      if verbose
-        puts 'Filling ' + file_name + '...'
-      end
+      puts 'Filling ' + file_name + '...' if verbose
       fill_file file_name
     end
   end
@@ -33,9 +31,7 @@ class ParameterFiller
   def load_yaml_file(file_name)
     begin
       data = YAML.load_file(file_name)
-      unless data
-        data = {}
-      end
+      data = {} unless data
     rescue Exception => e
       raise ArgumentError, 'Invalid YAML in config file ' + file_name unless data
     end
@@ -44,9 +40,7 @@ class ParameterFiller
 
   def setup_files(file_name, dist_file_name)
     raise ArgumentError, 'Dist file not found for ' + file_name unless File.file?(dist_file_name)
-    unless File.file?(file_name)
-      File.write(file_name, '')
-    end
+    File.write(file_name, '') unless File.file?(file_name)
     return
   end
 
@@ -57,9 +51,7 @@ class ParameterFiller
         data[key] = ask_for_param(key, value)
       end
       if dist_data[key].is_a?(Hash)
-        unless data.has_key?(key)
-          data[key] = {}
-        end
+        data[key] = {} unless data.has_key?(key)
         data[key] = fill_parameters(data[key], dist_data[key])
       end
     end

data/spec/parameter_filler_spec.rb

@@ -1,53 +1,196 @@
 require 'spec_helper'
-describe ParameterFiller do
 
-  def sample_dist_data
-    YAML.load(<<-EOF
-      NAME: value
-      string: abc
-      number: 1.23
-    EOF
-    )
-  end
+describe ParameterFiller do
+  describe '#fill_parameters' do
+    context 'simple input yml' do
+      def sample_dist_data
+        YAML.load(<<-EOF
+          NAME: value
+          string: abc
+          number: 1.23
+        EOF
+        )
+      end
 
-  let(:pf) { ParameterFiller.new('', false, false) }
-  context 'when the data is nil' do
-    let(:data){ nil }
-    it 'returns the same config as sample_dist_data' do
-      expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
-    end
-  end
-  context 'when the dist data is nil' do
-    let(:dist_data){ nil }
-    let(:data){ sample_dist_data }
-    it 'returns the same config as sample_dist_data' do
-      expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
+      let(:pf) { ParameterFiller.new('', false, false) }
+      context 'when the data is nil' do
+        let(:data){ nil }
+        it 'returns the same config as sample_dist_data' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
+        end
+      end
+      context 'when the dist data is nil' do
+        let(:dist_data){ nil }
+        let(:data){ sample_dist_data }
+        it 'returns the same config as sample_dist_data' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
+        end
+      end
+      context 'when the data is the same as sample data' do
+        let(:data){ sample_dist_data }
+        it 'returns the same config as sample_dist_data' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
+        end
+      end
+      context 'when the data has additional key' do
+        let(:data){ sample_dist_data.merge('new_key'=> 'new_val') }
+        it 'returns the same config as data' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq data
+        end
+      end
+      context 'when the dist data has additional key' do
+        let(:dist_data){ sample_dist_data.merge('new_key'=> 'new_val') }
+        let(:data){ sample_dist_data }
+        it 'returns the same config as dist_data' do
+          expect(pf.fill_parameters(data, dist_data)).to eq dist_data
+        end
+      end
+      context 'when both data and dist data have additional keys' do
+        let(:dist_data){ sample_dist_data.merge('new_key'=> 'new_val') }
+        let(:data){ sample_dist_data.merge('new_key2'=> 'new_val2') }
+        it 'returns data with this keys' do
+          expect(pf.fill_parameters(data, dist_data)).to eq dist_data.merge('new_key2'=> 'new_val2')
+        end
+      end
     end
-  end
-  context 'when the data is the same as sample data' do
-    let(:data){ sample_dist_data }
-    it 'returns the same config as sample_dist_data' do
-      expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
-    end
-  end
-  context 'when the data has additional key' do
-    let(:data){ sample_dist_data.merge('new_key'=> 'new_val') }
-    it 'returns the same config as data' do
-      expect(pf.fill_parameters(data, sample_dist_data)).to eq data
-    end
-  end
-  context 'when the dist data has additional key' do
-    let(:dist_data){ sample_dist_data.merge('new_key'=> 'new_val') }
-    let(:data){ sample_dist_data }
-    it 'returns the same config as dist_data' do
-      expect(pf.fill_parameters(data, dist_data)).to eq dist_data
+
+    context 'nested input yml' do
+      def sample_dist_data
+        YAML.load(<<-EOF
+          key01: val01
+          key02:
+            key11: val11
+            key12:
+              key20: val20
+        EOF
+        )
+      end
+      let(:pf) { ParameterFiller.new('', false, false) }
+      context 'when the data is nil' do
+        let(:data){ nil }
+        it 'returns the same config as sample_dist_data' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
+        end
+      end
+      context 'when the dist data is nil' do
+        let(:dist_data){ nil }
+        let(:data){ sample_dist_data }
+        it 'returns the same config as sample_dist_data' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
+        end
+      end
+      context 'when the data is the same as sample data' do
+        let(:data){ sample_dist_data }
+        it 'returns the same config as sample_dist_data' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq sample_dist_data
+        end
+      end
+      context 'when the data has additional key' do
+        context 'on zero level of nesting' do
+          let(:data){ sample_dist_data.merge('new_key'=> 'new_val') }
+          it 'returns the same config as data' do
+            expect(pf.fill_parameters(data, sample_dist_data)).to eq data
+          end
+        end
+        context 'on first level of nesting' do
+          let(:data){ sample_dist_data.merge('key02' => sample_dist_data['key02'].merge('new_key'=> 'new_val')) }
+          it 'returns the same config as data' do
+            expect(pf.fill_parameters(data, sample_dist_data)).to eq data
+          end
+        end
+      end
+      context 'when the dist data has additional key' do
+        context 'on zero level of nesting' do
+          let(:dist_data){ sample_dist_data.merge('new_key'=> 'new_val') }
+          let(:data){ sample_dist_data }
+          it 'returns the same config as dist_data' do
+            expect(pf.fill_parameters(data, dist_data)).to eq dist_data
+          end
+        end
+        context 'on first level of nesting' do
+          let(:dist_data){ sample_dist_data.merge('key02' => sample_dist_data['key02'].merge('new_key'=> 'new_val')) }
+          let(:data){ sample_dist_data }
+          it 'returns the same config as dist_data' do
+            expect(pf.fill_parameters(data, dist_data)).to eq dist_data
+          end
+        end
+      end
+      context 'when both data and dist data have additional keys' do
+        context 'dist data on zero level of nesting and data on first level of nesting' do
+          let(:dist_data){ sample_dist_data.merge('new_key'=> 'new_val') }
+          let(:data){ sample_dist_data.merge('key02' => sample_dist_data['key02'].merge('new_key2'=> 'new_val2')) }
+          it 'returns data with this keys' do
+            expect(pf.fill_parameters(data, dist_data)).to eq data.merge('new_key'=> 'new_val')
+          end
+        end
+        context 'dist data on first level of nesting and data on zero level of nesting' do
+          let(:dist_data){ sample_dist_data.merge('key02' => sample_dist_data['key02'].merge('new_key'=> 'new_val')) }
+          let(:data){ sample_dist_data.merge('new_key2'=> 'new_val2') }
+          it 'returns data with this keys' do
+            expect(pf.fill_parameters(data, dist_data)).to eq dist_data.merge('new_key2'=> 'new_val2')
+          end
+        end
+        context 'when both data and dist data on first level of nesting' do
+          let(:dist_data){ sample_dist_data.merge('key02' => sample_dist_data['key02'].merge('new_key'=> 'new_val')) }
+          let(:data){ sample_dist_data.merge('key02' => sample_dist_data['key02'].merge('new_key2'=> 'new_val2')) }
+          it 'returns data with this keys' do
+            expect(pf.fill_parameters(data, dist_data)).to eq dist_data.merge('key02' => dist_data['key02'].merge('new_key2'=> 'new_val2'))
+          end
+        end
+      end
     end
-  end
-  context 'when both data and dist data have additional keys' do
-    let(:dist_data){ sample_dist_data.merge('new_key'=> 'new_val') }
-    let(:data){ sample_dist_data.merge('new_key2'=> 'new_val2') }
-    it 'returns data with this keys' do
-      expect(pf.fill_parameters(data, dist_data)).to eq dist_data.merge('new_key2'=> 'new_val2')
+
+    context 'yml with anchors and aliases' do
+      def sample_dist_data
+        YAML.load(<<-EOF
+          defaults: &defaults
+            adapter:  postgres
+            host:     localhost
+
+          development:
+            database: myapp_development
+            <<: *defaults
+
+          test:
+            database: myapp_test
+            <<: *defaults
+        EOF
+        )
+      end
+
+      def data_results
+        YAML.load(<<-EOF
+          defaults:
+            adapter:  postgres
+            host:     localhost
+
+          development:
+            database: myapp_development
+            adapter:  postgres
+            host:     localhost
+
+          test:
+            database: myapp_test
+            adapter:  postgres
+            host:     localhost
+        EOF
+        )
+      end
+
+      let(:pf) { ParameterFiller.new('', false, false) }
+      context 'when the data is nil' do
+        let(:data){ nil }
+        it 'returns data_results' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq data_results
+        end
+      end
+      context 'when the dist data is nil' do
+        let(:dist_data){ nil }
+        let(:data){ sample_dist_data }
+        it 'returns data_results' do
+          expect(pf.fill_parameters(data, sample_dist_data)).to eq data_results
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'bundler/setup'
-
 require 'parameter_filler.rb'
 
 Bundler.setup

metadata

@@ -1,56 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: fillparams
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Krzysztof Hasiński
 - Justyna Wojtczak
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem for filling in parameters automatically
@@ -62,8 +62,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - FillParams.gemspec
 - Gemfile
 - LICENSE.txt
@@ -82,24 +83,23 @@ homepage: http://github.com/khasinski/fillparams
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Parameters handler, for usage see github page
 test_files: