onering-client 0.0.37 → 0.0.39
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/bin/onering +7 -6
- data/lib/onering/api.rb +3 -3
- data/lib/onering/plugins/reporter.rb +0 -1
- metadata +14 -14
data/bin/onering
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# provision [options] [key:value .. ] [pxe profile | ]
|
7
7
|
|
8
8
|
|
9
|
-
require '
|
9
|
+
require 'multi_json'
|
10
10
|
require 'rubygems'
|
11
11
|
require 'subcommander'
|
12
12
|
require 'onering'
|
@@ -34,7 +34,7 @@ def print_format(data, format=nil)
|
|
34
34
|
|
35
35
|
when :json
|
36
36
|
require 'json'
|
37
|
-
puts
|
37
|
+
puts MultiJson.dump(data)
|
38
38
|
|
39
39
|
else
|
40
40
|
raise "Unknown output format #{format}"
|
@@ -79,10 +79,11 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
|
|
79
79
|
# SHOW
|
80
80
|
devices.subcommand :show, "Print out a single node by ID" do |sc|
|
81
81
|
sc.usage = "onering devices show ID"
|
82
|
+
sc.opt :format, '-t', '--format FORMAT', "Return the results as FORMAT"
|
82
83
|
|
83
84
|
sc.exec do
|
84
85
|
id = sc[:args].first
|
85
|
-
print_format(api.get(id))
|
86
|
+
print_format(api.get(id), sc[:format])
|
86
87
|
end
|
87
88
|
end
|
88
89
|
|
@@ -147,7 +148,7 @@ subcommand :devices, "Operations related to Onering's assets database" do |devic
|
|
147
148
|
sc.exec do
|
148
149
|
unless STDIN.tty?
|
149
150
|
begin
|
150
|
-
json = ::
|
151
|
+
json = ::MultiJson.load(STDIN.read)
|
151
152
|
raise "Input document must specify an ID" if sc[:args].empty? and not json['id']
|
152
153
|
|
153
154
|
rv = api.save((sc[:args].first || json['id']), json)
|
@@ -201,7 +202,7 @@ subcommand :users, "Manage Onering users" do |users|
|
|
201
202
|
sc.exec do
|
202
203
|
unless STDIN.tty?
|
203
204
|
begin
|
204
|
-
json = ::
|
205
|
+
json = ::MultiJson.load(STDIN.read)
|
205
206
|
raise "Input document must specify an ID" if sc[:args].empty? and not json['id']
|
206
207
|
|
207
208
|
print_format(api.save((sc[:args].first || json['id']), json))
|
@@ -229,7 +230,7 @@ subcommand :call, "Call generic Onering API endpoints" do |call|
|
|
229
230
|
call.exec do
|
230
231
|
rv = api.request(call[:args].first.to_sym, {
|
231
232
|
:method => (call[:method] || :get),
|
232
|
-
:data => (STDIN.tty? ? {} : ::
|
233
|
+
:data => (STDIN.tty? ? {} : ::MultiJson.load(STDIN.read)),
|
233
234
|
:fields => (Hash[call[:opts].collect{|i| i.split(':',2) }] rescue {})
|
234
235
|
})
|
235
236
|
|
data/lib/onering/api.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'net/https'
|
2
2
|
require 'uri'
|
3
|
-
require '
|
3
|
+
require 'multi_json'
|
4
4
|
require 'yaml'
|
5
5
|
require 'addressable/uri'
|
6
6
|
require 'deep_merge'
|
@@ -98,7 +98,7 @@ module Onering
|
|
98
98
|
response = @_http.request(request)
|
99
99
|
|
100
100
|
if response.code.to_i >= 400
|
101
|
-
rv = (
|
101
|
+
rv = (MultiJson.load(response.body) rescue {}) unless response.body.empty?
|
102
102
|
|
103
103
|
if rv['errors']
|
104
104
|
msg = "#{rv['errors']['type']}: #{rv['errors']['message']}"
|
@@ -111,7 +111,7 @@ module Onering
|
|
111
111
|
end
|
112
112
|
else
|
113
113
|
if response['Content-Type'] == 'application/json'
|
114
|
-
rv = (response.body.empty? ? nil :
|
114
|
+
rv = (response.body.empty? ? nil : MultiJson.load(response.body))
|
115
115
|
else
|
116
116
|
rv = response.body
|
117
117
|
end
|
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.
|
4
|
+
version: 0.0.39
|
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: &
|
16
|
+
requirement: &13053640 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *13053640
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: subcommander
|
27
|
-
requirement: &
|
27
|
+
requirement: &13053220 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *13053220
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: deep_merge
|
38
|
-
requirement: &
|
38
|
+
requirement: &13052820 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *13052820
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: addressable
|
49
|
-
requirement: &
|
49
|
+
requirement: &13052420 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *13052420
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: hashlib
|
60
|
-
requirement: &
|
60
|
+
requirement: &13052020 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *13052020
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
|
-
name:
|
71
|
-
requirement: &
|
70
|
+
name: multi_json
|
71
|
+
requirement: &13051620 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,7 +76,7 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *13051620
|
80
80
|
description: A Ruby wrapper for Onering
|
81
81
|
email: ghetzel@outbrain.com
|
82
82
|
executables:
|