slave 1.1.0 → 1.2.0

data/README

@@ -39,6 +39,10 @@ URIS
 
 HISTORY
 
+  1.2.0:
+    - cleaned up a bunch of warnings.  thanks eric kolve <ekolve@gmail.com>
+      for reporting them.
+
   1.1.0:
     - replaced HeartBeat class with LifeLine.
 
@@ -155,7 +159,7 @@ SAMPLES
   ~ > ruby samples/b.rb
 
     :postgresql
-    ./lib/slave.rb:460:in `initialize': undefined method `typo' for #<Server:0xb7565694> (NoMethodError)
+    ./lib/slave.rb:458:in `initialize': undefined method `typo' for #<Server:0xb7567fa4> (NoMethodError)
     	from samples/b.rb:22:in `new'
     	from samples/b.rb:22
 
@@ -188,9 +192,9 @@ SAMPLES
 
   ~ > ruby samples/c.rb
 
-    14387
-    14388
-    ./lib/slave.rb:460:in `initialize': undefined local variable or method `fubar' for main:Object (NameError)
+    30103
+    30104
+    ./lib/slave.rb:458:in `initialize': undefined local variable or method `fubar' for main:Object (NameError)
     	from samples/c.rb:21:in `new'
     	from samples/c.rb:21
 
@@ -285,6 +289,6 @@ SAMPLES
 
   ~ > ruby samples/g.rb
 
-    {"that"=>14406, "this"=>14405}
-    {"that"=>[14407, Tue Nov 28 09:47:31 MST 2006], "this"=>[14405, Tue Nov 28 09:47:29 MST 2006]}
+    {"that"=>30122, "this"=>30121}
+    {"that"=>[30123, Fri Dec 08 08:32:37 MST 2006], "this"=>[30121, Fri Dec 08 08:32:35 MST 2006]}
 

data/README.tmpl

@@ -39,6 +39,10 @@ URIS
 
 HISTORY
 
+  1.2.0:
+    - cleaned up a bunch of warnings.  thanks eric kolve <ekolve@gmail.com>
+      for reporting them.
+
   1.1.0:
     - replaced HeartBeat class with LifeLine.
 

data/lib/{slave-1.1.0.rb → slave-1.2.0.rb}

@@ -40,7 +40,7 @@ require 'sync'
 #
   class Slave
 #--{{{
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
     def self.version() VERSION end
   #
   # env config
@@ -95,12 +95,12 @@ require 'sync'
       end
 
       # just fork with out silly warnings
-      def fork &block
+      def fork &b
 #--{{{
         v = $VERBOSE
         begin
           $VERBOSE = nil
-          Process::fork &block
+          Process::fork(&b)
         ensure
         $VERBOSE = v
         end
@@ -240,8 +240,7 @@ require 'sync'
       DELEGATED.each do |m|
         code = <<-code
           def #{ m }(*a, &b)
-            raise unless @socket
-            @socket.#{ m } *a, &b
+            @socket ? @socket.#{ m }(*a, &b) : raise('no socket!')
           end
         code
         module_eval code, __FILE__, __LINE__
@@ -278,7 +277,6 @@ require 'sync'
     attr :at_exit
     attr :dumped
 
-    attr :shutdown
     attr :status
     attr :object
     attr :pid
@@ -586,20 +584,6 @@ require 'sync'
   #   object = thread.value 
   #
     def self.object opts = {}, &b
-#--{{{
-      l = lambda{ begin; b.call; ensure; exit; end }
-
-      async = opts.delete('async') || opts.delete(:async) 
-
-      opts['object'] = opts[:object] = l
-      opts['dumped'] = opts[:dumped] = true 
-
-      slave = Slave.new opts
-
-      async ? Thread.new{ slave.object.call } : slave.object.call
-#--}}}
-    end
-    def self.object opts = {}, &b
 #--{{{
       async = opts.delete('async') || opts.delete(:async) 
 

data/lib/slave.rb

@@ -40,7 +40,7 @@ require 'sync'
 #
   class Slave
 #--{{{
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
     def self.version() VERSION end
   #
   # env config
@@ -95,12 +95,12 @@ require 'sync'
       end
 
       # just fork with out silly warnings
-      def fork &block
+      def fork &b
 #--{{{
         v = $VERBOSE
         begin
           $VERBOSE = nil
-          Process::fork &block
+          Process::fork(&b)
         ensure
         $VERBOSE = v
         end
@@ -240,8 +240,7 @@ require 'sync'
       DELEGATED.each do |m|
         code = <<-code
           def #{ m }(*a, &b)
-            raise unless @socket
-            @socket.#{ m } *a, &b
+            @socket ? @socket.#{ m }(*a, &b) : raise('no socket!')
           end
         code
         module_eval code, __FILE__, __LINE__
@@ -278,7 +277,6 @@ require 'sync'
     attr :at_exit
     attr :dumped
 
-    attr :shutdown
     attr :status
     attr :object
     attr :pid
@@ -586,20 +584,6 @@ require 'sync'
   #   object = thread.value 
   #
     def self.object opts = {}, &b
-#--{{{
-      l = lambda{ begin; b.call; ensure; exit; end }
-
-      async = opts.delete('async') || opts.delete(:async) 
-
-      opts['object'] = opts[:object] = l
-      opts['dumped'] = opts[:dumped] = true 
-
-      slave = Slave.new opts
-
-      async ? Thread.new{ slave.object.call } : slave.object.call
-#--}}}
-    end
-    def self.object opts = {}, &b
 #--{{{
       async = opts.delete('async') || opts.delete(:async) 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: slave
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-11-28 00:00:00.000000 -07:00
+  version: 1.2.0
+date: 2006-12-08 00:00:00.000000 -07:00
 summary: slave
 require_paths: 
   - lib
@@ -41,7 +41,7 @@ files:
   - doc
   - test.old/slave.rb
   - lib/slave.rb
-  - lib/slave-1.1.0.rb
+  - lib/slave-1.2.0.rb
   - samples/a.rb
   - samples/b.rb
   - samples/c.rb