recognizer 0.3.0-java → 0.4.0-java

data/README.org

@@ -7,10 +7,8 @@
 
   [[https://github.com/portertech/recognizer/raw/master/recognizer.gif]]
 * Install
-  Executable Java JAR (recommended)
-  : wget https://github.com/downloads/portertech/recognizer/recognizer.jar
-  RubyGems
-  : gem install recognizer
+  Executable Java JAR
+  : wget http://portertech.s3.amazonaws.com/recognizer/recognizer.jar
 * Configure
   Example: =config.json=
   : {
@@ -28,9 +26,7 @@
 * Usage
   Executable Java JAR
   : java -jar recognizer.jar -h
-  RubyGems
-  : recognizer -h
-
+  : 
   : Usage: recognizer (options)
   :  -c, --config CONFIG              The config file path
   :  -h, --help                       Show this message

data/lib/recognizer.rb

@@ -2,6 +2,7 @@ require "logger"
 require "recognizer/cli"
 require "recognizer/config"
 require "recognizer/librato"
+require "recognizer/input"
 require "recognizer/inputs/tcp"
 require "recognizer/inputs/amqp"
 
@@ -24,20 +25,15 @@ module Recognizer
     )
     librato.run
 
-    tcp = Recognizer::Input::TCP.new(
-      :logger      => logger,
-      :options     => options,
-      :input_queue => input_queue
-    )
-    tcp.run
-
-    if options.has_key?(:amqp)
-      amqp = Recognizer::Input::AMQP.new(
+    Recognizer::Input::Base.descendants.each do |klass|
+      input = klass.new(
         :logger      => logger,
         :options     => options,
         :input_queue => input_queue
       )
-      amqp.run
+      if input.enabled?
+        input.run
+      end
     end
 
     loop do

data/lib/recognizer/input.rb

@@ -0,0 +1,26 @@
+module Recognizer
+  module Input
+    class Base
+      def initialize(options={})
+        @enabled     = true
+        @logger      = options[:logger]
+        @options     = options[:options]
+        @input_queue = options[:input_queue]
+      end
+
+      def enabled?
+        !!@enabled
+      end
+
+      def run
+        true
+      end
+
+      def self.descendants
+        ObjectSpace.each_object(Class).select do |klass|
+          klass < self
+        end
+      end
+    end
+  end
+end

data/lib/recognizer/inputs/amqp.rb

@@ -2,11 +2,11 @@ require "hot_bunnies"
 
 module Recognizer
   module Input
-    class AMQP
+    class AMQP < Base
       def initialize(options={})
-        @logger      = options[:logger]
-        @options     = options[:options]
-        @input_queue = options[:input_queue]
+        super
+
+        @enabled = @options.has_key?(:amqp)
 
         @options[:amqp][:exchange]               ||= Hash.new
         @options[:amqp][:exchange][:name]        ||= "graphite"

data/lib/recognizer/inputs/tcp.rb

@@ -3,11 +3,9 @@ require "socket"
 
 module Recognizer
   module Input
-    class TCP
+    class TCP < Base
       def initialize(options={})
-        @logger      = options[:logger]
-        @options     = options[:options]
-        @input_queue = options[:input_queue]
+        super
 
         @options[:tcp] ||= Hash.new
         @tcp_connections = Queue.new

data/lib/recognizer/librato.rb

@@ -42,8 +42,8 @@ module Recognizer
       end
     end
 
-    def extract_metric_source(metric_path)
-      metric_source = @options[:librato][:metric_source]
+    def extract_metric_source(metric_path, metric_source=nil)
+      metric_source ||= @options[:librato][:metric_source]
       fallback_source = "recognizer"
       case metric_source
       when String

data/lib/recognizer/version.rb

@@ -1,5 +1,5 @@
 module Recognizer
   unless defined?(Recognizer::VERSION)
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/recognizer.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.add_dependency("jruby-openssl", "0.7.7")
   s.add_dependency("mixlib-cli", "1.2.2")
   s.add_dependency("hot_bunnies", "1.4.0")
-  s.add_dependency("librato-metrics", "0.7.5")
+  s.add_dependency("librato-metrics", "1.0.3")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recognizer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -83,13 +83,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 1.0.3
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 1.0.3
     none: false
   prerelease: false
   type: :runtime
@@ -101,22 +101,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  YmluL3JlY29nbml6ZXI=
-- !binary |-
-  bGliL3JlY29nbml6ZXIucmI=
-- !binary |-
-  bGliL3JlY29nbml6ZXIvdmVyc2lvbi5yYg==
-- !binary |-
-  bGliL3JlY29nbml6ZXIvY2xpLnJi
-- !binary |-
-  bGliL3JlY29nbml6ZXIvY29uZmlnLnJi
-- !binary |-
-  bGliL3JlY29nbml6ZXIvbGlicmF0by5yYg==
-- !binary |-
-  bGliL3JlY29nbml6ZXIvaW5wdXRzL2FtcXAucmI=
-- !binary |-
-  bGliL3JlY29nbml6ZXIvaW5wdXRzL3RjcC5yYg==
+- bin/recognizer
+- lib/recognizer.rb
+- lib/recognizer/version.rb
+- lib/recognizer/cli.rb
+- lib/recognizer/input.rb
+- lib/recognizer/config.rb
+- lib/recognizer/librato.rb
+- lib/recognizer/inputs/amqp.rb
+- lib/recognizer/inputs/tcp.rb
 - recognizer.gemspec
 - README.org
 - MIT-LICENSE.txt