zabbixapi 4.0.0 → 5.0.0.pre.alpha1

data/lib/zabbixapi/client.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'json'
+require 'openssl'
 
 class ZabbixApi
   class Client
@@ -16,7 +17,8 @@ class ZabbixApi
     #
     # @return [String]
     def api_version
-      @version ||= api_request(:method => 'apiinfo.version', :params => {})
+      @api_version ||= api_request(method: 'apiinfo.version', params: {})
+      @api_version
     end
 
     # Log in to the Zabbix Server and generate an auth token using the API
@@ -24,14 +26,21 @@ class ZabbixApi
     # @return [Hash]
     def auth
       api_request(
-        :method => 'user.login',
-        :params => {
-          :user     => @options[:user],
-          :password => @options[:password],
+        method: 'user.login',
+        params: {
+          user: @options[:user],
+          password: @options[:password]
         }
       )
     end
 
+    # ZabbixApi::Basic.log does not like @client.options[:debug]
+    #
+    # @return [boolean]
+    def debug?
+      return ! @options || @options[:debug]
+    end
+
     # Initializes a new Client object
     #
     # @param options [Hash]
@@ -51,9 +60,15 @@ class ZabbixApi
         @proxy_port = @proxy_uri.port
         @proxy_user, @proxy_pass = @proxy_uri.userinfo.split(/:/) if @proxy_uri.userinfo
       end
-      unless api_version =~ /(2\.4|3\.[024]|4\.0)\.\d+/
-        raise ApiError.new("Zabbix API version: #{api_version} is not support by this version of zabbixapi")
+      unless api_version =~ %r{^5.[0|2]\.\d+$}
+        message = "Zabbix API version: #{api_version} is not supported by this version of zabbixapi"
+        if @options[:ignore_version]
+          puts "[WARNING] #{message}" if @options[:debug]
+        else
+          raise ZabbixApi::ApiError.new(message)
+        end
       end
+
       @auth_hash = auth
     end
 
@@ -63,10 +78,10 @@ class ZabbixApi
     # @return [String]
     def message_json(body)
       message = {
-        :method  => body[:method],
-        :params  => body[:params],
-        :id      => id,
-        :jsonrpc => '2.0',
+        method: body[:method],
+        params: body[:params],
+        id: id,
+        jsonrpc: '2.0'
       }
 
       message[:auth] = @auth_hash unless body[:method] == 'apiinfo.version' || body[:method] == 'user.login'
@@ -83,11 +98,12 @@ class ZabbixApi
       timeout = @options[:timeout].nil? ? 60 : @options[:timeout]
       puts "[DEBUG] Timeout for request set to #{timeout} seconds" if @options[:debug]
 
-      if @proxy_uri
-        http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
-      else
-        http = Net::HTTP.new(uri.host, uri.port)
-      end
+      http =
+        if @proxy_uri
+          Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
+        else
+          Net::HTTP.new(uri.host, uri.port)
+        end
 
       if uri.scheme == 'https'
         http.use_ssl = true
@@ -101,6 +117,7 @@ class ZabbixApi
       request.basic_auth @options[:http_user], @options[:http_password] if @options[:http_user]
       request.add_field('Content-Type', 'application/json-rpc')
       request.body = body
+
       response = http.request(request)
 
       raise HttpError.new("HTTP Error: #{response.code} on #{@options[:url]}", response) unless response.code == '200'
@@ -115,6 +132,7 @@ class ZabbixApi
       puts "[DEBUG] Send request: #{body}" if @options[:debug]
       result = JSON.parse(http_request(body))
       raise ApiError.new("Server answer API error\n #{JSON.pretty_unparse(result['error'])}\n on request:\n #{pretty_body(body)}", result) if result['error']
+
       result['result']
     end
 

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = '4.0.0'.freeze
+  VERSION = '5.0.0-alpha1'.freeze
 end

data/zabbixapi.gemspec

@@ -9,7 +9,7 @@ require 'zabbixapi/version'
 Gem::Specification.new do |spec|
   spec.add_dependency 'http', '~> 2.0'
   spec.add_dependency 'json', '~> 2.0'
-  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_development_dependency 'bundler'
 
   spec.name        = 'zabbixapi'
   spec.version     = ZabbixApi::VERSION
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.rubyforge_project = 'zabbixapi'
 
-  spec.files         = ['.yardopts', 'CHANGELOG.md', 'LICENSE.md', 'README.md', 'zabbixapi.gemspec'] + Dir['lib/**/*.rb']
+  spec.files         = ['CHANGELOG.md', 'LICENSE.md', 'README.md', 'zabbixapi.gemspec'] + Dir['lib/**/*.rb']
   spec.require_paths = 'lib'
   spec.required_ruby_version = '>= 2.0.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0.pre.alpha1
 platform: ruby
 authors:
 - Vasiliev D.V.
 - Ivan Evtuhovich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -43,16 +43,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: Allows you to work with zabbix api from ruby.
 email:
 - vadv.mkn@gmail.com
@@ -61,7 +61,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
 - CHANGELOG.md
 - LICENSE.md
 - README.md
@@ -73,7 +72,9 @@ files:
 - lib/zabbixapi/classes/actions.rb
 - lib/zabbixapi/classes/applications.rb
 - lib/zabbixapi/classes/configurations.rb
+- lib/zabbixapi/classes/drules.rb
 - lib/zabbixapi/classes/errors.rb
+- lib/zabbixapi/classes/events.rb
 - lib/zabbixapi/classes/graphs.rb
 - lib/zabbixapi/classes/hostgroups.rb
 - lib/zabbixapi/classes/hosts.rb
@@ -81,7 +82,9 @@ files:
 - lib/zabbixapi/classes/items.rb
 - lib/zabbixapi/classes/maintenance.rb
 - lib/zabbixapi/classes/mediatypes.rb
+- lib/zabbixapi/classes/problems.rb
 - lib/zabbixapi/classes/proxies.rb
+- lib/zabbixapi/classes/roles.rb
 - lib/zabbixapi/classes/screens.rb
 - lib/zabbixapi/classes/scripts.rb
 - lib/zabbixapi/classes/server.rb
@@ -99,7 +102,7 @@ homepage: https://github.com/express42/zabbixapi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,13 +113,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: zabbixapi
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: Simple and lightweight ruby module for working with the Zabbix API
 test_files: []

data/.yardopts

@@ -1,9 +0,0 @@
---no-private
---protected
---tag authentication:"Authentication"
---markup markdown
--
-CHANGELOG.md
-LICENSE.md
-README.md
-examples/*.md