Convert to bundler/tarpit 2.x

.gitignore

@@ -1,3 +1,4 @@
 *~
 doc/
 pkg/
+.bundle/

Gemfile

@@ -0,0 +1,5 @@
+# -*- ruby -*-
+
+source :rubygems
+
+gemspec

Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    fishwife (1.2.0-java)
+      rack (~> 1.3.2)
+      rjack-jetty (~> 7.5.0)
+      rjack-slf4j (~> 1.6.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    json (1.6.4-java)
+    rack (1.3.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rjack-jetty (7.5.4.0-java)
+    rjack-logback (1.3.0-java)
+      rjack-slf4j (~> 1.6.0)
+    rjack-maven (3.0.3.1-java)
+    rjack-slf4j (1.6.4.0-java)
+    rjack-tarpit (2.0.a.0-java)
+      rake (~> 0.9.2)
+      rdoc (~> 3.6)
+      rjack-maven (~> 3.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  fishwife!
+  rjack-logback (~> 1.2)
+  rjack-tarpit (~> 2.0.a.0)
+  rspec (~> 2.6.0)

Rakefile

@@ -1,38 +1,7 @@
 # -*- ruby -*-
 
-$LOAD_PATH << './lib'
-
 require 'rubygems'
-gem     'rjack-tarpit', '~> 1.4'
+require 'bundler/setup'
 require 'rjack-tarpit'
 
-require 'fishwife/base'
-
-t = RJack::TarPit.new( 'fishwife', Fishwife::VERSION, :java_platform )
-
-t.specify do |h|
-  h.developer( 'David Kellum', 'dek-oss@gravitext.com' )
-  h.summary = "A hard working Jetty 7 based rack handler."
-
-  h.extra_deps     += [ [ 'rack',          '~> 1.3.2' ],
-                        [ 'rjack-jetty',   '~> 7.5.0' ],
-                        [ 'rjack-slf4j',   '~> 1.6.1' ] ]
-
-  h.extra_dev_deps += [ [ 'rjack-logback', '~> 1.2.0' ],
-                        [ 'rspec',         '~> 2.6.0' ] ]
-end
-
-# Version/date consistency checks:
-
-task :check_history_version do
-  t.test_line_match( 'History.rdoc', /^==/, / #{ t.version } / )
-end
-task :check_history_date do
-  t.test_line_match( 'History.rdoc', /^==/, /\([0-9\-]+\)$/ )
-end
-
-task :gem  => [ :check_history_version  ]
-task :tag  => [ :check_history_version, :check_history_date ]
-task :push => [ :check_history_version, :check_history_date ]
-
-t.define_tasks
+RJack::TarPit.new( 'fishwife' ).define_tasks

fishwife.gemspec

@@ -0,0 +1,26 @@
+# -*- ruby -*- encoding: utf-8 -*-
+
+gem 'rjack-tarpit', '~> 2.0.a'
+require 'rjack-tarpit/spec'
+
+$LOAD_PATH.unshift( File.join( File.dirname( __FILE__ ), 'lib' ) )
+
+require 'fishwife/base'
+
+RJack::TarPit.specify do |s|
+
+  s.version  = Fishwife::VERSION
+  s.summary = "A hard working Jetty 7 based rack handler."
+
+  s.add_developer( 'David Kellum', 'dek-oss@gravitext.com' )
+
+  s.depend 'rack',                  '~> 1.3.2'
+  s.depend 'rjack-jetty',           '~> 7.5.0'
+  s.depend 'rjack-slf4j',           '~> 1.6.1'
+
+  s.depend 'rjack-logback',         '~> 1.2',       :dev
+  s.depend 'rspec',                 '~> 2.6.0',     :dev
+
+  s.platform = :java
+
+end