rubix 0.5.5 → 0.5.6

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/VERSION +1 -1
  2. data/lib/rubix.rb +1 -3
  3. data/spec/test.yml +8 -8
  4. metadata +127 -121
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.5.5
1
+ 0.5.6
data/lib/rubix.rb CHANGED
@@ -46,9 +46,7 @@ module Rubix
46
46
  #
47
47
  # @return [true, false]
48
48
  def self.connected?
49
- (!! connection)
50
- rescue ConnectionError, AuthenticationError, RequestError
51
- false
49
+ @connection && @connection.authorized?
52
50
  end
53
51
 
54
52
  # Is Rubix presently connected and authorized with a Zabbix server?
data/spec/test.yml CHANGED
@@ -1,11 +1,11 @@
1
1
  ---
2
-
2
+
3
3
  api:
4
- url: localhost:8080/api_jsonrpc.php
5
-
6
- mysql:
7
- host: localhost
8
- username: zabbix
4
+ url: http://127.0.0.1:5000/~huston/php/api_jsonrpc.php
5
+ username: Admin
9
6
  password: zabbix
10
- database: zabbix
11
-
7
+ mysql:
8
+ host: 127.0.0.1
9
+ username: root
10
+ password:
11
+ database: zabbix
metadata CHANGED
@@ -1,188 +1,194 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: rubix
3
- version: !ruby/object:Gem::Version
4
- version: 0.5.5
3
+ version: !ruby/object:Gem::Version
5
4
  prerelease:
5
+ version: 0.5.6
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Dhruv Bansal
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-30 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
12
+
13
+ date: 2012-06-12 00:00:00 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
15
16
  name: rspec
16
- requirement: &17590460 !ruby/object:Gem::Requirement
17
+ prerelease: false
18
+ requirement: &id001 !ruby/object:Gem::Requirement
17
19
  none: false
18
- requirements:
19
- - - ! '>='
20
- - !ruby/object:Gem::Version
21
- version: '0'
20
+ requirements:
21
+ - - ">="
22
+ - !ruby/object:Gem::Version
23
+ version: "0"
22
24
  type: :development
23
- prerelease: false
24
- version_requirements: *17590460
25
- - !ruby/object:Gem::Dependency
25
+ version_requirements: *id001
26
+ - !ruby/object:Gem::Dependency
26
27
  name: mysql2
27
- requirement: &17589800 !ruby/object:Gem::Requirement
28
+ prerelease: false
29
+ requirement: &id002 !ruby/object:Gem::Requirement
28
30
  none: false
29
- requirements:
30
- - - ! '>='
31
- - !ruby/object:Gem::Version
32
- version: '0'
31
+ requirements:
32
+ - - ">="
33
+ - !ruby/object:Gem::Version
34
+ version: "0"
33
35
  type: :development
34
- prerelease: false
35
- version_requirements: *17589800
36
- - !ruby/object:Gem::Dependency
36
+ version_requirements: *id002
37
+ - !ruby/object:Gem::Dependency
37
38
  name: json
38
- requirement: &17589040 !ruby/object:Gem::Requirement
39
+ prerelease: false
40
+ requirement: &id003 !ruby/object:Gem::Requirement
39
41
  none: false
40
- requirements:
42
+ requirements:
41
43
  - - <=
42
- - !ruby/object:Gem::Version
44
+ - !ruby/object:Gem::Version
43
45
  version: 1.6.1
44
46
  type: :runtime
45
- prerelease: false
46
- version_requirements: *17589040
47
- - !ruby/object:Gem::Dependency
47
+ version_requirements: *id003
48
+ - !ruby/object:Gem::Dependency
48
49
  name: configliere
49
- requirement: &17588500 !ruby/object:Gem::Requirement
50
+ prerelease: false
51
+ requirement: &id004 !ruby/object:Gem::Requirement
50
52
  none: false
51
- requirements:
52
- - - ! '>='
53
- - !ruby/object:Gem::Version
53
+ requirements:
54
+ - - ">="
55
+ - !ruby/object:Gem::Version
54
56
  version: 0.4.8
55
57
  type: :runtime
56
- prerelease: false
57
- version_requirements: *17588500
58
- - !ruby/object:Gem::Dependency
58
+ version_requirements: *id004
59
+ - !ruby/object:Gem::Dependency
59
60
  name: multipart-post
60
- requirement: &17588120 !ruby/object:Gem::Requirement
61
+ prerelease: false
62
+ requirement: &id005 !ruby/object:Gem::Requirement
61
63
  none: false
62
- requirements:
63
- - - ! '>='
64
- - !ruby/object:Gem::Version
65
- version: '0'
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ version: "0"
66
68
  type: :runtime
