onering-client 0.0.82 → 0.0.83

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 (4) hide show
  1. data/lib/onering/api.rb +1 -1
  2. data/lib/onering/cli/version.rb +1 -1
  3. data/lib/onering/config.rb +6 -1
  4. metadata +30 -75
data/lib/onering/api.rb CHANGED
@@ -89,7 +89,7 @@ module Onering
89
89
  end
90
90
 
91
91
  # set API connectivity details
92
- Onering::API.base_uri Onering::Config.get(:url, DEFAULT_BASE)
92
+ Onering::API.base_uri(options.get('config.url', Onering::Config.get(:url, DEFAULT_BASE)))
93
93
 
94
94
  # add default parameters
95
95
  options.get('config.params',{}).each do |k,v|
data/lib/onering/cli/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Onering
2
2
  module CLI
3
- VERSION = "0.0.82"
3
+ VERSION = "0.0.83"
4
4
  end
5
5
  end
data/lib/onering/config.rb CHANGED
@@ -1,3 +1,4 @@
1
+ require 'set'
1
2
  require 'hashlib'
2
3
 
3
4
  module Onering
@@ -21,9 +22,13 @@ module Onering
21
22
 
22
23
  # merge all config files with more-specific values overriding less-specific ones
23
24
  @_config ||= DEFAULT_CONFIG
24
- @_configfiles.each do |i|
25
+ @_configfiles_seen ||= Set.new()
26
+
27
+ # only load files we haven't seen before
28
+ (@_configfiles - @_configfiles_seen.to_a).each do |i|
25
29
  c = YAML.load(File.read(File.expand_path(i))) rescue {}
26
30
  @_config.deep_merge!(c)
31
+ @_configfiles_seen << i
27
32
  end
28
33
 
29
34
  # settings specified in the library override everything
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: onering-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.82
4
+ version: 0.0.83
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2013-01-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: facter
16
- requirement: !ruby/object:Gem::Requirement
16
+ requirement: &10686340 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
21
21
  version: 1.7.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ! '>='
28
- - !ruby/object:Gem::Version
29
- version: 1.7.2
24
+ version_requirements: *10686340
30
25
  - !ruby/object:Gem::Dependency
31
26
  name: deep_merge
32
- requirement: !ruby/object:Gem::Requirement
27
+ requirement: &10685860 !ruby/object:Gem::Requirement
33
28
  none: false
34
29
  requirements:
35
30
  - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
37
32
  version: '0'
38
33
  type: :runtime
39
34
  prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ! '>='
44
- - !ruby/object:Gem::Version
45
- version: '0'
35
+ version_requirements: *10685860
46
36
  - !ruby/object:Gem::Dependency
47
37
  name: addressable
48
- requirement: !ruby/object:Gem::Requirement
38
+ requirement: &10685360 !ruby/object:Gem::Requirement
49
39
  none: false
50
40
  requirements:
51
41
  - - ! '>='
@@ -53,31 +43,21 @@ dependencies:
53
43
  version: '0'
54
44
  type: :runtime
55
45
  prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ! '>='
60
- - !ruby/object:Gem::Version
61
- version: '0'
46
+ version_requirements: *10685360
62
47
  - !ruby/object:Gem::Dependency
63
48
  name: httparty
64
- requirement: !ruby/object:Gem::Requirement
49
+ requirement: &10684900 !ruby/object:Gem::Requirement
65
50
  none: false
66
51
  requirements:
67
- - - '='
52
+ - - =
68
53
  - !ruby/object:Gem::Version
69
54
  version: 0.11.0
70
55
  type: :runtime
71
56
  prerelease: false
72
- version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
- requirements:
75
- - - '='
76
- - !ruby/object:Gem::Version
77
- version: 0.11.0
57
+ version_requirements: *10684900
78
58
  - !ruby/object:Gem::Dependency
79
59
  name: hashlib
80
- requirement: !ruby/object:Gem::Requirement
60
+ requirement: &10684420 !ruby/object:Gem::Requirement
81
61
  none: false
82
62
  requirements:
83
63
  - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
85
65
  version: 0.0.25
86
66
  type: :runtime
87
67
  prerelease: false
