armoire 1.1.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +3 -2
  3. data/lib/armoire/init.rb +3 -0
  4. data/lib/armoire/version.rb +1 -1
  5. data/lib/armoire.rb +6 -1
  6. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 52c4786f90e54eb7785eac1dc783ca4d1511bdd8
4
- data.tar.gz: 78f7ecb51b60b45461aaf28bffbb20ac20c7d485
3
+ metadata.gz: 16046f7dc3cfc111e688f040ceedc6d4ce5fe27d
4
+ data.tar.gz: 829927c14622774dabeaea3cf570e95e5f51d32e
5
5
  SHA512:
6
- metadata.gz: 334335be1f98a456ab2e5cea6197dddba01c0e6660cd49726374afb9f235f72385e1dd9df8f21d6bd888100e647c47c43d34d9b531678a8ab99d3d0039aa4ecc
7
- data.tar.gz: a4cf8d744be65d36c0695ef747229415a9a831fa484b3d73cbdec4696f38e41b44d48f330b3b4277198a0724c9a1e5932a3f99741ccc07385cf4cf65bad3338a
6
+ metadata.gz: aed809c5f2fe6d9bf1a5a9ae9d505118d7cf7b9bf6ce67225529f9fa557b545c49938c917f17d6af19a57e3ed3a1a009c93b7aedae1619122ab6691d93bf875e
7
+ data.tar.gz: 74b8b0200c547f30fb1896671a45386f46322d33779e4cc3a1f602e8eb8c8f7cf1d946bec2f27dfadd05fe25686d467f25de95e8df35f976c136e6815d9ceb13
data/.travis.yml CHANGED
@@ -1,7 +1,8 @@
1
1
  language: ruby
2
2
  rvm:
3
+ - "1.8.7"
3
4
  - "1.9.2"
4
5
  - "1.9.3"
5
6
  - "2.0.0"
6
- - jruby-19mode # JRuby in 1.9 mode
7
- - rbx-2.1.1
7
+ - "2.1.0"
8
+ - "jruby-19mode" # JRuby in 1.9 mode
data/lib/armoire/init.rb ADDED
@@ -0,0 +1,3 @@
1
+ Rails.configuration.after_initialize do
2
+ Armoire.load! Rails.root.join('config', 'application.yml')
3
+ end
data/lib/armoire/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Armoire
2
- VERSION = "1.1.0"
2
+ VERSION = "1.2.1"
3
3
  end
data/lib/armoire.rb CHANGED
@@ -4,7 +4,12 @@ require 'erb'
4
4
 
5
5
  require "armoire/setting"
6
6
  require "armoire/version"
7
- require "armoire/railtie" if defined?(Rails)
7
+
8
+ if defined?(Rails::Railtie)
9
+ require "armoire/railtie"
10
+ elsif defined?(Rails.configuration)
11
+ require "armoire/init"
12
+ end
8
13
 
9
14
  class Armoire
10
15
  include Singleton
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: armoire
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Smith
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-12-19 00:00:00.000000000 Z
11
+ date: 2014-03-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -83,6 +83,7 @@ files:
83
83
  - Rakefile
84
84
  - armoire.gemspec
85
85
  - lib/armoire.rb
86
+ - lib/armoire/init.rb
86
87
  - lib/armoire/railtie.rb
87
88
  - lib/armoire/setting.rb
88
89
  - lib/armoire/version.rb
@@ -111,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
111
112
  version: '0'
112
113
  requirements: []
113
114
  rubyforge_project:
114
- rubygems_version: 2.0.3
115
+ rubygems_version: 2.2.2
115
116
  signing_key:
116
117
  specification_version: 4
117
118
  summary: A simple configuration tool