mlanett-hive 0.3.0 → 0.4.0

data/Gemfile

@@ -4,11 +4,12 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
+  gem "growl_notify"    # for guard
   gem "guard-rspec"
+  gem "rake"
   gem "rb-fsevent"      # for guard
-  gem "growl_notify"    # for guard
   gem "rspec"
-  gem "ruby-debug19", require: false
+  ### "ruby-debug19", require: false
 end
 
 group :test do

data/bin/hive

@@ -20,17 +20,14 @@
 File.expand_path(File.dirname(__FILE__)+"/../lib").tap { |d| $:.unshift(d) if ! $:.member?(d) }
 require "hive"
 
-my = Hive::Configuration.parse(ARGV)
+options = Hive::Configuration.parse(ARGV)
 
-# TODO use my.options_for_daemon_spawn
-# TODO use my.args_for_daemon_spawn
-
-if ! my.dry_run then
+if ! options.dry_run then
   case ARGV.first
   when "stop"
-    Hive::Monitor.new(my).stop_all
+    Hive::Monitor.new(options).stop_all
   when "monitor"
-    Hive::Monitor.new(my).monitor
+    Hive::Monitor.new(options).monitor
   else
     Kernel.abort "Unknown command #{ARGV.first}"
   end

data/lib/hive.rb

@@ -27,6 +27,7 @@ end
 
 module Hive::Utilities
   autoload :AirbrakeObserver, "hive/utilities/airbrake_observer"
+  autoload :Hash,             "hive/utilities/hash"
   autoload :HoptoadObserver,  "hive/utilities/hoptoad_observer"
   autoload :LogObserver,      "hive/utilities/log_observer"
   autoload :NullObserver,     "hive/utilities/null_observer"

data/lib/hive/configuration.rb

@@ -145,20 +145,6 @@ class Hive::Configuration
     self
   end
 
-  def options_for_daemon_spawn
-    mkdirp root, "#{root}/log", "#{root}/tmp", "#{root}/tmp/pids" if ! dry_run
-    return {
-      working_dir: root,
-      log_file:    "#{root}/log/#{name}_#{env}.log",
-      pid_file:    "#{root}/tmp/pids/#{name}_#{env}.pid",
-      sync_log:    local?
-    }
-  end
-
-  def args_for_daemon_spawn
-    args + [self]
-  end
-
   # ----------------------------------------------------------------------------
   # DSL
   # ----------------------------------------------------------------------------

data/lib/hive/policy.rb

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-require "ostruct"
-
 class Hive::Policy
 
   DEFAULTS = {
@@ -19,19 +17,9 @@ class Hive::Policy
     observers:              []
   }
 
-  class Instance
-
-    # including options[:policy] will merge over these options
     def initialize( options = {} )
-      if options[:policy] then
-        policy   = options.delete(:policy)
-        defaults = policy.dup
-      else
-        defaults = DEFAULTS
-      end
-
       options  = Hash[ options.map { |k,v| [ k.to_sym, v ] } ] # poor man's symbolize keys
-      @options = defaults.merge( options )
+      @options = DEFAULTS.merge( options )
     end
 
     def storage
@@ -42,8 +30,13 @@ class Hive::Policy
       @options[symbol.to_sym]
     end
 
+    def merge( options = {} )
+      @options.merge!( options )
+      self
+    end
+
     def dup
-      @options.dup
+      self.class.new( @options.dup )
     end
 
     def before_fork
@@ -54,13 +47,12 @@ class Hive::Policy
       (after_forks || []).each { |f| f.call }
     end
 
-  end # Instance
-
   class << self
-
-    def resolve( options = {} )
-      # this will dup either an Instance or a Hash
-      Hive::Policy::Instance.new(options.dup)
+    # @returns a new policy
+    # @options_or_policy can be a set of options or a source policy
+    def resolve( options_or_policy = {} )
+      # if it is a policy, just dup it
+      options_or_policy.kind_of?(Hive::Policy) ? options_or_policy.dup : new(options_or_policy.dup)
     end
 
   end # class

