emdrb 0.3.1 → 0.4.0

data/History.txt

@@ -1,3 +1,10 @@
+== 0.4.0 / 2009-03-18
+* Mechanism for deferrable methods using blocks cleaned up further
+* Asynchronous method call API cleaned up
+
+== 0.3.2 / 2009-03-16
+* Deferrable method mechanism cleaned up
+
 == 0.3.1 / 2009-02-04
 * Used EventMachine::defer instead of spawning own threads
 

data/README.txt

@@ -97,11 +97,6 @@ Or it could be written to use of asynchronous calls:
 
 * Standard gem installation: 'sudo gem install' ought to do the trick.
 
-Note that you will need the daemons gem ('sudo gem install daemons')
-if you would like to run the rspec tests that are included with
-EMDRb.  Daemons is not required to use EMDRb otherwise, and as such it
-is not listed as a hard dependency in the gem install.
-
 If you want to install it manually, you can always download it at the
 EMDRb project page at:
 
@@ -113,5 +108,5 @@ Copyright © 2008, 2009 Rafael R. Sevilla.  You can redistribute it
 and/or modify it under the same terms as Ruby.  Please see the file
 COPYING for more details.
 
-$Id: README.txt 88 2009-02-04 04:10:52Z dido $
+$Id: README.txt 104 2009-03-18 04:45:56Z dido $
 

data/Rakefile

@@ -1,11 +1,11 @@
-#  -*- Ruby -*-
+# -*- coding: utf-8; mode: Ruby -*-
 #
 # Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
 # Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: Rakefile 61 2009-01-23 09:11:43Z dido $
+# $Id: Rakefile 94 2009-03-14 07:17:37Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -20,7 +20,16 @@
 # See the file COPYING for complete licensing information.
 #----------------------------------------------------------------------------
 #
-load 'tasks/setup.rb'
+begin
+  require 'bones'
+  Bones.setup
+rescue LoadError
+  begin
+    load 'tasks/setup.rb'
+  rescue LoadError
+    raise RuntimeError, '### please install the "bones" gem ###'
+  end
+end
 
 ensure_in_path 'lib'
 require 'emdrb/version'
@@ -32,8 +41,8 @@ PROJ.authors = 'dido@imperium.ph'
 PROJ.email = 'dido@imperium.ph'
 PROJ.url = 'http://emdrb.rubyforge.org'
 PROJ.rubyforge.name = 'emdrb'
-PROJ.version = EMDRb::Version::STRING
-PROJ.dependencies = ["eventmachine"]
+PROJ.version = EMDRb::VERSION
+depend_on "eventmachine"
 
 PROJ.spec.opts << '--color'
 

data/lib/emdrb/emdrb.rb

@@ -1,10 +1,11 @@
+# -*- coding: utf-8 -*-
 #
 # Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
 # Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: emdrb.rb 87 2009-02-04 04:08:06Z dido $
+# $Id: emdrb.rb 107 2009-03-18 05:52:00Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -37,20 +38,27 @@ module DRb
   # most especially with respect to blocks.  This may also provide more
   # performance if one is using a method that itself makes use of
   # Deferrables to accomplish the job.
+  #
+  # There are certain rules that deferrable methods must obey:
+  #
+  # 1. They must always return a Deferrable to their caller.  This
+  #    Deferrable should succeed if the method returns a normal value,
+  #    passing its result as a parameter to any of its callbacks.
+  # 2. Exceptions must be caught and the Deferrable they return must
+  #    fail, with the exception object passed as a parameter to its
+  #    errbacks.
+  # 3. Blocks passed to the deferrable method will always return a
+  #    Deferrable, which again will succeed 
+  #  
   # 
   module DRbEMSafe
     module ClassMethods
       ##
-      # Mark the method as a deferrable method.  Such a method must
-      # accept two arguments, an array of parameters and a block
-      # (usually nil).  The method must always return a Deferrable
-      # which should be set to success with the result of the method
-      # when the method is done, and failed with the exception object
-      # if the method failed.  The block, if any, is a DRbObject that
-      # should be invoked by send_async(:call).  Using a direct call
-      # on the DRbObject will most likely result in a threading
-      # deadlock since deferrable methods are invoked from the main
-      # thread!
+      # Mark the method as a deferrable method.  Such a method must always
+      # return an object which includes EventMachine::Deferrable.  A block
+      # passed to such a method returns a deferrable whenever it is invoked,
+      # by doing a direct call to the block or using yield, and the code
+      # for the deferrable method must take this into account.
       def deferrable_method(method_name)
         @deferrable_methods ||= {}
         @deferrable_methods[method_name] = true
@@ -59,6 +67,7 @@ module DRb
       def deferrable_method?(method_name)
         return(@deferrable_methods.has_key?(method_name))
       end
+
     end
 
     def self.included(base)
@@ -66,6 +75,37 @@ module DRb
     end
   end
 
+  ##
+  # Used to wrap Proc objects so that they can be safely called from
+  # deferrable methods.  This makes any invocation of the block an
+  # asynchronous call that returns a Deferrable rather than calling
+  # the block synchronously, which will result in a threading deadlock
+  # if this is performed in the main event loop.  This mechanism is
+  # used to provide facilities for deferrable methods which run within
+  # the master event loop.
+  class DRbProcWrapper
+    def initialize(block)
+      @block = block
+    end
+
+    ##
+    # Initiate an asynchronous call to the block this is wrapping around.
+    # Returns a deferrable.
+    def call(*args)
+      if args.size == 1 && args[0].class == Array
+        args[0] = DRbArray.new(args[0])
+      end
+      return(@block.send_async(:call, *args))
+    end
+
+    ##
+    # Return a Proc that will do an asynchronous call to the underlying
+    # object.
+    def to_proc
+      return(Proc.new { |args| self.call(args) })
+    end
+  end
+
   ##
   # Common protocol elements for distributed Ruby, used by both the
   # client and server.
@@ -300,9 +340,15 @@ module DRb
           @request[:ro].class.deferrable_method?(@request[:msg])
         # A deferrable method will return an actual Deferrable that we
         # can use instead.
-        return(@request[:ro].__send__(@request[:msg],
-                                      @request[:argv],
-                                      @request[:block]))
+        begin
+          return(@request[:ro].__send__(@request[:msg],
+                                        *@request[:argv],
+                                        &DRbProcWrapper.new(@request[:block])))
+        rescue
+          df = EventMachine::DefaultDeferrable.new
+          df.fail($!)
+          return(df)
+        end
       end
       df = EventMachine::DefaultDeferrable.new
       op = (@request[:block]) ? perform_with_block : perform_without_block
@@ -745,8 +791,7 @@ module DRb
       else
         @result = obj
         @state = :succ
-        @df.set_deferred_status(:succeeded, [@succ, @result])
-        # close the connection after the call succeeds.
+        @succ ? @df.succeed(@result) : @df.fail(@result)
         close_connection
       end
     end
@@ -777,10 +822,25 @@ module DRb
 
     ##
     # Perform an asynchronous call to the remote object.  This can only
-    # be used from within the event loop.  It returns a deferrable to which
-    # callbacks can be attached.
+    # be used from within the event loop.  It returns a deferrable, which
+    # will succeed if the remote method called performs a normal return,
+    # and callbacks attached to the deferrable will receive this return
+    # value.  If the remote method raises an exception, it will fail the
+    # deferrable, and the exception object will be passed to the errbacks
+    # of the deferrable.
     def send_async(msg_id, *a, &b)
       df = EventMachine::DefaultDeferrable.new
+      if DRb.here?(@uri)
+	obj = DRb.to_obj(@ref)
+	DRb.current_server.check_insecure_method(obj, msg_id)
+        begin
+          df.succeed(obj.__send__(msg_id, *a, &b))
+        rescue
+          df.fail($!)
+        end
+        return(df)
+      end
+
       @protocol ||= DRbTransport.factory(@uri, DRb.config)
 
       @protocol.client_connect(DRbClientProtocol) do |c|
@@ -801,16 +861,11 @@ module DRb
     # threading deadlock!  Use the send_async method if you want to
     # use EMDRb from within an event loop.
     def method_missing(msg_id, *a, &b)
-      if DRb.here?(@uri)
-	obj = DRb.to_obj(@ref)
-	DRb.current_server.check_insecure_method(obj, msg_id)
-	return obj.__send__(msg_id, *a, &b) 
-      end
-
       q = Queue.new
       EventMachine::next_tick do
         df = self.send_async(msg_id, *a, &b)
-        df.callback { |data| q << data }
+        df.callback { |data| q << [true, data] }
+        df.errback { |exc| q << [false, exc] }
       end
       succ, result = q.shift
       if succ

data/lib/emdrb/version.rb

@@ -4,7 +4,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU Lesser General Public License / Ruby License
 #
-# $Id: version.rb 83 2009-02-04 03:39:51Z dido $
+# $Id: version.rb 110 2009-03-18 05:55:43Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -22,13 +22,5 @@
 # EMDRb version code
 #
 module EMDRb
-  module Version
-
-    MAJOR = 0
-    MINOR = 3
-    TINY = 1
-
-    # The version of EMDRb in use.
-    STRING = [ MAJOR, MINOR, TINY ].join(".")
-  end  
+  VERSION = "0.4.0"
 end

data/spec/client_spec.rb

@@ -1,10 +1,11 @@
+# -*- coding: utf-8 -*-
 #
 # Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
 # Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: client_spec.rb 50 2009-01-23 08:52:21Z dido $
+# $Id: client_spec.rb 105 2009-03-18 05:48:08Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -21,41 +22,45 @@
 #
 require File.join(File.dirname(__FILE__), %w[spec_helper])
 require File.join(File.dirname(__FILE__), %w[spec_common])
+require 'thread'
 
 Thread.abort_on_exception = true
 
 describe EMDRb, "Client" do
   it_should_behave_like "DRb basics"
 
-  before(:all) do
-    system(File.join(File.dirname(__FILE__), "drbserver.rb drb"))
+  before do
     DRb.start_service
     @obj = DRb::DRbObject.new(nil, "druby://localhost:12345")
   end
 
-  after(:all) do
-    pid = File.open(File.join(File.dirname(__FILE__), "drbserver.pid")) { |fp| fp.read.to_i }
-    Process.kill("SIGTERM", pid)
+  after do
+    DRb.stop_service
   end
 
   it "should be able to perform asynchronous method calls" do
+    q = Queue.new
     EventMachine::next_tick do
       @obj.send_async(:identity, 1).callback do |data|
-        data[0].should be_true
-        data[1].should == 1
+        q << data
       end
     end
+    data = q.shift
+    data.should == 1
   end
 
   it "should be able to perform asynchronous method calls with a passed block" do
+    q = Queue.new
+    val = 1
     EventMachine::next_tick do
-      val = 1
       df = @obj.send_async(:blockyield, 1,2,3,4,5,6,7) { |x| val *= x; val }
       df.callback do |data|
-        data[0].should be_true
-        val.should == 5040
+        q << data
       end
     end
+    data = q.shift
+    data[0].should be_true
+    val.should == 5040
   end
 
 end

data/spec/drbserver.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 # Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
 # Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: drbserver.rb 66 2009-01-27 07:25:23Z dido $
+# $Id: drbserver.rb 106 2009-03-18 05:48:53Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -22,7 +23,7 @@
 # This is the DRb server that should be run by the specs, and can execute
 # using either the standard DRb or EMDRb depending on what is being tested.
 #
-require 'daemons'
+
 Thread.abort_on_exception = true
 if ARGV[0] == "emdrb"
   $LOAD_PATH << File.join(File.dirname(__FILE__), '../lib/')
@@ -33,25 +34,6 @@ else
   raise "specify emdrb or drb on the command line"
 end
 
-if ARGV[1].nil?
-  pidfile = File.expand_path(File.join(File.dirname(__FILE__), "drbserver.pid"))
-  if File.exist?(pidfile)
-    exit(0)
-  end
-#  logfile = File.expand_path(File.join(File.dirname(__FILE__), "drbserver.log"))
-  Daemonize.daemonize
-  pid = Process.pid
-  File.open(pidfile, "w") { |fp| fp.write(pid.to_s) }
-
-  handler = lambda do
-    File.delete(pidfile)
-    exit(0)
-  end
-
-  trap("SIGTERM", handler)
-  trap("SIGINT", handler)
-end
-
 class TestServer
   def identity(x)
     return(x)
@@ -82,25 +64,20 @@ if ARGV[0] == "emdrb"
     ##
     # Simple example of a deferrable method structured as a state
     # machine.
-    def block_df(args, block, state={:index => 0, :retval => 0 })
-      if state[:index] >= args.length
+    def block_df(data, state={:index => 0, :retval => 0 }, &block)
+      if state[:index] >= data.length
         self.set_deferred_status(:succeeded, state[:retval])
         return(self)
       end
 
-      df = block.send_async(:call, args[state[:index]])
-      df.callback do |succ,result|
-        if succ
-          state[:retval] += result
-          state[:index] += 1
-          EventMachine::next_tick do
-            self.block_df(args, block, state)
-          end
-        else
-          self.set_deferred_status(:failed,  res)
-        end
+      df = yield data[state[:index]]
+      df.callback do |result|
+        state[:retval] += result
+        state[:index] += 1
+        self.block_df(data, state, &block)
       end
       df.errback do |res|
+        df.fail(res)
       end
       return(self)
     end

data/spec/server_spec.rb

@@ -1,10 +1,11 @@
+# -*- coding: utf-8 -*-
 #
 # Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
 # Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: server_spec.rb 65 2009-01-27 07:24:53Z dido $
+# $Id: server_spec.rb 108 2009-03-18 05:53:00Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -33,15 +34,12 @@ describe "EMDRb Server" do
   it_should_behave_like "DRb basics"
 
   before(:all) do
-    # but we start the *server* with EMDRb
-    system(File.join(File.dirname(__FILE__), "drbserver.rb emdrb"))
     DRb.start_service
     @obj = DRbObject.new_with_uri("druby://localhost:12345")
   end
 
   after(:all) do
-    pid = File.open(File.join(File.dirname(__FILE__), "drbserver.pid")) { |fp| fp.read.to_i }
-    Process.kill("SIGTERM", pid)
+    DRb.stop_service
   end
 
   it "should work with variadic methods" do
@@ -49,7 +47,7 @@ describe "EMDRb Server" do
   end
 
   it "should use deferrable methods correctly" do
-    res = @obj.block_df(1,2,3,4,5) { |x| x }
+    res = @obj.block_df([1,2,3,4,5]) { |x| x }
     res.should == 15
   end
 

data/tasks/ann.rake

@@ -1,4 +1,3 @@
-# $Id: ann.rake 59 2009-01-23 09:10:01Z dido $
 
 begin
   require 'bones/smtp_tls'
@@ -43,7 +42,7 @@ namespace :ann do
   desc "Send an email announcement"
   task :email => ['ann:prereqs', PROJ.ann.file] do
     ann = PROJ.ann
-    from = ann.email[:from] || PROJ.email
+    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
     to   = Array(ann.email[:to])
 
     ### build a mail header for RFC 822

data/tasks/bones.rake

@@ -1,4 +1,3 @@
-# $Id: bones.rake 59 2009-01-23 09:10:01Z dido $
 
 if HAVE_BONES
 

data/tasks/gem.rake

@@ -1,6 +1,94 @@
-# $Id: gem.rake 59 2009-01-23 09:10:01Z dido $
 
-require 'rake/gempackagetask'
+require 'find'
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
+
+module Bones
+class GemPackageTask < Rake::PackageTask
+  # Ruby GEM spec containing the metadata for this package.  The
+  # name, version and package_files are automatically determined
+  # from the GEM spec and don't need to be explicitly provided.
+  #
+  attr_accessor :gem_spec
+
+  # Tasks from the Bones gem directory
+  attr_reader :bones_files
+
+  # Create a GEM Package task library.  Automatically define the gem
+  # if a block is given.  If no block is supplied, then +define+
+  # needs to be called to define the task.
+  #
+  def initialize(gem_spec)
+    init(gem_spec)
+    yield self if block_given?
+    define if block_given?
+  end
+
+  # Initialization tasks without the "yield self" or define
+  # operations.
+  #
+  def init(gem)
+    super(gem.name, gem.version)
+    @gem_spec = gem
+    @package_files += gem_spec.files if gem_spec.files
+    @bones_files = []
+
+    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
+    if !test(?e, local_setup)
+      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
+    end
+  end
+
+  # Create the Rake tasks and actions specified by this
+  # GemPackageTask.  (+define+ is automatically called if a block is
+  # given to +new+).
+  #
+  def define
+    super
+    task :prereqs
+    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
+    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
+      when_writing("Creating GEM") {
+        chdir(package_dir_path) do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "../#{gem_file}"
+          }
+        end
+      }
+    end
+
+    file package_dir_path => bones_files do
+      mkdir_p package_dir rescue nil
+
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+
+      bones_files.each do |fn|
+        base_fn = File.join('tasks', File.basename(fn))
+        f = File.join(package_dir_path, base_fn)
+        fdir = File.dirname(f)
+        mkdir_p(fdir) if !File.exist?(fdir)
+        if File.directory?(fn)
+          mkdir_p(f)
+        else
+          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
+          safe_ln(fn, f)
+        end
+      end
+    end
+  end
+  
+  def gem_file
+    if @gem_spec.platform == Gem::Platform::RUBY
+      "#{package_name}.gem"
+    else
+      "#{package_name}-#{@gem_spec.platform}.gem"
+    end
+  end
+end  # class GemPackageTask
+end  # module Bones
 
 namespace :gem do
 
@@ -19,6 +107,10 @@ namespace :gem do
       s.add_dependency(*dep)
     end
 
+    PROJ.gem.development_dependencies.each do |dep|
+      s.add_development_dependency(*dep)
+    end
+
     s.files = PROJ.gem.files
     s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
     s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
@@ -57,37 +149,21 @@ namespace :gem do
     end
   end  # Gem::Specification.new
 
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
+  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
+    pkg.need_tar = PROJ.gem.need_tar
+    pkg.need_zip = PROJ.gem.need_zip
+  end
 
   desc 'Show information about the gem'
   task :debug => 'gem:prereqs' do
     puts PROJ.gem._spec.to_ruby
   end
 
-  pkg = Rake::PackageTask.new(PROJ.name, PROJ.version) do |pkg|
-    pkg.need_tar = PROJ.gem.need_tar
-    pkg.need_zip = PROJ.gem.need_zip
-    pkg.package_files += PROJ.gem._spec.files
-  end
-  Rake::Task['gem:package'].instance_variable_set(:@full_comment, nil)
-
-  gem_file = if PROJ.gem._spec.platform == Gem::Platform::RUBY
-      "#{pkg.package_name}.gem"
-    else
-      "#{pkg.package_name}-#{PROJ.gem._spec.platform}.gem"
+  desc 'Write the gemspec '
+  task :spec => 'gem:prereqs' do
+    File.open("#{PROJ.name}.gemspec", 'w') do |f|
+      f.write PROJ.gem._spec.to_ruby
     end
-
-  desc "Build the gem file #{gem_file}"
-  task :package => ['gem:prereqs', "#{pkg.package_dir}/#{gem_file}"]
-
-  file "#{pkg.package_dir}/#{gem_file}" => [pkg.package_dir] + PROJ.gem._spec.files do
-    when_writing("Creating GEM") {
-      Gem::Builder.new(PROJ.gem._spec).build
-      verbose(true) {
-        mv gem_file, "#{pkg.package_dir}/#{gem_file}"
-      }
-    }
   end
 
   desc 'Install the gem'
@@ -113,14 +189,13 @@ namespace :gem do
   task :cleanup do
     sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
   end
-
 end  # namespace :gem
 
+
 desc 'Alias to gem:package'
 task :gem => 'gem:package'
 
 task :clobber => 'gem:clobber_package'
-
-remove_desc_for_task %w(gem:clobber_package)
+remove_desc_for_task 'gem:clobber_package'
 
 # EOF

data/tasks/git.rake

@@ -1,4 +1,3 @@
-# $Id: git.rake 59 2009-01-23 09:10:01Z dido $
 
 if HAVE_GIT
 

data/tasks/notes.rake

@@ -1,4 +1,3 @@
-# $Id: notes.rake 59 2009-01-23 09:10:01Z dido $
 
 if HAVE_BONES
 

data/tasks/post_load.rake

@@ -1,16 +1,16 @@
-# $Id: post_load.rake 59 2009-01-23 09:10:01Z dido $
 
 # This file does not define any rake tasks. It is used to load some project
 # settings if they are not defined by the user.
 
-PROJ.rdoc.exclude << "^#{Regexp.escape(PROJ.manifest_file)}$"
 PROJ.exclude << ["^#{Regexp.escape(PROJ.ann.file)}$",
+                 "^#{Regexp.escape(PROJ.ignore_file)}$",
                  "^#{Regexp.escape(PROJ.rdoc.dir)}/",
                  "^#{Regexp.escape(PROJ.rcov.dir)}/"]
 
 flatten_arrays = lambda do |this,os|
     os.instance_variable_get(:@table).each do |key,val|
-      next if key == :dependencies
+      next if key == :dependencies \
+           or key == :development_dependencies
       case val
       when Array; val.flatten!
       when OpenStruct; this.call(this,val)
@@ -25,12 +25,7 @@ PROJ.description ||= paragraphs_of(PROJ.readme_file, 'description').join("\n\n")
 
 PROJ.summary ||= PROJ.description.split('.').first
 
-PROJ.gem.files ||=
-  if test(?f, PROJ.manifest_file)
-    files = File.readlines(PROJ.manifest_file).map {|fn| fn.chomp.strip}
-    files.delete ''
-    files
-  else [] end
+PROJ.gem.files ||= manifest
 
 PROJ.gem.executables ||= PROJ.gem.files.find_all {|fn| fn =~ %r/^bin/}
 

data/tasks/rdoc.rake

@@ -1,4 +1,3 @@
-# $Id: rdoc.rake 59 2009-01-23 09:10:01Z dido $
 
 require 'rake/rdoctask'
 
@@ -20,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/rubyforge.rake

@@ -6,7 +6,7 @@ require 'rake/contrib/sshpublisher'
 
 namespace :gem do
   desc 'Package and upload to RubyForge'
-  task :release => [:clobber, 'gem:package'] do |t|
+  task :release => [:clobber, 'gem'] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
     pkg = "pkg/#{PROJ.gem._spec.full_name}"
@@ -26,9 +26,7 @@ namespace :gem do
     c['release_changes'] = PROJ.changes if PROJ.changes
     c['preformatted'] = true
 
-    files = [(PROJ.gem.need_tar ? "#{pkg}.tgz" : nil),
-             (PROJ.gem.need_zip ? "#{pkg}.zip" : nil),
-             "#{pkg}.gem"].compact
+    files = Dir.glob("#{pkg}*.*")
 
     puts "Releasing #{PROJ.name} v. #{PROJ.version}"
     rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files

data/tasks/setup.rb

@@ -1,12 +1,15 @@
-# $Id: setup.rb 59 2009-01-23 09:10:01Z dido $
 
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
+require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
+
+# TODO: make my own openstruct type object that includes descriptions
+# TODO: use the descriptions to output help on the available bones options
 
 PROJ = OpenStruct.new(
   # Project Defaults
@@ -25,8 +28,8 @@ PROJ = OpenStruct.new(
   :ruby_opts => %w(-w),
   :libs => [],
   :history_file => 'History.txt',
-  :manifest_file => 'Manifest.txt',
   :readme_file => 'README.txt',
+  :ignore_file => '.bnsignore',
 
   # Announce
   :ann => OpenStruct.new(
@@ -48,6 +51,7 @@ PROJ = OpenStruct.new(
   # Gem Packaging
   :gem => OpenStruct.new(
     :dependencies => [],
+    :development_dependencies => [],
     :executables => nil,
     :extensions => FileList['ext/**/extconf.rb'],
     :files => nil,
@@ -59,7 +63,7 @@ PROJ = OpenStruct.new(
   # File Annotations
   :notes => OpenStruct.new(
     :exclude => %w(^tasks/setup\.rb$),
-    :extensions => %w(.txt .rb .erb) << '',
+    :extensions => %w(.txt .rb .erb .rdoc) << '',
     :tags => %w(FIXME OPTIMIZE TODO)
   ),
 
@@ -74,7 +78,7 @@ PROJ = OpenStruct.new(
   # Rdoc
   :rdoc => OpenStruct.new(
     :opts => [],
-    :include => %w(^lib/ ^bin/ ^ext/ \.txt$),
+    :include => %w(^lib/ ^bin/ ^ext/ \.txt$ \.rdoc$),
     :exclude => %w(extconf\.rb$),
     :main => nil,
     :dir => 'doc',
@@ -110,17 +114,17 @@ PROJ = OpenStruct.new(
 )
 
 # Load the other rake files in the tasks folder
-rakefiles = Dir.glob('tasks/*.rake').sort
-rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
+tasks_dir = File.expand_path(File.dirname(__FILE__))
+post_load_fn = File.join(tasks_dir, 'post_load.rake')
+rakefiles = Dir.glob(File.join(tasks_dir, '*.rake')).sort
+rakefiles.unshift(rakefiles.delete(post_load_fn)).compact!
 import(*rakefiles)
 
 # Setup the project libraries
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -133,21 +137,15 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
 
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
 
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
   begin
@@ -162,6 +160,12 @@ HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
 HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
             system("git --version 2>&1 > #{DEV_NULL}"))
 
+# Add bones as a development dependency
+#
+if HAVE_BONES
+  PROJ.gem.development_dependencies << ['bones', ">= #{Bones::VERSION}"]
+end
+
 # Reads a file at +path+ and spits out an array of the +paragraphs+
 # specified.
 #
@@ -243,9 +247,29 @@ end
 # Scans the current working directory and creates a list of files that are
 # candidates to be in the manifest.
 #
-def manifest_files
+def manifest
   files = []
-  exclude = Regexp.new(PROJ.exclude.join('|'))
+  exclude = PROJ.exclude.dup
+  comment = %r/^\s*#/
+ 
+  # process the ignore file and add the items there to the exclude list
+  if test(?f, PROJ.ignore_file)
+    ary = []
+    File.readlines(PROJ.ignore_file).each do |line|
+      next if line =~ comment
+      line.chomp!
+      line.strip!
+      next if line.nil? or line.empty?
+
+      glob = line =~ %r/\*\./ ? File.join('**', line) : line
+      Dir.glob(glob).each {|fn| ary << "^#{Regexp.escape(fn)}"}
+    end
+    exclude.concat ary
+  end
+
+  # generate a regular expression from the exclude list
+  exclude = Regexp.new(exclude.join('|'))
+
   Find.find '.' do |path|
     path.sub! %r/^(\.\/|\/)/o, ''
     next unless test ?f, path

data/tasks/spec.rake

@@ -1,6 +1,5 @@
-# $Id: spec.rake 59 2009-01-23 09:10:01Z dido $
 
-if HAVE_SPEC_RAKE_SPECTASK
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
 require 'spec/rake/verify_rcov'
 
 namespace :spec do

data/tasks/svn.rake

@@ -1,4 +1,3 @@
-# $Id: svn.rake 59 2009-01-23 09:10:01Z dido $
 
 if HAVE_SVN
 

data/tasks/test.rake

@@ -1,5 +1,5 @@
-# $Id: test.rake 59 2009-01-23 09:10:01Z dido $
 
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
 require 'rake/testtask'
 
 namespace :test do
@@ -35,4 +35,6 @@ task :test => 'test:run'
 
 task :clobber => 'test:clobber_rcov' if HAVE_RCOV
 
+end
+
 # EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emdrb
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - dido@imperium.ph
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 +08:00
+date: 2009-03-18 00:00:00 +08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bones
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.4.2
+    version: 
 description: This is a distributed Ruby client and server which should work as a drop-in replacement for the standard distributed Ruby implementation available in the Ruby standard library.
 email: dido@imperium.ph
 executables: []
@@ -26,7 +45,6 @@ files:
 - COPYING
 - History.txt
 - LEGAL
-- Manifest.txt
 - README.txt
 - Rakefile
 - lib/emdrb.rb
@@ -42,7 +60,6 @@ files:
 - tasks/bones.rake
 - tasks/gem.rake
 - tasks/git.rake
-- tasks/manifest.rake
 - tasks/notes.rake
 - tasks/post_load.rake
 - tasks/rdoc.rake
@@ -74,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: emdrb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: This is a distributed Ruby client and server which should work as a drop-in replacement for the standard distributed Ruby implementation available in the Ruby standard library

data/Manifest.txt

@@ -1,28 +0,0 @@
-COPYING
-History.txt
-LEGAL
-Manifest.txt
-README.txt
-Rakefile
-lib/emdrb.rb
-lib/emdrb/emdrb.rb
-lib/emdrb/unix.rb
-lib/emdrb/version.rb
-spec/client_spec.rb
-spec/drbserver.rb
-spec/server_spec.rb
-spec/spec_common.rb
-spec/spec_helper.rb
-tasks/ann.rake
-tasks/bones.rake
-tasks/gem.rake
-tasks/git.rake
-tasks/manifest.rake
-tasks/notes.rake
-tasks/post_load.rake
-tasks/rdoc.rake
-tasks/rubyforge.rake
-tasks/setup.rb
-tasks/spec.rake
-tasks/svn.rake
-tasks/test.rake

data/tasks/manifest.rake

@@ -1,49 +0,0 @@
-# $Id: manifest.rake 59 2009-01-23 09:10:01Z dido $
-
-require 'find'
-
-namespace :manifest do
-
-  desc 'Verify the manifest'
-  task :check do
-    fn = PROJ.manifest_file + '.tmp'
-    files = manifest_files
-
-    File.open(fn, 'w') {|fp| fp.puts files}
-    lines = %x(#{DIFF} -du #{PROJ.manifest_file} #{fn}).split("\n")
-    if HAVE_FACETS_ANSICODE and ENV.has_key?('TERM')
-      lines.map! do |line|
-        case line
-        when %r/^(-{3}|\+{3})/; nil
-        when %r/^@/; Console::ANSICode.blue line
-        when %r/^\+/; Console::ANSICode.green line
-        when %r/^\-/; Console::ANSICode.red line
-        else line end
-      end
-    end
-    puts lines.compact
-    rm fn rescue nil
-  end
-
-  desc 'Create a new manifest'
-  task :create do
-    files = manifest_files
-    unless test(?f, PROJ.manifest_file)
-      files << PROJ.manifest_file
-      files.sort!
-    end
-    File.open(PROJ.manifest_file, 'w') {|fp| fp.puts files}
-  end
-
-  task :assert do
-    files = manifest_files
-    manifest = File.read(PROJ.manifest_file).split($/)
-    raise "ERROR: #{PROJ.manifest_file} is out of date" unless files == manifest
-  end
-
-end  # namespace :manifest
-
-desc 'Alias to manifest:check'
-task :manifest => 'manifest:check'
-
-# EOF