armoire 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52c4786f90e54eb7785eac1dc783ca4d1511bdd8
-  data.tar.gz: 78f7ecb51b60b45461aaf28bffbb20ac20c7d485
+  metadata.gz: 16046f7dc3cfc111e688f040ceedc6d4ce5fe27d
+  data.tar.gz: 829927c14622774dabeaea3cf570e95e5f51d32e
 SHA512:
-  metadata.gz: 334335be1f98a456ab2e5cea6197dddba01c0e6660cd49726374afb9f235f72385e1dd9df8f21d6bd888100e647c47c43d34d9b531678a8ab99d3d0039aa4ecc
-  data.tar.gz: a4cf8d744be65d36c0695ef747229415a9a831fa484b3d73cbdec4696f38e41b44d48f330b3b4277198a0724c9a1e5932a3f99741ccc07385cf4cf65bad3338a
+  metadata.gz: aed809c5f2fe6d9bf1a5a9ae9d505118d7cf7b9bf6ce67225529f9fa557b545c49938c917f17d6af19a57e3ed3a1a009c93b7aedae1619122ab6691d93bf875e
+  data.tar.gz: 74b8b0200c547f30fb1896671a45386f46322d33779e4cc3a1f602e8eb8c8f7cf1d946bec2f27dfadd05fe25686d467f25de95e8df35f976c136e6815d9ceb13

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
+  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-2.1.1
+  - "2.1.0"
+  - "jruby-19mode" # JRuby in 1.9 mode

data/lib/armoire/init.rb

@@ -0,0 +1,3 @@
+Rails.configuration.after_initialize do
+  Armoire.load! Rails.root.join('config', 'application.yml')
+end

data/lib/armoire/version.rb

@@ -1,3 +1,3 @@
 class Armoire
-  VERSION = "1.1.0"
+  VERSION = "1.2.1"
 end

data/lib/armoire.rb

@@ -4,7 +4,12 @@ require 'erb'
 
 require "armoire/setting"
 require "armoire/version"
-require "armoire/railtie" if defined?(Rails)
+
+if defined?(Rails::Railtie)
+  require "armoire/railtie"
+elsif defined?(Rails.configuration)
+  require "armoire/init"
+end
 
 class Armoire
   include Singleton

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armoire
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Michael Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - Rakefile
 - armoire.gemspec
 - lib/armoire.rb
+- lib/armoire/init.rb
 - lib/armoire/railtie.rb
 - lib/armoire/setting.rb
 - lib/armoire/version.rb
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple configuration tool