88
- version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
- requirements:
91
- - - ! '>='
92
- - !ruby/object:Gem::Version
93
- version: 0.0.25
68
+ version_requirements: *10684420
94
69
  - !ruby/object:Gem::Dependency
95
70
  name: multi_json
96
- requirement: !ruby/object:Gem::Requirement
71
+ requirement: &10700360 !ruby/object:Gem::Requirement
97
72
  none: false
98
73
  requirements:
99
74
  - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
101
76
  version: '0'
102
77
  type: :runtime
103
78
  prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
- requirements:
107
- - - ! '>='
108
- - !ruby/object:Gem::Version
109
- version: '0'
79
+ version_requirements: *10700360
110
80
  - !ruby/object:Gem::Dependency
111
81
  name: rainbow
112
- requirement: !ruby/object:Gem::Requirement
82
+ requirement: &10699860 !ruby/object:Gem::Requirement
113
83
  none: false
114
84
  requirements:
115
85
  - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
117
87
  version: '0'
118
88
  type: :runtime
119
89
  prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
- requirements:
123
- - - ! '>='
124
- - !ruby/object:Gem::Version
125
- version: '0'
90
+ version_requirements: *10699860
126
91
  - !ruby/object:Gem::Dependency
127
92
  name: trollop
128
- requirement: !ruby/object:Gem::Requirement
93
+ requirement: &10699400 !ruby/object:Gem::Requirement
129
94
  none: false
130
95
  requirements:
131
96
  - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
133
98
  version: '0'
134
99
  type: :runtime
135
100
  prerelease: false
136
- version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
- requirements:
139
- - - ! '>='
140
- - !ruby/object:Gem::Version
141
- version: '0'
101
+ version_requirements: *10699400
142
102
  - !ruby/object:Gem::Dependency
143
103
  name: xml-simple
144
- requirement: !ruby/object:Gem::Requirement
104
+ requirement: &10698940 !ruby/object:Gem::Requirement
145
105
  none: false
146
106
  requirements:
147
107
  - - ! '>='
@@ -149,12 +109,7 @@ dependencies:
149
109
  version: '0'
150
110
  type: :runtime
151
111
  prerelease: false
152
- version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
- requirements:
155
- - - ! '>='
156
- - !ruby/object:Gem::Version
157
- version: '0'
112
+ version_requirements: *10698940
158
113
  description: A Ruby wrapper for Onering
159
114
  email: ghetzel@outbrain.com
160
115
  executables:
@@ -162,22 +117,22 @@ executables:
162
117
  extensions: []
163
118
  extra_rdoc_files: []
164
119
  files:
165
- - lib/onering/config.rb
120
+ - lib/onering.rb
166
121
  - lib/onering/cli.rb
167
- - lib/onering/plugins/devices.rb
168
- - lib/onering/plugins/reporter.rb
122
+ - lib/onering/config.rb
123
+ - lib/onering/api.rb
124
+ - lib/onering/util.rb
169
125
  - lib/onering/plugins/authentication.rb
126
+ - lib/onering/plugins/reporter.rb
127
+ - lib/onering/plugins/devices.rb
170
128
  - lib/onering/plugins/automation.rb
171
- - lib/onering/cli/devices.rb
172
129
  - lib/onering/cli/reporter.rb
173
- - lib/onering/cli/config.rb
174
- - lib/onering/cli/fact.rb
175
130
  - lib/onering/cli/version.rb
131
+ - lib/onering/cli/devices.rb
132
+ - lib/onering/cli/config.rb
176
133
  - lib/onering/cli/automation.rb
134
+ - lib/onering/cli/fact.rb
177
135
  - lib/onering/cli/call.rb
178
- - lib/onering/api.rb
179
- - lib/onering/util.rb
180
- - lib/onering.rb
181
136
  - bin/onering
182
137
  homepage: https://github.com/outbrain/onering-ruby
183
138
  licenses: []
@@ -199,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
199
154
  version: '0'
200
155
  requirements: []
201
156
  rubyforge_project:
202
- rubygems_version: 1.8.23
157
+ rubygems_version: 1.8.11
203
158
  signing_key:
204
159
  specification_version: 3
205
160
  summary: Onering client API and utilities