onering-client 0.0.57 → 0.0.58

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/bin/onering +1 -0
  2. data/lib/onering/api.rb +12 -3
  3. data/lib/onering/cli.rb +3 -2
  4. metadata +18 -58
@@ -18,6 +18,7 @@ EOS
18
18
 
19
19
  opt :url, "The URL of the Onering server to connect to", :short => "-s", :type => :string
20
20
  opt :path, "The base path to prepend to all requests (default: /api)", :type => :string
21
+ opt :param, "Additional query string parameters to include with the request in the format FIELD=VALUE. Can be specified multiple times.", :short => '-p', :type => :string, :multi => true
21
22
  opt :format, "The output format for return values (i.e.: json, yaml, text)", :default => 'text', :short => "-t", :type => :string
22
23
  opt :sslkey, "Location of the SSL client key to use for authentication", :short => "-c", :type => :string
23
24
  opt :apikey, "The API token to use for authentication", :short => "-k", :type => :string
@@ -57,6 +57,11 @@ module Onering
57
57
  # set API connectivity details
58
58
  Onering::API.base_uri @_config.get(:url, DEFAULT_BASE)
59
59
 
60
+ # add default parameters
61
+ options.get('config.params',{}).each do |k,v|
62
+ _default_param(k,v)
63
+ end
64
+
60
65
  Onering::Reporter.setup()
61
66
  connect(options) if options.get(:autoconnect, true)
62
67
  end
@@ -190,6 +195,12 @@ module Onering
190
195
  end
191
196
  end
192
197
 
198
+ # -----------------------------------------------------------------------------
199
+ def _default_param(key, value)
200
+ @_default_params ||= {}
201
+ @_default_params[key] = value
202
+ Onering::API.default_params(@_default_params)
203
+ end
193
204
 
194
205
  # -----------------------------------------------------------------------------
195
206
  def _setup_auth_ssl()
@@ -279,9 +290,7 @@ module Onering
279
290
  })
280
291
 
281
292
  # set default parameters
282
- Onering::API.default_params({
283
- :token => key
284
- })
293
+ _default_param(:token, key)
285
294
  end
286
295
  end
287
296
  end
@@ -11,8 +11,9 @@ module Onering
11
11
  return Onering::API.new({
12
12
  'autoconnect' => cliargs[:autoconnect],
13
13
  'config' => {
14
- 'url' => cliargs[:url],
15
- 'path' => cliargs[:path],
14
+ 'url' => cliargs[:url],
15
+ 'path' => cliargs[:path],
16
+ 'params' => Hash[(cliargs[:param] || []).collect{|i| i.split('=',2) }],
16
17
  'authentication' => {
17
18
  'type' => (cliargs[:apikey_given] ? :token : nil),
18
19
  'keyfile' => (cliargs[:apikey] || cliargs[:sslkey])
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.57
4
+ version: 0.0.58
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: &7901220 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,15 +21,10 @@ dependencies:
21
21
  version: '1.6'
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.6'
24
+ version_requirements: *7901220
30
25
  - !ruby/object:Gem::Dependency
31
26
  name: deep_merge
32
- requirement: !ruby/object:Gem::Requirement
27
+ requirement: &7898700 !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: *7898700
46
36
  - !ruby/object:Gem::Dependency
47
37
  name: addressable
48
- requirement: !ruby/object:Gem::Requirement
38
+ requirement: &7896340 !ruby/object:Gem::Requirement
49
39
  none: false
50
40
  requirements:
51
41
  - - ! '>='
@@ -53,15 +43,10 @@ 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: *7896340
62
47
  - !ruby/object:Gem::Dependency
63
48
  name: httparty
64
- requirement: !ruby/object:Gem::Requirement
49
+ requirement: &7895500 !ruby/object:Gem::Requirement
65
50
  none: false
66
51
  requirements:
67
52
  - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
69
54
  version: '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'
57
+ version_requirements: *7895500
78
58
  - !ruby/object:Gem::Dependency
79
59
  name: hashlib
80
- requirement: !ruby/object:Gem::Requirement
60
+ requirement: &7522620 !ruby/object:Gem::Requirement
81
61
  none: false
82
62
  requirements:
83
63
  - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
85
65
  version: 0.0.18
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.18
68
+ version_requirements: *7522620
94
69
  - !ruby/object:Gem::Dependency
95
70
  name: multi_json
96
- requirement: !ruby/object:Gem::Requirement
71
+ requirement: &7520900 !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: *7520900
110
80
  - !ruby/object:Gem::Dependency
111
81
  name: rainbow
112
- requirement: !ruby/object:Gem::Requirement
82
+ requirement: &7519020 !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: *7519020
126
91
  - !ruby/object:Gem::Dependency
127
92
  name: trollop
128
- requirement: !ruby/object:Gem::Requirement
93
+ requirement: &7516960 !ruby/object:Gem::Requirement
129
94
  none: false
130
95
  requirements:
131
96
  - - ! '>='
@@ -133,12 +98,7 @@ 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: *7516960
142
102
  description: A Ruby wrapper for Onering
143
103
  email: ghetzel@outbrain.com
144
104
  executables:
@@ -180,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
180
140
  version: '0'
181
141
  requirements: []
182
142
  rubyforge_project:
183
- rubygems_version: 1.8.23
143
+ rubygems_version: 1.8.11
184
144
  signing_key:
185
145
  specification_version: 3
186
146
  summary: Onering client API and utilities