zabbix_receiver 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9b18abfc85a6f0c988942665b7764545131a0e5
-  data.tar.gz: e4ff56edf7bbfd4ba960881f25db18ab9156cbda
+  metadata.gz: 6bb55e93057af6f74f3a28e11eeea044c38b78d0
+  data.tar.gz: 5369d40a344d0973b03fffcba444af51de44b6ee
 SHA512:
-  metadata.gz: 39fcb740b7dc74ea719ac4dc330e52f28aa9202db534669527eb1b4b7f80aee4d3319f49dbdf6808518fe9a0d091c369d092c5cdbf113275e562e745beba5356
-  data.tar.gz: 4d755551630c848207a7174b93804c9ef63244197666da6d7109a597e21d41bc7df077a8e372e641d616d4d00950641dc7a2d3df2986b4a5d158810db22023ea
+  metadata.gz: 6ece7c04f1eb7379f87d570d915f1f8989d327c96ddc481ed8c637ee49bf2af4d7adc6733bbca81ca0c4fb834aa6615431aa09ea2a92b83521b04f8a7fb1c920
+  data.tar.gz: 8638037e040dcd4bcbf6050ddac7e841d32f363918fc684fde44030dbee39061a0bf27ee703eec827aeb32c1873cc082c8b3295a121baf625708995e57fcdcd5

data/lib/zabbix_receiver/cli.rb

@@ -1,11 +1,9 @@
 require 'zabbix_receiver'
 require 'serverengine'
-require 'optparse'
+require 'slop'
 
 module ZabbixReceiver
   class CLI
-    REQUIRED_OPTIONS = %i(daemonize workers proxy_to_host proxy_to_port bind port)
-
     def self.start(argv)
       self.new(argv).start
     end
@@ -26,45 +24,44 @@ module ZabbixReceiver
     private
 
     def load_options(argv)
-      argv_for_main, argv_for_output = argv.slice_before('--').to_a
-      argv_for_output.shift
+      output_type = argv.first
+      output_class = get_output_class(output_type)
+      if output_class
+        argv.shift # output type
+      else
+        output_type = 'stdout'
+        output_class = get_output_class(output_type)
+      end
 
-      @options = {
-        daemonize: false,
-        workers: 1,
-        bind: '0.0.0.0',
-        port: 10051,
-        proxy_to_port: 10051,
-        to: 'stdout',
-      }
+      puts "Using #{output_type} output."
 
-      parser = OptionParser.new
-      parser.on('--daemonize') {|v| @options[:daemonize] = true }
-      parser.on('--log=VAL', 'default: STDERR') {|v| @options[:log] = v }
-      parser.on('--pid-path=VAL') {|v| @options[:pid_path] = v }
-      parser.on('--workers=VAL') {|v| @options[:worker] = v }
-      parser.on('--bind=VAL') {|v| @options[:bind] = v }
-      parser.on('--port=VAL') {|v| @options[:port] = v }
-      parser.on('--proxy-to-host=VAL') {|v| @options[:proxy_to_host] = v }
-      parser.on('--proxy-to-port=VAL') {|v| @options[:proxy_to_port] = v }
-      parser.on('--to=VAL') {|v| @options[:to] = v }
-      parser.on('--log-level=VAL') {|v| @options[:log_level] = v }
-      parser.parse!(argv_for_main)
+      opts = Slop::Options.new
+      opts.on('--help') { puts opts; exit }
+      opts.bool '--daemonize', default: false
+      opts.string '--log'
+      opts.string '--pid-path'
+      opts.integer '--workers', default: 1
+      opts.string '--bind', default: '0.0.0.0'
+      opts.integer '--port', default: 10051
+      opts.string '--proxy-to-host'
+      opts.integer '--proxy-to-port', default: 10051
+      opts.string '--log-level'
+      output_class.add_options(opts)
 
-      REQUIRED_OPTIONS.each do |key|
-        unless @options.has_key?(key)
-          raise "--#{key.to_s.split('_').join('-')} option is required."
-        end
-      end
+      parser = Slop::Parser.new(opts)
+      @options = Hash[parser.parse(argv).to_hash.map do |k, v|
+        [k.to_s.tr('-', '_').to_sym, v]
+      end]
 
       @options[:output_class] = output_class
-      @options[:output_options] = @options[:output_class].parse_options(argv_for_output)
     end
 
-    def output_class
-      require "zabbix_receiver/output/#{@options[:to]}"
-      class_name = @options[:to].split('_').map {|v| v.capitalize }.join
+    def get_output_class(type)
+      require "zabbix_receiver/output/#{type}"
+      class_name = type.split('_').map {|v| v.capitalize }.join
       ZabbixReceiver::Output.const_get(class_name)
+    rescue NameError, LoadError
+      nil
     end
   end
 end

data/lib/zabbix_receiver/output/stdout.rb

@@ -1,15 +1,16 @@
 module ZabbixReceiver
   module Output
     class Stdout
-      def self.parse_options(argv)
-        {}
+      def self.add_options(opts)
+        opts.string '--indent', default: ''
       end
 
       def initialize(logger, options)
+        @options = options
       end
 
       def receive_sender_data(data)
-        puts data
+        puts @options[:indent] + data.inspect
       end
     end
   end

data/lib/zabbix_receiver/version.rb

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

data/lib/zabbix_receiver/worker.rb

@@ -5,7 +5,7 @@ module ZabbixReceiver
     ZABBIX_HEADER = "ZBXD\x01"
 
     def run
-      @output = config[:output_class].new(logger, config[:output_options])
+      @output = config[:output_class].new(logger, config)
 
       until @stop
         process(server.sock.accept)

data/zabbix_receiver.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "zabbix_receiver"
   spec.version       = ZabbixReceiver::VERSION
   spec.authors       = ["Ryota Arai"]
-  spec.email         = ["ryota-arai@cookpad.com"]
+  spec.email         = ["ryota.arai@gmail.com"]
   spec.summary       = %q{Server to receive sender data from zabbix-agent.}
   spec.homepage      = ""
   spec.license       = "MIT"
@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "serverengine"
+  spec.add_dependency "serverengine", "~> 1.5.10"
+  spec.add_dependency "slop"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_receiver
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryota Arai
@@ -12,12 +12,26 @@ date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.10
+- !ruby/object:Gem::Dependency
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -68,7 +82,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- ryota-arai@cookpad.com
+- ryota.arai@gmail.com
 executables:
 - zabbix_receiver
 extensions: []