a9n 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39c493dd369e2ff7e7ca0fbc67aeb3eb3d2bb4de
-  data.tar.gz: 3d15911fbfc65a606fc3f5484b99ca9549fd76fb
+  metadata.gz: 1278accbf3b20ef8dcf2084995996dbaa1bdabda
+  data.tar.gz: d444fa5ca535f636c4d0eefb03895d3bf12813da
 SHA512:
-  metadata.gz: d8dfd10661f36985ebbe762c773e329fa4aedcf74fe5c30da08d201e510198d9f8b81e66e4290657e1fb2c4e94c9661c9ae6a3f34854feda9cea581d2168588b
-  data.tar.gz: 31d6d95ae6553c7a62b332af9e40fef465395da7b6637452bfaa7a7317a4030ba4ba5c3db44128e465a17942b8469b3ca305a6cb00423834f3df69f8e14591fa
+  metadata.gz: 71e3c6444b5418cf69547a9e81cd88dcefd6d346648268de14f2adf045f0920100865041cd0f7637c25f5d2fe376036b39c4b3be24df2ddb8729531bcee02d1b
+  data.tar.gz: 5b924cb72e0a6d6813056ab6ef43e1b3a07ac4eb5c3615ae74c26834b3bc8ce0938fabbe0d07eeeaf06a23b94708255cf8ad192114405d40c00458a7bd345090

data/.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
   - jruby-19mode

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'rake'
-gem 'rspec', '~> 2.14.0'
+gem 'rspec', '~> 2.14.1'
 gem 'coveralls', require: false

data/README.md

@@ -10,7 +10,7 @@
 [codeclimate]: https://codeclimate.com/github/knapo/a9n
 [coveralls]: https://coveralls.io/r/knapo/a9n
 
-Simple tool for managing extra configuration in ruby/rails apps. Supports Rails 2.x, 3.x, 4.x and Ruby 1.9, 2.0. 
+Simple tool for managing extra configuration in ruby/rails apps. Supports Rails 2.x, 3.x, 4.x and Ruby 1.9, 2.0.
 Ruby 1.8 is not supported in version 0.1.2 and higher.
 
 ## Installation
@@ -28,7 +28,7 @@ directory. When none fo these files exists, `A9n::MissingConfigurationFile`
 exception is thrown.
 If both file exist, content of `configuration.yml` is validated. It means that
 all keys existing in example file must exist in base file - in case of missing
-keys`A9n::MissingConfigurationVariables` is thrown with information about 
+keys`A9n::MissingConfigurationVariables` is thrown with information about
 missing keys.
 
 Set application root and load configuration by adding to your `application.rb` or `environment.rb` right
@@ -45,7 +45,7 @@ you may need to tell it A9n:
 
 ## Usage
 
-You can access any variable defined in configuration files but delegating it to 
+You can access any variable defined in configuration files but delegating it to
 `A9n`. E.g:
 
     defaults:
@@ -62,16 +62,18 @@ is accessible by:
 
 ## Custom and multiple configuration files
 
-If you need to load config from custom files (e.g `config/mongo.yml` and `config/other.yml`), add:
-    
-    A9n.load('mongo.yml', 'other.yml')
-    
-and the configuration is availble under `mongo` and `other` scopes:
+If you need to load config from custom files (e.g `config/mongo.yml`, `config/other.yml` and `config/custom_dir/extra.yml`), add:
+
+    A9n.load('mongo.yml', 'other.yml', 'custom_dir/extra')
+
+and the configuration is availble under `mongo`, `other` and `extra` scopes:
 
     A9n.mongo.varname
-    
+
     A9n.other.varname
-    
+
+    A9n.extra.varname
+
 ## Contributing
 
 1. Fork it

data/lib/a9n.rb

@@ -10,8 +10,8 @@ module A9n
   class MissingConfigurationVariables < StandardError; end
   class NoSuchConfigurationVariable < StandardError; end
 
-  DEFAULT_FILE = 'configuration.yml'
   DEFAULT_SCOPE = :configuration
+  DEFAULT_FILE = "#{DEFAULT_SCOPE}.yml"
 
   class << self
     def env
