elastic-beanstalk 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODk1NDRlNWNiYzU4YjliODEzMmRlZDAxNzM5NmNjNGNmMDMzNjFhOQ==
-  data.tar.gz: !binary |-
-    YmZjN2U2ZTFkNDMwN2EwOTdiNmMwZTNmNDA2ZTI2NTQ0MTc4YTc1MA==
+SHA1:
+  metadata.gz: bd92161e1d28fa74d1477f25722ab46ef7a317a3
+  data.tar.gz: a420656cf0377105535dcb2fe85c0fe9e5cdc2f3
 SHA512:
-  metadata.gz: !binary |-
-    NDgyNzAwZTljM2NhMThmOWJlZDEwM2JhOGM1YWFkZTkzYTVjMTBmOWRmMmEz
-    ZjRhNGFjN2JhYzVkYTUzNDJjMGJiMDQxMWU2ZDU1Mjc4ZDFhZTA4ZWE5MDc5
-    YzgyNzk4ZWRkODEwOTgxZGQ4YWY4N2I0MGJiY2Q5MmY1NzJkNzY=
-  data.tar.gz: !binary |-
-    ZjIwY2JiNjg2OTljNjkzOWQxODVmNTJiNzQwMzc2MjExYWU4ODAzNGQ3YWRm
-    MzE0MmJkOTEzZTk1NzI1YWY5NTEyYmNiYzljMWY0YmM2ZjMxY2JiOGNiOGNi
-    MTIyN2M1ODQwZWM0MjU1ZDhmNmI0Yjk1NWJkOTk1MmFjY2JmMGU=
+  metadata.gz: b6bf08a076d200af22fffe617675a16e9a7f4c3d737b55847e632cafc7a2a37f1f6a96a5f59cccfe6d88b568f939f0bdf621cc4b102d984ec2491a09eb9d7658
+  data.tar.gz: 40398ddde6d73fd67bbcd7e841e0b7d08497ac842f3ec0b39f9172727ecfdbbf6f1560f2437e6c9cbcf62848b6c9dee7b9070f515294cd5aa35001e512b82651

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 *.gem
 *.rbc
 .bundle

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3@elastic_beanstalk --create
+rvm use ruby-2.1.2@elastic_beanstalk --create

data/elastic-beanstalk.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rubyzip'
   s.add_runtime_dependency 'table_print'
   s.add_runtime_dependency 'nokogiri'
+  s.add_runtime_dependency 'dry-config'
 end

data/lib/elastic/beanstalk.rb

@@ -1,7 +1,6 @@
 module Elastic
   module Beanstalk
     require 'elastic/beanstalk/railtie' if defined?(Rails::Railtie)
-    require 'deep_symbolize'
     require 'elastic/beanstalk/config'
     require 'elastic/beanstalk/extensions'
     require 'elastic/beanstalk/smoke_tester'
@@ -10,7 +9,7 @@ module Elastic
   end
 end
 
-EbConfig = Elastic::Beanstalk::Config
+EbConfig = Elastic::Beanstalk::Config.instance
 EbExtensions = Elastic::Beanstalk::Extensions
 EbSmokeTester = Elastic::Beanstalk::SmokeTester
 Spinner = Elastic::Beanstalk::Spinner

data/lib/elastic/beanstalk/config.rb

@@ -1,5 +1,5 @@
-require 'deep_symbolize'
-require 'yaml'
+require 'singleton'
+require 'dry/config'
 
 module Elastic
   module Beanstalk
@@ -12,12 +12,13 @@ module Elastic
 #   something is screwy, see the defaults in the #init as those add some default array values.
 #   If this behavior of merging arrays or the defaults are somehow un-sensible, file an issue and we'll revisit it.
 #
-    module Config
-      # it's a singleton, thus implemented as a self-extended module
-      extend self
+    class Config < Dry::Config::Base
 
-      def init
+      include Singleton
+      # it's a singleton, thus implemented as a self-extended module
+      # extend self
 
+      def seed_default_configuration
         # seed the sensible defaults here
         @configuration = {
             environment: nil,
@@ -35,84 +36,25 @@ module Elastic
         }
       end
 
-      init()
-      attr_reader :configuration
-
-      # This is the main point of entry - we call Settings.load! and provide
-      # a name of the file to read as it's argument. We can also pass in some
-      # options, but at the moment it's being used to allow per-environment
-      # overrides in Rails
       def load!(environment = nil, filename = resolve_path('config/eb.yml'))
-
-        # merge all top level settings with the defaults set in the #init
-        #@configuration.deep_merge!( YAML::load_file(filename).deep_symbolize )
-        deep_merge!(@configuration, YAML::load_file(filename).deep_symbolize)
-
-        # add the environment to the top level settings
-        @configuration[:environment] = (environment.nil? ? nil : environment.to_s)
-
-        # overlay the specific environment if provided
-        if environment && @configuration[environment.to_sym]
-
-          # this is environment specific, so prune any environment
-          # based settings from the initial set so that they can be overlaid.
-          [:development, :test, :staging, :production].each do |env|
-            @configuration.delete(env)
-          end
-
-          # re-read the file
-          environment_settings = YAML::load_file(filename).deep_symbolize
-
-          # snag the requested environment
-          environment_settings = environment_settings[environment.to_sym]
-
-          # finally overlay what was provided
-          #@configuration.deep_merge!(environment_settings)
-          deep_merge!(@configuration, environment_settings)
-        end
-
-
-        #ap @configuration
-        #generate_accessors
-      end
-
-      def deep_merge!(target, data)
-        merger = proc { |key, v1, v2|
-          if (Hash === v1 && Hash === v2)
-            v1.merge(v2, &merger)
-          elsif (Array === v1 && Array === v2)
-            v1.concat(v2)
-          else
-            v2
-          end
-        }
-        target.merge! data, &merger
-      end
-
-      def reload!(options = {}, filename)
-        clear
-        #filename.nil? ?
-        load!(options) # : load!(options, filename)
-      end
-
-      def to_yaml
-
+        super(environment, filename)
       end
 
-      def method_missing(name, *args, &block)
-        @configuration[name.to_sym] ||
-            #fail(NoMethodError, "Unknown settings root \'#{name}\'", caller)
-            nil
-      end
 
-      def clear
-        init
+      def resolve_path(relative_path)
+        if defined?(Rails)
+          Rails.root.join(relative_path)
+        elsif defined?(Rake.original_dir)
+          File.expand_path(relative_path, Rake.original_dir)
+        else
+          File.expand_path(relative_path, Dir.pwd)
+        end
       end
 
-      def options
-        @configuration[:options] = {} if @configuration[:options].nil?
-        @configuration[:options]
-      end
+      # def options
+      #   @configuration[:options] = {} if @configuration[:options].nil?
+      #   @configuration[:options]
+      # end
 
       # custom methods for the specifics of eb.yml settings
       def option_settings
@@ -158,43 +100,11 @@ module Elastic
 
       def to_option_setting(namespace, option_name, value)
         {
-            :"namespace" => "#{namespace}",
-            :"option_name" => "#{option_name}",
-            :"value" => "#{value}"
+            :'namespace' => "#{namespace}",
+            :'option_name' => "#{option_name}",
+            :'value' => "#{value}"
         }
       end
-
-      def resolve_path(relative_path)
-
-        if defined?(Rails)
-          Rails.root.join(relative_path)
-        elsif defined?(Rake.original_dir)
-          File.expand_path(relative_path, Rake.original_dir)
-        else
-          File.expand_path(relative_path, Dir.pwd)
-        end
-      end
-
-
-      #def environment
-      #  @configuration[:environment]
-      #end
-      #
-      #def options
-      #  @configuration[:options]
-      #end
-
-      private
-
-      #def generate_accessors
-      #  # generate a method for accessors
-      #  @configuration.each do |key, value|
-      #    define_method(key) do
-      #      value
-      #    end unless ['options', 'environment'].include? key
-      #  end
-      #end
     end
-
   end
 end

data/lib/elastic/beanstalk/version.rb

@@ -1,5 +1,5 @@
 module Elastic
   module Beanstalk
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

metadata

@@ -1,159 +1,171 @@
 --- !ruby/object:Gem::Specification
 name: elastic-beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kevin Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: eb_deployer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: time_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '    The simplest way to configure and deploy an Elastic Beanstalk
-  application via rake.
-
-'
+- !ruby/object:Gem::Dependency
+  name: dry-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      The simplest way to configure and deploy an Elastic Beanstalk application via rake.
 email:
 - kevin.ross@alienfast.com
 executables:
@@ -161,15 +173,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".gitignore"
+- ".rvmrc"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/elastic-beanstalk
 - elastic-beanstalk.gemspec
-- lib/deep_symbolize.rb
 - lib/elastic/beanstalk.rb
 - lib/elastic/beanstalk/config.rb
 - lib/elastic/beanstalk/extensions.rb
@@ -194,17 +205,17 @@ 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.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Configure and deploy a rails app to Elastic Beanstalk via rake in 60 seconds.

data/lib/deep_symbolize.rb

@@ -1,74 +0,0 @@
-# Slightly modified from https://gist.github.com/morhekil/998709
-
-# Symbolizes all of hash's keys and subkeys.
-# Also allows for custom pre-processing of keys (e.g. downcasing, etc)
-# if the block is given:
-#
-# somehash.deep_symbolize { |key| key.downcase }
-#
-# Usage: either include it into global Hash class to make it available to
-#        to all hashes, or extend only your own hash objects with this
-#        module.
-#        E.g.:
-#        1) class Hash; include DeepSymbolizable; end
-#        2) myhash.extend DeepSymbolizable
-module DeepSymbolizable
-  def deep_symbolize(invert = false, &block)
-    method = self.class.to_s.downcase.to_sym
-    symbolizers = DeepSymbolizable::Symbolizers
-    symbolizers.respond_to?(method) ? symbolizers.send(method, self, invert, &block) : self
-  end
-
-  module Symbolizers
-    extend self
-
-    # the primary method - symbolizes keys of the given hash,
-    # preprocessing them with a block if one was given, and recursively
-    # going into all nested enumerables
-    def hash(hash, invert, &block)
-      hash.inject({}) do |result, (key, value)|
-        # Recursively deep-symbolize subhashes
-        value = _recurse_(value, invert, &block)
-
-        # Pre-process the key with a block if it was given
-        key = yield key if block_given?
-
-        if invert
-          # UN-Symbolize the key
-          s_key = key.to_s rescue key
-
-          # write it back into the result and return the updated hash
-          result[s_key] = value
-
-        else
-          # Symbolize the key string if it responds to to_sym
-          sym_key = key.to_sym rescue key
-
-          # write it back into the result and return the updated hash
-          result[sym_key] = value
-        end
-        result
-      end
-    end
-
-    # walking over arrays and symbolizing all nested elements
-    def array(ary, invert, &block)
-      ary.map { |v| _recurse_(v, invert, &block) }
-    end
-
-    # handling recursion - any Enumerable elements (except String)
-    # is being extended with the module, and then symbolized
-    def _recurse_(value, invert, &block)
-      if value.is_a?(Enumerable) && !value.is_a?(String)
-        # support for a use case without extended core Hash
-        value.extend DeepSymbolizable unless value.class.include?(DeepSymbolizable)
-        value = value.deep_symbolize(invert, &block)
-      end
-      value
-    end
-  end
-
-end
-
-# include in all Hash objects
-class Hash; include DeepSymbolizable; end