rjack-tarpit 1.3.1 → 1.3.2

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.3.2 (2011-6-11)
+* Fix case where :install task would omit running "mvn install" due to
+  prior run of "mvn package".
+* Add conditional Rake::DSL includes for rake ~> 0.9.0.
+* Update rdoc dependency to >= 2.5.11, < 3.7 (3.6.1 works well.)
+
 === 1.3.1 (2011-5-19)
 * On gem install(_deps), only ignore gem SystemExitException when
   exit_code == 0; Fail on failed install.

data/README.rdoc

@@ -30,7 +30,7 @@ source with maven:
   require 'mygem/version'
 
   require 'rubygems'
-  gem     'rjack-tarpit', '~> 1.3.1'
+  gem     'rjack-tarpit', '~> 1.3.2'
   require 'rjack-tarpit'
 
   t = RJack::TarPit.new( 'mygem', MyGem::VERSION, :java_platform )

data/Rakefile

@@ -3,7 +3,7 @@
 $LOAD_PATH << './lib'
 require 'rubygems'
 
-tarpit_deps = [ [ 'rdoc', '>= 2.5.11', '< 3.6' ],
+tarpit_deps = [ [ 'rdoc', '>= 2.5.11', '< 3.7' ],
                 [ 'hoe',  '~> 2.8.0' ] ]
 
 # gem them here, so we can build tarpit with tarpit_deps

data/lib/rjack-tarpit.rb

@@ -21,7 +21,7 @@ module RJack
   # Provides glue for Rake, Hoe, and Maven by generating tasks.
   module TarPit
     # Module version
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
 
     # Construct new task generator by gem name, version, and flags. A descendant
     # of BaseStrategy is returned.
@@ -43,6 +43,9 @@ module RJack
     # 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.
@@ -189,22 +192,26 @@ module RJack
 
       # Define a file task tracking calls to "mvn package"
       def define_maven_package_task
-        file MVN_STATE_FILE => maven_dependencies do
-          mvn = [ 'mvn', @install_request ? 'install' : 'package' ].join(' ')
-          sh( mvn ) do |ok,res|
-            if ok
-              touch( MVN_STATE_FILE )
-            else
-              raise "TARPIT: 'mvn package' failed."
-            end
+        [ MVN_STATE_FILE, MVN_STATE_FILE_INSTALL ].each do |sf|
+          file sf => maven_dependencies do
+            run_maven
           end
         end
 
-        file MVN_STATE_FILE_INSTALL => MVN_STATE_FILE do
-          touch( MVN_STATE_FILE_INSTALL )
-        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
@@ -457,8 +464,12 @@ module RJack
 end
 
 # Replace special Hoe development dependency with rjack-tarpit (which
-# itself depends on constrained version of Hoe.)
+# 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

metadata

@@ -2,7 +2,7 @@
 name: rjack-tarpit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
   - David Kellum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -07:00
+date: 2011-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
             version: 2.5.11
         - - <
           - !ruby/object:Gem::Version 
-            version: "3.6"
+            version: "3.7"
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency