huck 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a756eec35292ca791c294071c7a845f8763a4b
-  data.tar.gz: 0b865048d077ea23f3fb206200f829bb7244ea9e
+  metadata.gz: 7c1f883695019dd9a24f181b919f8597399c1bcc
+  data.tar.gz: ca393ed87a5bd06e94df9d5e7552f03c2d739a62
 SHA512:
-  metadata.gz: 29b100df5fe489d1b392b8def0a347ef194e719ac457c2d04b916ee0265de0b9b90e0ce8a5a2bfec7d2f08b9f5a81ccdb712c490dd90f94686a3b7e612c670ba
-  data.tar.gz: 16eae156c0519939642214cbc7db1add89b63289631e8e8a9edb00dc3fd9d2da04700f4c93439e01edc42cf3b6871121840def762f220f3f879d6740c17b1aef
+  metadata.gz: af8dd8725a19a799be254f72f709ac461b440790d94959e9597f5588890cd7f8bdf00a2c935ec8d1f644b30477837a1a8df42f065870ba6ab1dc3f361a9a116e
+  data.tar.gz: 6f5852b59881ccb7506208deb5d400cadf6d65f16889901cde89cfbdd926c74ac1cbadc19b6805e04dddef7bebf7ca2d846a63d1cebf5460e026f3ea6f0c18ba

data/lib/huck.rb

@@ -3,12 +3,14 @@ require 'yaml'
 
 require 'huck/version'
 require 'huck/util'
+require 'huck/error'
 require 'huck/generator'
 require 'huck/generators/basic'
 require 'huck/generators/facter'
 require 'huck/generators/ohai'
 require 'huck/generators/file'
 require 'huck/generators/exec'
+require 'huck/generators/stdin'
 require 'huck/sender'
 require 'huck/senders/sqs'
 require 'huck/senders/rabbitmq'
@@ -57,7 +59,7 @@ module Huck
     generators.each do |g|
       data = block_given? ? yield : g.generate
       if !data.kind_of? String
-        raise RuntimeError, "generator produced non-string result: #{data.class}"
+        raise Error, "generator produced non-string result: #{data.class}"
       end
       s.send data
     end

data/lib/huck/error.rb

@@ -0,0 +1,6 @@
+module Huck
+  # The Error class exists to help us catch our own errors versus errors thrown
+  # from Ruby's core or other modules.
+  class Error < StandardError
+  end
+end

data/lib/huck/generator.rb

@@ -1,7 +1,6 @@
 module Huck
 
   class Generator
-
     attr_accessor :config
 
     # Given a generator's name (or no name), return a new generator instance
@@ -17,9 +16,9 @@ module Huck
     #
     def self.factory kwargs = {}
       name = Huck::getarg kwargs, :name, nil
-      config = Huck::getarg kwargs, :config, nil
+      config = Huck::getarg kwargs, :config, {}
 
-      name = 'basic' if name.nil?
+      name = 'stdin' if name.nil?
 
       case name
       when 'basic'
@@ -32,8 +31,10 @@ module Huck
         g = Generators::FileGenerator.new
       when 'exec'
         g = Generators::ExecGenerator.new
+      when 'stdin'
+        g = Generators::StdinGenerator.new
       else
-        raise RuntimeError, "bad generator: #{name}"
+        raise Huck::Error, "bad generator: #{name}"
       end
 
       g.config = config

data/lib/huck/generators/exec.rb

@@ -13,7 +13,7 @@ module Huck
       # Ensures that configuration is set properly before executing
       def verify_config
         if !@config.has_key? 'command'
-          raise RuntimeError, 'missing "exec" generator config: "command"'
+          raise Huck::Error, 'missing "exec" generator config: "command"'
         end
       end
 

data/lib/huck/generators/file.rb

@@ -8,7 +8,7 @@ module Huck
       # Ensure that all JSON config items are properly set
       def verify_config
         if !@config.has_key? 'path'
