rjack-tarpit 1.4.1 → 2.0.0

data/History.rdoc

@@ -1,12 +1,16 @@
-=== 1.4.1 (2012-1-26)
-This is likely the last maintenance release of the TarPit 1.4.x
-series. Please take the time to review and upgrade to TarPit 2.x.
-
-* Narrow and fix Hoe release to version = 2.12.3. An incompatible was
-  introduced in Hoe 2.12.5, causing loss of gem specification
-  dependencies.
-* Upgrade/narrow and fix RDoc to version 3.12 for long term
-  compatibility.
+=== 2.0.0 (2011-1-12)
+* Major rewrite. Consumer project changes are required on upgrade!
+  See also updated README.
+* Gem specification details are now in a separate, but highly
+  automated and generally improved gemspec file. This allows full
+  interoperability with Bundler.
+* Improved ReadmeParser for spec automation.
+* For Java projects, Maven is now executed in process via the
+  rjack-maven gem (speed improvement)
+* Hoe is no longer a dependency, however many Hoe compatible tasks are
+  still supported.
+* New default, in process Minitest launcher (speed improvement,
+  particularly on JRuby)
 
 === 1.4.0 (2011-9-21)
 * Update/broaden to rdoc ~> 3.6

data/Manifest.txt

@@ -3,4 +3,43 @@ Manifest.txt
 NOTICE.txt
 README.rdoc
 Rakefile
+lib/rjack-tarpit/base.rb
 lib/rjack-tarpit.rb
+lib/rjack-tarpit/base_strategy.rb
+lib/rjack-tarpit/clean.rb
+lib/rjack-tarpit/doc.rb
+lib/rjack-tarpit/gem.rb
+lib/rjack-tarpit/git.rb
+lib/rjack-tarpit/line_match.rb
+lib/rjack-tarpit/readme_parser.rb
+lib/rjack-tarpit/spec.rb
+lib/rjack-tarpit/test.rb
+lib/rjack-tarpit/util.rb
+test/setup.rb
+test/test_projects.rb
+test/test_readme_parser.rb
+test/test_tarpit.rb
+test/jproject/History.rdoc
+test/jproject/Manifest.static
+test/jproject/Manifest.txt
+test/jproject/NOTICE.txt
+test/jproject/README.rdoc
+test/jproject/Rakefile
+test/jproject/jproject.gemspec
+test/jproject/pom.xml
+test/jproject/lib/jproject/base.rb
+test/jproject/lib/jproject.rb
+test/jproject/test/setup.rb
+test/jproject/test/test_jproject.rb
+test/zookeeper/History.rdoc
+test/zookeeper/Manifest.static
+test/zookeeper/Manifest.txt
+test/zookeeper/README.rdoc
+test/zookeeper/Rakefile
+test/zookeeper/assembly.xml
+test/zookeeper/pom.xml
+test/zookeeper/rjack-zookeeper.gemspec
+test/zookeeper/lib/rjack-zookeeper/base.rb
+test/zookeeper/lib/rjack-zookeeper.rb
+test/zookeeper/test/setup.rb
+test/zookeeper/test/test_zookeeper.rb

data/NOTICE.txt

@@ -1,2 +1,2 @@
 rjack-tarpit
-Copyright (c) 2009-2011 David Kellum
+Copyright (c) 2009-2012 David Kellum

data/README.rdoc

@@ -6,55 +6,110 @@
 
 == Description
 
-TarPit provides the glue for an unholy union of build tools. Namely:
+TarPit provides the glue for an unholy union of build tools. TarPit
+includes general automation for any rubygems project. It originally
+used and remains heavily influenced by
+Hoe[http://seattlerb.rubyforge.org/hoe/] (e.g. Manifest.txt.)
+However, it fully supports use of Bundler[http://gembundler.com/]. The
+gemspec benefits from sensible automation but remains in
+a <project>.gemspec per Bundler's requirements.
+
+For java platform projects, TarPit offers Maven integration via the
+rjack-maven[http://rjack.rubyforge.org/maven] gem. Maven
+package/install is run as needed, and jars are linked to the gem lib
+directory for inclusion, with semi-automatic Manifest.txt production.
+No need to bloat your git repo by checking in every version of every
+jar for all time.  The standard Maven layout and configuration
+(i.e. src, target, pom.xml, assembly.xml) is otherwise retained for
+complete java tool set compatibility. Use Maven only for what is it
+good at: java compilation with dependencies. Use Rake for everything
+else.
+
+=== Features
+
+* In Rake/JVM process Maven execution via rjack-maven (speed)
+* Default, in Rake process
+  Minitest[http://docs.seattlerb.org/minitest/] launcher (speed)
+* Manifest.txt for gem file contents, derived from Manifest.static
+  plus jars in Java projects
+* ReadmeParser for default specification url, summary, description
+  values
+* Specification name defaults from <name>.gemspec
+* LineMatchTaskDefiner defines check_(history|init)_(version|date)
+  tasks where appropriate to avoid missing history or version updates
+  on release
+
+=== Java strategies
+
+Java projects require different strategies for integrating Maven,
+specified via +s.maven_strategy=+ and summarized below:
+
++:no_assembly+ :: pom.xml builds a single jar, default same name and
+                  same version as gem project (SpecHelper.default_jar)
+                  or specified via +s.jars=+.
+
++:jars_from_assembly+ :: assembly.xml defines the jars at Maven
+                         package time. Changes to this set of jars
+                         must be incorporated by explicitly running
+                         the `rake manifest` task.
+
+Default :: No java, or use assembly for multiple jars but specify
+           +s.jars=+ when they can be computed, for example from
+           common version number or other gem data. This avoids the
+           need for the `rake manifest` step of +:jars_from_assembly+.
+
+Assemblies are built and located with the pom version number. This
+defaults to gem project version, but can be fixed
+(i.e. s.assembly_version='1.0') to avoid a separate version to bump,
+where the project will not export the pom, for example when the
+project is re-packaging upstream jars as a gem.
 
-* Rake[http://github.com/jimweirich/rake] with
-  Hoe[http://seattlerb.rubyforge.org/hoe/] for gem publishing
-* Maven[http://maven.apache.org/] for Java builds with dependencies.
+== Synopsis
 
-In particular, it runs "mvn package" when needed, links jars to the
-gem lib directory, and provides (semi-)automatic Manifest.txt
-generation with these jar files without offending Hoe.
+Sample gemspec for a gem including a single jar, built from java
+source with maven (see also included test/jproject):
 
-* The Maven pom.xml (and assembly.xml if needed) must be managed
-  independently.
-* A Manifest.static file holds the static elements of the manifest.
+  gem 'rjack-tarpit', '~> 2.0'
+  require 'rjack-tarpit/spec'
 
-== Synopsis
+  RJack::TarPit.specify do |s|
+    require 'jproject/base'
+
+    s.version = JProject::VERSION
+
+    s.add_developer 'David Kellum', 'dek-oss@gravitext.com'
 
-Rakefile example for a gem including a single jar, built from java
-source with maven:
+    s.maven_strategy = :no_assembly
 
-  # -*- ruby -*-
-  $LOAD_PATH << './lib'
-  require 'mygem/version'
+    s.depend 'rjack-slf4j',   '~> 1.6.4'
+    s.depend 'minitest',      '~> 2.3',     :dev
+  end
+
+And the associated Rakefile (assuming use of Bundler):
 
   require 'rubygems'
-  gem     'rjack-tarpit', '~> 1.4.1'
+  require 'bundler/setup'
   require 'rjack-tarpit'
 
-  t = RJack::TarPit.new( 'mygem', MyGem::VERSION, :java_platform )
+  RJack::TarPit.new( "jproject" ).define_tasks
 
-  t.specify do |h|
-    h.developer( "David Kellum", "dek-oss@gravitext.com" )
-    h.extra_deps += [ [ 'rjack-slf4j',  '~> 1.6.2' ],
-                      [ 'rjack-logback, '~> 1.2'   ] ]
-  end
+And a Bundler Gemfile:
 
-  file 'Manifest.txt' => [ 'lib/mygem/version.rb' ]
+  source :rubygems
+  gemspec
 
-  t.define_tasks
+Java projects should provide a Manifest.static. Jars or other
+generated files will be added to this to produce Manifest.txt for use
+as the gemspec's files.
 
 == Dependencies
 
-Besides the explicit gem dependencies, TarPit requires:
-
-* rake 0.8.7+ (bundled with JRuby 1.3+)
-* Apache Maven 2+ ('mvn' command on path)
+See the gem dependencies. The rjack-maven gem is only a dependency on
+the java platform.
 
 == License
 
-Copyright (c) 2009-2011 David Kellum
+Copyright (c) 2009-2012 David Kellum
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License.  You

data/Rakefile

@@ -1,40 +1,21 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
 require 'rubygems'
-
-tarpit_deps = [ [ 'rdoc', '= 3.12'   ],
-                [ 'hoe',  '= 2.12.3' ] ]
-
-# gem them here, so we can build tarpit with tarpit_deps
-tarpit_deps.each { |dep| gem( *dep ) }
+require 'bundler/setup'
 
 require 'rjack-tarpit'
 
-include RJack
+RJack::TarPit.new( 'rjack-tarpit' ) do |tp|
 
-t = TarPit.new( 'rjack-tarpit', TarPit::VERSION )
+  tp.rdoc_destinations <<
+    'dekellum@rubyforge.org:/var/www/gforge-projects/rjack/tarpit'
 
-t.specify do |h|
-  h.developer( 'David Kellum', 'dek-oss@gravitext.com' )
-  h.extra_deps += tarpit_deps
-  h.rdoc_locations << "dekellum@rubyforge.org:/var/www/gforge-projects/rjack/tarpit"
-end
+  desc "Check that README sample has latest version"
+  task :check_sample_version do
+    tp.test_line_match( 'README.rdoc',
+                        /^\s*gem.+rjack-tarpit/,
+                        /#{ RJack::TarPit::MINOR_VERSION }/ )
+  end
+  [ :gem, :tag, :push ].each { |t| task t => :check_sample_version }
 
-task :check_history_version do
-  t.test_line_match( 'History.rdoc', /^==/, / #{ t.version } / )
-end
-task :check_sample_version do
-  t.test_line_match( 'README.rdoc', /^\s*gem.+#{ t.name }/, /#{ t.version }/ )
 end
-task :check_history_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :check_history_version, :check_sample_version  ]
-task :tag  => [ :check_history_version, :check_sample_version, :check_history_date ]
-task :push => [ :check_history_version, :check_sample_version, :check_history_date ]
-
-task :test #noop
-
-t.define_tasks

data/lib/rjack-tarpit.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2009-2011 David Kellum
+# Copyright (c) 2009-2012 David Kellum
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you
 # may not use this file except in compliance with the License.  You
@@ -14,468 +14,27 @@
 # permissions and limitations under the License.
 #++
 
-require 'hoe'
+require 'rjack-tarpit/base'
+require 'rjack-tarpit/spec'
+require 'rjack-tarpit/base_strategy'
 
-module RJack
+module RJack::TarPit
 
-  # Provides glue for Rake, Hoe, and Maven by generating tasks.
-  module TarPit
-    # Module version
-    VERSION = '1.4.1'
+  # New task generator given name matching <name>.gemspec in the
+  # current directory. If block is given, yields self (err, actually
+  # the BaseStrategy) to block and calls define_tasks upon exit.
+  def self.new( name )
 
-    # Construct new task generator by gem name, version, and flags. A descendant
-    # of BaseStrategy is returned.
-    # ==== flags
-    # :jars_from_assembly:: jars will be found in assembly rather then
-    #                       set in Rakefile.
-    # :no_assembly:: One jar created from source, jars=[default_jar],
-    #                no assembly setup in maven.
-    # :java_platform:: Set gem specification platform to java.
-    def self.new( name, version, *flags )
-      if flags.include?( :jars_from_assembly )
-        JarsFromAssembly.new( name, version, flags )
-      else
-        BaseStrategy.new( name, version, flags )
-      end
-    end
-
-    # Base strategy implementation where jars are known by the
-    # Rakefile (not :jars_from_assembly)
-    class BaseStrategy
-
-      #For rack ~> 0.9.0
-      include Rake::DSL if defined?( Rake::DSL )
-
-      # Name of gem as constructed.
-      attr_reader :name
-      # Version of gem as constructed.
-      attr_reader :version
-
-      # The set of jar file names (without path) to include. May be
-      # lazily computed by other strategies.
-      attr_accessor :jars
-
-      # Destination path for any jars [Default: lib/name]
-      attr_accessor :jar_dest
-
-      # Any additional generated files to be included [Default: nil]
-      attr_accessor :generated_files
-
-      # Use rdoc --diagram (requires http://graphiz.org 'dot' in PATH)
-      attr_accessor :rdoc_diagram
-
-      # The name of the assembly [Default: name]
-      attr_writer :assembly_name
-
-      # The version of the assembly, which might be static
-      # (i.e. "1.0") if the pom is not shared (dependency jars only)
-      # [Default: version]
-      attr_writer :assembly_version
-
-      # See TarPit.new
-      def initialize( name, version, flags )
-        @name = name
-        @version = version
-        @flags = flags
-        @jars = [ default_jar ] if @flags.include?( :no_assembly )
-        @jar_dest = File.join( 'lib', @name )
-        @hoe_specifier = :unset
-        @rdoc_diagram = false
-        @spec = nil
-
-        @install_request =
-          Rake.application.top_level_tasks.include?( "install" )
-      end
-
-      # Return a default jar name built from name and version
-      def default_jar
-        "#{name}-#{version}.jar"
-      end
-
-      # Specify gem project details, yielding Hoe instance to block
-      # after setting various defaults. Thus all Hoe.spec setters are
-      # valid in this block. The actual Hoe construction and execution
-      # of block is deferred to define_tasks.
-      def specify( &block )
-        @hoe_specifier = block
-      end
-
-      # Define all tasks based on provided details. In this strategy,
-      # the Manifest.txt task will be invoked prior to calling
-      # Hoe.spec, thus any additional Manifest.txt dependencies
-      # should be specified prior to this call.
-      def define_tasks
-        define_maven_package_task if jars
-
-        if jars || generated_files
-          mtask = define_manifest_task
-
-          # The manifest needs to run before hoe_specify
-          mtask.invoke
-        end
-
-        define_post_maven_tasks if jars
-
-        hoe_specify
-
-        define_git_tag
-        define_gem_tasks
-      end
-
-      # Test that all specified files have at least one line matching
-      # line_regex, and that first line additionally matches (optional)
-      # pass_line_regex.
-      # ==== Parameters
-      # files<Array(~)>:: List of files to test
-      # line_regex<Regexp>:: Test first matching line
-      # pass_line_regex:: Further test on match line (default: match all)
-      # ==== Raises
-      # RuntimeError:: on test failure.
-      def test_line_match( files, line_regex, pass_line_regex = // )
-        Array( files ).each do |mfile|
-          found = false
-          open( mfile ) do |mf|
-            num = 0
-            mf.each do |line|
-              num += 1
-              if line =~ line_regex
-                found = true
-                unless line =~ pass_line_regex
-                  raise( "%s:%d: %s !~ %s" %
-                         [ mfile, num, line.strip, pass_line_regex.inspect ] )
-                end
-                break
-              end
-            end
-          end
-          unless found
-            raise "#{mfile}: #{line_regex.inspect} not found"
-          end
-        end
-      end
-
-      # Define task for dynamically generating Manifest.txt, by
-      # appending array returned by the given block to specified files, or
-      # contents of Manifest.static.
-      def define_manifest_task
-
-        if File.exist?( 'Manifest.static' )
-          file 'Manifest.txt' => [ 'Manifest.static' ]
-        end
-
-        gf = clean_list( generated_files ).sort
-        [ :gem, :test ].each { |t| task t => gf }
-
-        unless gf.empty?
-          task :gen_clean do
-            rm_f gf
-          end
-          task :clean => :gen_clean
-        end
-
-        desc "Force update of Manifest.txt"
-        task :manifest do
-          generate_manifest
-        end
-
-        mtask = file 'Manifest.txt' do
-          generate_manifest
-        end
-
-        mtask
-      end
-
-      # File touched to record the time of last successful 'mvn
-      # package' run.
-      MVN_STATE_FILE         = 'target/.tarpit'
-      MVN_STATE_FILE_INSTALL = 'target/.tarpit-install'
-
-      # Define a file task tracking calls to "mvn package"
-      def define_maven_package_task
-        [ MVN_STATE_FILE, MVN_STATE_FILE_INSTALL ].each do |sf|
-          file sf => maven_dependencies do
-            run_maven
-          end
-        end
-
-        task :install => MVN_STATE_FILE_INSTALL
-      end
-
-      # Run Maven mvn package or install and touch state files.
-      def run_maven
-        mvn = [ 'mvn', @install_request ? 'install' : 'package' ].join( ' ' )
-        sh( mvn ) do |ok,res|
-          if ok
-            touch( MVN_STATE_FILE )
-            touch( MVN_STATE_FILE_INSTALL ) if @install_request
-          else
-            raise "TARPIT: '#{mvn}' failed."
-          end
-        end
-      end
-
-      # Define file tasks for all jar symlinks and other misc. maven
-      # associated tasks like :mvn_clean.
-      def define_post_maven_tasks
-        jfrom = jar_from
-        jars.each do |jar|
-          from = File.join( jfrom, jar )
-          dest = File.join( jar_dest, jar )
-          file from => [ MVN_STATE_FILE ]
-          file dest => [ from ] do
-            ln( from, dest, :force => true )
-          end
-          [ :gem, :test ].each { |t| task t => [ dest ] }
-        end
-
-        task :mvn_clean do
-          remove_dest_jars
-          sh 'mvn clean'
-        end
-        task :clean => :mvn_clean
-      end
-
-      # Dependencies on "mvn package" including pom.xml, any assembly.xml,
-      # all files under the "src" directory.
-      def maven_dependencies
-        deps  = [ 'pom.xml' ]
-        deps << 'assembly.xml' if File.exist?( 'assembly.xml' )
-        deps += FileList[ "src/**/*" ].exclude { |f| ! File.file?( f ) }
-        deps
-      end
-
-      # Define git based :tag task
-      def define_git_tag
-        desc "git tag current version"
-        task :tag do
-          tag = [ name, version ].join( '-' )
-          dname = Rake.original_dir
-          dname = '.' if Dir.getwd == dname
-          delta = `git status --porcelain -- #{dname} 2>&1`.split(/^/)
-          if delta.length > 0
-            puts delta
-            raise "Commit these changes before tagging"
-          end
-          sh %{git tag -s -f -m "tag [#{tag}]" "#{tag}"}
-        end
-      end
-
-      # Define gem push and install tasks
-      def define_gem_tasks
-        desc "gem push (gemcutter)"
-        task :push => [ :gem ] do
-          require 'rubygems'
-          require 'rubygems/command_manager'
-          cm = Gem::CommandManager.instance
-          cm.run( gem_config( 'push', '-V', gem_file ) )
-        end
-
-        desc "gem(+maven) install"
-        task :install => [ :gem ] do
-          require 'rubygems'
-          require 'rubygems/command_manager'
-          cm = Gem::CommandManager.instance
-          begin
-            cm.run( gem_config( 'install', '--local', '-V', gem_file ) )
-          rescue Gem::SystemExitException => x
-            raise "Install failed (#{x.exit_code})" if x.exit_code != 0
-          end
-        end
+    load( "#{name}.gemspec", true )
 
-        desc "gem install missing/all dev dependencies"
-        task( :install_deps, :force ) do |t,args|
-          require 'rubygems'
-          require 'rubygems/command_manager'
-          force = ( args[:force] == 'force' )
-          ( @spec.extra_deps + @spec.extra_dev_deps ).each do |dep|
-            if force
-              gem_install_dep( dep )
-            else
-              begin
-                gem( *dep )
-              rescue Gem::LoadError => e
-                puts "Gem dep: " + e.to_s
-                gem_install_dep( dep )
-              end
-            end
-          end
-        end
-      end
-
-      def gem_install_dep( dep )
-        puts "Install: " + dep.inspect
-        cm = Gem::CommandManager.instance
-        c = [ 'install', '--remote', '-V', dep.first ]
-        c += dep[1..-1].map { |r| [ '-v', r ] }.flatten
-        cm.run( gem_config( *c ) )
-      rescue Gem::SystemExitException => x
-        raise "Install failed (#{x.exit_code})" if x.exit_code != 0
-      end
-
-      def gem_file
-        parts = [ name, version ]
-        if @spec
-          pform = @spec.spec_extras[ :platform ]
-          parts << 'java' if ( pform && pform.os == 'java' )
-        end
-
-        "pkg/#{ parts.join( '-' ) }.gem"
-      end
-
-      def gem_config( command, *args )
-        cargs = [ 'gem', command ].map do |cmd|
-          conf = Gem.configuration[ cmd ]
-          conf.is_a?( String ) ? conf.split( ' ' ) : Array( conf )
-        end
-        cargs.flatten!
-        [ command ] + cargs + args
-      end
-
-      # Setup Hoe via Hoe.spec
-      def hoe_specify
-
-        unless @rdoc_diagram
-          # Silly Hoe sets up DOT with rdoc unless this is set.
-          ENV['NODOT'] = "no thanks"
-        end
-
-        unless @hoe_specifier == :unset
-          tp = self
-          outer = @hoe_specifier
-          jplat = @flags.include?( :java_platform )
-          @spec = Hoe.spec( @name ) do |h|
-
-            h.version = tp.version
-            h.readme_file  =  'README.rdoc' if File.exist?(  'README.rdoc' )
-            h.history_file = 'History.rdoc' if File.exist?( 'History.rdoc' )
-            h.extra_rdoc_files = FileList[ '*.rdoc' ]
-
-            h.spec_extras[ :platform ] = Gem::Platform.new( "java" ) if jplat
-
-            outer.call( h )
-          end
-        end
-      end
-
-      # Generate Manifest.txt
-      def generate_manifest
-        unless @generated_manifest #only once
-          remove_dest_jars
-
-          m = []
-          if File.exist?( 'Manifest.static' )
-            m += read_file_list( 'Manifest.static' )
-          end
-          m += clean_list( generated_files ).sort
-          m += dest_jars
-
-          puts "TARPIT: Updating Manifest.txt"
-          open( 'Manifest.txt', 'w' ) { |out| out.puts m }
-          @generated_manifest = true
-        end
-      end
-
-      # Remove jars in jar_dest by wildcard expression
-      def remove_dest_jars
-        jars = FileList[ File.join( jar_dest, "*.jar" ) ].sort
-        rm_f jars unless jars.empty?
-      end
-
-      # The list of jars in jar_dest path, used during manifest generation
-      def dest_jars
-        clean_list( jars ).sort.map { |j| File.join( jar_dest, j ) }
-      end
-
-      # The target/assembly path from which jars are linked
-      def jar_from
-        dirs = [ 'target' ]
-
-        unless @flags.include?( :no_assembly )
-          dirs << [ @assembly_name || name,
-                    @assembly_version || version,
-                    'bin.dir' ].join('-')
-        end
-
-        File.join( dirs )
-      end
-
-      # Read a list of files and return a cleaned list.
-      def read_file_list( sfile )
-        clean_list( open( sfile ) { |f| f.readlines } )
-      end
-
-      # Cleanup a list of files
-      def clean_list( l )
-        l = Array( l ).compact
-        l.map! { |f| f.strip }
-        l.map! { |f| f.empty? ? nil : f }
-        l.compact!
-        l
-      end
-
-    end
-
-    # Strategy in which the jars are inferred only by inspecting the
-    # the completed maven assembly. The :manifest task is thus
-    # dependent on 'mvn package'. Manifest changes need to be manually
-    # incorporated by explicitly running "jrake manifest"
-    class JarsFromAssembly < BaseStrategy
-
-      # Define all tasks based on provided details. Don't invoke
-      # Manifest.txt before Hoe, just use whats already in place.
-      def define_tasks
-        define_maven_package_task
-
-        mtask = define_manifest_task
-
-        task :manifest => [ MVN_STATE_FILE ]
-
-        define_post_maven_tasks
-
-        hoe_specify
-
-        define_git_tag
-        define_gem_tasks
-      end
-
-      # For manifest, map destination jars from available jars in
-      # (jar_from) target/assembly. These are available since mvn
-      # package will be run first for the :manifest target.
-      def dest_jars
-        jars = FileList[ File.join( jar_from, "*.jar" ) ]
-        jars = jars.map { |j| File.basename( j ) }.sort
-        jars.map { |j| File.join( jar_dest, j ) }
-      end
-
-      # Extract jar files from saved Manifest state, since
-      # neither from or dest jars may be available at call time.
-      def jars
-        unless @jars
-          files = read_file_list( 'Manifest.txt' ).select { |f| f =~ /\.jar$/ }
-          @jars = files.map { |f| File.basename( f ) }
-        end
-        @jars
-      end
+    tp = BaseStrategy.new( last_spec )
 
+    if block_given?
+      yield tp
+      tp.define_tasks
     end
 
+    tp
   end
 
 end
-
-# Replace special Hoe development dependency with rjack-tarpit (which
-# itself depends on a constrained version of Hoe.)
-class Hoe
-  # FIXME: Adjust Hoe for rack ~> 0.9.0 until we can update to a hoe
-  # that includes Rake::DSL itself.
-  include Rake::DSL if defined?( Rake::DSL )
-
-  def add_dependencies
-    self.extra_deps     = normalize_deps extra_deps
-    self.extra_dev_deps = normalize_deps extra_dev_deps
-
-    unless name == 'rjack-tarpit'
-      extra_dev_deps << [ 'rjack-tarpit', "~> #{ RJack::TarPit::VERSION }" ]
-    end
-  end
-end