@@ -109,6 +109,10 @@ module A9n
       ENV[name]
     end
 
+    def var_name_for(file)
+      :"@#{file.to_s.split('/').last.split('.').first}"
+    end
+
     private
 
     def verify!(example, local)
@@ -117,9 +121,5 @@ module A9n
         raise MissingConfigurationVariables.new("Following variables are missing in your configuration file: #{missing_keys.join(",")}")
       end
     end
-
-    def var_name_for(file)
-      :"@#{file.to_s.split('.').first}"
-    end
   end
 end

data/lib/a9n/capistrano.rb

@@ -0,0 +1,11 @@
+Capistrano::Configuration.instance.load do
+  after "deploy:update_code", "a9n:copy_stage_config"
+
+  namespace :a9n do
+    desc "Copy stage configuration to base file."
+    task :copy_stage_config, roles: :app do
+      run "cp #{fetch(:release_path)}/config/configuration.yml.#{fetch(:stage)} #{fetch(:release_path)}/config/configuration.yml"
+    end
+  end
+end
+

data/lib/a9n/struct.rb

@@ -5,7 +5,7 @@ module A9n
     def keys
       @table.keys
     end
-    
+
     def fetch(name, default = nil)
       @table[name.to_sym] || default
     end
@@ -14,4 +14,4 @@ module A9n
       raise NoSuchConfigurationVariable.new(name)
     end
   end
-end
+end

data/lib/a9n/version.rb

@@ -1,3 +1,3 @@
 module A9n
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/a9n_spec.rb

@@ -7,7 +7,7 @@ describe A9n do
         expect(described_class).to receive(:get_rails).and_return(nil)
       }
       specify {
-        described_class.local_app.should be_nil
+        expect(described_class.local_app).to be_nil
       }
     end
 
@@ -15,7 +15,7 @@ describe A9n do
       let(:local_app) { double(env: 'test', root: '/apps/a9n') }
       before { described_class.local_app = local_app }
 
-      specify { described_class.local_app.should == local_app }
+      specify { expect(described_class.local_app).to eq(local_app) }
     end
 
     after { described_class.local_app = nil }
@@ -30,13 +30,13 @@ describe A9n do
         described_class.root = '/home/knapo/workspace/a9n'
       }
       specify {
-        described_class.root.should == Pathname.new('/home/knapo/workspace/a9n')
+        expect(described_class.root).to eq(Pathname.new('/home/knapo/workspace/a9n'))
       }
     end
 
     context 'with local app path' do
       specify {
-        described_class.root.should == '/apps/a9n'
+        expect(described_class.root).to eq('/apps/a9n')
       }
     end
 
@@ -80,9 +80,9 @@ describe A9n do
         expect(described_class).to receive(:verify!).never
       end
       it 'raises expection'  do
-        lambda {
+        expect {
           described_class.load
-        }.should raise_error(described_class::MissingConfigurationData)
+        }.to raise_error(described_class::MissingConfigurationData)
       end
     end
 
@@ -215,13 +215,13 @@ describe A9n do
         end
 
         it 'has symbolized keys' do
-          subject.keys.first.should be_kind_of(Symbol)
-          subject[:hash_dwarf].should be_kind_of(Hash)
-          subject[:hash_dwarf].keys.first.should be_kind_of(Symbol)
+          expect(subject.keys.first).to be_kind_of(Symbol)
+          expect(subject[:hash_dwarf]).to be_kind_of(Hash)
+          expect(subject[:hash_dwarf].keys.first).to be_kind_of(Symbol)
         end
 
         it 'parses erb' do
-          subject[:erb_dwarf].should == 'erbized dwarf'
+          expect(subject[:erb_dwarf]).to eq('erbized dwarf')
         end
       end
 
@@ -242,7 +242,11 @@ describe A9n do
         expect(described_class).to receive(:local_app).and_return(double(env: 'dwarf_env')).exactly(3).times
         expect(described_class).to receive(:get_env_var).never
       }