-          raise RuntimeError, 'missing "file" generator config: "path"'
+          raise Huck::Error, 'missing "file" generator config: "path"'
         end
       end
 

data/lib/huck/generators/stdin.rb

@@ -0,0 +1,27 @@
+module Huck
+
+  module Generators
+
+    # A generator to use from the command line by piping in text
+    class StdinGenerator < Generator
+
+      # Submit all data from stdin.
+      def generate
+        data = ''
+
+        # Try reading 1 byte first in non-blocking mode. If the call would block
+        # during read(), then we just bail and raise. Otherwise, if at least 1
+        # byte can be read, we proceed to read until EOF since we already have
+        # our stream of data.
+        begin
+          data += STDIN.read_nonblock 1
+        rescue Errno::EWOULDBLOCK
+          raise Huck::Error, 'no data from stdin'
+        end
+        data += STDIN.read
+        data
+      end
+
+    end
+  end
+end

data/lib/huck/handler.rb

@@ -17,7 +17,7 @@ module Huck
     #
     def self.factory kwargs = {}
       name = Huck::getarg kwargs, :name, nil
-      config = Huck::getarg kwargs, :config, nil
+      config = Huck::getarg kwargs, :config, {}
 
       name = 'echo' if name.nil?
 
@@ -27,7 +27,7 @@ module Huck
       when 'exec'
         h = Handlers::ExecHandler.new
       else
-        raise RuntimeError, "bad handler: #{name}"
+        raise Huck::Error, "bad handler: #{name}"
       end
 
       h.config = config

data/lib/huck/handlers/exec.rb

@@ -14,7 +14,7 @@ module Huck
       # Ensures that configuration is set properly before executing
       def verify_config
         if !@config.has_key? 'command'
-          raise RuntimeError, 'missing "exec" generator config: "command"'
+          raise Huck::Error, 'missing "exec" generator config: "command"'
         end
       end
 

data/lib/huck/receiver.rb

@@ -17,7 +17,7 @@ module Huck
     #
     def self.factory kwargs = {}
       name = Huck::getarg kwargs, :name, nil
-      config = Huck::getarg kwargs, :config, nil
+      config = Huck::getarg kwargs, :config, {}
 
       name = 'sqs' if name.nil?
 
@@ -27,7 +27,7 @@ module Huck
       when 'rabbitmq'
         r = Receivers::RabbitMQReceiver.new
       else
-        raise RuntimeError, "bad receiver: #{name}"
+        raise Huck::Error, "bad receiver: #{name}"
       end
 
       r.config = config
@@ -63,6 +63,8 @@ module Huck
         end
       rescue Interrupt, SystemExit
         return
+      rescue Huck::Error
+        raise
       rescue => e
         puts "Receiver error (#{self.class}): #{e.message}"
         puts "Retrying in 5s..."

data/lib/huck/receivers/rabbitmq.rb

@@ -14,10 +14,10 @@ module Huck
       # connection data to talk to RabbitMQ
       def verify_config
         if !@config.has_key? 'rabbitmq'
-          raise RuntimeError, 'missing rabbitmq config'
+          raise Huck::Error, 'missing rabbitmq config'
         end
         if !@config['rabbitmq'].has_key? 'queue_name'
-          raise RuntimeError, 'missing rabbitmq receiver config: queue_name'
+          raise Huck::Error, 'missing rabbitmq receiver config: queue_name'
         end
       end
 

data/lib/huck/receivers/sqs.rb

@@ -14,12 +14,12 @@ module Huck
       # connection data to talk to AWS
       def verify_config
         if !@config.has_key? 'sqs'
-          raise RuntimeError, 'missing sqs config'
+          raise Huck::Error, 'missing sqs config'
         end
         ['access_key_id', 'secret_access_key', 'region',
          'queue_name'].each do |key|
           if !@config['sqs'].has_key? key
-            raise RuntimeError, "missing sqs config: #{key}"
+            raise Huck::Error, "missing sqs config: #{key}"
           end
         end
       end