67
- prerelease: false
68
- version_requirements: *17588120
69
- description: Rubix provides abstractions for connecting to Zabbix's API, an ORM for
70
- wrapping Zabbix resources, a set of scripts for writing data to Zabbix, and a collection
71
- of Monitor classes for building periodic monitors.
72
- email:
69
+ version_requirements: *id005
70
+ description: Rubix provides abstractions for connecting to Zabbix's API, an ORM for wrapping Zabbix resources, a set of scripts for writing data to Zabbix, and a collection of Monitor classes for building periodic monitors.
71
+ email:
73
72
  - dhruv@infochimps.com
74
- executables:
73
+ executables:
75
74
  - zabbix_api
76
75
  - zabbix_pipe
77
76
  extensions: []
77
+
78
78
  extra_rdoc_files: []
79
- files:
79
+
80
+ files:
80
81
  - bin/zabbix_api
81
82
  - bin/zabbix_pipe
82
- - lib/rubix.rb
83
- - lib/rubix/models/template.rb
84
- - lib/rubix/models/trigger.rb
85
- - lib/rubix/models/media_type.rb
86
- - lib/rubix/models/user_macro.rb
87
- - lib/rubix/models/action.rb
88
- - lib/rubix/models/script.rb
89
- - lib/rubix/models/item.rb
90
- - lib/rubix/models/user_group.rb
91
- - lib/rubix/models/operation.rb
92
- - lib/rubix/models/host.rb
93
- - lib/rubix/models/host_group.rb
94
- - lib/rubix/models/model.rb
95
- - lib/rubix/models/medium.rb
96
- - lib/rubix/models/time_series.rb
97
- - lib/rubix/models/condition.rb
98
- - lib/rubix/models/application.rb
99
- - lib/rubix/models/user.rb
100
- - lib/rubix/examples/simple_zabbix_monitor.rb
101
- - lib/rubix/examples/simple_uptime_monitor.rb
102
- - lib/rubix/examples/simple_cluster_monitor.rb
103
- - lib/rubix/examples/simple_chef_monitor.rb
104
- - lib/rubix/auto_sender.rb
105
- - lib/rubix/sender.rb
106
- - lib/rubix/log.rb
107
- - lib/rubix/models.rb
108
- - lib/rubix/monitors.rb
109
- - lib/rubix/response.rb
110
- - lib/rubix/associations/has_many_hosts.rb
111
- - lib/rubix/associations/has_many_applications.rb
83
+ - lib/rubix/associations/belongs_to_action.rb
84
+ - lib/rubix/associations/belongs_to_host.rb
85
+ - lib/rubix/associations/belongs_to_item.rb
112
86
  - lib/rubix/associations/belongs_to_media_type.rb
113
87
  - lib/rubix/associations/belongs_to_template.rb
114
- - lib/rubix/associations/has_many_host_groups.rb
115
- - lib/rubix/associations/has_many_users.rb
116
- - lib/rubix/associations/has_many_conditions.rb
117
88
  - lib/rubix/associations/belongs_to_user.rb
118
89
  - lib/rubix/associations/belongs_to_user_group.rb
119
- - lib/rubix/associations/belongs_to_host.rb
120
- - lib/rubix/associations/belongs_to_item.rb
90
+ - lib/rubix/associations/has_many_applications.rb
91
+ - lib/rubix/associations/has_many_conditions.rb
92
+ - lib/rubix/associations/has_many_host_groups.rb
93
+ - lib/rubix/associations/has_many_hosts.rb
121
94
  - lib/rubix/associations/has_many_items.rb
122
95
  - lib/rubix/associations/has_many_templates.rb
123
- - lib/rubix/associations/belongs_to_action.rb
124
96
  - lib/rubix/associations/has_many_user_groups.rb
125
97
  - lib/rubix/associations/has_many_user_macros.rb
98
+ - lib/rubix/associations/has_many_users.rb
99
+ - lib/rubix/associations.rb
100
+ - lib/rubix/auto_sender.rb
101
+ - lib/rubix/connection.rb
102
+ - lib/rubix/examples/simple_chef_monitor.rb
103
+ - lib/rubix/examples/simple_cluster_monitor.rb
104
+ - lib/rubix/examples/simple_uptime_monitor.rb
105
+ - lib/rubix/examples/simple_zabbix_monitor.rb
106
+ - lib/rubix/log.rb
107
+ - lib/rubix/models/action.rb
108
+ - lib/rubix/models/application.rb
109
+ - lib/rubix/models/condition.rb
110
+ - lib/rubix/models/host.rb
111
+ - lib/rubix/models/host_group.rb
112
+ - lib/rubix/models/item.rb
113
+ - lib/rubix/models/media_type.rb
114
+ - lib/rubix/models/medium.rb
115
+ - lib/rubix/models/model.rb
116
+ - lib/rubix/models/operation.rb
117
+ - lib/rubix/models/script.rb
118
+ - lib/rubix/models/template.rb
119
+ - lib/rubix/models/time_series.rb
120
+ - lib/rubix/models/trigger.rb
121
+ - lib/rubix/models/user.rb
122
+ - lib/rubix/models/user_group.rb
123
+ - lib/rubix/models/user_macro.rb
124
+ - lib/rubix/models.rb
126
125
  - lib/rubix/monitors/chef_monitor.rb
