confrider 0.0.2 → 0.1.0

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.
data/.travis.yml ADDED
@@ -0,0 +1,9 @@
1
+ language: ruby
2
+ rvm:
3
+ - 1.8.7
4
+ - 1.9.2
5
+ - 1.9.3
6
+ - jruby-18mode # JRuby in 1.8 mode
7
+ - jruby-19mode # JRuby in 1.9 mode
8
+ - rbx-18mode
9
+ - rbx-19mode
data/Gemfile.lock CHANGED
@@ -1,12 +1,13 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- confrider (0.0.2)
4
+ confrider (0.1.0)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
8
8
  specs:
9
9
  diff-lcs (1.1.3)
10
+ rake (0.9.2.2)
10
11
  rspec (2.10.0)
11
12
  rspec-core (~> 2.10.0)
12
13
  rspec-expectations (~> 2.10.0)
@@ -21,4 +22,5 @@ PLATFORMS
21
22
 
22
23
  DEPENDENCIES
23
24
  confrider!
25
+ rake
24
26
  rspec
data/README.md CHANGED
@@ -2,6 +2,8 @@
2
2
 
3
3
  Configuration managment system with i18n like syntax
4
4
 
5
+ ## Build Status [<img src="https://secure.travis-ci.org/kron4eg/confrider.png"/>](http://travis-ci.org/kron4eg/confrider)
6
+
5
7
  ## Usage
6
8
 
7
9
  ### little helper(to render yaml files with ERB)
data/confrider.gemspec CHANGED
@@ -15,5 +15,6 @@ Gem::Specification.new do |gem|
15
15
  gem.require_paths = ['lib']
16
16
  gem.version = Confrider::VERSION
17
17
 
18
+ gem.add_development_dependency 'rake'
18
19
  gem.add_development_dependency 'rspec'
19
20
  end
@@ -1,3 +1,3 @@
1
1
  module Confrider
2
- VERSION = '0.0.2'
2
+ VERSION = '0.1.0'
3
3
  end
data/lib/confrider.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'confrider/version'
2
- require 'confrider/deep_merge'
2
+ # don't load confrider/deep_merge if it was already loaded from active_support
3
+ require 'confrider/deep_merge' unless {}.respond_to? :deep_merge
3
4
  require 'confrider/core'
4
5
 
5
6
  module Confrider
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: confrider
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,6 +11,22 @@ bindir: bin
11
11
  cert_chain: []
12
12
  date: 2012-05-20 00:00:00.000000000 Z
13
13
  dependencies:
14
+ - !ruby/object:Gem::Dependency
15
+ name: rake
16
+ requirement: !ruby/object:Gem::Requirement
17
+ none: false
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
22
+ type: :development
23
+ prerelease: false
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
14
30
  - !ruby/object:Gem::Dependency
15
31
  name: rspec
16
32
  requirement: !ruby/object:Gem::Requirement
@@ -36,6 +52,7 @@ extra_rdoc_files: []
36
52
  files:
37
53
  - .gitignore
38
54
  - .rspec
55
+ - .travis.yml
39
56
  - Gemfile
40
57
  - Gemfile.lock
41
58
  - LICENSE
@@ -64,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
64
81
  version: '0'
65
82
  segments:
66
83
  - 0
67
- hash: -3148026561097312103
84
+ hash: 2987699669290260824
68
85
  required_rubygems_version: !ruby/object:Gem::Requirement
69
86
  none: false
70
87
  requirements:
@@ -73,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
73
90
  version: '0'
74
91
  segments:
75
92
  - 0
76
- hash: -3148026561097312103
93
+ hash: 2987699669290260824
77
94
  requirements: []
78
95
  rubyforge_project:
79
96
  rubygems_version: 1.8.18