data/lib/hive/pool.rb

@@ -10,6 +10,7 @@
 class Hive::Pool
 
   include Hive::Log
+  include Hive::Utilities::Hash
 
   attr :kind      # job class
   attr :name
@@ -36,8 +37,8 @@ class Hive::Pool
   # @param options[:log] can be true
   # @returns the checked worker lists
   def synchronize( options = {} )
-    do_log = options.delete(:log)
-    raise if options.size > 0
+    assert_valid_keys( options, :log )
+    do_log = options[:log]
 
     checklist  = registry.checked_workers( policy )
     live_count = checklist.live.size
@@ -91,8 +92,8 @@ class Hive::Pool
   # this really should be protected but it's convenient to be able to force a spawn
   # param options[:wait] can true to wait until after the process is spawned
   def spawn( options = {} )
-    wait = options.delete(:wait)
-    raise if options.size > 0
+    assert_valid_keys( options, :wait )
+    wait = options[:wait]
 
     if ! wait then
       Hive::Worker.spawn kind, registry: registry, policy: policy, name: name
@@ -113,8 +114,8 @@ class Hive::Pool
 
   # shut down a worker
   def reap( key, options = {} )
-    wait = options.delete(:wait)
-    raise if options.size > 0
+    assert_valid_keys( options, :wait )
+    wait = options[:wait]
 
     if key.host == Hive::Key.local_host then
       ::Process.kill( "TERM", key.pid )

data/lib/hive/utilities/hash.rb

@@ -0,0 +1,15 @@
+# -*- encoding: utf-8 -*-
+
+=begin
+  Gives you assert_valid_keys without infecting Hash
+=end
+
+module Hive::Utilities::Hash
+
+  def assert_valid_keys( hash, *valid_keys )
+    hash.each_key do |key|
+      raise(ArgumentError, "Unknown key: #{key}") unless valid_keys.include?(key)
+    end
+  end
+
+end

data/lib/hive/version.rb

@@ -1,3 +1,3 @@
 module Hive
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/helper.rb

@@ -9,7 +9,7 @@
 =end
 
 require "bundler/setup"       # set up gem paths
-#require "ruby-debug"          # because sometimes you need it
+####### "ruby-debug"          # because sometimes you need it
 
 #require "simplecov"           # code coverage
 #SimpleCov.start               # must be loaded before our own code

data/spec/policy_spec.rb

@@ -27,7 +27,7 @@ describe Hive::Policy do
 
   it "is copied from another policy" do
     p1 = Hive::Policy.resolve worker_max_jobs: 7, worker_max_lifetime: 999
-    p2 = Hive::Policy.resolve policy: p1, worker_max_jobs: 12
+    p2 = p1.dup.merge worker_max_jobs: 12
 
     p2.worker_max_lifetime.should eq(p1.worker_max_lifetime)
     p1.worker_max_jobs.should eq(7)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mlanett-hive
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70198172375900 !ruby/object:Gem::Requirement
+  requirement: &70292391849280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70198172375900
+  version_requirements: *70292391849280
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70198172375480 !ruby/object:Gem::Requirement
+  requirement: &70292391848860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70198172375480
+  version_requirements: *70292391848860
 description: 
 email:
 - mark.lanett@gmail.com
@@ -56,6 +56,7 @@ files:
 - demo/job2.rb
 - demo/job3.rb
 - demo/populate.rb
+- demo/squiggly.rb
 - hive.gemspec
 - lib/hive.rb
 - lib/hive/checker.rb
@@ -71,9 +72,9 @@ files:
 - lib/hive/pool.rb
 - lib/hive/redis/storage.rb
 - lib/hive/registry.rb
-- lib/hive/squiggly.rb
 - lib/hive/trace.rb
 - lib/hive/utilities/airbrake_observer.rb
+- lib/hive/utilities/hash.rb
 - lib/hive/utilities/hoptoad_observer.rb
 - lib/hive/utilities/log_observer.rb
 - lib/hive/utilities/observeable.rb