reap 6.0.0 → 6.0.1

data/forge/unit_runner/commentrunner.rb

@@ -0,0 +1,62 @@
+require 'nano/string/pull'
+
+module Test
+  module Unit
+    class CommentAutoRunner < AutoRunner
+      def self.run(current_file=nil, default_dir=nil, argv=ARGV, &block)
+        if(!current_file || current_file == $0)
+          r = new(!current_file, &block)
+          if !r.process_args(argv) && default_dir
+            r.to_run << default_dir
+          end
+          r.run
+        end
+      end
+
+      def load_commented_tests( filepath )
+        rbfile = File.read( filepath )
+        rblines = rbfile.split("\n")
+
+        tests = []
+        intest = nil
+        comment = nil
+        hcomment = nil
+
+        rblines.each_with_index do |l,i|
+          if /^(\ *#\ *)?=\ *begin testing/ =~ l
+            intest = true
+            comment = true unless $1
+            next
+          elsif intest and /^(\ *#\ *)?=\ *end/ =~ l
+            intest = false
+            comment = false
+            next
+          end
+          hcomment = true if /^\ *#/ =~ l
+
+          if intest and (comment or hcomment)
+            l.pull if hcomment
+            tests << l
+          end
+        end
+
+        tests = tests.join("\n")
+        tests.gsub!( %r{^([ ]*)testcase[ ]+(\w+)} ) { "#{$1}class TC_#{$2} < Test::Unit::TestCase" }
+        tests.gsub!( %r{^([ ]*)test[ ]+(\w+)} ) { |md| "#{$1}def test_#{$2}" }
+
+        tests
+      end
+
+    end
+  end
+end
+
+# Test::Unit::CommentAutoRunner.start( __FILE__ )
+# 
+# puts tests, "\n" if $VERBOSE
+# 
+# require 'test/unit'
+# 
+# load ARGV[0]
+# 
+# eval tests

data/forge/unit_runner/cunit.rb

@@ -0,0 +1,17 @@
+
+module Unit
+    def self.run=(flag)
+      @run = flag
+    end
+
+    def self.run?
+      @run ||= false
+    end
+  end
+end
+
+at_exit do
+  unless $! || Test::Unit.run?
+    exit Test::Unit::CommentAutoRunner.run($0 != "-e" && $0)
+  end
+end

data/forge/unit_runner/forkedrunner.rb

@@ -0,0 +1,91 @@
+require 'drb'
+require 'test/unit/collector'
+require 'test/unit/collector/objectspace'
+require 'test/unit/ui/testrunnermediator'
+
+class Test::Unit::UI::ForkedTestRunner
+
+  def initialize(suite) #, output_level=NORMAL, io=STDOUT)
+    if (suite.respond_to?(:suite))
+      @suite = suite.suite
+    else
+      @suite = suite
+    end
+    #@output_level = output_level
+    #@io = io
+    #@already_outputted = false
+    #@faults = []
+  end
+
+  def start
+
+    serialized_tests = Marshal.dump(@test)
+
+    src = %{
+      $output = STDOUT.dup
+      STDOUT.reopen( PLATFORM =~ /mswin/ ? "NUL" : "/dev/null" )
+
+      tests = Marshal.load <<HERE_TESTS_HERE
+#{serialized_tests}
+HERE_TESTS_HERE
+
+      runner = TestRunnerMediator.new( tests )
+
+      result = runner.run_suite
+
+      output << Marshal.dump(result)
+
+      STDOUT.reopen($output)
+      $output.close
+
+      exit 0
+    }
+
+    result = IO.popen("ruby","w+") do |ruby|
+      ruby.puts src
+      ruby.close_write
+      ruby.read
+    end
+
+    p testfile if $VERBOSE
+
+    return Marshal.load(result)
+
+  end
+
+  private
+  def load_comment_tests( filepath )
+    rbfile = File.read( filepath )
+    rblines = rbfile.split("\n")
+
+    tests = []
+    intest = nil
+    comment = nil
+    hcomment = nil
+
+    rblines.each_with_index do |l,i|
+      if /^(\ *#\ *)?=\ *begin testing/ =~ l
+        intest = true
+        comment = true unless $1
+        next
+      elsif intest and /^(\ *#\ *)?=\ *end/ =~ l
+        intest = false
+        comment = false
+        next
+      end
+      hcomment = true if /^\ *#/ =~ l
+
+      if intest and (comment or hcomment)
+        l.pull if hcomment
+        tests << l
+      end
+    end
+
+    tests = tests.join("\n")
+    tests.gsub!( %r{^([ ]*)testcase[ ]+(\w+)} ) { "#{$1}class TC_#{$2} < Test::Unit::TestCase" }
+    tests.gsub!( %r{^([ ]*)test[ ]+(\w+)} ) { |md| "#{$1}def test_#{$2}" }
+
+    tests
+  end
+
+end

data/forge/unit_runner/sample.rb

@@ -0,0 +1,16 @@
+
+# Here's a sample of commentary unit testcase.
+#
+# =begin testing
+#
+#   testcase Sample
+#     test one
+#       assert ( Sample.one == 1 )
+#     end
+#   end
+#
+# =end
+
+class Sample
+  def self.one ; 1 ; end
+end

data/lib/reap/class/extest.rb

@@ -35,11 +35,10 @@ module Reap
 
     include TaskUtils
 
-    attr_accessor :dir, :trunk, :files, :options
+    attr_accessor :dir, :files, :options
 
     def initialize( tst )
       @dir     = 'test'
-      #@trunk   = 'trunk' if File.directory?('trunk')
       @files   = [ 'lib/**/*.rb' ]
       @options = {}
 
@@ -51,11 +50,7 @@ module Reap
     # Extract tests.
 
     def extract
-      if @trunk
-        Dir.chdir( @trunk ) { extract_tests }
-      else
-        extract_tests
-      end
+      extract_tests
     end
 
     alias_method :call, :extract

data/lib/reap/class/manifest.rb

@@ -28,9 +28,7 @@ module Reap
 
     MUST_EXCLUDE = [ 'InstalledFiles', '**/CVS/**/*', '**/*~' ] #, 'dist', 'pkg' ]
 
-    # Note that ++dir++ is not offset by ++trunk++. But ++include++ and ++exclude++ are offset.
-
-    attr_accessor :trunk, :dir, :include, :exclude
+    attr_accessor :dir, :include, :exclude
 
     def initialize( man )
       @dir     = '.'
@@ -39,7 +37,6 @@ module Reap
 
       super
 
-      @trunk = '.' unless @trunk
       @exclude |= MUST_EXCLUDE
     end
 
@@ -48,13 +45,12 @@ module Reap
     def generate #( type=nil )
       manifest_file = File.join( File.expand_path( @dir ), 'MANIFEST' )
       package_files = FileList.new
-      Dir.chdir( @trunk ) do
-        package_files.include(*@include)
-        package_files.exclude(*@exclude) #if @exclude and not @exclude.empty?
-        File.open( manifest_file, 'w+') do |f|
-          package_files.each do |pf|
-            f << "#{salt(pf)} #{pf}\n" if File.file?(pf)
-          end
+
+      package_files.include(*@include)
+      package_files.exclude(*@exclude) #if @exclude and not @exclude.empty?
+      File.open( manifest_file, 'w+') do |f|
+        package_files.each do |pf|
+          f << "#{salt(pf)} #{pf}\n" if File.file?(pf)
         end
       end
     end

data/lib/reap/class/package.rb

@@ -54,8 +54,9 @@ module Reap
 
     include TaskUtils
 
+    KINDS        = [ 'bin', 'lib', 'ext', 'data', 'conf', 'doc' ]
+    LOCATIONS    = [ 'dist', 'pkg', 'release', 'package', 'distribution' ]
     MUST_EXCLUDE = [ 'InstalledFiles', '**/CVS/**/*', '**/*~', 'dist', 'pkg', 'release' ]
-    LOCATIONS = [ 'dist', 'pkg', 'release', 'package', 'distribution' ]
 
     attr :pkg
 
@@ -64,14 +65,6 @@ module Reap
     def initialize( pkg )
       @pkg = pkg
 
-      #pkg.name         ||= master.name
-      #pkg.title        ||= master.title
-      #pkg.version      ||= master.version
-      #pkg.project      ||= master.project || master.rubyforge.project
-      #pkg.homepage     ||= master.homepage || master.rubyforge.homepage
-
-      pkg.trunk        ||= '.'  # '.' probably will become the mater default.
-
       pkg.status       ||= 'development'
       pkg.series       ||= '1'
       pkg.author       ||= "Anonymous"
@@ -134,8 +127,54 @@ module Reap
         end
         #@autorequire
       end
+
+      # for a mirror image (but no rules does this too)
+      # pkg.rules ||= %{
+      #   bin  bin  *
+      #   ext  ext  **/*
+      #   lib  lib  **/*
+      #   data data **/*
+      #   conf conf **/*
+      # }
+
+      # for a typical Rolls versioned package
+      # pkg.rules ||= %{
+      #   bin   bin  *
+      #   ext   ext/$name  **/*  $name/$version
+      #   lib   lib/$name  **/*  $name/$version
+      #   data data/$name  **/*  $name/$version
+      #   conf conf/$name  **/*  $name/$version
+      # }
+
+      @transfer = parse_rules( pkg.rules )
+    end
+
+  private
+
+    #--
+    # TODO use shellwords
+    #++
+    def parse_rules( spec )
+      return [] unless spec
+      rules = [] #Hash.new { |h,k| h[k] = [] }
+      lines = spec.strip.split("\n")
+      lines.each { |line|
+        words = line.strip.split(/\s+/)
+        kind, from, glob, to = *words
+        rules << [ kind, vsub(from), vsub(glob), vsub(to) ]
+      }
+      rules
+    end
+
+    def vsub( str )
+      return nil if str.nil?
+      str = str.gsub( '$version', pkg.version.to_s ) #@version.to_s )
+      str = str.gsub( '$name', pkg.name.to_s )
+      str
     end
 
+  public
+
     # Generate packages.
 
     def generate_packages
@@ -149,7 +188,7 @@ module Reap
       if FileTest.directory?(release_folder)
         if $FORCE
           puts "Removing old directory '#{File.expand_path(release_folder)}'..."
-          FileUtils.rm_r(release_folder)
+          FileUtils.rm_r(release_folder) unless $PRETEND
         else
           puts "Package directory '#{pkg.package_name}' already exists. Use -f option to overwrite."
           return nil
@@ -160,28 +199,44 @@ module Reap
 
       # First we make a copy of the files to be distributed.
 
-      FileUtils.mkdir_p( mirror_folder ) #pkg.dir #rescue nil
-      @package_files = nil
-      Dir.chdir( pkg.trunk ) do
-        @package_files = ::FileList.new(*pkg.include)
-        #package_files.include(*pkg.include)
-        @package_files.exclude(*pkg.exclude) if pkg.exclude #and not pkg.exclude.empty?
-        @package_files.resolve # reslove FileList here to be sure we get the right files!
-
-        @package_files.each do |f|
-          from = f #pkg.trunk ? File.join( pkg.trunk, f ) : f
-          to = File.join( @mirror_path, f )
-          to_dir = File.dirname( to )
-          FileUtils.mkdir_p( to_dir ) if not File.exist?(to_dir)
+      if $PRETEND
+        puts "mkdir_p #{mirror_folder}"
+      else
+        FileUtils.mkdir_p( mirror_folder )
+      end
+
+      @package_files = ::FileList.new
+      @package_files.include(*pkg.include)
+      @package_files.exclude(*pkg.exclude) if pkg.exclude #and not pkg.exclude.empty?
+      #@package_files.resolve # reslove FileList here to be sure we get the right files!
+      @package_files.each do |from|
+        to = apply_rules( from )
+        to = File.join( mirror_folder, to )
+
+        if $PRETEND
           if File.directory?( from )
-            FileUtils.mkdir_p( to )
+            puts "mkdir_p #{to}" if not File.exist?( to )
           else
+            to_dir = File.dirname( to )
+            puts "mkdir_p #{to_dir}" if not File.exist?( to_dir )
+            puts "rm_f #{to}" #if File.exist?( to )
+            puts "safe_ln #{from}, #{to}"
+          end
+        else
+          if File.directory?( from )
+            FileUtils.mkdir_p( to ) if not File.exist?( to )
+          else
+            to_dir = File.dirname( to )
+            FileUtils.mkdir_p( to_dir ) if not File.exist?( to_dir )
             FileUtils.rm_f( to )
             FileUtils.safe_ln( from, to )
           end
         end
       end
 
+      # TODO Finish pretend mode for the distribution types.
+      return if $PRETEND
+
       # Now we create standard packages from the copy.
 
       FileUtils.chdir( @release_path ) do
@@ -251,7 +306,47 @@ module Reap
 
   private
 
-    # This builds the gem package.
+#     # Copy the files into the release package folder.
+#
+#     def package( kind, from, glob, to )
+#       mkdirp = []
+#       Dir.chdir( @trunk ) do
+#         next unless File.directory?( from )
+#         Dir.chdir( from ) do
+#           files = Dir.glob( glob ).reject { |f| File.directory?( f ) }
+#           files.each do |file|
+#             f = File.join( from, file )
+#             t = to ? File.join( @mirror_path, kind, to, file ) : File.join( @mirror_path, kind, file )
+#             #m = "mode(:#{kind})" # MODES[kind]
+#             d = File.dirname(t)
+#             unless mkdirp.include?(d)
+#               puts "makedir_p #{d}"
+#               mkdirp << d
+#             end
+#             puts "safe_ln #{f} => ...#{t.sub(@release_path,'')}"
+#           end
+#         end
+#       end
+#     end
+
+    #
+
+    def apply_rules( file )
+      @transfer.each do |rule|
+        kind, from, glob, to = *rule
+        if File.fnmatch( File.join( from,  glob ), file )
+          if to
+            return File.join( kind, to, file.sub(from,'') )
+          else
+            return File.join( kind, file.sub(from,'') )
+          end
+        end
+      end
+      return file
+    end
+
+
+    # Build a gem package.
 
     def run_gem
 

data/lib/reap/class/rdoc.rb

@@ -28,13 +28,10 @@ module Reap
 
     MUST_EXCLUDE = [ 'InstalledFiles', 'CVS/**/*', '_darcs/**/*' ]
 
-    # Note that ++dir++ is not offset by trunk.
-
     attr_accessor :dir,
                   :main,
                   :title,
                   :template,
-                  :trunk,
                   :include,
                   :exclude,
                   :options
@@ -60,12 +57,7 @@ module Reap
 
     def generate
       @rdoc_dir = File.expand_path(@dir)
-
-      if @trunk
-        Dir.chdir( @trunk ) { generate_rdocs }
-      else
-        generate_rdocs
-      end
+      generate_rdocs
     end
 
     alias_method :call, :generate

data/lib/reap/class/test.rb

@@ -42,10 +42,9 @@ module Reap
 
     include TaskUtils
 
-    attr_accessor :trunk, :files, :requires, :live, :libs
+    attr_accessor :files, :requires, :live, :libs
 
     def initialize( tst )
-      #@trunk    = 'trunk' if File.directory?('trunk')
       @files    = [ 'test/*/**/*.rb', 'test/**/tc*.rb', 'test/**/test*.rb', 'test/**/*test.rb' ]
       @requires = []
       @live     = false
@@ -57,11 +56,7 @@ module Reap
     # Start testing.
 
     def test
-      if @trunk
-        Dir.chdir( @trunk ) { run_tests }
-      else
-        run_tests
-      end
+      run_tests
     end
 
     alias_method :call, :test

data/lib/reap/tasks.rb

@@ -134,7 +134,6 @@ module Tasks
 
     task name do
       data = data.to_openobject
-      data.trunk ||= master.trunk
       Reap::ExTest.new( data ).extract
     end
 
@@ -175,50 +174,53 @@ module Tasks
     ProjectInfo.exists?
   end
 
-  # == Installer
-  #
-  # The installer task generates a specialized
-  # install.rb script specifically for your
-  # project. It currently does not support c/c++
-  # ext/ compilation.
-  #
-  #     template   Template for installation. (See below)
-  #     options    Hash of variable options. Project name
-  #                and version are automatically added this.
-  #
-  # The template is a special configuration for installation.
-  # It should be a literal string with each line containing
-  # four parts seprated by spaces.
-  #
-  #     [type]  [from]  [glob]  [to]
-  #
-  # There are five types: bin, lib, ext, etc (or conf) and data.
-  #
-  # The template use variables in the from of $name. These are filled
-  # in using the options hash.
-  #
-  # Here's a basic example of an entry:
-  #
-  #     ins: !!installer
-  #       template: |
-  #         bin  bin  *     .
-  #         lib  lib  **/*  $name/$version
-  #
-
-  def installer( name, &data )
-
-    require 'reap/class/installer'
-
-    desc "Generate install.rb script" unless desc
-
-    task name do
-      data = data.to_openobject
-      data.options[:name]    ||= master.name
-      data.options[:version] ||= master.version
-      Reap::Installer.new( data ).compile_and_write
-    end
-
-  end
+#   # == Installer
+#   #
+#   # The installer task generates a specialized
+#   # install.rb script specifically for your
+#   # project. It currently does not support c/c++
+#   # ext/ compilation.
+#   #
+#   #     template   Template for installation. (See below)
+#   #     options    Hash of variable options. Project name
+#   #                and version are automatically added this.
+#   #
+#   # The template is a special configuration for installation.
+#   # It should be a literal string with each line containing
+#   # four parts seprated by spaces.
+#   #
+#   #     [type]  [from]  [glob]  [to]
+#   #
+#   # There are five types: bin, lib, ext, etc (or conf) and data.
+#   #
+#   # The template use variables in the from of $name. These are filled
+#   # in using the options hash.
+#   #
+#   # Here's a basic example of an entry:
+#   #
+#   #     ins: !!installer
+#   #       template: |
+#   #         bin  bin  *     .
+#   #         lib  lib  **/*  $name/$version
+#   #
+# 
+#   def installer( name, &data )
+# 
+#     require 'reap/class/installer'
+# 
+#     desc "Generate install.rb script" unless desc
+# 
+#     task name do
+#       data = data.to_openobject
+# 
+#       data.name    ||= master.name
+#       data.version ||= master.version
+# 
+#       i = Reap::Installer.new( data )
+#       puts i.compile #_and_write
+#     end
+# 
+#   end
 
   # == Count
   #
@@ -233,7 +235,7 @@ module Tasks
 
     task name do
       data = data.to_openobject
-      incl = data.include || 'lib/**/*'  # TODO maybe check trunk too
+      incl = data.include || 'lib/**/*'
 
       fc, l, c, t, bt, r, rb = 0, 0, 0, 0, false, 0, false
       Dir.glob( incl ).each do |fname|
@@ -288,7 +290,6 @@ module Tasks
 
     task name do
       data = data.to_openobject
-      data.trunk ||= master.trunk
       Reap::Manifest.new( data ).generate
     end
 
@@ -356,7 +357,6 @@ module Tasks
       data.license      ||= master.license
       data.project      ||= master.project
       data.homepage     ||= master.homepage
-      data.trunk        ||= master.trunk
 
       Reap::Package.new( data ).generate_packages
     end
@@ -447,7 +447,6 @@ module Tasks
       data = data.to_openobject
 
       data.title ||= master.title
-      data.trunk ||= master.trunk
 
       Reap::RDoc.new( data ).call
     end
@@ -565,10 +564,9 @@ module Tasks
     task name do
       data = data.to_openobject
 
-      data.trunk   ||= master.trunk || '.'
       data.options ||= []
 
-      unless provide_setup_rb( data.trunk )
+      unless provide_setup_rb
         puts "Setup.rb is missing. Forced to cancel task."
         return nil
       end
@@ -583,10 +581,8 @@ module Tasks
       exe << data.options.join(' ')
       exe << ' all'
 
-      success = false
-      Dir.chdir( data.trunk ) do
-        success = sh( exe )
-      end
+      #success = false
+      success = sh( exe )
 
       puts "Setup complete!" if success
     end
@@ -663,9 +659,6 @@ module Tasks
 
     task name do
       data = data.to_openobject
-
-      data.trunk ||= master.trunk
-
       Reap::Test.new( data ).call
     end