pangolin 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/examples/package/Rakefile

@@ -12,7 +12,7 @@ task :default => :package
 task :package => [:compile, 'dist'] do
   jar 'dist/package.jar', FileList['build/**/*.class'], :base_dir => 'build', 
                                                       :main_class => 'com.example.HelloWorld', 
-                                                        :manifest => {'X-Test', 'foo'},
+                                                        :manifest => {'X-Test' => 'foo'},
                                                          :verbose => true
 end
 

data/lib/pangolin.rb

@@ -1,15 +1,3 @@
-raise "Pangolin requires JRuby" unless RUBY_PLATFORM =~ /\bjava\b/
-
-$stderr.puts "Warning: JAVA_HOME not set, this may cause problems" unless ENV['JAVA_HOME']
-
-
-require File.expand_path(File.dirname(__FILE__)) + '/pangolin/output/formatting'
-require File.expand_path(File.dirname(__FILE__)) + '/pangolin/javac'
-require File.expand_path(File.dirname(__FILE__)) + '/pangolin/jar'
-require File.expand_path(File.dirname(__FILE__)) + '/pangolin/junit'
-
-
-
 module Pangolin # :nodoc:
   
   def self.version # :nodoc:
@@ -42,17 +30,42 @@ module Pangolin # :nodoc:
     end
   end
   
+  def self.is_java?
+    defined?(JRUBY_VERSION)
+  end
+  
 end
 
-class Exception # :nodoc:
-  alias exception_backtrace backtrace
+require File.expand_path(File.dirname(__FILE__)) + '/pangolin/output/formatting'
+require File.expand_path(File.dirname(__FILE__)) + '/pangolin/common/jar_common'
+require File.expand_path(File.dirname(__FILE__)) + '/pangolin/common/javac_common'
+require File.expand_path(File.dirname(__FILE__)) + '/pangolin/common/junit_common'
+
+if Pangolin::is_java?
+  $stderr.puts 'Warning: JAVA_HOME not set, this may cause problems' unless ENV['JAVA_HOME']
+  
+  require File.expand_path(File.dirname(__FILE__)) + '/pangolin/java/javac'
+  require File.expand_path(File.dirname(__FILE__)) + '/pangolin/java/jar'
+  require File.expand_path(File.dirname(__FILE__)) + '/pangolin/java/junit'
   
-  # Elide JRuby backtraces to remove all the internal stuff
-  def backtrace
-    exception_backtrace.reject do |line|
-      line =~ /^(org\/jruby|com\/mysql|sun\/|java\/)/
+  class Exception # :nodoc:
+    alias exception_backtrace backtrace
+  
+    # Elide JRuby backtraces to remove all the internal stuff
+    def backtrace
+      exception_backtrace.reject do |line|
+        line =~ /^(org\/jruby|com\/mysql|sun\/|java\/)/
+      end
     end
   end
+else
+  require 'rubygems'
+  
+  gem 'rubyzip', '>= 0.9.1'
+  
+  require File.expand_path(File.dirname(__FILE__)) + '/pangolin/exec/javac'
+  require File.expand_path(File.dirname(__FILE__)) + '/pangolin/exec/jar'
+  require File.expand_path(File.dirname(__FILE__)) + '/pangolin/exec/junit'
 end
 
 # Javac can be run in either command or yield mode: command mode

data/lib/pangolin/{jar.rb → common/jar_common.rb}

@@ -1,15 +1,6 @@
-require 'java'
-
-
 module Pangolin
+  module JarCommon
 
-  include_class 'java.io.FileOutputStream'
-  include_class 'java.util.zip.ZipOutputStream'
-  include_class 'java.util.zip.ZipEntry'
-  
-
-  class Jar
-  
     # The path to the directory which should be considered the root of the archive.
     #
     # If you set +base_dir+ to "build" and add the file "build/Main.class", that file
@@ -24,7 +15,6 @@ module Pangolin
     
     # The path to the JAR file that will be generated
     attr_reader :output
-     
     
     def initialize( output, files = nil, base_dir = nil )
       @output      = output
@@ -37,7 +27,7 @@ module Pangolin
       
       add_files(files) unless files.nil? || files.empty?
     end
-  
+    
     # Sets the attributes that will end up in the JAR manifest.
     #
     # Attribute names are treated case insensitively, so setting
@@ -64,7 +54,7 @@ module Pangolin
     def remove_manifest_attribute( name ) # :nodoc:
       @manifest.delete_if do |key, value|
         key.downcase == name.downcase
-      end      
+      end
     end
     
     # Convenience method for setting the Main-Class manifest attribute
@@ -144,24 +134,6 @@ module Pangolin
       true
     end
     
-    def create_zipfile # :nodoc:
-      buffer_size = 65536
-      
-      zipstream = ZipOutputStream.new(FileOutputStream.new(@output))
-      
-      @entries.each do |path, io|
-        while buffer = io.read(buffer_size)
-          zipstream.put_next_entry(ZipEntry.new(path))
-          zipstream.write(buffer.to_java_bytes, 0, buffer.length)
-          zipstream.close_entry
-        end
-        
-        io.close
-      end
-            
-      zipstream.close
-    end
-    
     def find_archive_path( path, base_dir ) # :nodoc:
       if base_dir
         prefix = base_dir + (base_dir =~ /\/$/ ? '' : '/')
@@ -175,5 +147,4 @@ module Pangolin
     end
     
   end
-  
 end

data/lib/pangolin/{javac.rb → common/javac_common.rb}

@@ -1,22 +1,9 @@
-require 'java'
-
-
 module Pangolin
   
-  TOOLS_PATHS = [ ]
-  TOOLS_PATHS << File.join(ENV['JAVA_HOME'], '..', 'lib', 'tools.jar') if ENV['JAVA_HOME']
-  TOOLS_PATHS << File.join(ENV['JAVA_HOME'], 'lib', 'tools.jar') if ENV['JAVA_HOME']
-
-  # must use include_class instead of import because import interferes with Rake's import
-  include_class 'java.io.PrintWriter'
-  include_class 'java.io.StringWriter'
-
-
-  class Javac
+  module JavacCommon
     
-    include Output::Formatting
+    include ::Pangolin::Output::Formatting
     
-
     # The files to compile.
     attr_accessor :source_files
     
@@ -80,27 +67,6 @@ module Pangolin
       @lint                 = [ ]
       @colorize             = false
     end
-  
-    # Run javac. If #verbose is true the equivalent command string for
-    # the +javac+ command will be printed to the stream passed as +io+ (or
-    # +$stdout+ by default)
-    def execute( io = $stderr )
-      output_writer = StringWriter.new
-  
-      io.puts 'javac …' if @verbose
-  
-      result = execute_compiler(output_writer)
-      
-      output_str = output_writer.to_s
-      
-      io.puts format_output(output_str) if output_str !~ /^\s*$/
-  
-      if 0 == result
-        true
-      else
-        false
-      end
-    end
     
     def command_args # :nodoc:
       args = [ ]
@@ -115,36 +81,21 @@ module Pangolin
       args + lint_flags + @source_files
     end
     
-  private
+    # Run javac. If #verbose is true the equivalent command string for
+    # the +javac+ command will be printed to the stream passed as +io+ (or
+    # +$stdout+ by default)
+    def execute( io = $stderr )
+      raise 'No source files' if @source_files.nil? || @source_files.empty?
   
-    def lint_flags
-      @lint.map { |lint| '-Xlint:' + lint }
-    end
+      io.puts 'javac …' if @verbose
   
-    def execute_compiler(output_writer)
-      compiler.compile(command_args.to_java(java.lang.String), PrintWriter.new(output_writer))
+      execute_compiler(io)
     end
-    
-    def compiler
-      begin
-        return com.sun.tools.javac.Main
-      rescue NameError
-        TOOLS_PATHS.each do |path|
-          if File.exists? path
-            require path
 
-            begin
-              return com.sun.tools.javac.Main
-            rescue NameError
-              # ignore and try next
-            end
-          end
-        end
-      end
-      
-      raise 'Could not find com.sun.tools.javac.Main, perhaps tools.jar isn\'t in the class path?'
+    def lint_flags
+      @lint.map { |lint| '-Xlint:' + lint }
     end
-        
+
     def formatted_path(items)
       if items.respond_to? :join
         items.join(':')
@@ -152,7 +103,7 @@ module Pangolin
         items.to_s
       end
     end
-    
+
     def format_output(output)
       output.split(/\n/).map do |line|
         case line
@@ -167,7 +118,6 @@ module Pangolin
         end
       end.join("\n")
     end
-
+    
   end
-  
 end

data/lib/pangolin/common/junit_common.rb

@@ -0,0 +1,61 @@
+module Pangolin
+  module JunitCommon
+    include Output::Formatting
+    
+    JUNIT_JAR_PATH = File.expand_path(File.dirname(__FILE__) + '/../ext/junit.jar')    
+    
+    attr_accessor :class_path
+    attr_accessor :colorize
+    attr_accessor :verbose
+    
+    def initialize(*classes)
+      @class_names = classes || [ ]
+      @class_path  = [ ]
+      @colorize    = false
+      @verbose     = false
+    end
+  
+    def classes
+      @class_names
+    end
+    
+    def print_header(io, num_tests, num_failures, time_taken)
+      if num_failures == 0
+        io.puts(format_header('%d tests run in %.1f seconds, no failures' % [num_tests, time_taken/1000]))
+      else
+        args = [
+          num_tests,
+          time_taken/1000,
+          num_failures, 
+          num_failures == 1 ? '' : 's'
+        ]
+        
+        io.puts(format_header('%d tests run in %.1f seconds with %d failure%s' % args))
+        io.puts('')
+      end
+    end
+    
+    def print_failure(io, test_header, message, backtrace)
+      io.puts(format_error_header('- ' + test_header))
+      io.puts(format_error('  ' + message)) unless message.nil? || message =~ /^\s*$/
+      
+      filtered_stack_trace_array(backtrace).each do |trace_frame|
+        io.puts(format_stack_trace('  ' + trace_frame.strip))
+      end
+      
+      io.puts('')
+    end
+    
+    def filtered_stack_trace_array(trace)
+      trace.split("\n").reject do |line|
+        case line
+        when /java.lang.AssertionError/, /at org.junit/, /at sun.reflect/, /at java.lang.reflect/, /at org.jruby/, /jrake/
+          true
+        else
+          false
+        end
+      end
+    end
+    
+  end
+end

data/lib/pangolin/exec/jar.rb

@@ -0,0 +1,18 @@
+require 'zip/zip'
+
+module Pangolin
+  class Jar
+    include JarCommon
+    include Zip
+    
+    def create_zipfile # :nodoc:
+      ZipFile.open(@output, ZipFile::CREATE) do |zipfile|
+        @entries.each do |path, io|
+          zipfile.get_output_stream(path) do |f|
+            f.write(io.read)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pangolin/exec/javac.rb

@@ -0,0 +1,13 @@
+module Pangolin
+  class Javac
+    include JavacCommon
+    
+    def execute_compiler(io)
+      output = %x(javac #{command_args.join(' ')} 2>&1)
+      
+      io.puts(format_output(output))
+      
+      $?.success?
+    end
+  end
+end

data/lib/pangolin/exec/junit.rb

@@ -0,0 +1,41 @@
+module Pangolin
+  class Junit
+    include JunitCommon
+    
+    def execute(io=$stderr)
+      raise 'No tests' if @class_names.nil? || @class_names.empty?
+      
+      class_path_str = (@class_path + [JUNIT_JAR_PATH]).join(':')
+      test_classes   = @class_names.join(' ')
+      
+      output = %x(java -classpath #{class_path_str} org.junit.runner.JUnitCore #{test_classes} 2>&1)
+      
+      print_result(io, output)
+      
+      $?.success?
+    end
+    
+    def print_result(io, output)
+      num_tests, num_failures, time_taken = 0, 0, 0
+      
+      if output =~ /Time: (\d+\.\d+)/.match(output)
+        time_taken = ($1.to_f * 1000).to_i
+      end
+      
+      if output =~ /There was (\d+) failure/
+        num_failures = $1.to_i
+      end
+      
+      if output =~ /Tests run: (\d+)/
+        num_tests = $1.to_i
+      end
+      
+      print_header(io, num_tests, num_failures, time_taken)
+      
+      output.scan(/\d+\) (\w+\([^\)]+\))\n(.+?)\n(.+?)\n\n/m) do |match|
+        print_failure(io, match[0], match[1], match[2])
+      end
+    end
+    
+  end
+end

data/lib/pangolin/java/jar.rb

@@ -0,0 +1,31 @@
+require 'java'
+
+
+module Pangolin
+
+  include_class 'java.io.FileOutputStream'
+  include_class 'java.util.zip.ZipOutputStream'
+  include_class 'java.util.zip.ZipEntry'
+  
+  class Jar  
+    include JarCommon
+    
+    def create_zipfile # :nodoc:
+      buffer_size = 65536
+      
+      zipstream = ZipOutputStream.new(FileOutputStream.new(@output))
+      
+      @entries.each do |path, io|
+        while buffer = io.read(buffer_size)
+          zipstream.put_next_entry(ZipEntry.new(path))
+          zipstream.write(buffer.to_java_bytes, 0, buffer.length)
+          zipstream.close_entry
+        end
+        
+        io.close
+      end
+            
+      zipstream.close
+    end
+  end
+end

data/lib/pangolin/java/javac.rb

@@ -0,0 +1,53 @@
+require 'java'
+
+
+module Pangolin
+  
+  TOOLS_PATHS = [ ]
+  TOOLS_PATHS << File.join(ENV['JAVA_HOME'], '..', 'lib', 'tools.jar') if ENV['JAVA_HOME']
+  TOOLS_PATHS << File.join(ENV['JAVA_HOME'], 'lib', 'tools.jar') if ENV['JAVA_HOME']
+
+  # must use include_class instead of import because import interferes with Rake's import
+  include_class 'java.io.PrintWriter'
+  include_class 'java.io.StringWriter'
+
+
+  class Javac
+
+    include JavacCommon
+    
+    def execute_compiler(io)
+      output_writer = StringWriter.new
+      
+      status = compiler.compile(command_args.to_java(java.lang.String), PrintWriter.new(output_writer))
+      
+      io.print(format_output(output_writer.to_s))
+      
+      0 == status
+    end
+    
+  private
+
+    def compiler
+      begin
+        return com.sun.tools.javac.Main
+      rescue NameError
+        TOOLS_PATHS.each do |path|
+          if File.exists? path
+            require path
+
+            begin
+              return com.sun.tools.javac.Main
+            rescue NameError
+              # ignore and try next
+            end
+          end
+        end
+      end
+
+      raise 'Could not find com.sun.tools.javac.Main, perhaps tools.jar isn\'t in the class path?'
+    end
+
+  end
+  
+end

data/lib/pangolin/java/junit.rb

@@ -0,0 +1,73 @@
+include_class 'java.lang.ClassLoader'
+include_class 'java.lang.ClassNotFoundException'
+include_class 'java.net.URLClassLoader'
+include_class 'java.net.URL'
+
+
+module Pangolin
+
+  class Junit
+    
+    include JunitCommon
+    
+    require JUNIT_JAR_PATH
+      
+    def execute(io=$stderr)
+      raise 'No tests' if @class_names.nil? || @class_names.empty?
+      
+      io.puts 'junit …' if @verbose
+      
+      junit  = load_class('org.junit.runner.JUnitCore').new_instance
+      result = junit.run(class_instances)
+      
+      print_result(io, result)
+      
+      0 == result.failure_count
+    end
+      
+  private
+  
+    def print_result(io, result)
+      print_header(io, result.run_count, result.failure_count, result.run_time)
+      
+      unless result.was_successful
+        result.failures.each do |failure|
+          print_failure(io, failure.test_header, failure.message, failure.trace)
+        end
+      end
+    end
+
+    def full_class_path
+      @class_path + [JUNIT_JAR_PATH]
+    end
+  
+    def pretty_class_path
+      full_class_path.join(':')
+    end
+
+    def class_path_urls
+      full_class_path.map do |e|
+        full_path  = File.expand_path(e)
+        full_path += '/' if File.directory?(full_path) && full_path[-1] != '/'
+        
+        URL.new('file', 'localhost', full_path)
+      end
+    end
+
+    def class_loader
+      @class_loader ||= URLClassLoader.new(class_path_urls.to_java(URL), ClassLoader.system_class_loader)
+    end
+
+    def class_instances
+      @class_names.map { |class_name| load_class(class_name) }.to_java(java.lang.Class)
+    end
+    
+    def load_class(class_name)
+      class_loader.load_class(class_name)
+    rescue ClassNotFoundException => e
+      raise LoadError, "Class not found: #{class_name} (looking in #{pretty_class_path})"
+    end
+  
+  end
+  
+end

data/pangolin.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{pangolin}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Theo Hultberg"]
-  s.date = %q{2009-11-06}
+  s.date = %q{2009-12-07}
   s.description = %q{Ant is a nice tool for writing Java build scripts, but Rake is nicer. The only thing missing from Rake is a way to run javac and jar, and although it's easy to run these as shell scripts you have to wait for the JVM to start. In combination with JRuby this gem lets you run javac and jar in your Rake scripts without exec'ing.}
   s.email = %q{theo@iconara.net}
   s.extensions = ["Rakefile"]
@@ -32,11 +32,25 @@ Gem::Specification.new do |s|
      "examples/test/src/com/example/HelloWorld.java",
      "examples/test/test/com/example/TestHelloWorld.java",
      "lib/pangolin.rb",
-     "lib/pangolin/jar.rb",
-     "lib/pangolin/javac.rb",
-     "lib/pangolin/junit.rb",
+     "lib/pangolin/common/jar_common.rb",
+     "lib/pangolin/common/javac_common.rb",
+     "lib/pangolin/common/junit_common.rb",
+     "lib/pangolin/exec/jar.rb",
+     "lib/pangolin/exec/javac.rb",
+     "lib/pangolin/exec/junit.rb",
+     "lib/pangolin/java/jar.rb",
+     "lib/pangolin/java/javac.rb",
+     "lib/pangolin/java/junit.rb",
      "lib/pangolin/output/formatting.rb",
      "pangolin.gemspec",
+     "spec/integration/data/classes/com/example/HelloWorld.class",
+     "spec/integration/data/sources/com/example/Error.java",
+     "spec/integration/data/sources/com/example/HelloWorld.java",
+     "spec/integration/data/tests/com/example/HelloWorld.class",
+     "spec/integration/data/tests/com/example/TestHelloWorld.class",
+     "spec/integration/jar_intg_spec.rb",
+     "spec/integration/javac_intg_spec.rb",
+     "spec/integration/junit_intg_spec.rb",
      "spec/jar_cmd_spec.rb",
      "spec/jar_spec.rb",
      "spec/javac_cmd_spec.rb",
@@ -52,10 +66,13 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/iconara/pangolin}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby wrappers for javac and jar that don't just exec}
   s.test_files = [
-    "spec/jar_cmd_spec.rb",
+    "spec/integration/jar_intg_spec.rb",
+     "spec/integration/javac_intg_spec.rb",
+     "spec/integration/junit_intg_spec.rb",
+     "spec/jar_cmd_spec.rb",
      "spec/jar_spec.rb",
      "spec/javac_cmd_spec.rb",
      "spec/javac_spec.rb",
@@ -69,8 +86,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.1"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
+      s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/spec/integration/data/sources/com/example/Error.java

@@ -0,0 +1,10 @@
+package	com.example;
+
+
+public class Error {
+	
+	public static void main( String[] args ) {
+		plink;
+	}
+	
+}

data/spec/integration/data/sources/com/example/HelloWorld.java

@@ -0,0 +1,10 @@
+package	com.example;
+
+
+public class HelloWorld {
+	
+	public static void main( String[] args ) {
+		System.out.println("Hello world");
+	}
+	
+}

data/spec/integration/jar_intg_spec.rb

@@ -0,0 +1,67 @@
+require 'tmpdir'
+require 'fileutils'
+require 'digest/md5'
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe Jar do
+  
+  context 'a created jar file' do
+    before do
+      @output_dir = File.join(Dir.tmpdir, "jar_spec_#{rand(1_000_000)}")
+      @output_file = File.join(@output_dir, 'package.jar')
+      @base_dir = File.dirname(__FILE__) + '/data/classes'
+      @files = Dir["#{@base_dir}/**/*.class"]
+      @jar = Jar.new(@output_file, @files, @base_dir)
+      @jar.manifest = {'Hello' => 'World', 'Foo' => 'Bar'}
+      
+      Dir.mkdir(@output_dir)
+      
+      @jar.execute
+    end
+    
+    after do
+      FileUtils.rm_rf(@output_dir)
+    end
+    
+    context 'unpacked' do
+      before do
+        %x(cd #{@output_dir} && jar -xf #{@output_file})
+      end
+      
+      it 'can be unpacked' do
+        Dir[@output_dir + '/**/*.class'].should_not be_empty
+      end
+      
+      it 'contains a manifest with all attributes' do
+        manifest = File.read(File.join(@output_dir, 'META-INF', 'MANIFEST.MF'))
+        manifest.should include('Hello: World')
+        manifest.should include('Foo: Bar')
+      end
+      
+      it 'contains the same files' do
+        @original = @base_dir + '/com/example/HelloWorld.class'
+        @extracted = @output_dir + '/com/example/HelloWorld.class'
+        
+        @original_digest = Digest::MD5.hexdigest(File.read(@original))
+        @extracted_digest = Digest::MD5.hexdigest(File.read(@extracted))
+        
+        @original_digest.should == @extracted_digest
+      end
+    end
+    
+    context 'table of contents' do
+      it 'contains all files' do
+        file_listing = %x(jar -tf #{@output_file})
+        file_listing.should include('com/example/HelloWorld.class')
+      end
+    
+      it 'contains a manifest' do
+        file_listing = %x(jar -tf #{@output_file})
+        file_listing.should include('META-INF/MANIFEST.MF')
+      end
+    end
+  end
+  
+end

data/spec/integration/javac_intg_spec.rb

@@ -0,0 +1,49 @@
+require 'tmpdir'
+require 'fileutils'
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe Javac do
+
+  before do
+    @output_dir = File.join(Dir.tmpdir, "javac_intg_spec_#{rand(1_000_000)}")
+    @base_dir = File.dirname(__FILE__) + '/data/sources'
+
+    @javac = Javac.new
+    @javac.destination = @output_dir
+    
+    Dir.mkdir(@output_dir)
+  end
+  
+  after do
+    FileUtils.rm_rf(@output_dir)
+  end
+
+  context 'compile class' do
+    before do
+      @javac.source_files = Dir["#{@base_dir}/**/HelloWorld.java"]
+      @javac.execute
+    end
+    
+    it 'is runnable' do
+      output = %x(cd #{@output_dir} && java com.example.HelloWorld)
+      output.should == "Hello world\n"
+    end
+  end
+  
+  context 'compile class with syntax errors' do
+    before do
+      @javac.source_files = Dir["#{@base_dir}/**/Error.java"]
+    end
+    
+    it 'prints errors' do
+      io = StringIO.new
+
+      @javac.execute(io)
+      
+      io.string.should include("com/example/Error.java:7")
+      io.string.should include("not a statement")
+    end
+  end
+end

data/spec/integration/junit_intg_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe Junit do
+
+  before do
+    @junit = Junit.new('com.example.TestHelloWorld')
+    @junit.class_path = [File.dirname(__FILE__) + '/data/tests']
+  end
+  
+  it 'runs the tests' do
+    io = StringIO.new
+    
+    @junit.execute(io)
+    
+    io.string.should include('2 tests run')
+    io.string.should include('1 failure')
+  end
+
+end

data/spec/jar_spec.rb

@@ -126,11 +126,11 @@ describe Jar do
       }.should_not raise_error
     end
     
-    it "should ignore case when setting attributes" do
-      @jar.manifest = {'Hello' => 'World', 'hello' => 'Theo'}
+    it "should ignore case when removing attributes" do
+      @jar.manifest = {'Hello' => 'World'}
+      @jar.remove_manifest_attribute('hello')
       
-      @jar.manifest_string.include?('Hello: World').should be_false
-      @jar.manifest_string.include?('hello: Theo').should be_true
+      @jar.manifest_string.include?('Hello:').should be_false
     end
         
   end

data/spec/javac_spec.rb

@@ -1,3 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
 describe Javac do
   
   before(:each) do
@@ -199,5 +202,21 @@ describe Javac do
     end
 
   end
+ 
+  describe '#execute' do
+    before do
+      @javac.stub!(:execute_compiler).and_return(1)
+    end
+    
+    it 'raises an exception if there are no source files' do
+      @javac.source_files = [ ]
+
+      lambda { @javac.execute }.should raise_error
+      
+      @javac.source_files = nil
+      
+      lambda { @javac.execute }.should raise_error
+    end
+  end
   
 end

data/spec/junit_spec.rb

@@ -1,3 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+
 describe Junit do
     
   describe 'defaults' do
@@ -21,4 +24,10 @@ describe Junit do
     
   end
   
+  describe '#execute' do
+    it 'raises an exception if there are no tests to run' do
+      lambda { @junit.execute }.should raise_error
+    end
+  end
+  
 end

data/spec/spec.opts

@@ -1,3 +1,3 @@
 --color
---require spec/spec_helper
---format specdoc
+--format specdoc
+--backtrace

data/spec/spec_helper.rb

@@ -1 +1,3 @@
+require File.expand_path(File.dirname(__FILE__) + '/../lib/pangolin')
+
 include Pangolin

data/tasks/gem.rake

@@ -4,18 +4,21 @@ begin
   CLEAN.include('pkg')
   
   Jeweler::Tasks.new do |gemspec|
-      gemspec.name = "pangolin"
-      gemspec.summary = "Ruby wrappers for javac and jar that don't just exec"
-      gemspec.description = "Ant is a nice tool for writing Java build scripts, but Rake is nicer. The only thing missing from Rake is a way to run javac and jar, and although it's easy to run these as shell scripts you have to wait for the JVM to start. In combination with JRuby this gem lets you run javac and jar in your Rake scripts without exec'ing."
-      gemspec.email = "theo@iconara.net"
-      gemspec.homepage = "http://github.com/iconara/pangolin"
-      gemspec.authors = ["Theo Hultberg"]
-      gemspec.extensions = 'Rakefile'
-      gemspec.files.exclude '**/.gitignore'
-      #gemspec.platform = 'java'
+    gemspec.name = 'pangolin'
+    gemspec.summary = 'Ruby wrappers for javac and jar that don\'t just exec'
+    gemspec.description = 'Ant is a nice tool for writing Java build scripts, but Rake is nicer. The only thing missing from Rake is a way to run javac and jar, and although it\'s easy to run these as shell scripts you have to wait for the JVM to start. In combination with JRuby this gem lets you run javac and jar in your Rake scripts without exec\'ing.'
+    gemspec.email = 'theo@iconara.net'
+    gemspec.homepage = 'http://github.com/iconara/pangolin'
+    gemspec.authors = ['Theo Hultberg']
+    gemspec.extensions = 'Rakefile'
+    gemspec.files.exclude '**/.gitignore'
+
+    gemspec.add_dependency 'rubyzip', '>= 0.9.1'
+
+    gemspec.add_development_dependency 'rspec'
   end
   
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts 'Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler'
 end

data/tasks/spec.rake

@@ -3,7 +3,12 @@ require 'spec/rake/spectask'
 
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_opts << '--options' << 'spec/spec.opts'
-  spec.libs << 'lib'
   spec.ruby_opts << '-rpangolin'
-#  spec.warning = true
+  spec.pattern = 'spec/*_spec.rb'
+end
+
+Spec::Rake::SpecTask.new(:intg_spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts'
+  spec.ruby_opts << '-rpangolin'
+  spec.pattern = 'spec/integration/*_spec.rb'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pangolin
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - Theo Hultberg
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +01:00
+date: 2009-12-07 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Ant is a nice tool for writing Java build scripts, but Rake is nicer. The only thing missing from Rake is a way to run javac and jar, and although it's easy to run these as shell scripts you have to wait for the JVM to start. In combination with JRuby this gem lets you run javac and jar in your Rake scripts without exec'ing.
 email: theo@iconara.net
 executables: []
@@ -37,11 +56,25 @@ files:
 - examples/test/src/com/example/HelloWorld.java
 - examples/test/test/com/example/TestHelloWorld.java
 - lib/pangolin.rb
-- lib/pangolin/jar.rb
-- lib/pangolin/javac.rb
-- lib/pangolin/junit.rb
+- lib/pangolin/common/jar_common.rb
+- lib/pangolin/common/javac_common.rb
+- lib/pangolin/common/junit_common.rb
+- lib/pangolin/exec/jar.rb
+- lib/pangolin/exec/javac.rb
+- lib/pangolin/exec/junit.rb
+- lib/pangolin/java/jar.rb
+- lib/pangolin/java/javac.rb
+- lib/pangolin/java/junit.rb
 - lib/pangolin/output/formatting.rb
 - pangolin.gemspec
+- spec/integration/data/classes/com/example/HelloWorld.class
+- spec/integration/data/sources/com/example/Error.java
+- spec/integration/data/sources/com/example/HelloWorld.java
+- spec/integration/data/tests/com/example/HelloWorld.class
+- spec/integration/data/tests/com/example/TestHelloWorld.class
+- spec/integration/jar_intg_spec.rb
+- spec/integration/javac_intg_spec.rb
+- spec/integration/junit_intg_spec.rb
 - spec/jar_cmd_spec.rb
 - spec/jar_spec.rb
 - spec/javac_cmd_spec.rb
@@ -77,11 +110,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby wrappers for javac and jar that don't just exec
 test_files: 
+- spec/integration/jar_intg_spec.rb
+- spec/integration/javac_intg_spec.rb
+- spec/integration/junit_intg_spec.rb
 - spec/jar_cmd_spec.rb
 - spec/jar_spec.rb
 - spec/javac_cmd_spec.rb

data/lib/pangolin/junit.rb

@@ -1,120 +0,0 @@
-JUNIT_JAR_PATH = File.dirname(__FILE__) + '/ext/junit.jar'
-
-
-require JUNIT_JAR_PATH
-
-
-include_class 'java.lang.ClassLoader'
-include_class 'java.lang.ClassNotFoundException'
-include_class 'java.net.URLClassLoader'
-include_class 'java.net.URL'
-
-
-module Pangolin
-
-  class Junit
-    
-    include Output::Formatting
-    
-    
-    attr_accessor :class_path
-    attr_accessor :colorize
-    attr_accessor :verbose
-    
-
-    def initialize(*classes)
-      @class_names = classes || [ ]
-      @class_path  = [ ]
-      @colorize    = false
-      @verbose     = false
-    end
-  
-    def classes
-      @class_names
-    end
-  
-    def execute(io=$stderr)
-      io.puts 'junit …' if @verbose
-      
-      junit  = load_class('org.junit.runner.JUnitCore').new_instance
-      result = junit.run(class_instances)
-      
-      print_result(result)
-      
-      0 == result.failure_count
-    end
-      
-  private
-  
-    def print_result(result)
-      if result.was_successful
-        puts format_header('%d tests run in %.1f seconds, no failures' % [result.run_count, result.run_time/1000])
-      else
-        args = [
-          result.run_count, 
-          result.run_time/1000, 
-          result.failure_count, 
-          result.failure_count == 1 ? '' : 's'
-        ]
-    
-        puts format_header('%d tests run in %.1f seconds with %d failure%s' % args)
-        puts ''
-      
-        result.failures.each do |failure|
-          puts format_error_header('- ' + failure.test_header)
-          puts format_error('  ' + failure.message) unless failure.message.nil? || failure.message =~ /^\s*$/
-          
-          filtered_stack_trace_array(failure.trace).each do |trace_frame|
-            puts format_stack_trace('  ' + trace_frame.strip)
-          end
-          
-          puts '' #unless failure == result.failures.to_a.last
-        end
-      end
-    end
-    
-    def filtered_stack_trace_array(trace)
-      trace.split("\n").reject do |line|
-        case line
-        when /java.lang.AssertionError/, /at org.junit/, /at sun.reflect/, /at java.lang.reflect/, /at org.jruby/, /jrake/
-          true
-        else
-          false
-        end
-      end
-    end  
-  
-    def full_class_path
-      @class_path + [JUNIT_JAR_PATH]
-    end
-  
-    def pretty_class_path
-      full_class_path.join(':')
-    end
-
-    def class_path_urls      
-      full_class_path.map do |e|
-        full_path  = File.expand_path(e)
-        full_path += '/' if File.directory?(full_path) && full_path[-1] != '/'
-        
-        URL.new('file', 'localhost', full_path)
-      end
-    end
-
-    def class_loader
-      @class_loader ||= URLClassLoader.new(class_path_urls.to_java(URL), ClassLoader.system_class_loader)
-    end
-
-    def class_instances
-      @class_names.map { |class_name| load_class(class_name) }.to_java(java.lang.Class)
-    end
-    
-    def load_class(class_name)
-      class_loader.load_class(class_name)
-    rescue ClassNotFoundException => e
-      raise LoadError, "Class not found: #{class_name} (looking in #{pretty_class_path})"
-    end
-  
-  end
-  
-end