restfully-addons 1.3.0 → 1.3.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 (4) hide show
  1. data/examples/bonfire/scenario1.rb +1 -2
  2. data/lib/restfully/addons/bonfire/zabbix.rb +8 -7
  3. data/lib/restfully/addons/version.rb +1 -1
  4. metadata +52 -17
data/examples/bonfire/scenario1.rb CHANGED
@@ -11,8 +11,7 @@ session = Restfully::Session.new(
11
11
  :configuration_file => "~/.restfully/api.bonfire-project.eu",
12
12
  :cache => false,
13
13
  :gateway => "ssh.bonfire.grid5000.fr",
14
- :keys => ["~/.ssh/id_rsa"],
15
- :require => ["http://bonfire-dev.gforge.inria.fr/public/restfully/http.rb"]
14
+ :keys => ["~/.ssh/id_rsa"]
16
15
  )
17
16
  session.logger.level = Logger::INFO
18
17
 
data/lib/restfully/addons/bonfire/zabbix.rb CHANGED
@@ -22,13 +22,13 @@ module Restfully
22
22
  @zabbix ||= Zabbix.new(session, self)
23
23
  end
24
24
  end
25
-
25
+
26
26
  class Zabbix
27
27
  attr_reader :session, :experiment
28
28
  def initialize(session, experiment, opts = {})
29
29
  @session = session
30
30
  @username = opts[:username] || "Admin"
31
- @password = opts[:password] || "zabbix"
31
+ @password = opts[:password] || experiment['aggregator_password']
32
32
  @experiment = experiment
33
33
  @token, @request_id = nil, 0
34
34
  @uri = @experiment.uri.to_s+"/zabbix"
@@ -72,7 +72,7 @@ module Restfully
72
72
  def authenticate
73
73
  @token = request("user.authenticate", {"user" => @username, "password" => @password})
74
74
  end
75
-
75
+
76
76
  def metric(name, options = {})
77
77
  hosts = [options.delete(:hosts) || []].flatten.map{|h|
78
78
  [h['name'], h['id']].join("-")
@@ -117,7 +117,7 @@ module Restfully
117
117
  end
118
118
 
119
119
  def values
120
- @results.map{|r|
120
+ @results.map{|r|
121
121
  case @opts[:type]
122
122
  when :numeric, 0, 3
123
123
  r['value'].to_f
@@ -127,7 +127,8 @@ module Restfully
127
127
  }.reverse
128
128
  end
129
129
  end
130
-
130
+
131
131
  end
132
-
133
- end
132
+
133
+ end
134
+
data/lib/restfully/addons/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Restfully
2
2
  module Addons
3
- VERSION = "1.3.0"
3
+ VERSION = "1.3.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: restfully-addons
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.3.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-16 00:00:00.000000000Z
12
+ date: 2013-09-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: restfully
16
- requirement: &2156274160 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2156274160
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: net-ssh-gateway
27
- requirement: &2156273400 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '0'
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *2156273400
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: net-scp
38
- requirement: &2156272600 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: '0'
44
54
  type: :runtime
45
55
  prerelease: false
46
- version_requirements: *2156272600
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: net-sftp
49
- requirement: &2156271800 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: '0'
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *2156271800
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: '0'
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: net-ssh-multi
60
- requirement: &2156270920 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: '0'
66
86
  type: :runtime
67
87
  prerelease: false
68
- version_requirements: *2156270920
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ! '>='
92
+ - !ruby/object:Gem::Version
93
+ version: '0'
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: libxml-ruby
71
- requirement: &2156270220 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
76
101
  version: '0'
77
102
  type: :runtime
78
103
  prerelease: false
79
- version_requirements: *2156270220
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
80
110
  - !ruby/object:Gem::Dependency
81
111
  name: rake
82
- requirement: &2156269180 !ruby/object:Gem::Requirement
112
+ requirement: !ruby/object:Gem::Requirement
83
113
  none: false
84
114
  requirements:
85
115
  - - ~>
@@ -87,7 +117,12 @@ dependencies:
87
117
  version: '0.8'
88
118
  type: :development
89
119
  prerelease: false
90
- version_requirements: *2156269180
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ~>
124
+ - !ruby/object:Gem::Version
125
+ version: '0.8'
91
126
  description: Addons for Restfully
92
127
  email:
93
128
  - cyril.rohr@inria.fr
@@ -129,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
129
164
  version: '1.3'
130
165
  requirements: []
131
166
  rubyforge_project:
132
- rubygems_version: 1.8.13
167
+ rubygems_version: 1.8.23
133
168
  signing_key:
134
169
  specification_version: 3
135
170
  summary: Addons for Restfully