127
126
  - lib/rubix/monitors/cluster_monitor.rb
128
- - lib/rubix/monitors/zabbix_monitor.rb
129
127
  - lib/rubix/monitors/monitor.rb
130
- - lib/rubix/connection.rb
131
- - lib/rubix/associations.rb
132
- - spec/test.yml
133
- - spec/rubix/model_spec.rb
134
- - spec/rubix/auto_sender_spec.rb
135
- - spec/rubix/monitors/monitor_spec.rb
136
- - spec/rubix/monitors/chef_monitor_spec.rb
137
- - spec/rubix/monitors/zabbix_monitor_spec.rb
138
- - spec/rubix/monitors/cluster_monitor_spec.rb
139
- - spec/rubix/response_spec.rb
140
- - spec/rubix/sender_spec.rb
141
- - spec/rubix/connection_spec.rb
142
- - spec/requests/time_series_request_spec.rb
143
- - spec/requests/media_type_request_spec.rb
144
- - spec/requests/script_request_spec.rb
145
- - spec/requests/item_request_spec.rb
128
+ - lib/rubix/monitors/zabbix_monitor.rb
129
+ - lib/rubix/monitors.rb
130
+ - lib/rubix/response.rb
131
+ - lib/rubix/sender.rb
132
+ - lib/rubix.rb
133
+ - spec/data/test_template.xml
146
134
  - spec/requests/action_request_spec.rb
147
- - spec/requests/host_group_request_spec.rb
148
- - spec/requests/user_macro_request_spec.rb
135
+ - spec/requests/application_request_spec.rb
149
136
  - spec/requests/connection_request_spec.rb
137
+ - spec/requests/host_group_request_spec.rb
138
+ - spec/requests/host_request_spec.rb
139
+ - spec/requests/item_request_spec.rb
140
+ - spec/requests/media_type_request_spec.rb
141
+ - spec/requests/script_request_spec.rb
150
142
  - spec/requests/template_request_spec.rb
143
+ - spec/requests/time_series_request_spec.rb
151
144
  - spec/requests/trigger_request_spec.rb
152
- - spec/requests/host_request_spec.rb
153
- - spec/requests/user_request_spec.rb
154
145
  - spec/requests/user_group_request_spec.rb
155
- - spec/requests/application_request_spec.rb
146
+ - spec/requests/user_macro_request_spec.rb
147
+ - spec/requests/user_request_spec.rb
148
+ - spec/rubix/auto_sender_spec.rb
149
+ - spec/rubix/connection_spec.rb
150
+ - spec/rubix/model_spec.rb
151
+ - spec/rubix/monitors/chef_monitor_spec.rb
152
+ - spec/rubix/monitors/cluster_monitor_spec.rb
153
+ - spec/rubix/monitors/monitor_spec.rb
154
+ - spec/rubix/monitors/zabbix_monitor_spec.rb
155
+ - spec/rubix/response_spec.rb
156
+ - spec/rubix/sender_spec.rb
156
157
  - spec/spec_helper.rb
158
+ - spec/support/configliere_helper.rb
157
159
  - spec/support/integration_helper.rb
158
160
  - spec/support/response_helper.rb
159
- - spec/support/configliere_helper.rb
160
- - spec/data/test_template.xml
161
+ - spec/test.yml
161
162
  - LICENSE
162
163
  - README.rdoc
163
164
  - VERSION
164
165
  homepage: http://github.com/dhruvbansal/rubix
165
166
  licenses: []
167
+
166
168
  post_install_message:
167
169
  rdoc_options: []
168
- require_paths:
170
+
171
+ require_paths:
169
172
  - lib
170
- required_ruby_version: !ruby/object:Gem::Requirement
173
+ required_ruby_version: !ruby/object:Gem::Requirement
171
174
  none: false
172
- requirements:
173
- - - ! '>='
174
- - !ruby/object:Gem::Version
175
- version: '0'
176
- required_rubygems_version: !ruby/object:Gem::Requirement
175
+ requirements:
176
+ - - ">="
177
+ - !ruby/object:Gem::Version
178
+ version: "0"
179
+ required_rubygems_version: !ruby/object:Gem::Requirement
177
180
  none: false
178
- requirements:
179
- - - ! '>='
180
- - !ruby/object:Gem::Version
181
- version: '0'
181
+ requirements:
182
+ - - ">="
183
+ - !ruby/object:Gem::Version
184
+ version: "0"
182
185
  requirements: []
186
+
183
187
  rubyforge_project:
184
- rubygems_version: 1.8.17
188
+ rubygems_version: 1.8.15
185
189
  signing_key:
186
190
  specification_version: 3
187
191
  summary: A Ruby client for configuring and writing data to Zabbix
188
192
  test_files: []
193
+
194
+ has_rdoc: