zabbirc 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ec10324939be38bb26704f2746f95e5cb732eb7
-  data.tar.gz: 367d58e4c674c4240d2d5c0b2a47706507608523
+  metadata.gz: 9709c2587dc9ede55cf578ac23dd8cdab18a0a39
+  data.tar.gz: 384e3abc02e685d19e1db41575ee4343cdd80753
 SHA512:
-  metadata.gz: a964e144c9668f1e005177578267612e4795ae1a5e5fbd61b7c950bd05f53a4f39c13d04ccdb0effda3eb79c8ba7a294c46f66f213ecda656c4352e8a68c243d
-  data.tar.gz: b8302932d61bcf6fc41642422997e9f72c62a2437b7e0c3f8f464bbe140ba13618c325531ea142ba36708512f55c3fa5d08b2987fc1f9439c0f1496b095e0af3
+  metadata.gz: ff594056094dd32781b14022e6b87bbd1ff7981b81d73d4989c44ad8bb6018141e2f5521c09286e0dd93e05b87dbb6a3e479cba341e51359743735e3d9f66c4f
+  data.tar.gz: f63c3689718110f00ffde34a5cd2ca244077e4ecb147fdc58cb7acfb56ab80cf83dd3e581c8c9f9f32b4f8cdbe48552a1e79457f6cc575f39b4b96a452f97559

data/bin/zabbirc-install

@@ -14,31 +14,31 @@ require 'zabbirc'
 require 'pry'
 
 def chown_directory dir
-  puts "Using sudo to chown runtime directory `#{dir}`"
+  puts "Using sudo to chown directory `#{dir}`"
   system "sudo chown #{Process.uid}:#{Process.gid} #{dir}"
 end
 
 begin
-  unless Dir.exists? Zabbirc::RUNTIME_DATA_DIR
-    puts "Using sudo to create runtime directory #{Zabbirc::RUNTIME_DATA_DIR}"
-    r = system "sudo mkdir #{Zabbirc::RUNTIME_DATA_DIR}"
+  unless Dir.exists? Zabbirc::LIB_DATA_DIR
+    puts "Using sudo to create lib directory #{Zabbirc::LIB_DATA_DIR}"
+    r = system "sudo mkdir #{Zabbirc::LIB_DATA_DIR}"
     if r
-      puts "Runtime directory #{Zabbirc::RUNTIME_DATA_DIR} created"
-      chown_directory Zabbirc::RUNTIME_DATA_DIR
+      puts "Runtime directory #{Zabbirc::LIB_DATA_DIR} created"
+      chown_directory Zabbirc::LIB_DATA_DIR
     else
-      puts "Could not create runtime directory #{Zabbirc::RUNTIME_DATA_DIR}"
+      puts "Could not create runtime directory #{Zabbirc::LIB_DATA_DIR}"
       puts "Please create this directory and check if it's accesible by user, that will run zabbirc bot"
     end
   end
 
   # Test if runtime directory is accessible
-  f = File.open(Zabbirc::RUNTIME_DATA_DIR.join("test"), "w")
+  f = File.open(Zabbirc::LIB_DATA_DIR.join("test"), "w")
   f.puts "test"
   f.close
   FileUtils.rm f.path
 rescue Errno::EACCES
-  unless chown_directory Zabbirc::RUNTIME_DATA_DIR
-    puts "Could not make runtime directory `#{Zabbirc::RUNTIME_DATA_DIR}` accessible"
+  unless chown_directory Zabbirc::LIB_DATA_DIR
+    puts "Could not make runtime directory `#{Zabbirc::LIB_DATA_DIR}` accessible"
   end
 end
 

data/lib/zabbirc/op_list.rb

@@ -1,5 +1,5 @@
 module Zabbirc
-  STORED_SETTINGS_FILE = Zabbirc::RUNTIME_DATA_DIR.join("ops_settings.yaml")
+  STORED_SETTINGS_FILE = Zabbirc::LIB_DATA_DIR.join("ops_settings.yaml")
   class OpList
     include Enumerable
 

data/lib/zabbirc/zabbix/resource/finders.rb

@@ -15,7 +15,7 @@ module Zabbirc
                 else
                   self.new res.first
                 end
-        rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, SocketError => e
+        rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, SocketError, OpenSSL::SSL::SSLError => e
           Zabbirc.logger.error "Zabbix::Resource#find: #{e}"
           raise NotConnected, e
         else
@@ -29,7 +29,7 @@ module Zabbirc
           ret = res.collect do |obj|
             self.new obj
           end
-        rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, SocketError => e
+        rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, SocketError, OpenSSL::SSL::SSLError => e
           Zabbirc.logger.error "Zabbix::Resource#get: #{e}"
           raise NotConnected, e
         else

data/lib/zabbirc.rb

@@ -12,7 +12,7 @@ def require_dir dir
 end
 
 module Zabbirc
-  RUNTIME_DATA_DIR = Pathname.new("/var/run/zabbirc") unless defined? RUNTIME_DATA_DIR
+  LIB_DATA_DIR = Pathname.new("/usr/local/zabbirc") unless defined? LIB_DATA_DIR
   def self.synchronize &block
     @mutex ||= Mutex.new
     @mutex.synchronize &block

data/tmp/playground.rb

@@ -1,37 +0,0 @@
-/usr/local/rvm/gems/ruby-2.1.2@zabbirc-test/bin
-/usr/local/rvm/gems/ruby-2.1.2@global/bin
-/usr/local/rvm/rubies/ruby-2.1.2/bin
-/usr/local/rvm/bin
-/usr/local/heroku/bin
-/usr/local/bin
-/usr/local/sbin
-~/bin
-/usr/bin
-/bin
-/usr/sbin
-/sbin
-/usr/local/bin
-/opt/X11/bin
-/Applications/Server.app/Contents/ServerRoot/usr/bin
-/Applications/Server.app/Contents/ServerRoot/usr/sbin
-/usr/texbin
-/usr/local/bin
-/usr/bin
-/bin
-/usr/sbin
-/sbin
-/usr/local/bin
-/opt/X11/bin
-/Applications/Server.app/Contents/ServerRoot/usr/bin
-/Applications/Server.app/Contents/ServerRoot/usr/sbin
-/Users/wayneeseguin/.sm/bin
-/Users/wayneeseguin/.sm/pkg/active/bin
-/Users/wayneeseguin/.sm/pkg/active/sbin
-/usr/local/mysql/bin
-/usr/bin
-/usr/local/bin
-/Users/tulak/Documents/Android Development/android-sdk-macosx/tools
-/Users/tulak/Documents/Android Development/android-sdk-macosx/platform-tools
-/Users/tulak/.rvm/bin
-/usr/local/sbin
-/usr/local/gnat/bin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbirc
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Filip Zachar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport