rjack-tarpit 1.2.3 → 1.3.0

data/History.rdoc

@@ -1,3 +1,13 @@
+=== 1.3.0 (2011-2-5)
+* Add new install_deps task to install missing or all gem
+  dev. dependencies.
+* Use hard links for jars to avoid package problems with rubygems 1.4+
+* Update to hoe 2.8.0 and drop now unnecessary explicit dependency on
+  rubyforge.
+* Update rdoc dependency to >= 2.5.11, < 3.6 (3.5.2 works well.)
+* Generate manifest only once per run.
+* Fix git status check on tag (status --only flag no longer supported.)
+
 === 1.2.3 (2010-12-28)
 * Update rdoc dependency to >= 2.5.11, < 3.1 (3.0.1 works well.)
 

data/README.rdoc

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

data/Rakefile

@@ -3,9 +3,12 @@
 $LOAD_PATH << './lib'
 require 'rubygems'
 
-# Use same hoe version for building gem plus this gem's dependency
-hoe_version = '~> 2.3.3'
-gem     'hoe', hoe_version
+tarpit_deps = [ [ 'rdoc', '>= 2.5.11', '< 3.6' ],
+                [ 'hoe',  '~> 2.8.0' ] ]
+
+# gem them here, so we can build tarpit with tarpit_deps
+tarpit_deps.each { |dep| gem( *dep ) }
+
 require 'rjack-tarpit'
 
 include RJack
@@ -14,9 +17,7 @@ t = TarPit.new( 'rjack-tarpit', TarPit::VERSION )
 
 t.specify do |h|
   h.developer( 'David Kellum', 'dek-oss@gravitext.com' )
-  h.extra_deps += [ [ 'rdoc',      '>= 2.5.11', '< 3.1' ],
-                    [ 'rubyforge', '~> 1.0.3'  ],
-                    [ 'hoe',       hoe_version ] ]
+  h.extra_deps += tarpit_deps
   h.rubyforge_name = 'rjack'
   h.remote_rdoc_dir = 'tarpit'
 end

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.3'
+    VERSION = '1.3.0'
 
     # Construct new task generator by gem name, version, and flags. A descendant
     # of BaseStrategy is returned.
@@ -216,7 +216,7 @@ module RJack
           dest = File.join( jar_dest, jar )
           file from => [ MVN_STATE_FILE ]
           file dest => [ from ] do
-            ln_sf( File.join( '..', '..', from ), dest )
+            ln( from, dest, :force => true )
           end
           [ :gem, :test ].each { |t| task t => [ dest ] }
         end
@@ -244,10 +244,10 @@ module RJack
           tag = [ name, version ].join( '-' )
           dname = Rake.original_dir
           dname = '.' if Dir.getwd == dname
-          sh( "git status --only #{dname}" ) do |ok,res|
-            if ok #changes present
-              raise "Commit these changes before tagging."
-            end
+          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
@@ -263,13 +263,46 @@ module RJack
           cm.run( gem_config( 'push', '-V', gem_file ) )
         end
 
-        desc "gem install (default install dir)"
+        desc "gem(+maven) install"
         task :install => [ :gem ] do
           require 'rubygems'
           require 'rubygems/command_manager'
           cm = Gem::CommandManager.instance
-          cm.run( gem_config( 'install', '--local', '-V', gem_file ) )
+          begin
+            cm.run( gem_config( 'install', '--local', '-V', gem_file ) )
+          rescue Gem::SystemExitException
+            #ignore
+          end
         end
+
+        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
+        #ignore
       end
 
       def gem_file
@@ -319,17 +352,20 @@ module RJack
 
       # Generate Manifest.txt
       def generate_manifest
-        remove_dest_jars
+        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
+          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 }
+          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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 1
-    - 2
     - 3
-  version: 1.2.3
+    - 0
+  version: 1.3.0
 platform: ruby
 authors: 
   - David Kellum
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -08:00
+date: 2011-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -33,38 +33,24 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 3
-              - 1
-            version: "3.1"
+              - 6
+            version: "3.6"
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: rubyforge
+    name: hoe
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             segments: 
-              - 1
+              - 2
+              - 8
               - 0
-              - 3
-            version: 1.0.3
+            version: 2.8.0
     type: :runtime
     version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: hoe
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 3
-              - 3
-            version: 2.3.3
-    type: :runtime
-    version_requirements: *id003
 description: |-
   TarPit provides the glue for an unholy union of build tools. Namely: