a9n 0.6.2 → 0.7.0

data/lib/a9n/struct.rb

@@ -12,15 +12,17 @@ module A9n
       data
     end
 
+    alias to_h to_hash
+
     def merge(another_data)
       data.merge!(another_data)
     end
 
-    def method_missing(name, *args)
+    def method_missing(name, *_args)
       if data.key?(name)
         fetch(name)
       else
-        fail NoSuchConfigurationVariableError.new(name)
+        raise NoSuchConfigurationVariableError.new, name
       end
     end
 

data/lib/a9n/version.rb

@@ -1,3 +1,3 @@
 module A9n
-  VERSION = "0.6.2"
+  VERSION = '0.7.0'.freeze
 end

data/spec/integration/a9n_spec.rb

@@ -1,38 +1,38 @@
 RSpec.describe A9n do
   subject { described_class }
 
-  let(:env) { "test" }
+  let(:env) { 'test' }
 
   before do
     clean_singleton(subject)
-    ENV["ERB_DWARF"] = "erbized dwarf"
-    ENV["DWARF_PASSWORD"] = "dwarf123"
-    ENV["MANDRILL_API_KEY"] = "ASDF1234"
-    ENV["API_KEY"] = "XYZ999"
+    ENV['ERB_DWARF'] = 'erbized dwarf'
+    ENV['DWARF_PASSWORD'] = 'dwarf123'
+    ENV['MANDRILL_API_KEY'] = 'ASDF1234'
+    ENV['API_KEY'] = 'XYZ999'
     subject.app = double(env: env)
-    subject.root = File.expand_path("../../../test_app", __FILE__)
+    subject.root = File.expand_path('../../test_app', __dir__)
     subject.load
   end
 
   after do
     clean_singleton(subject)
-    ENV.delete("MANDRILL_API_KEY")
-    ENV.delete("API_KEY")
+    ENV.delete('MANDRILL_API_KEY')
+    ENV.delete('API_KEY')
   end
 
-  context "base config file" do
+  context 'base config file' do
     it do
       expect(subject.storage).to be_kind_of(A9n::Struct)
     end
 
     it do
-      expect(subject.default_dwarf).to eq("default dwarf")
-      expect(subject.overriden_dwarf).to eq("already overriden dwarf")
+      expect(subject.default_dwarf).to eq('default dwarf')
+      expect(subject.overriden_dwarf).to eq('already overriden dwarf')
     end
 
     it do
-      expect(subject.fetch(:default_dwarf)).to eq("default dwarf")
-      expect(subject.fetch(:overriden_dwarf)).to eq("already overriden dwarf")
+      expect(subject.fetch(:default_dwarf)).to eq('default dwarf')
+      expect(subject.fetch(:overriden_dwarf)).to eq('already overriden dwarf')
     end
 
     it do
@@ -44,37 +44,37 @@ RSpec.describe A9n do
     end
 
     it do
-      expect { subject.fetch(:invalid, "Hello").to eq("Hello") }
+      expect { subject.fetch(:invalid, 'Hello').to eq('Hello') }
     end
   end
 
-  context "undefined env" do
-    let(:env) { "tropical" }
+  context 'undefined env' do
+    let(:env) { 'tropical' }
 
     it do
-      expect(subject.default_dwarf).to eq("default dwarf")
-      expect(subject.overriden_dwarf).to eq("not yet overriden dwarf")
+      expect(subject.default_dwarf).to eq('default dwarf')
+      expect(subject.overriden_dwarf).to eq('not yet overriden dwarf')
     end
 
     it do
-      expect(subject.fetch(:default_dwarf)).to eq("default dwarf")
-      expect(subject.fetch(:overriden_dwarf)).to eq("not yet overriden dwarf")
+      expect(subject.fetch(:default_dwarf)).to eq('default dwarf')
+      expect(subject.fetch(:overriden_dwarf)).to eq('not yet overriden dwarf')
     end
   end
 
-  context "extra config file" do
+  context 'extra config file' do
     before do
       expect(subject.mandrill).to be_kind_of(A9n::Struct)
     end
 
     it do
-      expect(subject.mandrill.username).to eq("joe")
-      expect(subject.mandrill.api_key).to eq("ASDF1234")
+      expect(subject.mandrill.username).to eq('joe')
+      expect(subject.mandrill.api_key).to eq('ASDF1234')
     end
 
     it do
-      expect(subject.mandrill.fetch(:username)).to eq("joe")
-      expect(subject.mandrill.fetch(:api_key)).to eq("ASDF1234")
+      expect(subject.mandrill.fetch(:username)).to eq('joe')
+      expect(subject.mandrill.fetch(:api_key)).to eq('ASDF1234')
     end
 
     it do
@@ -82,19 +82,19 @@ RSpec.describe A9n do
     end
   end
 
-  context "extra config file with erb" do
+  context 'extra config file with erb' do
     before do
       expect(subject.cloud).to be_kind_of(A9n::Struct)
     end
 
     it do
-      expect(subject.cloud.username).to eq("testuser")
-      expect(subject.cloud.password).to eq("qwerty")
+      expect(subject.cloud.username).to eq('testuser')
+      expect(subject.cloud.password).to eq('qwerty')
     end
 
     it do
-      expect(subject.cloud.fetch(:username)).to eq("testuser")
-      expect(subject.cloud.fetch(:password)).to eq("qwerty")
+      expect(subject.cloud.fetch(:username)).to eq('testuser')
+      expect(subject.cloud.fetch(:password)).to eq('qwerty')
     end
 
     it do
@@ -102,17 +102,17 @@ RSpec.describe A9n do
     end
   end
 
-  context "extra config file with example" do
+  context 'extra config file with example' do
     before do
       expect(subject.mailer).to be_kind_of(A9n::Struct)
     end
 
     it do
-      expect(subject.mailer.delivery_method).to eq("test")
+      expect(subject.mailer.delivery_method).to eq('test')
     end
 
     it do
-      expect(subject.mailer.fetch(:delivery_method)).to eq("test")
+      expect(subject.mailer.fetch(:delivery_method)).to eq('test')
     end
 
     it do

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
-require "simplecov"
+require 'simplecov'
 SimpleCov.start
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "a9n"
-require "pry"
+require 'a9n'
+require 'pry'
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
@@ -16,9 +16,9 @@ RSpec.configure do |config|
     # and `failure_message` of custom matchers include text for helper methods
     # defined using `chain`, e.g.:
     #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
+    #     # => 'be bigger than 2 and smaller than 4'
     # ...rather than:
-    #     # => "be bigger than 2"
+    #     # => 'be bigger than 2'
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
@@ -48,7 +48,7 @@ RSpec.configure do |config|
   # Allows RSpec to persist some state between runs in order to support
   # the `--only-failures` and `--next-failure` CLI options. We recommend
   # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
+  config.example_status_persistence_file_path = 'spec/examples.txt'
 
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
@@ -91,9 +91,6 @@ end
 
 def clean_singleton(klass)
   [:@storage, :@env, :@app, :@root].each do |var|
-    if klass.instance_variable_defined?(var)
-      klass.remove_instance_variable(var)
-    end
+    klass.instance_variable_defined?(var) && klass.remove_instance_variable(var)
   end
 end
-

data/spec/unit/a9n_spec.rb

@@ -3,42 +3,42 @@ RSpec.describe A9n do
   before { clean_singleton(subject) }
   after { clean_singleton(subject) }
 
-  describe ".env" do
+  describe '.env' do
     before do
       subject.instance_variable_set(:@env, nil)
     end
 
-    context "app_env is set" do
+    context 'app_env is set' do
       before do
-        expect(subject).to receive(:app).and_return(double(env: ::A9n::StringInquirer.new("dwarf_env"))).exactly(3).times
+        expect(subject).to receive(:app).and_return(double(env: ::A9n::StringInquirer.new('dwarf_env')))
         expect(subject).to receive(:env_var).never
       end
 
       it do
-        expect(subject.env).to eq("dwarf_env")
+        expect(subject.env).to eq('dwarf_env')
         expect(subject.env.dwarf_env?).to eq(true)
         expect(subject.env.production?).to eq(false)
       end
     end
 
-    context "when APP_ENV is set" do
+    context 'when APP_ENV is set' do
       before do
         expect(subject).to receive(:app_env).and_return(nil)
-        expect(subject).to receive(:env_var).with("RAILS_ENV").and_return(nil)
-        expect(subject).to receive(:env_var).with("RACK_ENV").and_return(nil)
-        expect(subject).to receive(:env_var).with("APP_ENV").and_return("dwarf_env")
+        expect(subject).to receive(:env_var).with('RAILS_ENV').and_return(nil)
+        expect(subject).to receive(:env_var).with('RACK_ENV').and_return(nil)
+        expect(subject).to receive(:env_var).with('APP_ENV').and_return('dwarf_env')
       end
 
       it do
-        expect(subject.env).to eq("dwarf_env")
+        expect(subject.env).to eq('dwarf_env')
         expect(subject.env.dwarf_env?).to eq(true)
         expect(subject.env.production?).to eq(false)
       end
     end
   end
 
-  describe ".app" do
-    context "when rails not found" do
+  describe '.app' do
+    context 'when rails not found' do
       before do
         expect(subject).to receive(:rails_app).and_return(nil)
       end
@@ -48,8 +48,8 @@ RSpec.describe A9n do
       end
     end
 
-    context "when rails app is being used" do
-      let(:app) { double(env: "test", root: "/apps/a9n") }
+    context 'when rails app is being used' do
+      let(:app) { double(env: 'test', root: '/apps/a9n') }
 
       before do
         expect(subject).to receive(:rails_app).and_return(app)
@@ -60,8 +60,8 @@ RSpec.describe A9n do
       end
     end
 
-    context "when custom non-rails app is being used" do
-      let(:app) { double(env: "test", root: "/apps/a9n") }
+    context 'when custom non-rails app is being used' do
+      let(:app) { double(env: 'test', root: '/apps/a9n') }
 
       before do
         subject.app = app
@@ -73,60 +73,60 @@ RSpec.describe A9n do
     end
   end
 
-  describe ".root" do
-    context "when app is set" do
-      let(:app) { double(env: "test", root: "/apps/a9n") }
+  describe '.root' do
+    context 'when app is set' do
+      let(:app) { double(env: 'test', root: '/apps/a9n') }
 
       before do
         subject.app = app
       end
 
-      context "with custom path" do
+      context 'with custom path' do
         before do
-          subject.root = "/home/knapo/workspace/a9n"
+          subject.root = '/home/knapo/workspace/a9n'
         end
 
         it do
-          expect(subject.root).to eq(Pathname.new("/home/knapo/workspace/a9n"))
+          expect(subject.root).to eq(Pathname.new('/home/knapo/workspace/a9n'))
         end
       end
 
-      context "with local app path" do
+      context 'with local app path' do
         it do
-          expect(subject.root).to eq("/apps/a9n")
+          expect(subject.root).to eq('/apps/a9n')
         end
       end
     end
 
-    context "when app is not set" do
+    context 'when app is not set' do
       it do
         expect(subject.root).to eq(nil)
       end
 
-      context "when setting a custom path when is falsy" do
+      context 'when setting a custom path when is falsy' do
         before do
-          subject.root ||= "/home/knapo/workspace/a9n"
+          subject.root ||= '/home/knapo/workspace/a9n'
         end
 
         it do
-          expect(subject.root).to eq(Pathname.new("/home/knapo/workspace/a9n"))
+          expect(subject.root).to eq(Pathname.new('/home/knapo/workspace/a9n'))
         end
       end
 
-      context "when setting a custom path" do
+      context 'when setting a custom path' do
         before do
-          subject.root = "/home/knapo/workspace/a9n"
+          subject.root = '/home/knapo/workspace/a9n'
         end
 
         it do
-          expect(subject.root).to eq(Pathname.new("/home/knapo/workspace/a9n"))
+          expect(subject.root).to eq(Pathname.new('/home/knapo/workspace/a9n'))
         end
       end
     end
   end
 
-  describe ".rails_app" do
-    context "when defined" do
+  describe '.rails_app' do
+    context 'when defined' do
       before do
         Object.const_set(:Rails, Module.new)
       end
@@ -140,54 +140,54 @@ RSpec.describe A9n do
       end
     end
 
-    context "when not defined" do
+    context 'when not defined' do
       it do
         expect(subject.rails_app).to be_nil
       end
     end
   end
 
-  describe ".env_var" do
+  describe '.env_var' do
     before do
-      ENV["DWARF"] = "little dwarf"
+      ENV['DWARF'] = 'little dwarf'
     end
 
     it do
-      expect(subject.env_var("DWARF")).to eq("little dwarf")
+      expect(subject.env_var('DWARF')).to eq('little dwarf')
     end
 
     it do
-      expect(subject.env_var("IS_DWARF")).to be_nil
+      expect(subject.env_var('IS_DWARF')).to be_nil
     end
   end
 
-  describe ".default_files" do
+  describe '.default_files' do
     before do
-      subject.root = File.expand_path("../../../test_app", __FILE__)
+      subject.root = File.expand_path('../../test_app', __dir__)
     end
 
     it do
-      expect(subject.default_files[0]).to include("configuration.yml")
+      expect(subject.default_files[0]).to include('configuration.yml')
       expect(Pathname.new(subject.default_files[0])).to be_absolute
-      expect(subject.default_files[1]).to include("a9n/mandrill.yml")
+      expect(subject.default_files[1]).to include('a9n/mandrill.yml')
       expect(Pathname.new(subject.default_files[1])).to be_absolute
     end
   end
 
-  describe ".load" do
+  describe '.load' do
     before do
-      expect(described_class).to receive(:env).exactly(2).times.and_return("dev")
-      subject.root = "/apps/test_app"
+      expect(described_class).to receive(:env).exactly(2).times.and_return('dev')
+      subject.root = '/apps/test_app'
       files.each do |f, cfg|
-        expect(A9n::Loader).to receive(:new).with(f, kind_of(A9n::Scope), "dev").and_return(double(get: cfg))
+        expect(A9n::Loader).to receive(:new).with(f, kind_of(A9n::Scope), 'dev').and_return(double(get: cfg))
       end
     end
 
-    context "when no files given" do
+    context 'when no files given' do
       let(:files) do
         {
-          "/apps/test_app/config/file1.yml" => { host: "host1.com" },
-          "/apps/test_app/config/dir/file2.yml" => { host: "host2.com" }
+          '/apps/test_app/config/file1.yml' => { host: 'host1.com' },
+          '/apps/test_app/config/dir/file2.yml' => { host: 'host2.com' }
         }
       end
 
@@ -201,15 +201,15 @@ RSpec.describe A9n do
       end
     end
 
-    context "when custom files given" do
+    context 'when custom files given' do
       let(:given_files) do
-        ["file3.yml", "/apps/test_app/config/dir/file4.yml"]
+        ['file3.yml', '/apps/test_app/config/dir/file4.yml']
       end
 
       let(:files) do
         {
-          "/apps/test_app/config/file3.yml" => { host: "host3.com" },
-          "/apps/test_app/config/dir/file4.yml" => { host: "host4.com" }
+          '/apps/test_app/config/file3.yml' => { host: 'host3.com' },
+          '/apps/test_app/config/dir/file4.yml' => { host: 'host4.com' }
         }
       end
 
@@ -224,8 +224,8 @@ RSpec.describe A9n do
     end
   end
 
-  describe ".method_missing" do
-    context "when storage is empty" do
+  describe '.method_missing' do
+    context 'when storage is empty' do
       before do
         expect(subject).to receive(:load).once
       end
@@ -236,7 +236,7 @@ RSpec.describe A9n do
       end
     end
 
-    context "when storage is not empty" do
+    context 'when storage is not empty' do
       before do
         subject.storage[:whenever] = 'whenever'
         expect(subject).not_to receive(:load)