huck 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca3bf22a8ff5affb95d7bb88e7d40aa58e8077ab
-  data.tar.gz: ed30d1fedd87e7cc62b4942a7247323c57a77265
+  metadata.gz: 0b92d1a0367c6d0a896431dc7ccee1301c72367e
+  data.tar.gz: a30e14efb2a153c6ac90fdc9129dea7741bb2830
 SHA512:
-  metadata.gz: fc300e2459538853941313c9352fed1ba7b661530dce80da41c9eb18a36991b1581918e4f206934603f979b5819d170a70dce7095fa8b8bc4bb8f5ab565091b7
-  data.tar.gz: 80592af74c45e1eb246f20b1b99acfdedf363e8ef9adef532c3b918628523b2b4512805f9f0ca22c27950a2b50f9ec199e2ac06ac00f3867051b7d8233c80901
+  metadata.gz: 5a9a9adfd2acb585c57e370c91369aca27b594f65ce3335e5cdd43bada495d01d5dd042577d6ad932ccdc2f5064cea52f308455f9bf0c5b376a2853f7fe0ad45
+  data.tar.gz: dce955a2fcb58a4ddc38eb9150c5833ecde9f81ea4a228a05d64c7c1654576d2a35da42c06b0a484c07530a8584ed56f14e08da3239fcd2278eeb8b1b5478aec

data/lib/huck/generator.rb

@@ -28,10 +28,10 @@ module Huck
         g = Generators::FacterGenerator.new
       when 'ohai'
         g = Generators::OhaiGenerator.new
-      when 'yaml'
-        g = Generators::YamlGenerator.new
-      when 'json'
-        g = Generators::JsonGenerator.new
+      when 'file'
+        g = Generators::FileGenerator.new
+      when 'exec'
+        g = Generators::ExecGenerator.new
       else
         raise RuntimeError, "bad generator: #{name}"
       end

data/lib/huck/generators/basic.rb

@@ -16,8 +16,9 @@ module Huck
       # A hash of host information
       #
       def generate
-        {'hostname' => Socket.gethostname,
-         'platform' => RUBY_PLATFORM}
+        data = {'hostname' => Socket.gethostname,
+                'platform' => RUBY_PLATFORM}
+        Huck::serialize data, :format => @config['format']
       end
 
     end

data/lib/huck/generators/exec.rb

@@ -0,0 +1,32 @@
+module Huck
+
+  module Generators
+
+    # A generator to execute arbitrary scripts and use their output
+    class ExecGenerator < Generator
+
+      # Includes all required modules
+      def initialize
+        Huck::must_load 'open3'
+      end
+
+      # Ensures that configuration is set properly before executing
+      def verify_config
+        if !@config.has_key? 'command'
+          raise RuntimeError, 'missing "exec" generator config: "command"'
+        end
+      end
+
+      # Generate data by running a command and collecting output
+      def generate
+        verify_config
+
+        Open3.popen2e @config['command'] do |_, output, thread|
+          thread.value # wait for process to complete
+          return output.read
+        end
+      end
+
+    end
+  end
+end

data/lib/huck/generators/facter.rb

@@ -16,7 +16,8 @@ module Huck
       # A hash of facts as returned by facter
       #
       def generate
-        Facter.to_hash
+        data = Facter.to_hash
+        Huck::serialize data, :format => @config['format']
       end
 
     end

data/lib/huck/generators/file.rb

@@ -0,0 +1,27 @@
+module Huck
+
+  module Generators
+
+    # File generator reads any file and submits the raw content
+    class FileGenerator < Generator
+
+      # Ensure that all JSON config items are properly set
+      def verify_config
+        if !@config.has_key? 'path'
+          raise RuntimeError, 'missing "file" generator config: "path"'
+        end
+      end
+
+      # Reads in a configured file and returns the data
+      #
+      # == Returns:
+      # The text contained within the specified file
+      #
+      def generate
+        verify_config
+        IO.read(@config['path'])
+      end
+
+    end
+  end
+end

data/lib/huck/generators/ohai.rb

@@ -22,7 +22,9 @@ module Huck
         # Need to load the JSON output, since ohai emits a 'mash' object map
         # instead of normal hashes, making serialization ugly in some cases
         # like YAML where canonical objects (eg. !ruby/mash) is emitted.
-        JSON.load ohai.json_pretty_print
+        data = JSON.load ohai.json_pretty_print
+
+        Huck::serialize data, :format => @config['format']
       end
 
     end

data/lib/huck/handlers/exec.rb

@@ -13,11 +13,8 @@ module Huck
 
       # Ensures that configuration is set properly before executing
       def verify_config
-        if !@config.has_key? 'exec'
-          raise RuntimeError, 'missing exec config'
-        end
-        if !@config['exec'].has_key? 'command'
-          raise RuntimeError, 'missing exec config: command'
+        if !@config.has_key? 'command'
+          raise RuntimeError, 'missing "exec" generator config: "command"'
         end
       end
 
@@ -31,7 +28,7 @@ module Huck
       def handle msg
         verify_config
 
-        Open3.popen2 @config['exec']['command'] do |stdin, stdout, thread|
+        Open3.popen2 @config['command'] do |stdin, _, _|
           stdin.print msg
         end
       end

data/lib/huck/util.rb

@@ -74,7 +74,9 @@ module Huck
   # A string of serialized text
   #
   def self.serialize data, kwargs = {}
-    format = Huck::getarg kwargs, :format, 'json'
+    format = Huck::getarg kwargs, :format, nil
+    format = 'json' if format.nil?
+
     case format
     when 'json'
       return JSON.dump data
@@ -85,4 +87,31 @@ module Huck
     end
   end
 
+  # Parses a list of provider data for generators or handlers. This allows
+  # each provider to have its own config, and if no config is required, to
+  # simply pass the name of the provider. It also allows multiples of the
+  # same provider type to be configured and run.
+  #
+  # == Parameters:
+  # data::
+  #   The configuration data to parse
+  #
+  def self.parse_providers data
+    if !data.kind_of? Array
+      raise RuntimeError, "expected array, got: #{data}"
+    end
+    data.each do |provider|
+      config = Hash.new
+      if provider.kind_of? Hash
+        name = provider.keys[0]
+        config = provider.values[0]
+      elsif provider.kind_of? String
+        name = provider
+      else
+        raise RuntimeError, "expected hash, got: #{gen}"
+      end
+      yield name, config
+    end
+  end
+
 end

data/lib/huck/version.rb

@@ -1,3 +1,3 @@
 module Huck
-  Version = '0.3.0'
+  Version = '0.3.2'
 end

data/lib/huck.rb

@@ -7,8 +7,8 @@ require 'huck/generator'
 require 'huck/generators/basic'
 require 'huck/generators/facter'
 require 'huck/generators/ohai'
-require 'huck/generators/yaml'
-require 'huck/generators/json'
+require 'huck/generators/file'
+require 'huck/generators/exec'
 require 'huck/sender'
 require 'huck/senders/sqs'
 require 'huck/senders/rabbitmq'
@@ -26,12 +26,10 @@ module Huck
   # generator will be invoked instead.
   #
   # == Parameters:
-  # config::
+  # config_file::
   #   Configuration file path
-  # generator::
-  #   The name of the generator to use
-  # sender::
-  #   The name of the sender to use
+  # config::
+  #   Configuration hash to use in place of a config file
   #
   def self.run kwargs = {}
     config = Huck::getarg kwargs, :config, nil
@@ -40,13 +38,7 @@ module Huck
       config = Huck::config :path => conf_file
     end
 
-    if config.has_key? 'generator'
-      gen_name = config['generator']
-    end
-    gen_arg = Huck::getarg kwargs, :generator, nil
-    gen_name = gen_arg if !gen_arg.nil?
-    g = Generator::factory :name => gen_name, :config => config
-
+    # Prep the sender
     if config.has_key? 'sender'
       send_name = config['sender']
     end
@@ -54,8 +46,18 @@ module Huck
     send_name = send_arg if !send_arg.nil?
     s = Sender::factory :name => send_name, :config => config
 
-    data = block_given? ? yield : g.generate
-    s.send Huck::serialize data
+    # Create an array of generators to execute
+    gen_list = config.has_key?('generators') ? config['generators'] : ['basic']
+    generators = Array.new
+    Huck::parse_providers gen_list do |gen_name, gen_config|
+      generators << Generator::factory(:name => gen_name, :config => gen_config)
+    end
+
+    # Execute the generators and send their output
+    generators.each do |g|
+      data = block_given? ? yield : g.generate
+      s.send data
+    end
   end
 
   # Main method to receive messages from a Huck client. If a block is given, the
@@ -63,8 +65,10 @@ module Huck
   # or default handler will be used.
   #
   # == Parameters:
-  # receiver::
-  #   The receiver to use (default=sqs)
+  # config_file::
+  #   Configuration file path
+  # config::
+  #   Configuration hash to use in place of a config file
   #
   def self.serve kwargs = {}
     config = Huck::getarg kwargs, :config, nil
@@ -73,13 +77,14 @@ module Huck
       config = Huck::config :path => conf_file
     end
 
-    if config.has_key? 'handler'
-      hand_name = config['handler']
+    # Create an array of handlers to run when messages arrive
+    hand_list = config.has_key?('handlers') ? config['handlers'] : ['echo']
+    handlers = Array.new
+    Huck::parse_providers hand_list do |hand_name, hand_config|
+      handlers << Handler::factory(:name => hand_name, :config => hand_config)
     end
-    hand_arg = Huck::getarg kwargs, :handler, nil
-    hand_name = hand_arg if !hand_arg.nil?
-    h = Handler::factory :name => hand_name, :config => config
 
+    # Prep the receiver
     if config.has_key? 'receiver'
       recv_name = config['receiver']
     end
@@ -87,9 +92,10 @@ module Huck
     recv_name = recv_arg if !recv_arg.nil?
     r = Receiver::factory :name => recv_name, :config => config
 
+    # Receive messages and pass them down to the handlers
     begin
       r.receive do |msg|
-        block_given? ? yield(msg) : h.handle(msg)
+        block_given? ? yield(msg) : handlers.each {|h| h.handle msg}
       end
     rescue Interrupt, SystemExit
       return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huck
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Ryan Uber
@@ -62,8 +62,8 @@ files:
 - lib/huck/generators/ohai.rb
 - lib/huck/generators/facter.rb
 - lib/huck/generators/basic.rb
-- lib/huck/generators/yaml.rb
-- lib/huck/generators/json.rb
+- lib/huck/generators/exec.rb
+- lib/huck/generators/file.rb
 - lib/huck/senders/sqs.rb
 - lib/huck/senders/rabbitmq.rb
 - lib/huck/receiver.rb

data/lib/huck/generators/json.rb

@@ -1,35 +0,0 @@
-module Huck
-
-  module Generators
-
-    # JSON generator reads json files for data
-    class JsonGenerator < Generator
-
-      # Load required modules for json generator
-      def initialize
-        Huck::must_load 'json'
-      end
-
-      # Ensure that all JSON config items are properly set
-      def verify_config
-        if !@config.has_key? 'json'
-          raise RuntimeError, 'missing json config'
-        end
-        if !@config['json'].has_key? 'file'
-          raise RuntimeError, 'missing json config: file'
-        end
-      end
-
-      # Reads in a configured JSON file and returns the data
-      #
-      # == Returns:
-      # A hash of facts read from the JSON file
-      #
-      def generate
-        verify_config
-        JSON.load IO.read(@config['json']['file'])
-      end
-
-    end
-  end
-end

data/lib/huck/generators/yaml.rb

@@ -1,35 +0,0 @@
-module Huck
-
-  module Generators
-
-    # YAML generator reads yaml files for data
-    class YamlGenerator < Generator
-
-      # Load required modules for yaml generator
-      def initialize
-        Huck::must_load 'yaml'
-      end
-
-      # Ensure that all YAML config items are properly set
-      def verify_config
-        if !@config.has_key? 'yaml'
-          raise RuntimeError, 'missing yaml config'
-        end
-        if !@config['yaml'].has_key? 'file'
-          raise RuntimeError, 'missing yaml config: file'
-        end
-      end
-
-      # Reads in a configured YAML file and returns the data
-      #
-      # == Returns:
-      # A hash of facts read from the YAML file
-      #
-      def generate
-        verify_config
-        YAML.load_file @config['yaml']['file']
-      end
-
-    end
-  end
-end