data/lib/huck/sender.rb

@@ -17,7 +17,7 @@ module Huck
     #
     def self.factory kwargs = {}
       name = Huck::getarg kwargs, :name, nil
-      config = Huck::getarg kwargs, :config, nil
+      config = Huck::getarg kwargs, :config, {}
 
       name = 'sqs' if name.nil?
 
@@ -27,7 +27,7 @@ module Huck
       when 'rabbitmq'
         s = Senders::RabbitMQSender.new
       else
-        raise RuntimeError, "bad sender: #{name}"
+        raise Huck::Error, "bad sender: #{name}"
       end
 
       s.config = config

data/lib/huck/senders/rabbitmq.rb

@@ -14,10 +14,10 @@ module Huck
       # connection data to talk to rabbitmq
       def verify_config
         if !@config.has_key? 'rabbitmq'
-          raise RuntimeError, 'missing rabbitmq sender config'
+          raise Huck::Error, 'missing rabbitmq sender config'
         end
         if !@config['rabbitmq'].has_key? 'queue_name'
-          raise RuntimeError, 'missing rabbitmq sender config: queue_name'
+          raise Huck::Error, 'missing rabbitmq sender config: queue_name'
         end
       end
 

data/lib/huck/senders/sqs.rb

@@ -16,10 +16,10 @@ module Huck
       # is set in the configuration.
       def verify_config
         if !@config.has_key? 'sqs'
-          raise RuntimeError, 'missing sqs sender config'
+          raise Huck::Error, 'missing sqs sender config'
         end
         if !@config['sqs'].has_key? 'queue_name'
-          raise RuntimeError, 'missing sqs sender config: queue_name'
+          raise Huck::Error, 'missing sqs sender config: queue_name'
         end
       end
 

data/lib/huck/util.rb

@@ -50,7 +50,7 @@ module Huck
     true
   end
 
-  # Try to load a module, and raise a RuntimeError if it is not
+  # Try to load a module, and raise a Huck::Error if it is not
   # loadable. This is useful for trying to load certain provider
   # code at runtime without dealing with LoadError.
   #
@@ -60,7 +60,7 @@ module Huck
   #
   def self.must_load name
     if !self.try_load name
-      raise RuntimeError, "huck: unable to load #{name}"
+      raise Huck::Error, "huck: unable to load #{name}"
     end
   end
 
@@ -79,11 +79,11 @@ module Huck
 
     case format
     when 'json'
-      return JSON.dump data
+      return JSON.generate data
     when 'yaml'
       return YAML.dump data
     else
-      raise RuntimeError, "unknown format '#{format}'"
+      raise Huck::Error, "unknown format '#{format}'"
     end
   end
 
@@ -98,7 +98,7 @@ module Huck
   #
   def self.parse_providers data
     if !data.kind_of? Array
-      raise RuntimeError, "expected array, got: #{data}"
+      raise Huck::Error, "expected array, got: #{data}"
     end
     data.each do |provider|
       config = Hash.new
@@ -108,7 +108,7 @@ module Huck
       elsif provider.kind_of? String
         name = provider
       else
-        raise RuntimeError, "expected string or hash, got: #{provider}"
+        raise Huck::Error, "expected string or hash, got: #{provider}"
       end
       yield name, config
     end

data/lib/huck/version.rb

@@ -1,3 +1,3 @@
 module Huck
-  Version = '0.3.4'
+  Version = '0.3.5'
 end

data/spec/huck/util_spec.rb

@@ -31,8 +31,8 @@ describe 'Module Loading' do
     expect{Huck::must_load 'yaml'}.not_to raise_error
   end
 
-  it 'should raise a RuntimeError when module cannot be loaded' do
-    expect{Huck::must_load 'nonexistent'}.to raise_error(RuntimeError)
+  it 'should raise a Huck::Error when module cannot be loaded' do
+    expect{Huck::must_load 'nonexistent'}.to raise_error(Huck::Error)
   end
 
 end
@@ -41,7 +41,7 @@ describe 'Data Serialization' do
   input = {'a' => 'b'}
 
   it 'should serialize to json' do
-    output = JSON.dump input
+    output = JSON.generate input
     expect(Huck::serialize(input, :format => 'json')).to eq(output)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huck
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ryan Uber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,40 +129,42 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/huck/generators/ohai.rb
-- lib/huck/generators/facter.rb
+- bin/huck
+- lib/huck/error.rb
+- lib/huck/generator.rb
 - lib/huck/generators/basic.rb
 - lib/huck/generators/exec.rb
+- lib/huck/generators/facter.rb
 - lib/huck/generators/file.rb
-- lib/huck/senders/sqs.rb
-- lib/huck/senders/rabbitmq.rb
+- lib/huck/generators/ohai.rb
+- lib/huck/generators/stdin.rb
+- lib/huck/handler.rb
+- lib/huck/handlers/echo.rb
+- lib/huck/handlers/exec.rb
 - lib/huck/receiver.rb
+- lib/huck/receivers/rabbitmq.rb
+- lib/huck/receivers/sqs.rb
 - lib/huck/sender.rb
+- lib/huck/senders/rabbitmq.rb
+- lib/huck/senders/sqs.rb
 - lib/huck/util.rb
-- lib/huck/generator.rb
-- lib/huck/receivers/sqs.rb
-- lib/huck/receivers/rabbitmq.rb
-- lib/huck/handlers/exec.rb
-- lib/huck/handlers/echo.rb
 - lib/huck/version.rb
-- lib/huck/handler.rb
 - lib/huck.rb
-- bin/huck
-- spec/huck/generators/facter_spec.rb
+- spec/huck/generator_spec.rb
 - spec/huck/generators/basic_spec.rb
 - spec/huck/generators/exec_spec.rb
+- spec/huck/generators/facter_spec.rb
 - spec/huck/generators/file_spec.rb
 - spec/huck/generators/ohai_spec.rb
-- spec/huck/util_spec.rb
-- spec/huck/receiver_spec.rb
-- spec/huck/senders/sqs_spec.rb
-- spec/huck/huck_spec.rb
-- spec/huck/sender_spec.rb
 - spec/huck/handler_spec.rb
-- spec/huck/receivers/sqs_spec.rb
-- spec/huck/generator_spec.rb
 - spec/huck/handlers/echo_spec.rb
 - spec/huck/handlers/exec_spec.rb
+- spec/huck/huck_spec.rb
+- spec/huck/receiver_spec.rb
+- spec/huck/receivers/sqs_spec.rb
+- spec/huck/sender_spec.rb
+- spec/huck/senders/sqs_spec.rb
+- spec/huck/util_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ryanuber/huck
 licenses:
@@ -184,24 +186,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Information sharing framework
 test_files:
-- spec/huck/generators/facter_spec.rb
+- spec/huck/generator_spec.rb
 - spec/huck/generators/basic_spec.rb
 - spec/huck/generators/exec_spec.rb
+- spec/huck/generators/facter_spec.rb
 - spec/huck/generators/file_spec.rb
 - spec/huck/generators/ohai_spec.rb
-- spec/huck/util_spec.rb
-- spec/huck/receiver_spec.rb
-- spec/huck/senders/sqs_spec.rb
-- spec/huck/huck_spec.rb
-- spec/huck/sender_spec.rb
 - spec/huck/handler_spec.rb
-- spec/huck/receivers/sqs_spec.rb
-- spec/huck/generator_spec.rb
 - spec/huck/handlers/echo_spec.rb
 - spec/huck/handlers/exec_spec.rb
+- spec/huck/huck_spec.rb
+- spec/huck/receiver_spec.rb
+- spec/huck/receivers/sqs_spec.rb
+- spec/huck/sender_spec.rb
+- spec/huck/senders/sqs_spec.rb
+- spec/huck/util_spec.rb
 - spec/spec_helper.rb