chamber 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a3d686721e6b3ccbf6352227cfa0a6bdfb2b43
-  data.tar.gz: 798f1cec12ea2648a916d7830739f0ef50647679
+  metadata.gz: 4f7dbdffb12b7b5622f0599bd110ce6ff1ff5316
+  data.tar.gz: 16f1879d1d7bafadd27f9e573b420cceeb18abfb
 SHA512:
-  metadata.gz: 68c4c8c96652a068514f1ac17edda03d06977b11dfc776f06d4b5f39fd75a579efde318806c29d8169d899f562bd75cd41de743b81d088b7721af2afc4adf197
-  data.tar.gz: 0de18f64eb779247df51a06085287f73eaf56acd9662a1643e75a5b5864c4cfc060a46ce6562f2ee67ad23560d9dfab4d39b64fcb3f43fd1d99b5f946b838b89
+  metadata.gz: cd5da56e5554973ac39e4615ec410f12e3771069182c65081a90f9a2b41476f06db63c853d373810336ebe097e2cd83a46215972e2f8c808ad5669514391dea4
+  data.tar.gz: cea1cd1f08b84475c92ea6391755f58e0621eccf3dd08d4a54acd9c8125705ee78fc5ff874d508767ddafb2f125281a62b6e6c3cea8e75c7a01947ab4b715cf6

data/README.md

@@ -29,3 +29,17 @@ management library.
 ## Full Reference
 
 Visit the [wiki](https://github.com/thekompanee/chamber/wiki)
+
+## Credits
+
+Chamber was written by Jeff Felchner and Mark McEahern.
+
+![The Kompanee](https://www.dropbox.com/s/86jfka1d6bhv8as/kompanee-text-black.png?dl=1)
+
+Chamber is maintained and funded by [The Kompanee, Ltd.](http://www.thekompanee.com/)
+
+The names and logos for The Kompanee are trademarks of The Kompanee, Ltd.
+
+## License
+
+Chamber is Copyright © 2014 Jeff Felchner and Mark McEahern. It is free software, and may be redistributed under the terms specified in the [LICENSE](https://github.com/thekompanee/chamber/blob/master/LICENSE) file.

data/lib/chamber/commands/initialize.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'fileutils'
 require 'openssl'
 require 'chamber/configuration'
 require 'chamber/commands/base'
@@ -12,7 +13,7 @@ class   Initialize < Chamber::Commands::Base
     self.basepath = Chamber.configuration.basepath
   end
 
-  # rubocop:disable Metrics/LineLength, Metrics/MethodLength
+  # rubocop:disable Metrics/LineLength, Metrics/MethodLength, Metrics/AbcSize
   def call
     shell.create_file private_key_filepath,    rsa_private_key.to_pem
     shell.create_file protected_key_filepath,  rsa_protected_key
@@ -22,9 +23,12 @@ class   Initialize < Chamber::Commands::Base
     `chmod 600 #{protected_key_filepath}`
     `chmod 644 #{public_key_filepath}`
 
+    ::FileUtils.touch gitignore_filepath
+
     unless ::File.read(gitignore_filepath).match(/^.chamber.pem$/)
-      shell.append_to_file gitignore_filepath, private_key_filename
-      shell.append_to_file gitignore_filepath, protected_key_filename
+      shell.append_to_file gitignore_filepath, "\n# Private and protected key files for Chamber\n"
+      shell.append_to_file gitignore_filepath, "#{private_key_filename}\n"
+      shell.append_to_file gitignore_filepath, "#{protected_key_filename}\n"
     end
 
     shell.copy_file settings_template_filepath, settings_filepath
@@ -41,10 +45,10 @@ class   Initialize < Chamber::Commands::Base
     shell.say protected_key_filepath, :green
     shell.say ''
     shell.say 'and not have to worry about sending it via a secure medium (such as', :green
-    shell.say 'email), however do not send the passphrase along with it.  Give it to'
+    shell.say 'email), however do not send the passphrase along with it.  Give it to', :green
     shell.say 'your team members in person.', :green
     shell.say ''
-    shell.say 'In order for them to decrypt it (for use with Chamber), they can run:'
+    shell.say 'In order for them to decrypt it (for use with Chamber), they can run:', :green
     shell.say ''
     shell.say "$ cp /path/to/{#{protected_key_filename},#{private_key_filename}}", :green
     shell.say "$ ssh-keygen -p -f /path/to/#{private_key_filename}", :green
@@ -52,7 +56,7 @@ class   Initialize < Chamber::Commands::Base
     shell.say 'Enter the passphrase when prompted and leave the new passphrase blank.', :green
     shell.say ''
   end
-  # rubocop:enable Metrics/LineLength, Metrics/MethodLength
+  # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Metrics/AbcSize
 
   def self.call(options = {})
     new(options).call

data/lib/chamber/context_resolver.rb

@@ -9,6 +9,8 @@ class   ContextResolver
     self.options = Hashie::Mash.new(options)
   end
 
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength
   def resolve
     options[:rootpath]       ||= Pathname.pwd
     options[:rootpath]         = Pathname.new(options[:rootpath])
@@ -17,11 +19,22 @@ class   ContextResolver
     options[:namespaces]     ||= []
     options[:preset]         ||= resolve_preset
 
-    if options[:preset] == 'rails'
+    if %w{rails rails-engine}.include?(options[:preset])
+      if options[:preset] == 'rails-engine'
+        engine_spec_dummy_directory = options[:rootpath] + 'spec' + 'dummy'
+        engine_test_dummy_directory = options[:rootpath] + 'test' + 'dummy'
+
+        options[:rootpath] = if (engine_spec_dummy_directory + 'config.ru').exist?
+                               engine_spec_dummy_directory
+                             elsif (engine_test_dummy_directory + 'config.ru').exist?
+                               engine_test_dummy_directory
+                             end
+      end
+
       options[:basepath]     ||= options[:rootpath] + 'config'
 
       if options[:namespaces] == []
-        require options[:rootpath].join('config', 'application')
+        require options[:rootpath].join('config', 'application').to_s
 
         options[:namespaces]   = [
           ::Rails.env,
@@ -41,6 +54,8 @@ class   ContextResolver
   rescue LoadError
     options
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+  # rubocop:enable Metrics/PerceivedComplexity, Metrics/MethodLength
 
   def self.resolve(options = {})
     new(options).resolve
@@ -51,7 +66,11 @@ class   ContextResolver
   attr_accessor :options
 
   def resolve_preset
-    'rails' if in_a_rails_project?
+    if in_a_rails_project?
+      'rails'
+    elsif in_a_rails_engine?
+      'rails-engine'
+    end
   end
 
   def resolve_encryption_key(key)
@@ -70,6 +89,11 @@ class   ContextResolver
     rails_executable_exists?
   end
 
+  def in_a_rails_engine?
+    (options[:rootpath] + 'spec' + 'dummy' + 'config.ru').exist? ||
+    (options[:rootpath] + 'test' + 'dummy' + 'config.ru').exist?
+  end
+
   def rails_executable_exists?
     options[:rootpath].join('bin',    'rails').exist? ||
     options[:rootpath].join('script', 'rails').exist? ||

data/lib/chamber/version.rb

@@ -1,3 +1,3 @@
 module Chamber
-  VERSION = '2.7.1'
+  VERSION = '2.8.0'
 end

data/spec/lib/chamber/context_resolver_spec.rb

@@ -4,9 +4,13 @@ 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__) }
+  let(:rails_engine_path) { ::File.expand_path('../../../rails-engine-test', __FILE__) }
+
+  before(:each) { @old_chamber_key = ENV.delete('CHAMBER_KEY') }
+  after(:each)  { ENV['CHAMBER_KEY'] = @old_chamber_key }
 
   it 'does not attempt to do any resolution if all valid options are passed in' do
     options = ContextResolver.resolve(basepath:   'my_path',
@@ -142,6 +146,16 @@ describe  ContextResolver do
     expect(options[:basepath].to_s).to  include 'rails-4-test/config'
     expect(options[:namespaces]).to     eql     %w{development my_host}
   end
+
+  it 'sets the basepath if inside a Rails engine' do
+    allow(Socket).to receive(:gethostname).and_return 'my_host'
+
+    options = ContextResolver.resolve(rootpath: rails_engine_path)
+
+    expect(options[:rootpath].to_s).to  include 'rails-engine-test/spec/dummy'
+    expect(options[:basepath].to_s).to  include 'rails-engine-test/spec/dummy/config'
+    expect(options[:namespaces]).to     eql     %w{development my_host}
+  end
 end
 end
 end

data/spec/lib/chamber_spec.rb

@@ -71,7 +71,7 @@ only_namespaced_sub_settings:
   HEREDOC
 end
 
-describe Chamber do
+describe 'Chamber' do
   before(:each) { Chamber.load(basepath: '/tmp/chamber') }
 
   it 'knows how to load itself with a path string' do
@@ -280,13 +280,13 @@ describe Chamber do
   end
 
   it 'can render itself as a string even if it has not been loaded' do
-    Chamber.load
+    Chamber.load basepath: '/'
 
     expect(Chamber.to_s).to eql ''
   end
 
   it 'can determine settings even if it has not been loaded' do
-    Chamber.load
+    Chamber.load basepath: '/'
 
     expect(Chamber.to_hash).to eql({})
   end

data/spec/rails-engine-test/spec/dummy/config/application.rb

@@ -0,0 +1,5 @@
+class Rails
+  def self.env
+    'development'
+  end
+end

data/templates/settings.yml

@@ -0,0 +1,14 @@
+development:
+  setting:                development_value
+  # The following will become 'secure_setting'
+  _secure_secure_setting: secure_development_value
+
+test:
+  setting:                test_value
+  # The following will become 'secure_setting'
+  _secure_secure_setting: secure_test_value
+
+production:
+  setting:                production_value
+  # The following will become 'secure_setting'
+  _secure_secure_setting: secure_production_value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chamber
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - thekompanee
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -69,20 +69,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.46'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: "\n                          Chamber lets you source your Settings from
   an arbitrary number of YAML files and\n                          provides a simple
   mechanism for overriding settings from the ENV, which is\n                          friendly
@@ -171,8 +157,12 @@ files:
 - spec/rails-4-test/bin/rails
 - spec/rails-4-test/config.ru
 - spec/rails-4-test/config/application.rb
+- spec/rails-engine-test/spec/dummy/config.ru
+- spec/rails-engine-test/spec/dummy/config/application.rb
+- spec/rails-engine-test/spec/dummy/script/rails
 - spec/spec_key
 - spec/spec_key.pub
+- templates/settings.yml
 homepage: https://github.com/thekompanee/chamber
 licenses:
 - MIT
@@ -193,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A surprisingly configurable convention-based approach to managing your application's
@@ -222,15 +212,17 @@ test_files:
 - spec/lib/chamber/namespace_set_spec.rb
 - spec/lib/chamber/settings_spec.rb
 - spec/lib/chamber_spec.rb
-- spec/rails-2-test/config/application.rb
 - spec/rails-2-test/config.ru
+- spec/rails-2-test/config/application.rb
 - spec/rails-2-test/script/console
-- spec/rails-3-test/config/application.rb
 - spec/rails-3-test/config.ru
+- spec/rails-3-test/config/application.rb
 - spec/rails-3-test/script/rails
 - spec/rails-4-test/bin/rails
-- spec/rails-4-test/config/application.rb
 - spec/rails-4-test/config.ru
+- spec/rails-4-test/config/application.rb
+- spec/rails-engine-test/spec/dummy/config.ru
+- spec/rails-engine-test/spec/dummy/config/application.rb
+- spec/rails-engine-test/spec/dummy/script/rails
 - spec/spec_key
 - spec/spec_key.pub
-has_rdoc: