comp_tree 1.1.2 → 1.1.3

data/CHANGES.rdoc

@@ -1,6 +1,10 @@
 
 = comp_tree Changes
 
+== Version 1.1.3
+
+* update build tools
+
 == Version 1.1.2
 
 * optimizations

data/Rakefile

@@ -5,7 +5,7 @@ require 'levitate'
 Levitate.new "comp_tree" do |s|
   s.developers << ["James M. Lawrence", "quixoticsycophant@gmail.com"]
   s.rubyforge_info = ["quix", "comptree"]
-  s.github_user = "quix"
+  s.username = "quix"
   s.rdoc_files = %w[
     lib/comp_tree.rb
     lib/comp_tree/driver.rb

data/devel/levitate.rb

@@ -1,276 +1,33 @@
 
 class Levitate
-  class Installer
-    def initialize
-      require 'fileutils'
-      require 'rbconfig'
-      require 'find'
-      dest_root = RbConfig::CONFIG["sitelibdir"]
-      sources = []
-      Find.find("./lib") { |source|
-        if install_file?(source)
-          sources << source
-        end
-      }
-      @spec = sources.inject(Array.new) { |acc, source|
-        if source == "./lib"
-          acc
-        else
-          dest = File.join(dest_root, source.sub(%r!\A\./lib!, ""))
-  
-          install = lambda {
-            if File.directory?(source)
-              unless File.directory?(dest)
-                puts "mkdir #{dest}"
-                FileUtils.mkdir(dest)
-              end
-            else
-              puts "install #{source} --> #{dest}"
-              FileUtils.install(source, dest)
-            end
-          }
-            
-          uninstall = lambda {
-            if File.directory?(source)
-              if File.directory?(dest)
-                puts "rmdir #{dest}"
-                FileUtils.rmdir(dest)
-              end
-            else
-              if File.file?(dest)
-                puts "rm #{dest}"
-                FileUtils.rm(dest)
-              end
-            end
-          }
-  
-          acc << {
-            :source => source,
-            :dest => dest,
-            :install => install,
-            :uninstall => uninstall,
-          }
-        end
-      }
-    end
-  
-    def install_file?(source)
-      File.directory?(source) or
-      (File.file?(source) and File.extname(source) == ".rb")
-    end
-
-    def install
-      @spec.each { |entry|
-        entry[:install].call
-      }
-    end
-  
-    def uninstall
-      @spec.reverse.each { |entry|
-        entry[:uninstall].call
-      }
-    end
-
-    def run(args = ARGV)
-      if args.empty?
-        install
-      elsif args.size == 1 and args.first == "--uninstall"
-        uninstall
-      else
-        raise "unrecognized arguments: #{args.inspect}"
-      end
-    end
-  end
-
-  module AttrLazy
-    def attr_lazy(name, &block)
-      AttrLazy.define_reader(class << self ; self ; end, name, &block)
-    end
-
-    def attr_lazy_accessor(name, &block)
-      attr_lazy(name, &block)
-      AttrLazy.define_writer(class << self ; self ; end, name, &block)
-    end
-
-    class << self
-      def included(mod)
-        (class << mod ; self ; end).class_eval do
-          def attr_lazy(name, &block)
-            AttrLazy.define_reader(self, name, &block)
-          end
-
-          def attr_lazy_accessor(name, &block)
-            attr_lazy(name, &block)
-            AttrLazy.define_writer(self, name, &block)
-          end
-        end
-      end
+  def initialize(gem_name)
+    @gem_name = gem_name
 
-      def define_evaluated_reader(instance, name, value)
-        (class << instance ; self ; end).class_eval do
-          remove_method name rescue nil
-          define_method name do
-            value
-          end
-        end
-      end
+    $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
-      def define_reader(klass, name, &block)
-        klass.class_eval do
-          remove_method name rescue nil
-          define_method name do
-            value = instance_eval(&block)
-            AttrLazy.define_evaluated_reader(self, name, value)
-            value
-          end
-        end
-      end
+    yield self
 
-      def define_writer(klass, name, &block)
-        klass.class_eval do
-          writer = "#{name}="
-          remove_method writer rescue nil
-          define_method writer do |value|
-            AttrLazy.define_evaluated_reader(self, name, value)
-            value
-          end
-        end
+    self.class.instance_methods(false).sort.each do |name|
+      if name.to_s =~ %r!\Adefine_!
+        send(name)
       end
     end
   end
 
-  module Ruby
-    module_function
-
-    def executable
-      require 'rbconfig'
-
-      name = File.join(
-        RbConfig::CONFIG["bindir"],
-        RbConfig::CONFIG["RUBY_INSTALL_NAME"]
-      )
+  attr_reader :gem_name
 
-      if RbConfig::CONFIG["host"] =~ %r!(mswin|cygwin|mingw)! and
-          File.basename(name) !~ %r!\.(exe|com|bat|cmd)\Z!i
-        name + RbConfig::CONFIG["EXEEXT"]
+  def self.attribute(name, &block)
+    var = :"@#{name}"
+    define_method name do
+      if instance_variable_defined?(var)
+        instance_variable_get(var)
       else
-        name
+        instance_variable_set(var, instance_eval(&block))
       end
     end
-
-    def run(*args)
-      cmd = [executable, *args]
-      unless system(*cmd)
-        cmd_str = cmd.map { |t| "'#{t}'" }.join(", ")
-        raise "system(#{cmd_str}) failed with status #{$?.exitstatus}"
-      end
-    end
-
-    def run_code_and_capture(code)
-      IO.popen(%{"#{executable}"}, "r+") { |pipe|
-        pipe.print(code)
-        pipe.flush
-        pipe.close_write
-        pipe.read
-      }
-    end
-
-    def run_file_and_capture(file)
-      unless File.file? file
-        raise "file does not exist: `#{file}'"
-      end
-      IO.popen(%{"#{executable}" "#{file}"}, "r") { |pipe|
-        pipe.read
-      }
-    end
-      
-    def with_warnings(value = true)
-      previous = $VERBOSE
-      $VERBOSE = value
-      begin
-        yield
-      ensure
-        $VERBOSE = previous
-      end
-    end
-      
-    def no_warnings(&block)
-      with_warnings(nil, &block)
-    end
+    attr_writer name
   end
 
-  module Util
-    module_function
-
-    def run_ruby_on_each(*files)
-      files.each { |file|
-        Ruby.run("-w", file)
-      }
-    end
-
-    def to_camel_case(str)
-      str.split('_').map { |t| t.capitalize }.join
-    end
-
-    def write_file(file)
-      contents = yield
-      File.open(file, "wb") { |out|
-        out.print(contents)
-      }
-      contents
-    end
-  end
-
-  module InstanceEvalWithArgs
-    module_function
-
-    def with_temp_method(instance, method_name, method_block)
-      (class << instance ; self ; end).class_eval do
-        define_method(method_name, &method_block)
-        begin
-          yield method_name
-        ensure
-          remove_method(method_name)
-        end
-      end
-    end
-
-    def call_temp_method(instance, method_name, *args, &method_block)
-      with_temp_method(instance, method_name, method_block) {
-        instance.send(method_name, *args)
-      }
-    end
-
-    def instance_eval_with_args(instance, *args, &block)
-      call_temp_method(instance, :__temp_method, *args, &block)
-    end
-  end
-
-  include AttrLazy
-  include Util
-
-  def initialize(gem_name)
-    $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-    require 'rubygems/package_task'
-
-    @gem_name = gem_name
-
-    yield self
-
-    self.class.instance_methods(false).select { |t|
-      t.to_s =~ %r!\Adefine_!
-    }.sort.each { |method_name|
-      send(method_name)
-    }
-  end
-
-  class << self
-    alias_method :attribute, :attr_lazy_accessor
-  end
-
-  attr_reader :gem_name
-
   attribute :version_constant_name do
     "VERSION"
   end
@@ -296,6 +53,10 @@ class Levitate
       mod.const_get(version_constant_name)
     end or "0.0.0"
   end
+
+  attribute :required_ruby_version do
+    ">= 0"
+  end
   
   attribute :readme_file do
     "README.rdoc"
@@ -329,16 +90,10 @@ class Levitate
     "spec.html"
   end
 
-  attr_lazy :spec_output do
+  attribute :spec_output do
     "#{spec_output_dir}/#{spec_output_file}"
   end
 
-  [:gem, :tgz].each { |ext|
-    attribute ext do
-      "pkg/#{gem_name}-#{version}.#{ext}"
-    end
-  }
-
   attribute :rcov_options do
     # workaround for the default rspec task
     Dir["*"].select { |f| File.directory? f }.inject(Array.new) { |acc, dir|
@@ -350,30 +105,18 @@ class Levitate
     } + ["--text-report"]
   end
 
-  attribute :readme_file do
-    "README.rdoc"
-  end
-    
-  attribute :manifest_file do
-    "MANIFEST"
-  end
-
   attribute :generated_files do
     []
   end
 
-  attribute :files do
-    if File.file? manifest_file
-      File.read(manifest_file).split("\n")
-    elsif source_control?
-      IO.popen("git ls-files") { |pipe| pipe.read.split "\n" }
-    end.to_a + [manifest_file] + generated_files
+  attribute :extra_gemspec do
+    lambda { |spec| }
   end
 
-  def files_in_require_paths
-    require_paths.inject([]) { |acc, dir|
-      acc + Dir.glob("#{dir}/**/*.rb")
-    }
+  attribute :files do
+    if source_control?
+      IO.popen("git ls-files") { |pipe| pipe.read.split "\n" }
+    end.to_a + generated_files
   end
 
   attribute :rdoc_files do
@@ -381,7 +124,7 @@ class Levitate
   end
     
   attribute :rdoc_title do
-    "#{gem_name}: #{summary}"
+    "#{gem_name}: #{summary}".sub(/\.\Z/, "")
   end
 
   attribute :require_paths do
@@ -417,8 +160,6 @@ class Levitate
   attribute :gemspec do
     Gem::Specification.new do |g|
       %w[
-        authors
-        email
         summary
         version
         description
@@ -426,11 +167,11 @@ class Levitate
         rdoc_options
         extra_rdoc_files
         require_paths
+        required_ruby_version
       ].each do |param|
         t = send(param) and g.send("#{param}=", t)
       end
       g.name = gem_name
-      g.has_rdoc = true
       g.homepage = url if url
       dependencies.each { |dep|
         g.add_dependency(*dep)
@@ -438,6 +179,9 @@ class Levitate
       development_dependencies.each { |dep|
         g.add_development_dependency(*dep)
       }
+      g.authors = developers.map { |d| d[0] }
+      g.email =   developers.map { |d| d[1] }
+      extra_gemspec.call(g)
     end
   end
 
@@ -490,25 +234,17 @@ class Levitate
   }
 
   attribute :url do
-    "http://#{github_user}.github.com/#{gem_name}"
+    "http://#{username}.github.com/#{gem_name}"
   end
 
-  attribute :github_user do
-    raise "github_user not set"
+  attribute :username do
+    raise "username not set"
   end
 
   attribute :rubyforge_info do
     nil
   end
 
-  attribute :authors do
-    developers.map { |d| d[0] }
-  end
-
-  attribute :email do
-    developers.map { |d| d[1] }
-  end
-
   attribute :dependencies do
     []
   end
@@ -521,6 +257,18 @@ class Levitate
     []
   end
 
+  attribute :remote_levitate do
+    url = ENV["LEVITATE"] ||
+      "https://github.com/quix/levitate/raw/master/levitate.rb"
+    IO.popen("curl -s #{url}") { |f| f.read }
+  end
+
+  attribute :local_levitate do
+    File.open(__FILE__, "rb") { |f| f.read }
+  end
+
+  #### tasks
+
   def define_clean
     require 'rake/clean'
     task :clean do 
@@ -530,10 +278,8 @@ class Levitate
 
   def define_package
     if source_control?
-      task manifest_file do
-        create_manifest
-      end
-      CLEAN.add manifest_file
+      require 'rubygems/package_task'
+
       task :package => :clean
       Gem::PackageTask.new(gemspec).define
     end
@@ -541,7 +287,7 @@ class Levitate
 
   def define_spec
     unless spec_files.empty?
-      Ruby.no_warnings {
+      no_warnings {
         require 'spec/rake/spectask'
       }
       
@@ -573,7 +319,7 @@ class Levitate
 
       desc "run specs individually"
       task :spec_deps do
-        run_ruby_on_each(*spec_files)
+        run_each_file(*spec_files)
       end
 
       task :prerelease => [:spec, :spec_deps]
@@ -629,7 +375,7 @@ class Levitate
       
       desc "run tests individually"
       task :test_deps do
-        run_ruby_on_each(*test_files)
+        run_each_file(*test_files)
       end
       
       task :prerelease => [:test, :test_deps]
@@ -642,7 +388,7 @@ class Levitate
   def define_doc
     desc "run rdoc"
     task :doc => :clean_doc do
-      Kernel.send :gem, 'rdoc' rescue nil
+      gem 'rdoc' rescue nil
       require 'rdoc/rdoc'
       args = (
         gemspec.rdoc_options +
@@ -671,6 +417,7 @@ class Levitate
     if source_control?
       desc "publish docs"
       task :publish => [:clean, :check_directory, :doc] do
+        current_branch = `git branch`[/^\* (\S+)$/, 1] or raise "??? branch"
         if rubyforge_info
           user, project = rubyforge_info
           Dir.chdir(doc_dir) do
@@ -689,6 +436,7 @@ class Levitate
         FileUtils.rmdir "doc"
         git "add", "."
         git "commit", "-m", "generated by rdoc"
+        git "checkout", current_branch
         git "push", "-f", "origin", "gh-pages"
       end
     end
@@ -697,12 +445,12 @@ class Levitate
   def define_install
     desc "direct install (no gem)"
     task :install do
-      Installer.new.run([])
+      Installer.new.install
     end
 
     desc "direct uninstall (no gem)"
     task :uninstall do
-      Installer.new.run(["--uninstall"])
+      Installer.new.uninstall
     end
   end
   
@@ -717,7 +465,10 @@ class Levitate
   def define_ping
     task :ping do
       require 'rbconfig'
-      %w[github.com].each { |server|
+      [
+       "github.com",
+       ("rubyforge.org" if rubyforge_info),
+      ].compact.each do |server|
         cmd = "ping " + (
           if RbConfig::CONFIG["host"] =~ %r!darwin!
             "-c2 #{server}"
@@ -728,23 +479,26 @@ class Levitate
         unless `#{cmd}` =~ %r!0% packet loss!
           raise "No ping for #{server}"
         end
-      }
+      end
+    end
+  end
+
+  def define_check_levitate
+    task :check_levitate do
+      unless local_levitate == remote_levitate
+        raise "levitate is out of date"
+      end
     end
   end
 
   def define_update_levitate
-    url = ENV["LEVITATE"] ||
-      "https://github.com/quix/levitate/raw/master/levitate.rb"
     task :update_levitate do
-      if system "curl", "-s", "-o", __FILE__, url
-        if `git diff #{__FILE__}` == ""
-          puts "Already up-to-date."
-        else
-          git "commit", __FILE__, "-m", "updated levitate"
-          puts "Updated levitate."
-        end
+      if local_levitate == remote_levitate
+        puts "Already up-to-date."
       else
-        raise "levitate download failed"
+        File.open(__FILE__, "w") { |f| f.print(remote_levitate) }
+        git "commit", __FILE__, "-m", "update levitate"
+        puts "Updated levitate."
       end
     end
   end
@@ -769,30 +523,22 @@ class Levitate
     end
   end
 
-  def last_release
-    `git tag`.lines.select { |t| t.index(gem_name) == 0 }.last.chomp
-  end
-
-  def git(*args)
-    sh "git", *args
-  end
-
-  def create_manifest
-    write_file(manifest_file) {
-      files.sort.join("\n")
-    }
-  end
-
   def define_release
-    task :prerelease => [:clean, :check_directory, :ping, history_file]
+    task :prerelease => [
+      :clean,
+      :check_directory,
+      :check_levitate,
+      :ping,
+      history_file
+    ]
 
     task :finish_release do
       git "tag", "#{gem_name}-" + version.to_s
       git "push", "--tags", "origin", "master"
-      sh "gem", "push", gem
+      sh "gem", "push", "pkg/#{gem_name}-#{version}.gem"
     end
 
-    task :release => [:prerelease, :package, :finish_release]
+    task :release => [:prerelease, :package, :finish_release, :publish]
   end
 
   def define_debug_gem
@@ -800,7 +546,23 @@ class Levitate
       puts gemspec.to_ruby
     end
   end
-  
+
+  #### helpers
+
+  def files_in_require_paths
+    require_paths.inject([]) { |acc, dir|
+      acc + Dir.glob("#{dir}/**/*.rb")
+    }
+  end
+
+  def last_release
+    `git tag`.lines.select { |t| t.index(gem_name) == 0 }.last.chomp
+  end
+
+  def git(*args)
+    sh "git", *args
+  end
+
   def open_browser(*files)
     sh(*([browser].flatten + files))
   end
@@ -809,7 +571,7 @@ class Levitate
     task_names.each { |task_name|
       Rake::Task[task_name].actions.map! { |action|
         lambda { |*args|
-          Ruby.no_warnings {
+          no_warnings {
             action.call(*args)
           }
         }
@@ -825,11 +587,110 @@ class Levitate
     File.directory? ".git"
   end
 
-  class << self
-    include Util
-    include InstanceEvalWithArgs
+  #### utility for instance and class
 
-    # From minitest, part of the Ruby source; by Ryan Davis.
+  module Util
+    def ruby_bin
+      require 'rbconfig'
+
+      name = File.join(
+        RbConfig::CONFIG["bindir"],
+        RbConfig::CONFIG["RUBY_INSTALL_NAME"]
+      )
+
+      if RbConfig::CONFIG["host"] =~ %r!(mswin|cygwin|mingw)! and
+          File.basename(name) !~ %r!\.(exe|com|bat|cmd)\Z!i
+        name + RbConfig::CONFIG["EXEEXT"]
+      else
+        name
+      end
+    end
+
+    def ruby_command
+      [ruby_bin] + Levitate.ruby_opts.to_a
+    end
+
+    def ruby_command_string
+      ruby_command.join(" ")
+    end
+
+    def run(*args)
+      cmd = ruby_command + args
+      unless system(*cmd)
+        cmd_str = cmd.map { |t| "'#{t}'" }.join(", ")
+        raise "system(#{cmd_str}) failed with status #{$?.exitstatus}"
+      end
+    end
+
+    def run_each_file(*files)
+      files.each { |file|
+        run("-w", file)
+      }
+    end
+
+    def run_code_and_capture(code)
+      IO.popen(ruby_command_string, "r+") { |pipe|
+        pipe.print(code)
+        pipe.flush
+        pipe.close_write
+        pipe.read
+      }
+    end
+
+    def run_file_and_capture(file)
+      unless File.file? file
+        raise "file does not exist: `#{file}'"
+      end
+      IO.popen(ruby_command_string + " " + file, "r") { |pipe|
+        pipe.read
+      }
+    end
+      
+    def with_warnings(value = true)
+      previous = $VERBOSE
+      $VERBOSE = value
+      begin
+        yield
+      ensure
+        $VERBOSE = previous
+      end
+    end
+      
+    def no_warnings(&block)
+      with_warnings(nil, &block)
+    end
+
+    def to_camel_case(str)
+      str.split('_').map { |t| t.capitalize }.join
+    end
+
+    def write_file(file)
+      contents = yield
+      File.open(file, "wb") { |out|
+        out.print(contents)
+      }
+      contents
+    end
+
+    def instance_exec2(obj, *args, &block)
+      method_name = ["_", obj.object_id, "_", Thread.current.object_id].join
+      (class << obj ; self ; end).class_eval do
+        define_method method_name, &block
+        begin
+          obj.send(method_name, *args)
+        ensure
+          remove_method method_name
+        end
+      end
+    end
+  end
+  extend Util
+  include Util
+
+  #### public helpers for testing
+
+  class << self
+    # From 'minitest' by Ryan Davis.
     def capture_io
       require 'stringio'
 
@@ -864,10 +725,10 @@ class Levitate
       Tempfile.open("run-rdoc-code") { |temp_file|
         temp_file.print(final_code)
         temp_file.close
-        actual = Ruby.run_file_and_capture(temp_file.path).chomp
+        actual = run_file_and_capture(temp_file.path).chomp
       }
 
-      instance_eval_with_args(instance, expected, actual, index, &block)
+      instance_exec2(instance, expected, actual, index, &block)
     end
 
     def run_doc_section(file, section, instance, &block)
@@ -887,6 +748,7 @@ class Levitate
               raise "parse error"
             end
           )
+          code.gsub!(/^\s*%.*$/, "") # ignore shell command examples
           run_doc_code(code, expected, index, instance, &block)
           index += 1
         }
@@ -933,5 +795,57 @@ class Levitate
       end
       Object.const_set("Test#{file}".gsub(".", ""), klass)
     end
+
+    def ruby_opts
+      @ruby_opts ||= []
+    end
+    attr_writer :ruby_opts
+  end
+
+  #### raw install, bypass gems
+
+  class Installer
+    def initialize
+      require 'fileutils'
+      require 'rbconfig'
+      require 'find'
+
+      @fu = FileUtils::Verbose
+      @spec = []
+
+      rb_root = RbConfig::CONFIG["sitelibdir"]
+
+      Find.find "lib" do |source|
+        next if source == "lib"
+        next unless File.directory?(source) || File.extname(source) == ".rb"
+        dest = File.join(rb_root, source.sub(%r!\Alib/!, ""))
+        @spec << [source, dest]
+      end
+    end
+
+    def install
+      @spec.each do |source, dest|
+        if File.directory?(source)
+          @fu.mkdir(dest) unless File.directory?(dest)
+        else
+          @fu.install(source, dest)
+        end
+      end
+    end
+  
+    def uninstall
+      @spec.reverse.each do |source, dest|
+        if File.directory?(source)
+          @fu.rmdir(dest) if File.directory?(dest)
+        else
+          @fu.rm(dest) if File.file?(dest)
+        end
+      end
+    end
   end
 end
+
+lambda do
+  config = File.join(File.dirname(__FILE__), "levitate_config.rb")
+  require config if File.file? config
+end.call

data/lib/comp_tree/version.rb

@@ -1,3 +1,3 @@
 module CompTree
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: comp_tree
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
-default_executable: 
+date: 2011-05-18 00:00:00 Z
 dependencies: []
 
 description: CompTree is a parallel computation tree structure based upon concepts from pure functional programming.
@@ -48,8 +47,6 @@ files:
 - test/readme_test.rb
 - test/sequential_test.rb
 - test/throw_test.rb
-- MANIFEST
-has_rdoc: true
 homepage: http://quix.github.com/comp_tree
 licenses: []
 
@@ -58,7 +55,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- "comp_tree: A simple framework for automatic parallelism."
+- "comp_tree: A simple framework for automatic parallelism"
 - --exclude
 - lib/comp_tree/algorithm.rb
 - --exclude
@@ -88,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A simple framework for automatic parallelism.

data/MANIFEST

@@ -1,24 +0,0 @@
-CHANGES.rdoc
-MANIFEST
-README.rdoc
-Rakefile
-devel/levitate.rb
-lib/comp_tree.rb
-lib/comp_tree/algorithm.rb
-lib/comp_tree/driver.rb
-lib/comp_tree/error.rb
-lib/comp_tree/node.rb
-lib/comp_tree/queue/queue.rb
-lib/comp_tree/queue/queue_18.rb
-lib/comp_tree/queue/queue_19.rb
-lib/comp_tree/version.rb
-test/basic_test.rb
-test/circular_test.rb
-test/comp_tree_test_base.rb
-test/drain_test.rb
-test/exception_test.rb
-test/flood_test.rb
-test/grind_test.rb
-test/readme_test.rb
-test/sequential_test.rb
-test/throw_test.rb