huck 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79a3c9c263d302401491186d5ab0bd97a3ce51c
-  data.tar.gz: 600ea4d99d5c905796abbe425060e27e43cba421
+  metadata.gz: ab41afdccbfa3acca2682260a3f767f81df16c98
+  data.tar.gz: 10c43b6f14370e182b92354ab802f564d292262b
 SHA512:
-  metadata.gz: d96f236417d31c5af714c20814cf95f3a11a8b266b68f8f879464218af21df3957fd3af53dab536079ff2865d023da3e9f6489f5b1525064c63569e82bb69379
-  data.tar.gz: ca82f5ca5ddd75d8c4a67e6cb45e9e059a01e9ad5055bcd4d562183889a81f02824e942c198f86e8de891a7c802fe53468c500450920c06e76a7e8bf76791533
+  metadata.gz: ae7aca31731c943519ec239dad61b262ee2ee7a4641a66b37b39748f544730a4fb3395bd83e008c200329a37fda09bd82420902a2bb2fd0e88770fec4efcb410
+  data.tar.gz: 461a94e2f90cb3ecd96594065d20bcbad9f96552fadbbb58fcc1e8ad28751ec663cfb95a69d67991ac29bd8e3612efd12ab8447be4676218fea2e08902c50894

data/bin/huck

@@ -6,15 +6,15 @@ begin
   options = Hash.new
   OptionParser.new do |opts|
     opts.on '-c [path]' do |v|
-      options[:config] = v
+      options[:config_file] = v
     end
   end.parse!
 
   case ARGV[0]
   when 'run'
-    Huck.run :config => options[:config]
+    Huck.run :config_file => options[:config_file]
   when 'serve'
-    Huck.serve :config => options[:config]
+    Huck.serve :config_file => options[:config_file]
   else
     puts <<EOF
 Usage: huck <run|serve>

data/lib/huck/version.rb

@@ -1,3 +1,3 @@
 module Huck
-  Version = '0.2.1'
+  Version = '0.2.2'
 end

data/lib/huck.rb

@@ -30,8 +30,11 @@ module Huck
   #   The name of the sender to use
   #
   def self.run kwargs = {}
-    conf_file = Huck::getarg kwargs, :config, nil
-    config = Huck::config :path => conf_file
+    config = Huck::getarg kwargs, :config, nil
+    if config.nil?
+      conf_file = Huck::getarg kwargs, :config_file, nil
+      config = Huck::config :path => conf_file
+    end
 
     if config.has_key? 'generator'
       gen_name = config['generator']
@@ -50,15 +53,20 @@ module Huck
     s.send g.dump
   end
 
-  # Main method to receive messages from a Huck client
+  # Main method to receive messages from a Huck client. If a block is given, the
+  # block will be used as the handler code. Otherwise, the configured handler
+  # or default handler will be used.
   #
   # == Parameters:
   # receiver::
   #   The receiver to use (default=sqs)
   #
   def self.serve kwargs = {}
-    conf_file = Huck::getarg kwargs, :config, nil
-    config = Huck::config :path => conf_file
+    config = Huck::getarg kwargs, :config, nil
+    if config.nil?
+      conf_file = Huck::getarg kwargs, :config_file, nil
+      config = Huck::config :path => conf_file
+    end
 
     if config.has_key? 'handler'
       hand_name = config['handler']
@@ -76,9 +84,9 @@ module Huck
 
     begin
       r.receive do |msg|
-        h.handle msg
+        block_given? ? yield(msg) : h.handle(msg)
       end
-    rescue Interrupt, SystemExit
+    rescue Interrupt, SystemExit, IRB::Abort
       return
     end
   end

data/spec/huck/util_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe 'Huck Configuration' do
+  it 'should read the proper default config file' do
+    path = File.join Dir.home, 'huck.conf'
+    if !File.exist? path
+      f = File.open path, 'w'
+      f.write '{"test": "config"}'
+      f.close
+    end
+    expect(Huck.config).not_to be_empty
+    File.delete f.path if f
+  end
+
+  it 'should accept an alternate config file path' do
+    file = mktempfile "test: config\n"
+    expect(Huck.config :path => file).to eq({'test' => 'config'})
+  end
+end
+
+describe 'Module Loading' do
+  it 'should return true when module is loaded' do
+    expect(Huck::try_load 'yaml').to be true
+  end
+
+  it 'should return false when module cannot be loaded' do
+    expect(Huck::try_load 'nonexistent').to be false
+  end
+
+  it 'should not raise when module is loaded' 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)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require 'simplecov'
+require 'tempfile'
+require 'tmpdir'
+
+SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+require 'huck'
+
+def mktempfile content
+  f = Tempfile.new 'huck'
+  f.write content
+  f.close
+  f.path
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huck
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryan Uber
@@ -59,24 +59,25 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/huck/generators/ohai.rb
-- lib/huck/generators/facter.rb
+- bin/huck
+- lib/huck/generator.rb
 - lib/huck/generators/basic.rb
-- lib/huck/generators/yaml.rb
+- lib/huck/generators/facter.rb
 - lib/huck/generators/json.rb
-- lib/huck/senders/sqs.rb
+- lib/huck/generators/ohai.rb
+- lib/huck/generators/yaml.rb
+- lib/huck/handler.rb
+- lib/huck/handlers/echo.rb
+- lib/huck/handlers/exec.rb
 - lib/huck/receiver.rb
+- lib/huck/receivers/sqs.rb
 - lib/huck/sender.rb
+- lib/huck/senders/sqs.rb
 - lib/huck/util.rb
-- lib/huck/generator.rb
-- lib/huck/receivers/sqs.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/huck_spec.rb
+- spec/huck/util_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/ryanuber/huck
 licenses:
 - MIT
@@ -97,9 +98,10 @@ 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/huck_spec.rb
+- spec/huck/util_spec.rb
+- spec/spec_helper.rb

data/spec/huck/huck_spec.rb

@@ -1,9 +0,0 @@
-require 'huck'
-require 'aws-sdk'
-#AWS::Stub!
-
-describe 'Running Huck Client' do
-  it 'should run the client without errors' do
-    Huck.run
-  end
-end