-      its(:env) { should == 'dwarf_env' }
+
+      describe '#env' do
+        subject { super().env }
+        it { should == 'dwarf_env' }
+      end
     end
 
     context "when APP_ENV is set" do
@@ -252,14 +256,18 @@ describe A9n do
         expect(described_class).to receive(:get_env_var).with('RACK_ENV').and_return(nil)
         expect(described_class).to receive(:get_env_var).with('APP_ENV').and_return('dwarf_env')
       }
-      its(:env) { should == 'dwarf_env' }
+
+      describe '#env' do
+        subject { super().env }
+        it { should == 'dwarf_env' }
+      end
     end
   end
 
   describe '.get_env_var' do
     before { ENV['DWARF'] = 'little dwarf' }
-    it { described_class.get_env_var('DWARF').should == 'little dwarf'}
-    it { described_class.get_env_var('IS_DWARF').should be_nil}
+    it { expect(described_class.get_env_var('DWARF')).to eq('little dwarf')}
+    it { expect(described_class.get_env_var('IS_DWARF')).to be_nil}
   end
 
   describe '.get_rails' do
@@ -271,11 +279,17 @@ describe A9n do
         Object.send(:remove_const, :Rails)
       }
       it {
-        described_class.get_rails.should be_kind_of(Module)
+        expect(described_class.get_rails).to be_kind_of(Module)
       }
     end
     context 'when not defined' do
-      it { described_class.get_rails.should be_nil }
+      it { expect(described_class.get_rails).to be_nil }
     end
   end
+
+  describe '.var_name_for' do
+    it { expect(described_class.var_name_for(:configuration)).to eq(:@configuration) }
+    it { expect(described_class.var_name_for('configuration.yml')).to eq(:@configuration) }
+    it { expect(described_class.var_name_for('custom_dir/extra.yml')).to eq(:@extra) }
+  end
 end

data/spec/struct_spec.rb

@@ -11,41 +11,44 @@ describe A9n::Struct do
       })
   }
 
-  its(:keys) { should == [:non_empty_dwarf, :nil_dwarf, :false_dwarf, :true_dwarf, :hash_dwarf] }
+  describe '#keys' do
+    subject { super().keys }
+    it { should == [:non_empty_dwarf, :nil_dwarf, :false_dwarf, :true_dwarf, :hash_dwarf] }
+  end
 
   it 'gets non-empty value' do
-    subject.non_empty_dwarf.should == 'dwarf'
+    expect(subject.non_empty_dwarf).to eq('dwarf')
   end
 
   it 'gets nil value' do
-    subject.nil_dwarf.should == nil
+    expect(subject.nil_dwarf).to eq(nil)
   end
 
   it 'gets true value' do
-    subject.true_dwarf.should == true
+    expect(subject.true_dwarf).to eq(true)
   end
-  
+
   it 'gets false value' do
-    subject.false_dwarf.should == false
+    expect(subject.false_dwarf).to eq(false)
   end
 
   it 'gets hash value' do
-    subject.hash_dwarf.should be_kind_of(Hash)
+    expect(subject.hash_dwarf).to be_kind_of(Hash)
   end
 
   it 'raises exception when value not exists' do
-    expect { 
+    expect {
       subject.non_existing_dwarf
     }.to raise_error(A9n::NoSuchConfigurationVariable)
   end
 
   describe '#fetch' do
     it 'return non empty value' do
-      subject.fetch(:non_empty_dwarf).should == 'dwarf'
+      expect(subject.fetch(:non_empty_dwarf)).to eq('dwarf')
     end
 
     it 'not returns nil for non existing value' do
-      subject.fetch(:non_existing_dwarf).should == nil
+      expect(subject.fetch(:non_existing_dwarf)).to eq(nil)
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: a9n
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Krzysztof Knapik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies: []
 description: Simple tool for managing extra configuration in ruby/rails apps
 email:
@@ -26,6 +26,7 @@ files:
 - Rakefile
 - a9n.gemspec
 - lib/a9n.rb
+- lib/a9n/capistrano.rb
 - lib/a9n/core_ext/hash.rb
 - lib/a9n/struct.rb
 - lib/a9n/version.rb