pangolin 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/examples/errors/Rakefile

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/pangolin')
+
+require 'rake/clean'
+
+
+CLOBBER.include('build')
+
+
+task :default => :compile
+
+desc "Compile all classes"
+task :compile => 'build' do
+  javac FileList['src/**/*.java'], :destination => 'build', :verbose => true, :colorize => true
+end
+
+directory 'build'

data/examples/errors/src/com/example/HelloWorld.java

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

data/lib/pangolin.rb

@@ -1,5 +1,7 @@
 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'

data/lib/pangolin/javac.rb

@@ -3,10 +3,9 @@ require 'java'
 
 module Pangolin
   
-  TOOLS_PATHS = [
-    File.join(ENV['JAVA_HOME'], '..', 'lib', 'tools.jar'),
-    File.join(ENV['JAVA_HOME'], 'lib', 'tools.jar')
-  ]
+  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'
@@ -14,6 +13,9 @@ module Pangolin
 
 
   class Javac
+    
+    include Output::Formatting
+    
 
     # The files to compile.
     attr_accessor :source_files
@@ -61,6 +63,8 @@ module Pangolin
     
     # Determines the maximum number of warnings to print, default (nil) is to print all
     attr_accessor :max_warnings
+    
+    attr_accessor :colorize
 
 
     def initialize( *source_files )
@@ -74,6 +78,7 @@ module Pangolin
       @encoding             = nil
       @verbose              = false
       @lint                 = [ ]
+      @colorize             = false
     end
   
     # Run javac. If #verbose is true the equivalent command string for
@@ -88,7 +93,7 @@ module Pangolin
       
       output_str = output_writer.to_s
       
-      io.puts output_str if output_str !~ /^\s*$/
+      io.puts format_output(output_str) if output_str !~ /^\s*$/
   
       if 0 == result
         true
@@ -147,6 +152,21 @@ module Pangolin
         items.to_s
       end
     end
+    
+    def format_output(output)
+      output.split(/\n/).map do |line|
+        case line
+        when /^.+\.java:\d+: warning: .+$/
+          format_warning_header(line)
+        when /^.+\.java:\d+: .+$/
+          format_error_header(line)
+        when /^\d+ errors?$/
+          format_error(line)
+        else
+          line
+        end
+      end.join("\n")
+    end
 
   end
   

data/lib/pangolin/output/formatting.rb

@@ -51,6 +51,10 @@ module Pangolin
       def format_error_header(text)
         format_text(text, [:red, :bold])
       end
+
+      def format_warning_header(text)
+        format_text(text, [:yellow, :bold])
+      end
       
       def format_error(text)
         format_text(text, :red)

data/pangolin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pangolin}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Theo Hultberg"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-06}
   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"]
@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
      "VERSION",
      "examples/compile/Rakefile",
      "examples/compile/src/com/example/HelloWorld.java",
+     "examples/errors/Rakefile",
+     "examples/errors/src/com/example/HelloWorld.java",
      "examples/package/Rakefile",
      "examples/package/src/com/example/HelloWorld.java",
      "examples/test/Rakefile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pangolin
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Theo Hultberg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 +01:00
+date: 2009-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,8 @@ files:
 - VERSION
 - examples/compile/Rakefile
 - examples/compile/src/com/example/HelloWorld.java
+- examples/errors/Rakefile
+- examples/errors/src/com/example/HelloWorld.java
 - examples/package/Rakefile
 - examples/package/src/com/example/HelloWorld.java
 - examples/test/Rakefile