aws-ssm-env 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42b51ae8562dfef400fdc2a244ac04ee333d76e836b80b1cd722ca3027bde2d4
-  data.tar.gz: 351176835c06d118460bb5455a34cfdd3198771b161aca9c1d8e66aac0eb0368
+  metadata.gz: 7f70eabbd5d506e704fe7c7c3d22d60a998207596df66c22c205da2951d9eb92
+  data.tar.gz: 722a3d367daf0d4d4175e535dd16df23942aa2dede494950386ec2ea5e93ac70
 SHA512:
-  metadata.gz: 27a30b575fd1b1b1ca6b951df0bff61f61b549f59f8568039007d352ae61b65f5c204b88e43ef23f95cf9caff66d5437ac2fad8d3091a964b499747afc6b1615
-  data.tar.gz: 7cab36b73fa5adeb5c2532695239777aa97be74128668b34ec8a48a57833f7b53dd19e7e68bd5518087fa1d4f9795685876d5f5a1170f6f15c915d3d84e8f74f
+  metadata.gz: 3dfa1d43c25d1dbf99a51f25c8e8042deb09d472e81ab3c8b32d2ac9210dadc99606a1d170a7d5d68332a5dc0c415307e509c39e5614a3a99aa6103b5c809184
+  data.tar.gz: 6ec4f594ba7e945b4831efa7b768d9c7a5939cd2e40c3a696e29064a758a232fb6d15e2cba7e94e590fd12a0decaf6abe95bd6137fc57fa74958154c16e67e9e

data/CHANGELOG.md

@@ -1,7 +1,12 @@
 # CHANGELOG
 
+## 0.1.2 (2020-12-02)
+
+- Add ruby 2.7 to Travis CI test matrix #7
+- Fix for early abort when next_token is not null #8
+- drop ruby 2.4 support, and fix warnings #11
+
 ## 0.1.1 (2018-01-16)
 
 - Translate README.
 - Added ruby 2.5 tests.
-

data/README.md

@@ -16,7 +16,7 @@ The naming of environment variables is optional and can be customized.
 
 ## Installation
 
-This gem has been tested with ruby version 2.2 to 2.5.
+This gem has been tested with ruby version 2.5 to 2.7.
 
 ```
 gem install aws-ssm-env

data/README_ja.md

@@ -13,7 +13,7 @@ AWS EC2 Parameter Storeから取得したパラメータを環境変数として
 
 ## Installation
 
-このgemはRuby2.2から2.5まででテストされています。
+このgemはRuby2.5から2.7まででテストされています。
 
 ```
 gem install aws-ssm-env

data/lib/aws-ssm-env.rb

@@ -149,12 +149,12 @@ module AwsSsmEnv
   #
   # @see AwsSsmEnv::Loader#load
   def load(**args)
-    AwsSsmEnv::Loader.load(args)
+    AwsSsmEnv::Loader.load(**args)
   end
 
   # `overwrite`オプションを付与した AwsSsmEnv::Loader#load の委譲メソッド。
   # @see AwsSsmEnv::Loader#load
   def load!(**args)
-    AwsSsmEnv::Loader.load(args.merge(overwrite: true))
+    AwsSsmEnv::Loader.load(**args.merge(overwrite: true))
   end
 end

data/lib/aws-ssm-env/fetcher.rb

@@ -23,8 +23,8 @@ module AwsSsmEnv
     #
     # @see http://docs.aws.amazon.com/sdk-for-ruby/v3/api/index.html
     def initialize(**args)
-      @client = create_ssm_client(args)
-      @with_decryption = with_decryption?(args)
+      @client = create_ssm_client(**args)
+      @with_decryption = with_decryption?(**args)
     end
 
     # Iteratorパターンを実装したメソッド。AwsSsmEnv#load から呼び出される。
@@ -36,9 +36,6 @@ module AwsSsmEnv
       loop do
         response = fetch(next_token)
         next_token = response.next_token
-        if response.parameters.empty?
-          break
-        end
         response.parameters.each do |p|
           yield(p)
         end

data/lib/aws-ssm-env/fetchers/begins_with.rb

@@ -16,7 +16,7 @@ module AwsSsmEnv
     # @option args [Integet] :fetch_size <optional> 一度のAPI実行で取得するパラメータ数。最大50。デフォルトは50。
     def initialize(**args)
       super
-      @base_params = base_params(args)
+      @base_params = base_params(**args)
     end
 
     protected

data/lib/aws-ssm-env/fetchers/factory.rb

@@ -19,11 +19,11 @@ module AwsSsmEnv
         fetch_type = args[:fetch]
         case fetch_type
         when nil
-          default_fetcher(args)
+          default_fetcher(**args)
         when PATH_FETCHER
-          create_path_fetcher(args)
+          create_path_fetcher(**args)
         when BEGINS_WITH_FETCHER
-          create_begins_with_fetcher(args)
+          create_begins_with_fetcher(**args)
         else
           unless fetcher_instance?(fetch_type)
             raise ArgumentError, 'Possible values for :fetch are either :path, :begins_with, ' \
@@ -37,20 +37,20 @@ module AwsSsmEnv
 
       def default_fetcher(**args)
         if args.key?(:begins_with)
-          create_begins_with_fetcher(args)
+          create_begins_with_fetcher(**args)
         else
-          create_path_fetcher(args)
+          create_path_fetcher(**args)
         end
       end
 
       def create_path_fetcher(**args)
         require 'aws-ssm-env/fetchers/path'
-        AwsSsmEnv::PathFetcher.new(args)
+        AwsSsmEnv::PathFetcher.new(**args)
       end
 
       def create_begins_with_fetcher(**args)
         require 'aws-ssm-env/fetchers/begins_with'
-        AwsSsmEnv::BeginsWithFetcher.new(args)
+        AwsSsmEnv::BeginsWithFetcher.new(**args)
       end
 
       def fetcher_instance?(object)

data/lib/aws-ssm-env/fetchers/path.rb

@@ -18,7 +18,7 @@ module AwsSsmEnv
     # @option args [Integer] :fetch_size <optional> 一度のAPI実行で取得するパラメータ数。最大10。デフォルトは10。
     def initialize(**args)
       super
-      @base_params = base_params(args)
+      @base_params = base_params(**args)
     end
 
     protected

data/lib/aws-ssm-env/loader.rb

@@ -10,11 +10,11 @@ module AwsSsmEnv
   class Loader
     # メイン処理。引数の詳細は AwsSsmEnv#load を参照。
     def self.load(**args)
-      new(args).load
+      new(**args).load
     end
 
     def initialize(**args)
-      parse_options(args)
+      parse_options(**args)
       if @logger
         @logger.debug("#{self.class.name} overwrite: #{@overwrite}")
         @logger.debug("#{self.class.name} fetcher: #{@fetcher}")
@@ -34,9 +34,9 @@ module AwsSsmEnv
 
     def parse_options(**options)
       @logger = options[:logger]
-      @fetcher = AwsSsmEnv::FetcherFactory.create_fetcher(options)
-      @naming_strategy = AwsSsmEnv::NamingStrategyFactory.create_naming_strategy(options)
-      @overwrite = overwrite?(options)
+      @fetcher = AwsSsmEnv::FetcherFactory.create_fetcher(**options)
+      @naming_strategy = AwsSsmEnv::NamingStrategyFactory.create_naming_strategy(**options)
+      @overwrite = overwrite?(**options)
       if @overwrite
         @applier = :apply!
       else

data/lib/aws-ssm-env/naming_strategies/factory.rb

@@ -18,13 +18,13 @@ module AwsSsmEnv
       def create_naming_strategy(**args)
         naming_strategy = args[:naming]
         if naming_strategy.nil?
-          return default_strategy(args)
+          return default_strategy(**args)
         end
         case naming_strategy
         when BASENAME_STRATEGY
-          create_basename_strategy(args)
+          create_basename_strategy(**args)
         when SNAKE_CASE_STRATEGY
-          create_snakecase_strategy(args)
+          create_snakecase_strategy(**args)
         else
           unknown_naming_strategy(naming_strategy)
         end
@@ -33,17 +33,17 @@ module AwsSsmEnv
       private
 
       def default_strategy(**args)
-        create_basename_strategy(args)
+        create_basename_strategy(**args)
       end
 
       def create_basename_strategy(**args)
         require 'aws-ssm-env/naming_strategies/basename'
-        AwsSsmEnv::BasenameNamingStrategy.new(args)
+        AwsSsmEnv::BasenameNamingStrategy.new(**args)
       end
 
       def create_snakecase_strategy(**args)
         require 'aws-ssm-env/naming_strategies/snakecase'
-        AwsSsmEnv::SnakeCaseNamingStrategy.new(args)
+        AwsSsmEnv::SnakeCaseNamingStrategy.new(**args)
       end
 
       def unknown_naming_strategy(naming_strategy)

data/lib/aws-ssm-env/naming_strategies/snakecase.rb

@@ -18,8 +18,8 @@ module AwsSsmEnv
     #   アンダースコアに変換する区切り文字。デフォルトはスラッシュ('/')。 TODO: AwsSsmEnv#loadとREADMEに反映
     def initialize(**args)
       @logger = args[:logger]
-      @delimiter = detect_delimiter(args)
-      removed_prefix = detect_prefix(args).sub(%r{/\z}, '')
+      @delimiter = detect_delimiter(**args)
+      removed_prefix = detect_prefix(**args).sub(%r{/\z}, '')
       @removed_prefix = /\A#{Regexp.escape(removed_prefix)}/
       @logger.debug("#{self.class.name} removed_prefix is #{@removed_prefix}") if @logger
     end

data/lib/aws-ssm-env/version.rb

@@ -1,3 +1,3 @@
 module AwsSsmEnv
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/spec/aws-ssm-env/fetcher_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe AwsSsmEnv::Fetcher do
-  let(:fetcher) { described_class.new(args) }
+  let(:fetcher) { described_class.new(**args) }
   let(:args) { {} }
   let(:client) { fetcher.send(:client) }
   let(:ssm_client_args) {
@@ -86,58 +86,55 @@ describe AwsSsmEnv::Fetcher do
     let(:parameters) { [ Parameter.new('foo', 'foo'), Parameter.new('bar', 'bar') ] }
     let(:fetcher) {
       mock_class = Class.new(described_class) do
-        def initialize(response); @response = response; end
-        protected def fetch(_); @response; end
+        def initialize(responses); @responses = responses; end
+        protected def fetch(_); @responses.shift; end
       end
-      mock_class.new(dummy_response)
+      mock_class.new(responses)
     }
 
+    def call_count
+      called = 0
+      fetcher.each do |_|
+        called += 1
+      end
+      called
+    end
+
     context 'when fetch returns empty parameters at first' do
-      let(:dummy_response) { AwsSsmEnv::FetchResult::EMPTY }
+      let(:responses) { [AwsSsmEnv::FetchResult::EMPTY] }
 
       it 'consumer is not called' do
-        called = false
-        fetcher.each do |_|
-          called = true
-        end
-        expect(called).to be_falsey
+        expect(call_count).to eq(0)
+      end
+    end
+
+    context 'when fetch returns empty params and next_token at first, fetch returns two parameters and empty next_token at second' do
+      let(:responses) {
+        [ AwsSsmEnv::FetchResult.new([], 'next_token'),
+          AwsSsmEnv::FetchResult.new(parameters, nil)]
+      }
+
+      it 'consumer is called twice' do
+        expect(call_count).to eq(2)
       end
     end
 
     context 'when fetch returns two parameters at first and empty next_token' do
-      let(:dummy_response) { AwsSsmEnv::FetchResult.new(parameters, nil) }
+      let(:responses) { [AwsSsmEnv::FetchResult.new(parameters, nil)] }
 
       it 'consumer is called twice' do
-        called = 0
-        fetcher.each do |_|
-          called += 1
-        end
-        expect(called).to eq(2)
+        expect(call_count).to eq(2)
       end
     end
 
     context 'when fetch returns two parameters and next_token at first, fetch returns two parameters and empty next_token at second' do
-      let(:fetcher) {
-        mock_class = Class.new(described_class) do
-          def initialize(parameters); @parameters = parameters; @count = 0; end
-          protected def fetch(_)
-            if @count == 0
-              @count = 1
-              AwsSsmEnv::FetchResult.new(@parameters, 'next_token')
-            else
-              AwsSsmEnv::FetchResult.new(@parameters, nil)
-            end
-          end
-        end
-        mock_class.new(parameters)
+      let(:responses) {
+        [AwsSsmEnv::FetchResult.new(parameters, 'next_token'),
+         AwsSsmEnv::FetchResult.new(parameters, nil)]
       }
 
       it 'consumer is called four times' do
-        called = 0
-        fetcher.each do |_|
-          called += 1
-        end
-        expect(called).to eq(4)
+        expect(call_count).to eq(4)
       end
     end
   end

data/spec/aws-ssm-env/fetchers/begins_with_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'aws-ssm-env/fetchers/begins_with'
 
 describe AwsSsmEnv::BeginsWithFetcher do
-  let(:fetcher) { described_class.new(args) }
+  let(:fetcher) { described_class.new(**args) }
   let(:args) { { begins_with: [ '/foo', '/bar' ] } }
   let(:base_params) { fetcher.instance_variable_get(:'@base_params') }
   let(:parameter_filter) { base_params[:parameter_filters][0] }

data/spec/aws-ssm-env/fetchers/factory_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe AwsSsmEnv::FetcherFactory do
   describe '#create_fetcher' do
-    let(:fetcher) { described_class.create_fetcher(args) }
+    let(:fetcher) { described_class.create_fetcher(**args) }
 
     context 'when fetch was not set' do
       context 'when begins_with was not set' do

data/spec/aws-ssm-env/fetchers/path_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'aws-ssm-env/fetchers/path'
 
 describe AwsSsmEnv::PathFetcher do
-  let(:fetcher) { described_class.new(args) }
+  let(:fetcher) { described_class.new(**args) }
   let(:args) { { path: '/path' } }
   let(:base_params) { fetcher.instance_variable_get(:'@base_params') }
 

data/spec/aws-ssm-env/loader_spec.rb

@@ -4,7 +4,7 @@ describe AwsSsmEnv::Loader do
   let(:args) { { path: '/foo' } }
 
   describe '#initialize' do
-    let(:loader) { described_class.new(args) }
+    let(:loader) { described_class.new(**args) }
 
     it 'has fetcher and naming_strategy' do
       expect(loader.instance_variable_get(:@fetcher)).to be_a(AwsSsmEnv::PathFetcher)
@@ -52,7 +52,7 @@ describe AwsSsmEnv::Loader do
         ENV['foo'] = nil
         ENV['fizz'] = 'fizz'
 
-        loader = described_class.new(args)
+        loader = described_class.new(**args)
         loader.instance_variable_set(:@fetcher,
           [ Parameter.new('foo', 'bar'), Parameter.new('fizz', 'buzz') ])
 
@@ -70,7 +70,7 @@ describe AwsSsmEnv::Loader do
         ENV['foo'] = nil
         ENV['fizz'] = 'fizz'
 
-        loader = described_class.new(args)
+        loader = described_class.new(**args)
         loader.instance_variable_set(:@fetcher,
           [ Parameter.new('foo', 'bar'), Parameter.new('fizz', 'buzz') ])
 

data/spec/aws-ssm-env/naming_strategies/factory_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe AwsSsmEnv::NamingStrategyFactory do
   describe '#create_naming_strategy' do
-    let(:naming_strategy) { described_class.create_naming_strategy(args) }
+    let(:naming_strategy) { described_class.create_naming_strategy(**args) }
 
     context 'when naming was not set' do
       let(:args) { { naming: nil } }

data/spec/aws-ssm-env/naming_strategies/snakecase_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'aws-ssm-env/naming_strategies/snakecase'
 
 describe AwsSsmEnv::SnakeCaseNamingStrategy do
-  let(:strategy) { described_class.new(args) }
+  let(:strategy) { described_class.new(**args) }
   let(:name) { 'path.to.db/password' }
   let(:env_name) { strategy.parse_name(Parameter.new(name)) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ssm-env
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryohei Sonoda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
@@ -84,16 +84,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ licenses:
 - Apache-2.0
 metadata:
   source_code_uri: https://github.com/sonodar/aws-ssm-env-ruby
-  changelog_uri: https://github.com/sonodar/aws-ssm-env-ruby/tree/master/aws-ssm-env-ruby/CHANGELOG.md
+  changelog_uri: https://github.com/sonodar/aws-ssm-env-ruby/tree/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -156,15 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Set parameters acquired from AWS EC2 Parameter Store as environment variables.