capistrano2-zabbix 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40bb07fb11b83db26ea99ab1d6d585a926738fbb
-  data.tar.gz: e52966615eda20f05695fbdd07f0b11e4dae40b0
+  metadata.gz: 5ff5eb345ec9879e64d547b161f3115e7fb05027
+  data.tar.gz: 88b40acbf5f0a59c1a441793a5e763f42772927b
 SHA512:
-  metadata.gz: 4c56384f0342832ad59cd5985cde5a794c01abb5cab32da2fb88adec0edbcc7334f0b19b91939496b6f40af11f8d63887c4a7834ca239bd78c3f4d7ee91f8480
-  data.tar.gz: 482f88799b86020281cd364c873f1ba4752d9e0c77fdb92023f86b9062a472b254fcb7babee9e4bf9def17dd57f98457d2302ba37e6c8f243d6eb90d92593160
+  metadata.gz: 54e357c547e20c32a323e34faf11b59fe9a463d3d4c4315472c1369c3f4ccd60bcafdd8431ab1bb7e153fff21742aa82b67861b288398e3819ecbbf5a43903b4
+  data.tar.gz: 31a9c2eb46ca7108ea87a91f25be877572174282d39fd48a40fd4f0eef884546725e4a01919cabc56c92c3e4fe69e281ea88544ee04aa300c596cb7fdf03ca36

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/capistrano2-zabbix.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: capistrano2-zabbix 0.1.2 ruby lib
+# stub: capistrano2-zabbix 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano2-zabbix"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "spec/cassettes/ZabbixMaintenance/_exists_/when_maintenance_exists_on_remote_server/.yml",
     "spec/cassettes/ZabbixMaintenance/_maint_id/when_maintenance_exsts/returns_correct_ID.yml",
     "spec/cassettes/ZabbixMaintenance/_new/authenticates_with_correct_credentials.yml",
+    "spec/cassettes/ZabbixMaintenance/_new/password_is_incorrect/raises_an_exception.yml",
     "spec/spec_helper.rb",
     "spec/zabbix_maintenance_spec.rb"
   ]

data/lib/zabbix_maintenance.rb

@@ -8,8 +8,12 @@ class ZabbixMaintenance
   def initialize(url, user, password, title: 'capistrano auto maintenance')
     begin
       @zbx = ZabbixApi.connect(url: url, user: user, password: password)
-    rescue RuntimeError
-      @zbx = nil
+    rescue RuntimeError => e
+      if e.message =~ /password is incorrect/
+        fail 'Login failed - incorrect password.'
+      else
+        fail "Error while connecting to Zabbix: #{e}"
+      end
     end
 
     @maint_title = title

data/spec/cassettes/ZabbixMaintenance/_new/password_is_incorrect/raises_an_exception.yml

@@ -0,0 +1,39 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://192.168.56.2/zabbix/api_jsonrpc.php
+    body:
+      encoding: UTF-8
+      string: '{"method":"user.authenticate","params":{"user":"wronglogin","password":"wrongpw"},"auth":null,"id":47116,"jsonrpc":"2.0"}'
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json-rpc
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Fri, 15 May 2015 15:55:36 GMT
+      Server:
+      - Apache/2.2.22 (Linux/SUSE)
+      X-Powered-By:
+      - PHP/5.3.17
+      Content-Length:
+      - '126'
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: '{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid params.","data":"Login
+        name or password is incorrect."},"id":47116}'
+    http_version: 
+  recorded_at: Thu, 14 May 2015 16:15:26 GMT
+recorded_with: VCR 2.9.3

data/spec/zabbix_maintenance_spec.rb

@@ -20,6 +20,15 @@ describe ZabbixMaintenance do
       expect(lzbx).to be_a ZabbixMaintenance
       expect(lzbx.authenticated?).to eq(true)
     end
+
+    context 'password is incorrect', :vcr do
+      it 'raises an exception' do
+        expect do ZabbixMaintenance.new('http://192.168.56.2/zabbix/api_jsonrpc.php',
+                                       'wronglogin',
+                                       'wrongpw')
+              end.to raise_error(/incorrect password/)
+      end
+    end
   end
 
   describe '.create' do
@@ -58,15 +67,6 @@ describe ZabbixMaintenance do
       subject { zbx.authenticated? }
       it { is_expected.to eq(true) }
     end
-
-    context 'when not authenticated', :vcr do
-      it 'returns false' do
-        wrong_pw_zbx = ZabbixMaintenance.new('http://192.168.56.2/zabbix/api_jsonrpc.php',
-                                             'wronglogin',
-                                             'wrongpw')
-        expect(wrong_pw_zbx.authenticated?).to eq(false)
-      end
-    end
   end
 
   describe '.maint_id' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano2-zabbix
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marek Skrobacki
@@ -247,6 +247,7 @@ files:
 - spec/cassettes/ZabbixMaintenance/_exists_/when_maintenance_exists_on_remote_server/.yml
 - spec/cassettes/ZabbixMaintenance/_maint_id/when_maintenance_exsts/returns_correct_ID.yml
 - spec/cassettes/ZabbixMaintenance/_new/authenticates_with_correct_credentials.yml
+- spec/cassettes/ZabbixMaintenance/_new/password_is_incorrect/raises_an_exception.yml
 - spec/spec_helper.rb
 - spec/zabbix_maintenance_spec.rb
 homepage: http://github.com/skrobul/capistrano2-zabbix