rjack-tarpit 1.2.1 → 1.2.2

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.2.2 (2010-7-8)
+* Actually, use both Gem.configuration['gem'] and [command] in gem
+  command tasks (i.e. .gemrc with install: args)
+* Perform a 'mvn install' with rake :install task, checking for
+  changes since last .tarpit-install.
+
 === 1.2.1 (2010-4-21)
 * Also require 'rubygems/command_manager' for gem tasks (ruby)
 * Really use Gem.configuration['gem'] in gem command tasks.

data/README.rdoc

@@ -29,10 +29,10 @@ source with maven:
   require 'mygem/version'
 
   require 'rubygems'
-  gem     'rjack-tarpit', '~> 1.2.1'
+  gem     'rjack-tarpit', '~> 1.2.2'
   require 'rjack-tarpit'
 
-  t = RJack::TarPit.new( 'mygem', MyGem::VERSION, :no_assembly, :java_package )
+  t = RJack::TarPit.new( 'mygem', MyGem::VERSION, :java_platform )
 
   t.specify do |h|
     h.developer( "David Kellum", "dek-oss@gravitext.com" )

data/Rakefile

@@ -1,19 +1,4 @@
 # -*- ruby -*-
-#--
-# Copyright (C) 2009 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
-# may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.  See the License for the specific language governing
-# permissions and limitations under the License.
-#++
 
 $LOAD_PATH << './lib'
 require 'rubygems'

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.2.1'
+    VERSION = '1.2.2'
 
     # Construct new task generator by gem name, version, and flags. A descendant
     # of BaseStrategy is returned.
@@ -79,6 +79,9 @@ module RJack
         @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
@@ -181,12 +184,14 @@ module RJack
 
       # File touched to record the time of last successful 'mvn
       # package' run.
-      MVN_STATE_FILE = 'target/.tarpit'
+      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
         file MVN_STATE_FILE => maven_dependencies do
-          sh( 'mvn package' ) do |ok,res|
+          mvn = [ 'mvn', @install_request ? 'install' : 'package' ].join(' ')
+          sh( mvn ) do |ok,res|
             if ok
               touch( MVN_STATE_FILE )
             else
@@ -194,6 +199,12 @@ module RJack
             end
           end
         end
+
+        file MVN_STATE_FILE_INSTALL => MVN_STATE_FILE do
+          touch( MVN_STATE_FILE_INSTALL )
+        end
+        task :install => MVN_STATE_FILE_INSTALL
+
       end
 
       # Define file tasks for all jar symlinks and other misc. maven
@@ -257,8 +268,7 @@ module RJack
           require 'rubygems'
           require 'rubygems/command_manager'
           cm = Gem::CommandManager.instance
-          cm.run( gem_config( 'install',
-                              '--local', '--no-ri', '-V', gem_file ) )
+          cm.run( gem_config( 'install', '--local', '-V', gem_file ) )
         end
       end
 
@@ -273,8 +283,11 @@ module RJack
       end
 
       def gem_config( command, *args )
-        cargs = Gem.configuration[ 'gem' ]
-        cargs = cargs.is_a?( String ) ? cargs.split( ' ' ) : cargs.to_a
+        cargs = [ 'gem', command ].map do |cmd|
+          conf = Gem.configuration[ cmd ]
+          conf.is_a?( String ) ? conf.split( ' ' ) : conf.to_a
+        end
+        cargs.flatten!
         [ command ] + cargs + args
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 2
-    - 1
-  version: 1.2.1
+    - 2
+  version: 1.2.2
 platform: ruby
 authors: 
   - David Kellum
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -07:00
+date: 2010-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency