rjack-tarpit 1.1.0 → 1.2.0

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.2.0 (2010-3-6)
+* Add RJack::TarPit::BaseStrategy.test_line_match for common
+  version, etc. file checks. See example usage in this gem's Rakefile.
+* Add :java_platform flag for setting gem specification platform to java.
+* Add available Gem.configuration in gem command tasks.
+* Fix tag task outside of RJack repo.
+
 === 1.1.0 (2009-12-19)
 * Add :rdoc_diagram option to use Graphviz dot --diagram with rdoc.
 * Added gem :push (gemcutter) and :install tasks

data/README.rdoc

@@ -53,7 +53,7 @@ Besides the explicit gem dependencies, TarPit requires:
 
 == License
 
-Copyright (c) 2009 David Kellum
+Copyright (c) 2009-2010 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

@@ -36,4 +36,15 @@ t.specify do |h|
   h.remote_rdoc_dir = 'tarpit'
 end
 
+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_date ]
+
 t.define_tasks

data/lib/rjack-tarpit.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2009 David Kellum
+# Copyright (C) 2009-2010 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
@@ -21,7 +21,7 @@ module RJack
   # Provides glue for Rake, Hoe, and Maven by generating tasks.
   module TarPit
     # Module version
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
 
     # Construct new task generator by gem name, version, and flags. A descendant
     # of BaseStrategy is returned.
@@ -30,6 +30,7 @@ module RJack
     #                       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 )
@@ -77,6 +78,7 @@ module RJack
         @jar_dest = File.join( 'lib', @name )
         @hoe_specifier = :unset
         @rdoc_diagram = false
+        @spec = nil
       end
 
       # Return a default jar name built from name and version
@@ -114,6 +116,38 @@ module RJack
         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<~to_a>:: 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 = // )
+        files.to_a.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.
@@ -197,7 +231,7 @@ module RJack
         desc "git tag current version"
         task :tag do
           tag = [ name, version ].join( '-' )
-          dname = File.dirname( __FILE__ )
+          dname = Rake.original_dir
           dname = '.' if Dir.getwd == dname
           sh( "git status --only #{dname}" ) do |ok,res|
             if ok #changes present
@@ -213,18 +247,36 @@ module RJack
         desc "gem push (gemcutter)"
         task :push => [ :gem ] do
           require 'rubygems'
-          cm = Gem::CommandManager::instance
-          cm.run( [ 'push', '-V', "pkg/#{name}-#{version}.gem" ] )
+          cm = Gem::CommandManager.instance
+          cm.run( gem_config( 'push' ) +
+                  [ '-V', gem_file ] )
         end
 
         desc "gem install (default install dir)"
         task :install => [ :gem ] do
           require 'rubygems'
-          cm = Gem::CommandManager::instance
-          cm.run( [ 'install', '--no-ri', '-V', "pkg/#{name}-#{version}.gem" ] )
+          cm = Gem::CommandManager.instance
+          cm.run( gem_config( 'install' ) +
+                  [ '--no-ri', '-V', gem_file ] )
         end
       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 )
+        cargs = Gem.configuration[ command ]
+        cargs = cargs.is_a?( String ) ? cargs.split( ' ' ) : cargs.to_a
+        [ command ] + cargs
+      end
+
       # Setup Hoe via Hoe.spec
       def hoe_specify
 
@@ -236,13 +288,16 @@ module RJack
         unless @hoe_specifier == :unset
           tp = self
           outer = @hoe_specifier
-          Hoe.spec( @name ) do |h|
-            h.version = tp.version
+          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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjack-tarpit
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
   - David Kellum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 -08:00
+date: 2010-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency