comp_tree 0.5.0 → 0.5.1

data/Rakefile

@@ -2,7 +2,6 @@ $LOAD_PATH.unshift "contrib/quix/lib"
 
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
-require 'quix/subpackager'
 
 $VERBOSE = nil
 require 'rdoc/rdoc'
@@ -11,12 +10,8 @@ $VERBOSE = true
 require 'fileutils'
 include FileUtils
 
-gemspec = eval(File.read("comp_tree.gemspec"))
-package_name = gemspec.name 
-package_name_in_ruby = "CompTree"
-
-# I would prefer "doc", but "html" is hard-coded for rubyforgepublisher
-doc_dir = "html"
+GEMSPEC = eval(File.read("comp_tree.gemspec"))
+DOC_DIR = "html"
 
 ######################################################################
 # clean
@@ -25,7 +20,7 @@ task :clean => [:clobber, :clean_doc] do
 end
 
 task :clean_doc do
-  rm_rf(doc_dir)
+  rm_rf(DOC_DIR)
 end
 
 ######################################################################
@@ -40,7 +35,7 @@ end
 
 task :package => :clean
 
-Rake::GemPackageTask.new(gemspec) { |t|
+Rake::GemPackageTask.new(GEMSPEC) { |t|
   t.need_tar = true
 }
 
@@ -53,39 +48,14 @@ task :doc => :clean_doc do
   }
 
   options = [
-    "-o", doc_dir,
-    "--title", "comp_tree: #{gemspec.summary}",
+    "-o", DOC_DIR,
+    "--title", "comp_tree: #{GEMSPEC.summary}",
     "--main", "README"
   ]
 
   RDoc::RDoc.new.document(files + options)
 end
 
-######################################################################
-# repackage files from contrib/
-
-task :generate_rb do
-  packages = {
-    :comp_tree => {
-      :name_in_ruby => "CompTree",
-      :lib_dir => "./lib",
-      :subpackages => {
-        :quix => {
-          :name_in_ruby => "Quix",
-          :sources => [
-            "diagnostic",
-            "kernel",
-            "builtin/kernel/tap",
-          ],
-          :lib_dir => "./contrib/quix/lib",
-          :ignore_root_rb => true,
-        },
-      },
-    },
-  }
-  Quix::Subpackager.run(packages)
-end
-
 ######################################################################
 # git
 
@@ -110,7 +80,7 @@ task :run_pull_contrib do
   git(*%w!pull --no-commit -s subtree quix master!)
 end
 
-task :pull_contrib => [ :init_contrib, :run_pull_contrib, :generate_rb ]
+task :pull_contrib => [ :init_contrib, :run_pull_contrib ]
 
 ######################################################################
 # publisher
@@ -123,24 +93,42 @@ end
 # release
 
 task :prerelease => :clean do
-  rm_rf(doc_dir)
+  rm_rf(DOC_DIR)
   rm_rf("pkg")
   unless `git status` =~ %r!nothing to commit \(working directory clean\)!
     raise "Directory not clean"
   end
+  unless `ping -c2 github.com` =~ %r!0% packet loss!i
+    raise "No ping for github.com"
+  end
+end
+
+def rubyforge(command, file)
+  sh("rubyforge",
+     command,
+     GEMSPEC.rubyforge_project,
+     GEMSPEC.rubyforge_project,
+     GEMSPEC.version.to_s,
+     file)
 end
 
 task :finish_release do
-  %w(gem tgz).each_with_index { |ext, index|
-    sh("rubyforge",
-       (index == 0 ? "add_release" : "add_file"), 
-       gemspec.rubyforge_project,
-       gemspec.rubyforge_project,
-       gemspec.version.to_s,
-       "pkg/#{gemspec.name}-#{gemspec.version}.#{ext}")
+  gem, tgz = %w(gem tgz).map { |ext|
+    "pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.#{ext}"
+  }
+  gem_md5, tgz_md5 = [gem, tgz].map { |file|
+    "#{file}.md5".tap { |md5|
+      sh("md5sum #{file} > #{md5}")
+    }
   }
-  git("tag", gemspec.version.to_s)
-  git("push")
+
+  rubyforge("add_release", gem)
+  rubyforge("add_file", gem_md5)
+  rubyforge("add_file", tgz)
+  rubyforge("add_file", tgz_md5)
+
+  git("tag", "comp_tree-" + GEMSPEC.version.to_s)
+  git(*%w(push --tags origin master))
 end
 
 task :release =>

data/comp_tree.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new { |t|
   t.name = "comp_tree"
   t.rubyforge_project = "comptree"
   t.homepage = "comptree.rubyforge.org"
-  t.version = "0.5.0"
+  t.version = "0.5.1"
   t.description = "Build a computation tree and execute it with N " +
     "parallel threads.  Optionally fork computation nodes into new processes."
 

data/contrib/quix/lib/quix/diagnostic.rb

@@ -1,7 +1,7 @@
 
-require 'quix/builtin/kernel/tap'
+require 'comp_tree/tap'
 
-module Quix
+module CompTree
   module Diagnostic
     def show(desc = nil, stream = STDOUT, &block)
       if desc

data/contrib/quix/lib/quix/kernel.rb

@@ -1,8 +1,8 @@
 
 require 'thread'
 
-module Quix
-  module Kernel
+module CompTree
+  module Misc
     def let
       yield self
     end
@@ -23,7 +23,7 @@ module Quix
             @count += 1
           }
         }
-        "#{prefix || :G}_#{count}_#{rand}".to_sym
+        "#{prefix || :G}_#{count}".to_sym
       end
     end
     include Gensym

data/lib/comp_tree/algorithm.rb

@@ -1,10 +1,10 @@
 
-require 'comp_tree/quix/diagnostic'
+require 'comp_tree/diagnostic'
 require 'comp_tree/retriable_fork'
 
 module CompTree
   module Algorithm
-    include Quix::Diagnostic
+    include Diagnostic
 
     def compute_multithreaded(root, num_threads, use_fork, buckets)
       trace "Computing #{root.name} with #{num_threads} threads"

data/lib/comp_tree/bucket_ipc.rb

@@ -3,13 +3,13 @@ require 'drb'
 require 'thread'
 
 require 'comp_tree/retriable_fork'
-require 'comp_tree/quix/diagnostic'
-require 'comp_tree/quix/builtin/kernel/tap'
+require 'comp_tree/diagnostic'
+require 'comp_tree/tap'
 
 module CompTree
   module BucketIPC
     class Bucket
-      include Quix::Diagnostic
+      include Diagnostic
       include RetriableFork
 
       def initialize(address, timeout, wait_interval)

data/lib/comp_tree/{quix/diagnostic.rb → diagnostic.rb}

@@ -1,19 +1,7 @@
 
+require 'comp_tree/tap'
 
-
-######################################################
-# 
-# **** DO NOT EDIT ****
-# 
-# **** THIS IS A GENERATED FILE *****
-# 
-######################################################
-
-
-
-require 'comp_tree/quix/builtin/kernel/tap'
-
-module CompTree::Quix
+module CompTree
   module Diagnostic
     def show(desc = nil, stream = STDOUT, &block)
       if desc
@@ -54,15 +42,3 @@ module CompTree::Quix
   end
 end
 
-
-
-
-######################################################
-# 
-# **** DO NOT EDIT ****
-# 
-# **** THIS IS A GENERATED FILE *****
-# 
-######################################################
-
-

data/lib/comp_tree/driver.rb

@@ -1,7 +1,7 @@
 
 require 'comp_tree/bucket_ipc'
-require 'comp_tree/quix/diagnostic'
-require 'comp_tree/quix/kernel'
+require 'comp_tree/diagnostic'
+require 'comp_tree/misc'
 require 'comp_tree/algorithm'
 require 'comp_tree/node'
 require 'comp_tree/task_node'
@@ -22,8 +22,8 @@ module CompTree
       :wait_interval => 0.02,
     }
 
-    include Quix::Diagnostic #:nodoc:
-    include Quix::Kernel #:nodoc:
+    include Diagnostic
+    include Misc
     
     #
     # Begin a new computation tree.

data/lib/comp_tree/{quix/kernel.rb → misc.rb}

@@ -1,20 +1,8 @@
 
-
-
-######################################################
-# 
-# **** DO NOT EDIT ****
-# 
-# **** THIS IS A GENERATED FILE *****
-# 
-######################################################
-
-
-
 require 'thread'
 
-module CompTree::Quix
-  module Kernel
+module CompTree
+  module Misc
     def let
       yield self
     end
@@ -35,7 +23,7 @@ module CompTree::Quix
             @count += 1
           }
         }
-        "#{prefix || :G}_#{count}_#{rand}".to_sym
+        "#{prefix || :G}_#{count}".to_sym
       end
     end
     include Gensym
@@ -71,15 +59,3 @@ module CompTree::Quix
     extend self
   end
 end
-
-
-
-######################################################
-# 
-# **** DO NOT EDIT ****
-# 
-# **** THIS IS A GENERATED FILE *****
-# 
-######################################################
-
-

data/lib/comp_tree/node.rb

@@ -1,5 +1,5 @@
 
-require 'comp_tree/quix/diagnostic'
+require 'comp_tree/diagnostic'
 require 'thread'
 
 module CompTree
@@ -7,7 +7,7 @@ module CompTree
   # Base class for nodes in the computation tree.
   # 
   class Node
-    include Quix::Diagnostic #:nodoc:
+    include Diagnostic
 
     attr_reader :name                   #:nodoc:
 

data/lib/comp_tree/tap.rb

@@ -0,0 +1,9 @@
+
+unless respond_to? :tap
+  module Kernel
+    def tap
+      yield self
+      self
+    end
+  end
+end

data/test/test_comp_tree.rb

@@ -14,7 +14,7 @@ module CompTree
   DO_FORK = (HAVE_FORK and not ARGV.include?("--no-fork"))
 
   module TestCommon
-    include Quix::Diagnostic
+    include Diagnostic
 
     if  ARGV.include?("--bench")
       def separator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: comp_tree
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 -04:00
+date: 2008-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -53,13 +53,13 @@ files:
 - ./install.rb
 - ./lib/comp_tree/algorithm.rb
 - ./lib/comp_tree/bucket_ipc.rb
+- ./lib/comp_tree/diagnostic.rb
 - ./lib/comp_tree/driver.rb
 - ./lib/comp_tree/error.rb
+- ./lib/comp_tree/misc.rb
 - ./lib/comp_tree/node.rb
-- ./lib/comp_tree/quix/builtin/kernel/tap.rb
-- ./lib/comp_tree/quix/diagnostic.rb
-- ./lib/comp_tree/quix/kernel.rb
 - ./lib/comp_tree/retriable_fork.rb
+- ./lib/comp_tree/tap.rb
 - ./lib/comp_tree/task_node.rb
 - ./lib/comp_tree.rb
 - ./test/all.rb

data/lib/comp_tree/quix/builtin/kernel/tap.rb

@@ -1,33 +0,0 @@
-
-
-
-######################################################
-# 
-# **** DO NOT EDIT ****
-# 
-# **** THIS IS A GENERATED FILE *****
-# 
-######################################################
-
-
-
-unless respond_to? :tap
-  module Kernel
-    def tap
-      yield self
-      self
-    end
-  end
-end
-
-
-
-######################################################
-# 
-# **** DO NOT EDIT ****
-# 
-# **** THIS IS A GENERATED FILE *****
-# 
-######################################################
-
-