drake 0.8.2.1.0.10 → 0.8.2.1.0.11

data/CHANGES.drake

@@ -1,6 +1,10 @@
 
 = Drake Changelog
 
+== Version 0.8.2.1.0.11
+
+* Remove drb code from this CompTree branch (reduce load time).
+
 == Version 0.8.2.1.0.10
 
 * Parents must be marked as needed during dry run for parallel tasks.

data/lib/rake.rb

@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.2.1.0.10'
+RAKEVERSION = '0.8.2.1.0.11'
 
 require 'rbconfig'
 require 'getoptlong'

data/lib/rake/comp_tree/algorithm.rb

@@ -1,6 +1,5 @@
 
 require 'rake/comp_tree/diagnostic'
-require 'rake/comp_tree/retriable_fork'
 
 module Rake::CompTree
   module Algorithm

data/lib/rake/comp_tree/diagnostic.rb

@@ -1,6 +1,7 @@
 
 require 'rake/comp_tree/tap'
 
+module Rake ; end
 module Rake::CompTree
   module Diagnostic
     def show(desc = nil, stream = STDOUT, &block)

data/lib/rake/comp_tree/driver.rb

@@ -1,5 +1,4 @@
 
-require 'rake/comp_tree/bucket_ipc'
 require 'rake/comp_tree/diagnostic'
 require 'rake/comp_tree/misc'
 require 'rake/comp_tree/algorithm'

data/lib/rake/comp_tree/misc.rb

@@ -1,6 +1,7 @@
 
 require 'thread'
 
+module Rake ; end
 module Rake::CompTree
   module Misc
     def let

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drake
 version: !ruby/object:Gem::Version 
-  version: 0.8.2.1.0.10
+  version: 0.8.2.1.0.11
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -70,13 +70,11 @@ files:
 - lib/rake/testtask.rb
 - lib/rake.rb
 - lib/rake/comp_tree/algorithm.rb
-- lib/rake/comp_tree/bucket_ipc.rb
 - lib/rake/comp_tree/diagnostic.rb
 - lib/rake/comp_tree/driver.rb
 - lib/rake/comp_tree/error.rb
 - lib/rake/comp_tree/misc.rb
 - lib/rake/comp_tree/node.rb
-- lib/rake/comp_tree/retriable_fork.rb
 - lib/rake/comp_tree/tap.rb
 - lib/rake/comp_tree/task_node.rb
 - test/capture_stdout.rb

data/lib/rake/comp_tree/bucket_ipc.rb

@@ -1,151 +0,0 @@
-
-require 'drb'
-require 'thread'
-
-require 'rake/comp_tree/retriable_fork'
-require 'rake/comp_tree/diagnostic'
-require 'rake/comp_tree/tap'
-
-module Rake::CompTree
-  module BucketIPC
-    class Bucket
-      include Diagnostic
-      include RetriableFork
-
-      def initialize(address, timeout, wait_interval)
-        trace "Making bucket with address #{address}"
-        
-        @remote_pid = fork {
-          own_object = Class.new {
-            attr_accessor(:contents)
-          }.new
-          server = DRb.start_service(address, own_object)
-          debug {
-            server.verbose = true
-          }
-          DRb.thread.join
-        }
-
-        @remote_object = DRbObject.new_with_uri(address)
-        @address = address
-        @timeout = timeout
-        @wait_interval = wait_interval
-      end
-      
-      attr_accessor(:timeout, :wait_interval)
-      attr_reader(:address)
-      
-      def contents=(new_contents)
-        connect {
-          @remote_object.contents = new_contents
-        }
-      end
-      
-      def contents
-        connect {
-          @remote_object.contents
-        }
-      end
-      
-      def stop
-        Process.kill("TERM", @remote_pid)
-      end
-      
-      private
-      
-      def connect
-        begin
-          return yield
-        rescue DRb::DRbConnError
-          start = Time.now
-          begin
-            Kernel.sleep(@wait_interval)
-            return yield
-          rescue DRb::DRbConnError
-            if Time.now - start > @timeout
-              raise
-            end
-            retry
-          end
-        end
-      end
-    end
-
-    class DriverBase
-      def initialize(addresses, timeout, wait_interval)
-        begin
-          @buckets = addresses.map { |address|
-            Bucket.new(address, timeout, wait_interval)
-          }
-          if block_given?
-            yield @buckets
-          end
-        ensure
-          if block_given?
-            stop
-          end
-        end
-      end
-      
-      def stop
-        if defined?(@buckets)
-          @buckets.each { |bucket|
-            bucket.stop
-          }
-        end
-      end
-    end
-
-    class Driver < DriverBase
-      DEFAULTS = {
-        :timeout => 0.5,
-        :wait_interval => 0.05,
-        :port_start => 18181,
-      }
-
-      module BucketCounter
-        @mutex = Mutex.new
-        @count = 0
-        class << self
-          def increment_count
-            @mutex.synchronize {
-              @count += 1
-            }
-          end
-
-          def map_indexes(num_buckets)
-            Array.new.tap { |result|
-              num_buckets.times {
-                result << yield(increment_count)
-              }
-            }
-          end
-        end
-      end
-
-      def initialize(num_buckets, opts_in = {})
-        opts = DEFAULTS.merge(opts_in)
-
-        addresses = 
-          if RetriableFork::HAVE_FORK
-            #
-            # Assume the existence of fork implies a unix machine.
-            #
-            require 'drb/unix'
-            basename = "drbunix://#{Dir.tmpdir}/bucket.#{Process.pid}.#{rand}"
-            BucketCounter.map_indexes(num_buckets) { |index|
-              "#{basename}.#{index}"
-            }
-          else
-            #
-            # Fallback: use the default socket.
-            #
-            BucketCounter.map_indexes(num_buckets) { |index|
-              "druby://localhost:#{opts[:port_start] + index}"
-            }
-          end
-        super(addresses, opts[:timeout], opts[:wait_interval])
-      end
-    end
-  end
-end

data/lib/rake/comp_tree/retriable_fork.rb

@@ -1,43 +0,0 @@
-
-module Rake ; end
-module Rake::CompTree
-  module RetriableFork
-    HAVE_FORK = lambda {
-      begin
-        process_id = fork { }
-        Process.wait(process_id)
-      rescue NotImplementedError
-        return false
-      end
-      true
-    }.call
-
-    def fork(retry_wait = 10, retry_max = 10, &block)
-      num_retries = 0
-      begin
-        Process.fork(&block)
-      rescue Errno::EAGAIN
-        num_retries += 1
-        if num_retries == retry_max
-          message = %Q{
-            ****************************************************************
-            Maximum number of EAGAIN signals reached (#{retry_max})
-            ****************************************************************
-
-            Either increase your process limit permission (consult your
-            OS manual) or run this script as superuser.
-  
-            ****************************************************************
-          }
-          STDERR.puts(message.gsub(%r!^[ \t]+!, ""))
-          raise
-        end
-        STDERR.puts "Caught EGAIN. Retrying in #{retry_wait} seconds."
-        sleep(retry_wait)
-        retry
-      end
-    end
-    module_function :fork
-  end
-end
-