chamber 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d109673b130deb762adb5bb07bdce3f93c3848
-  data.tar.gz: 7bbce53ee5448ac94a876ca314461ce216ad881c
+  metadata.gz: 25bcff86c6f67c097a5b89db28c8f04cb92ca51b
+  data.tar.gz: fdb0c2f9f311ccd0f8f99a2a678bd584842e8d4f
 SHA512:
-  metadata.gz: 8e1cdda8675bdb504657159f52209dd24fa5bd9accecd2cfddbb68a1df08011684b1152eeb975362a0b3452d8a9183655e886f5b3078659a934349229ee5a4a3
-  data.tar.gz: d540cd77c3e966b9f355f1e910b74317254f4d8b6ea32e47db39fc92f567b3e6d71d029daebd059cbe371fcc5d63f7e3e106090dec9bb8f6944245cc3626dd0d
+  metadata.gz: 775493e4d7cb32f6878e6f86cef1995eff27816324aecb0d33b8b99a3d2e04b8684644f035f3a806b82dfd969bed778c980e99c8871c4176993e2bafc103b319
+  data.tar.gz: 54104049d2d5de2362a5f72e5d683040956e9338cbf374903db15538ccdb62174231e48adebd290a046ce65139e1771af2a8c9992d29cf8eb7d9878a9235a708

data/README.md

@@ -10,10 +10,10 @@ We reviewed [some other gems](#alternatives), and while each fit a specific need
 and each did some things well, none of them met all of the criteria that we felt
 we (and assumed others) needed.
 
-<img src="https://akiajm7spx4gtbhaxe3qcomhaystacksoftwarearp.s3.amazonaws.com/photos/readmes/ten-commandments.png" align="right" />
-
 **Our Ten Commandments of Configuration Management**
 
+<img src="https://akiajm7spx4gtbhaxe3qcomhaystacksoftwarearp.s3.amazonaws.com/photos/readmes/ten-commandments.png" align="right" />
+
 1. Thou shalt be configurable, but use conventions so that configuration isn't
    necessary
 1. Thou shalt seemlessly work with Heroku or other deployment platforms, where custom

data/lib/chamber/commands/base.rb

@@ -1,4 +1,3 @@
-require 'chamber/commands/context_resolver'
 require 'chamber/instance'
 
 module  Chamber
@@ -6,8 +5,6 @@ module  Commands
 class   Base
 
   def initialize(options = {})
-    options       = ContextResolver.resolve(options)
-
     self.chamber  = Chamber::Instance.new options
     self.shell    = options[:shell]
     self.rootpath = options[:rootpath]

data/lib/chamber/configuration.rb

@@ -1,3 +1,5 @@
+require 'chamber/context_resolver'
+
 module  Chamber
 class   Configuration
   attr_accessor :basepath,
@@ -7,14 +9,13 @@ class   Configuration
                 :namespaces
 
   def initialize(options = {})
-    self.basepath       = options[:basepath]        || ''
-    self.namespaces     = options[:namespaces]      || []
+    options             = ContextResolver.resolve(options)
+
+    self.basepath       = options[:basepath]
+    self.namespaces     = options[:namespaces]
     self.decryption_key = options[:decryption_key]
     self.encryption_key = options[:encryption_key]
-    self.files          = options[:files]           || [
-                        self.basepath + 'credentials*.yml',
-                        self.basepath + 'settings*.yml',
-                        self.basepath + 'settings' ]
+    self.files          = options[:files]
   end
 
   def to_hash
@@ -26,9 +27,5 @@ class   Configuration
       namespaces:     self.namespaces,
     }
   end
-
-  def basepath=(pathlike)
-    @basepath = pathlike == '' ? '' : Pathname.new(::File.expand_path(pathlike))
-  end
 end
 end

data/lib/chamber/{commands/context_resolver.rb → context_resolver.rb}

@@ -1,5 +1,4 @@
 module  Chamber
-module  Commands
 class   ContextResolver
 
   def initialize(options = {})
@@ -26,6 +25,12 @@ class   ContextResolver
       options[:basepath]     ||= options[:rootpath]
     end
 
+    options[:basepath]         = Pathname.new(options[:basepath])
+
+    options[:files]          ||= [ options[:basepath] + 'credentials*.yml',
+                                   options[:basepath] + 'settings*.yml',
+                                   options[:basepath] + 'settings' ]
+
     options
   rescue LoadError
     options
@@ -69,4 +74,3 @@ class   ContextResolver
   end
 end
 end
-end

data/lib/chamber/version.rb

@@ -1,3 +1,3 @@
 module Chamber
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/lib/chamber/{commands/context_resolver_spec.rb → context_resolver_spec.rb}

@@ -1,19 +1,18 @@
 require 'rspectacular'
-require 'chamber/commands/context_resolver'
+require 'chamber/context_resolver'
 
 module    Chamber
 module    Commands
 describe  ContextResolver do
-  let(:rails_2_path) { ::File.expand_path('../../../../rails-2-test', __FILE__) }
-  let(:rails_3_path) { ::File.expand_path('../../../../rails-3-test', __FILE__) }
-  let(:rails_4_path) { ::File.expand_path('../../../../rails-4-test', __FILE__) }
+  let(:rails_2_path) { ::File.expand_path('../../../rails-2-test', __FILE__) }
+  let(:rails_3_path) { ::File.expand_path('../../../rails-3-test', __FILE__) }
+  let(:rails_4_path) { ::File.expand_path('../../../rails-4-test', __FILE__) }
 
   it 'does not attempt to do any resolution if all valid options are passed in' do
     options = ContextResolver.resolve(basepath:       'my_path',
                                       namespaces:     'ns')
 
-    expect(options[:basepath]).to       eql 'my_path'
-    expect(options[:files]).to          be_nil
+    expect(options[:basepath].to_s).to  eql 'my_path'
     expect(options[:namespaces]).to     eql 'ns'
   end
 
@@ -32,6 +31,20 @@ describe  ContextResolver do
     expect(options[:basepath].to_s).to  eql './app'
   end
 
+  it 'always sets the basepath to a Pathname even if it is passed in as a String' do
+    options = ContextResolver.resolve(basepath: './app')
+
+    expect(options[:basepath]).to be_a Pathname
+  end
+
+  it 'sets the default files if none are passed in' do
+    options = ContextResolver.resolve(basepath: './app')
+
+    expect(options[:files].map(&:to_s)).to eql [  './app/credentials*.yml',
+                                                  './app/settings*.yml',
+                                                  './app/settings' ]
+  end
+
   it 'sets the rootpath to the current working directory if none is passed in' do
     allow(Pathname).to  receive(:pwd).
                         and_return('my_dir')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chamber
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - stevenhallen
@@ -101,7 +101,6 @@ files:
 - lib/chamber/commands/base.rb
 - lib/chamber/commands/comparable.rb
 - lib/chamber/commands/compare.rb
-- lib/chamber/commands/context_resolver.rb
 - lib/chamber/commands/files.rb
 - lib/chamber/commands/heroku/clear.rb
 - lib/chamber/commands/heroku/compare.rb
@@ -115,6 +114,7 @@ files:
 - lib/chamber/commands/travis/secure.rb
 - lib/chamber/commands/travis.rb
 - lib/chamber/configuration.rb
+- lib/chamber/context_resolver.rb
 - lib/chamber/environmentable.rb
 - lib/chamber/errors/undecryptable_value_error.rb
 - lib/chamber/file.rb
@@ -136,7 +136,6 @@ files:
 - README.md
 - LICENSE
 - spec/fixtures/settings.yml
-- spec/lib/chamber/commands/context_resolver_spec.rb
 - spec/lib/chamber/commands/files_spec.rb
 - spec/lib/chamber/commands/heroku/clear_spec.rb
 - spec/lib/chamber/commands/heroku/compare_spec.rb
@@ -144,6 +143,7 @@ files:
 - spec/lib/chamber/commands/heroku/push_spec.rb
 - spec/lib/chamber/commands/secure_spec.rb
 - spec/lib/chamber/commands/show_spec.rb
+- spec/lib/chamber/context_resolver_spec.rb
 - spec/lib/chamber/file_set_spec.rb
 - spec/lib/chamber/file_spec.rb
 - spec/lib/chamber/filters/boolean_conversion_filter_spec.rb
@@ -196,7 +196,6 @@ summary: A surprisingly configurable convention-based approach to managing your
   custom configuration settings.
 test_files:
 - spec/fixtures/settings.yml
-- spec/lib/chamber/commands/context_resolver_spec.rb
 - spec/lib/chamber/commands/files_spec.rb
 - spec/lib/chamber/commands/heroku/clear_spec.rb
 - spec/lib/chamber/commands/heroku/compare_spec.rb
@@ -204,6 +203,7 @@ test_files:
 - spec/lib/chamber/commands/heroku/push_spec.rb
 - spec/lib/chamber/commands/secure_spec.rb
 - spec/lib/chamber/commands/show_spec.rb
+- spec/lib/chamber/context_resolver_spec.rb
 - spec/lib/chamber/file_set_spec.rb
 - spec/lib/chamber/file_spec.rb
 - spec/lib/chamber/filters/boolean_conversion_filter_spec.rb