sky_zabbix 2.2.0.1.2 → 2.4.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2612fdc7159aea8b6e28d595ba4e8e398ad081c6
-  data.tar.gz: 57fd288b36269bae13b3c13104ddf1021694734b
+  metadata.gz: bdac882c1ec3d242254cf9d78b53f6463d6a0c82
+  data.tar.gz: dfaabecd497386ec8356d13c14aed9b71acd3475
 SHA512:
-  metadata.gz: 80a4b6c689b0a2b1c25550fdf55ce704a35bb26d50930bd1458d9c244a8eef7092e5178489853f779107a2d0188e855e9fd82bbb68214da78b4c1f8a4cf5d290
-  data.tar.gz: ef60f52b49098fae68d17fdaaed9763c6e64a2360683afd0c6b95dfc5cec8c4fcfdd92ef55bf6060f40aacf340ee1ded4a1111109857c958f616f55e97807f52
+  metadata.gz: 8b30adb1d063a50a7b23d45cab6347ad43958c90bad99b50545b34fdbd21583c0b6370db0baafc9bcb3163fe0085e67a70add6d705d67025f3bbfdb05b9e4494
+  data.tar.gz: d14d4562f206f73555e3a85fd6652063607a473b23e3c04c15a912e0d3177c1e23ffa3aad3e76c34b764572cfd9f042de62e8071487070e1c140e7c5b2f77c92

data/README.md

@@ -1,8 +1,5 @@
 # SkyZabbix
 
-[![Gem Version](https://badge.fury.io/rb/sky_zabbix.svg)](http://badge.fury.io/rb/sky_zabbix)
-[![Inline docs](http://inch-ci.org/github/skyarch-networks/sky_zabbix.svg?branch=master)](http://inch-ci.org/github/skyarch-networks/sky_zabbix)
-
 SkyZabbix is a Zabbix API Wrapper written by Ruby.
 
 ## Installation
@@ -89,21 +86,7 @@ requests = []
 requests.push client.host.build_get()
 requests.push client.user.build_get()
 requests.push client.hostgroup.build_get()
-host_resp, user_resp, hostgroup_resp = client.batch(*requests)
-```
-
-### Logger
-
-Don't log on default.
-If logger is received to constructor, SkyZabbix start logging.
-
-```ruby
-require 'logger'
-logger = Logger.new(STDOUT)
-client = SkyZabbix::Client.new(zabbix_url, logger: logger)
-client.login(zabbix_user, zabbix_pass)
-
-client.host.get()   # =>  I, [2015-06-29T17:35:19.609971 #3500]  INFO -- : [SkyZabbix 200 5.296144592] host.get({})
+host_resp, user_resp, hostgroup_resp = cleint.batch(*requests)
 ```
 
 ## Development

data/Rakefile

@@ -3,11 +3,14 @@ require "rspec/core/rake_task"
 require 'open3'
 require 'json'
 
+require_relative 'lib/sky_zabbix/version'
+
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
 namespace :generate do
+  #TODO: clone zabbix/zabbix, version
   desc "Generate list of method"
   task :methods do |task, args|
     out, err, status = Open3.capture3("php", "build.php")
@@ -24,40 +27,12 @@ namespace :release do
   task :all do |task, args|
     exec = -> (cmd) {
       print '> '; puts cmd.join(' ')
-      r = system(*cmd)
-      unless r
-        raise "#{cmd} exit with #{$?}"
-      end
-    }
-
-    get_env = -> (name) {
-      v = ENV[name]
-      raise "#{name} environment variable should be set!" unless v
-      return v
+      system(*cmd)
     }
 
     versions = %w[2.2 2.4]
-    path        = get_env.('PATH_ZABBIX')
-    lib_version = get_env.('LIB_VERSION')
+    path = ENV['PATH_ZABBIX']
 
-    # check git status
-    unless `git status --short`.empty?
-      raise "Should commit some changes."
-    end
-
-    # Update version
-    v_path = File.expand_path('../lib/sky_zabbix/version.rb', __FILE__)
-    f = File.read(v_path)
-    f[/^\s+LIB_VERSION = "([\d.]+)"$/, 1] = lib_version
-    File.write(v_path, f)
-
-    # version up commit and add tag and push.
-    exec.(%W[git commit -am "Bump\ up\ version to #{lib_version}"])
-    exec.(%W[git tag v#{lib_version}])
-    exec.(%w[git push])
-    exec.(%W[git push origin v#{lib_version}])
-
-    # build gems
     versions.each do |v|
       Dir.chdir(path) do
         latest_tag = `git tag`.split("\n").select{|x|x =~ /^#{Regexp.escape(v)}/}.sort{|a, b|a[/\.(\d+)$/, 1].to_i <=> b[/\.(\d+)$/, 1].to_i}.last
@@ -66,9 +41,7 @@ namespace :release do
       Rake::Task['generate:methods'].execute
       Rake::Task['build'].execute
     end
-
-    pkgs = Dir.glob(File.join(File.expand_path('../pkg/', __FILE__), "sky_zabbix-*#{lib_version}.gem"))
-    # Push gems
+    pkgs = Dir.glob(File.join(File.expand_path('../pkg/', __FILE__), "sky_zabbix-*#{SkyZabbix::LIB_VERSION}.gem"))
     pkgs.each do |p|
       exec.(%W[gem push #{p}])
     end

data/lib/sky_zabbix/client/target_base.rb

@@ -1,4 +1,3 @@
-# TargetBase is a Base Class for target of Zabbix API method.
 # @abstract
 class SkyZabbix::Client::TargetBase
   # @return [String]
@@ -15,7 +14,6 @@ class SkyZabbix::Client::TargetBase
     @client = client
   end
 
-  # Returns list of filtered primary key.
   # @param [Hash] filter
   # @return [Array<String>] List of ID
   def get_ids(filter)
@@ -26,7 +24,6 @@ class SkyZabbix::Client::TargetBase
     return _query('get', params).map{|x|x[pk]}
   end
 
-  # Return filtered primary key of founded first.
   # @param [Hash] filter
   # @return [Array<String>] ID of founded first.
   def get_id(filter)
@@ -43,7 +40,6 @@ class SkyZabbix::Client::TargetBase
 
   # @param [String] method is method name. ex) get, create, delete ...
   # @param [Any] params is parameters.
-  # @return [Hash{Symbol => Any}]
   def _build(method, params)
     raise "Should use method of sub class!" unless _zbx_class
     @client.build("#{_zbx_class}.#{method}", params)
@@ -53,9 +49,4 @@ class SkyZabbix::Client::TargetBase
   def _zbx_class
     return self.class._zbx_class
   end
-
-  # @abstract
-  def pk
-    raise 'Should override pk method!'
-  end
 end

data/lib/sky_zabbix/client/target_gen.rb

@@ -13,17 +13,12 @@ methods.each do |name, v|
     v[:methods].each do |method|
       # Generate query method.
       # Example: user.login()
-      # @param [Any] params
-      # @return [Any] return query response.
       define_method(method) do |params={}|
         _query(method, params)
       end
 
       # Generate build method. For batch request
       # Example: user.build_login()
-      # @param [Any] params
-      # @return [Hash{}] return query response.
-      # @return [Hash{Symbol => Any}]
       define_method("build_#{method}") do |params={}|
         _build(method, params)
       end

data/lib/sky_zabbix/jsonrpc.rb

@@ -12,7 +12,6 @@ class SkyZabbix::Jsonrpc
 
   attr_accessor :token
 
-  # Send normal request.
   # @param [String] method is json-rpc method name.
   # @param [Any?] params is json-rpc parameters.
   # @param [Boolean] notification
@@ -20,7 +19,23 @@ class SkyZabbix::Jsonrpc
     request(build(method, params, notification: notification))
   end
 
-  # Send batch request.
+  # @param [Hash{String => Any}] builded is result of 'build' method.
+  # @return [Any?] return result of response
+  def request(builded)
+    uri = URI.parse(@uri)
+
+    resp = do_req(uri, builded)
+
+    return nil unless builded[:id] # when notification
+
+    # Parse and error handling
+    body = JSON.parse(resp.body)
+    raise Error.create(body) if body['error']
+
+    return body['result']
+  end
+
+  # XXX: エラー処理はこれでいい?
   # @example Return values.
   #   rpc.batch(
   #     rpc.build('a', 'A'),
@@ -35,8 +50,7 @@ class SkyZabbix::Jsonrpc
   #   ) # => Error::BatchError.
   #   #  Can get response of 'a' from ex.result
   # @param [Array<Hash>] buildeds is Array of result of 'build' method.
-  # @return [Array<Any|nil>]
-  # @raise [Error::BatchError]
+  # @return [Array<Any|Error|nil>]
   def batch(buildeds)
     uri = URI.parse(@uri)
     resp = do_req(uri, buildeds)
@@ -69,7 +83,6 @@ class SkyZabbix::Jsonrpc
   # @param [String] method is json-rpc method name.
   # @param [Any?] params is json-rpc parameters.
   # @param [Boolean] notification
-  # @return [Hash{Symbol => Any}]
   def build(method, params, notification: false)
     res = {
       jsonrpc: VERSION,
@@ -85,22 +98,6 @@ class SkyZabbix::Jsonrpc
 
   private
 
-  # @param [Hash{String => Any}] builded is result of 'build' method.
-  # @return [Any?] return result of response
-  def request(builded)
-    uri = URI.parse(@uri)
-
-    resp = do_req(uri, builded)
-
-    return nil unless builded[:id] # when notification
-
-    # Parse and error handling
-    body = JSON.parse(resp.body)
-    raise Error.create(body) if body['error']
-
-    return body['result']
-  end
-
   # @return [Integer] random ID.
   def id_gen
     return rand(10**12)
@@ -134,7 +131,7 @@ class SkyZabbix::Jsonrpc
   # @param [Hash|Array] body is request body.
   # @param [Net::HTTPResponse] resp
   def logging_request(start_time, body, resp)
-    return unless @logger && resp
+    return unless @logger
 
     sec = Time.now - start_time
     msg_body =

data/lib/sky_zabbix/jsonrpc/errors.rb

@@ -1,5 +1,4 @@
 class SkyZabbix::Jsonrpc::Error < StandardError
-  # @param [Array<Hash{String => Any}>] body is response body.
   def initialize(body)
     @error = body['error']
     msg = "#{@error['message']} #{@error['data']}"
@@ -14,8 +13,6 @@ class SkyZabbix::Jsonrpc::Error < StandardError
   class InternalError  < self; end # Internal JSON-RPC error.
   class ServerError    < self; end # Reserved for implementation-defined server-errors.
 
-  # @param [Array<Hash{String => Any}>] body is response body.
-  # @return [Error] A Error instance.
   def self.create(body)
     klass =
       case body['code']
@@ -44,7 +41,7 @@ class SkyZabbix::Jsonrpc::Error < StandardError
       return errors.map(&:message).join(', ')
     end
 
-    # @param [Array<Hash{String => Any}>] body is response body.
+    # @param [Array<Hash<String => Any>] body is response body.
     # @return [Boolean]
     def self.error?(body)
       return body.any?{|x|x['error']}

data/lib/sky_zabbix/version.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 module SkyZabbix
-  LIB_VERSION = "0.1.2"
+  LIB_VERSION = "0.1.0"
   ZABBIX_VERSION = JSON.parse(File.read(File.expand_path('../methods.json', __FILE__)), symbolize_names: true)[:version]
   VERSION = ZABBIX_VERSION + '.' + LIB_VERSION
 end

data/sky_zabbix.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |spec|
 
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.files.push('lib/sky_zabbix/methods.json')
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sky_zabbix
 version: !ruby/object:Gem::Version
-  version: 2.2.0.1.2
+  version: 2.4.0.1.0
 platform: ruby
 authors:
 - Skyarch Networks Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +120,6 @@ files:
 - lib/sky_zabbix/client/target_gen.rb
 - lib/sky_zabbix/jsonrpc.rb
 - lib/sky_zabbix/jsonrpc/errors.rb
-- lib/sky_zabbix/methods.json
 - lib/sky_zabbix/version.rb
 - sky_zabbix.gemspec
 homepage: https://github.com/skyarch-networks/sky_zabbix
@@ -143,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An API Wrapper of Zabbix