zabbix_send 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.swp
 .bundle
 .config
 .yardoc

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/.rvmrc

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p194@zabbix_send"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.13.8 (stable)" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+  if [[ $- == *i* ]] # check for interactive shells
+  then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+  else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create use  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+# fi

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem "rake"
+gem "rspec"
 
 # Specify your gem's dependencies in zabbix_send.gemspec
 gemspec

data/README.md

@@ -18,6 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
+    require 'zabbix_send'
     sender = ZabbixSend::Sender.new
     sender.send("zabbixserver","zabbixhost","zabbixitem.key","value")
 
@@ -25,6 +26,8 @@ Or install it yourself as:
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Write tests for the new feature. (cf. `spec/`)
+4. Write the new feature.
+5. Commit your changes (`git commit -am 'Added some feature'`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create new Pull Request

data/Rakefile

@@ -1,2 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+desc "Rull all specs"
+RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = "spec/**/*_spec.rb"
+end
+task :default => :spec
+

data/lib/zabbix_send.rb

@@ -1,10 +1,11 @@
 require "zabbix_send/version"
 require 'json'
 require 'socket'
+require 'time'
 
 module ZabbixSend
   class Sender
-    def self.build_message(zhost,zkey,zvalue)
+    def self.build_message(zhost,zkey,zvalue,ztime)
       msg = {
         "request" => "sender data",
         "data" => [
@@ -12,13 +13,12 @@ module ZabbixSend
             "host" => zhost,
             "key" => zkey,
             "value" => zvalue,
+            "clock" => ztime
           }]
       }
       body = JSON.generate msg
       data_length = body.bytesize
-      data_header = "ZBXD\1".encode("ascii") + \
-                    [data_length].pack("i") + \
-                    "\x00\x00\x00\x00"
+      data_header = "ZBXD\1".encode("ascii") + [data_length].pack("Q")
       data_to_send = data_header + body
     end
 
@@ -31,15 +31,15 @@ module ZabbixSend
         raise 'Got invalid response'
       end
       response_data_header = s.recv(8)
-      response_length = response_data_header[0,4].unpack("i")[0]
+      response_length = response_data_header.unpack("Q")[0]
       response_raw = s.recv(response_length)
       s.close
       response = JSON.load response_raw
     end
 
-    def zabbix_send(zserver, zhost,zkey,zvalue)
-      z_send = Sender.build_message zhost, zkey, zvalue
-      Sender.send_message z_send, zserver, 10051
+    def zabbix_send(zserver,zhost,zkey,zvalue,ztime=Time.now.to_i,zport=10051)
+      z_send = Sender.build_message zhost, zkey, zvalue, ztime
+      Sender.send_message z_send, zserver, zport
     end
   end
-end
+end

data/lib/zabbix_send/version.rb

@@ -1,3 +1,3 @@
 module ZabbixSend
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/spec/zabbix_send_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe ZabbixSend do
+  it "should have a place for tests" do
+    # TODO: write tests
+  end
+end

metadata

@@ -1,59 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: zabbix_send
-version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Mike English
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+
+date: 2013-06-22 00:00:00 -04:00
+default_executable: 
 dependencies: []
+
 description: Send data to Zabbix trappers from Ruby
-email:
+email: 
 - mike.english@atomicobject.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .rspec
+- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/zabbix_send.rb
 - lib/zabbix_send/version.rb
+- spec/spec_helper.rb
+- spec/zabbix_send_spec.rb
 - zabbix_send.gemspec
+has_rdoc: true
 homepage: https://github.com/englishm/zabbix_send
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: -1766732450666042547
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: -1766732450666042547
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby implementation of the Zabbix sender protocol
-test_files: []
+test_files: 
+- spec/spec_helper.rb
+- spec/zabbix_send_spec.rb