javagems 0.4.8 → 0.4.9

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/bin/jam

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'pathname'
+$: << Pathname(__FILE__).parent.parent + "lib"
+require 'javagems/jam'
+
+ENV["CLASSPATH"], argv = JavaGems::Jam.classpath_from_options(ARGV)
+exec("javagem-exec", "java", *argv)

data/bin/jamc

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require 'pathname'
+$: << Pathname(__FILE__).parent.parent + "lib"
+require 'javagems/jam'
+
+ENV["CLASSPATH"], argv = JavaGems::Jam.classpath_from_options(ARGV)
+exec("javagem-exec", "javac", *argv)

data/javagems.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{javagems}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "jaknowlden"]
   s.date = %q{2009-11-19}
   s.description = %q{Provides gem-esque support to Java}
   s.email = %q{gabriel.gironda@gmail.com}
-  s.executables = ["javagem", "javagem-exec", "jem", "jemc"]
+  s.executables = ["jam", "jamc", "javagem", "javagem-exec"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -23,14 +23,15 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/jam",
+     "bin/jamc",
      "bin/javagem",
      "bin/javagem-exec",
-     "bin/jem",
-     "bin/jemc",
      "javagems.gemspec",
      "lib/javagems.rb",
      "lib/javagems/classpath_builder.rb",
      "lib/javagems/gem_overrides.rb",
+     "lib/javagems/jam.rb",
      "lib/rubygems/commands/classpath_command.rb",
      "test/classpath_command_test.rb",
      "test/gem_overrides_test.rb",
@@ -69,6 +70,7 @@ Gem::Specification.new do |s|
      "test/invalid_test_app/vendor/gems/specifications/test-gem-four-0.0.0.gemspec",
      "test/invalid_test_app/vendor/gems/specifications/test-gem-one-0.0.0.gemspec",
      "test/invalid_test_app/vendor/gems/specifications/test-gem-two-0.0.0.gemspec",
+     "test/jam_test.rb",
      "test/test_helper.rb",
      "test/valid_test_app/Gemfile",
      "test/valid_test_app/vendor/gems/dirs/test-gem-four/.document",
@@ -140,6 +142,7 @@ variable for maximum-JavaGems-fun-times.
      "test/invalid_test_app/vendor/gems/dirs/test-gem-two/test/helper.rb",
      "test/invalid_test_app/vendor/gems/dirs/test-gem-two/test/test_test-gem-two.rb",
      "test/invalid_test_app/vendor/gems/environment.rb",
+     "test/jam_test.rb",
      "test/test_helper.rb",
      "test/valid_test_app/vendor/gems/dirs/test-gem-four/lib/test-gem-four.rb",
      "test/valid_test_app/vendor/gems/dirs/test-gem-four/test/helper.rb",

data/lib/javagems/jam.rb

@@ -0,0 +1,12 @@
+module JavaGems
+  module Jam
+    def self.classpath_from_options(options)
+      classpath = [ENV["CLASSPATH"]]
+      classpath += %w[-cp -classpath].map do |option|
+        idx = options.index(option)
+        options.slice!(idx..(idx + 1)).last if idx
+      end
+      [classpath.compact.join(File::PATH_SEPARATOR), options]
+    end
+  end # Jam
+end # JamaGems

data/lib/rubygems/commands/classpath_command.rb

@@ -3,6 +3,14 @@ require 'bundler'
 require 'javagems/classpath_builder'
 require 'stringio'
 
+class Gem::StreamUI
+  def print(str) @outs.print(str); end
+end
+
+Gem::UserInteraction.class_eval do
+  def print(str) ui.print(str); end
+end
+
 class Gem::Commands::ClasspathCommand < Gem::Command
   attr_reader :cp_builder
 
@@ -16,7 +24,7 @@ class Gem::Commands::ClasspathCommand < Gem::Command
   end
 
   def execute
-    say(@cp_builder.classpath_for(options[:args].first))
+    print(@cp_builder.classpath_for(options[:args].first))
   rescue => e
     alert_error(e.message)
     exit 1

data/test/jam_test.rb

@@ -0,0 +1,90 @@
+require 'test_helper'
+require 'javagems/jam'
+
+context "Jam: classpath_from_options" do
+  context "with only -cp option" do
+    setup do
+      JavaGems::Jam.classpath_from_options(%w[-cp foo:bar])
+    end
+
+    should "include anything after -cp option" do
+      topic.first
+    end.equals("foo:bar")
+
+    should "remove -cp option and value from option array" do
+      topic.last
+    end.equals([])
+  end # with only -cp option
+
+  context "with only -classpath option" do
+    setup do
+      JavaGems::Jam.classpath_from_options(%w[-classpath bar:food])
+    end
+
+    should "include anything after option" do
+      topic.first
+    end.equals("bar:food")
+
+    should "remove option and value from option array" do
+      topic.last
+    end.equals([])
+  end # with only -classpath option
+
+  context "with -cp and -classpath options" do
+    setup do
+      JavaGems::Jam.classpath_from_options(%w[-cp foo:beard -classpath bar:food])
+    end
+
+    should "include anything after option" do
+      topic.first
+    end.equals("foo:beard:bar:food")
+
+    should "remove options and values from option array" do
+      topic.last
+    end.equals([])
+  end # with -cp and -classpath options
+
+  context "with -cp, -classpath and some other options" do
+    setup do
+      JavaGems::Jam.classpath_from_options(%w[your -cp foo:beard classy -classpath bar:food mom])
+    end
+
+    should "include anything after option" do
+      topic.first
+    end.equals("foo:beard:bar:food")
+
+    should "remove cp options and values but keep other stuff" do
+      topic.last
+    end.equals(%w[your classy mom])
+  end # with -cp, -classpath and some other options
+
+  context "when CLASSPATH defined but not the command line options" do
+    setup do
+      ENV["CLASSPATH"] = "bar:food"
+      JavaGems::Jam.classpath_from_options(%w[your classy mom])
+    end
+
+    should "include just the CLASSPATH value" do
+      topic.first
+    end.equals("bar:food")
+
+    should "leave command line options alone" do
+      topic.last
+    end.equals(%w[your classy mom])
+  end
+
+  context "when CLASSPATH , -cp, and -classpath are defined" do
+    setup do
+      ENV["CLASSPATH"] = "yum:juice"
+      JavaGems::Jam.classpath_from_options(%w[your -classpath food classy -cp bar mom])
+    end
+
+    should "include just CLASSPATH, -cp, and -classpath values" do
+      topic.first
+    end.equals("yum:juice:bar:food")
+
+    should "also keep the other command line options" do
+      topic.last
+    end.equals(%w[your classy mom])
+  end
+end # Jam: classpath_from_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: javagems
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - gabrielg
@@ -56,10 +56,10 @@ dependencies:
 description: Provides gem-esque support to Java
 email: gabriel.gironda@gmail.com
 executables: 
+- jam
+- jamc
 - javagem
 - javagem-exec
-- jem
-- jemc
 extensions: []
 
 extra_rdoc_files: 
@@ -71,14 +71,15 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/jam
+- bin/jamc
 - bin/javagem
 - bin/javagem-exec
-- bin/jem
-- bin/jemc
 - javagems.gemspec
 - lib/javagems.rb
 - lib/javagems/classpath_builder.rb
 - lib/javagems/gem_overrides.rb
+- lib/javagems/jam.rb
 - lib/rubygems/commands/classpath_command.rb
 - test/classpath_command_test.rb
 - test/gem_overrides_test.rb
@@ -117,6 +118,7 @@ files:
 - test/invalid_test_app/vendor/gems/specifications/test-gem-four-0.0.0.gemspec
 - test/invalid_test_app/vendor/gems/specifications/test-gem-one-0.0.0.gemspec
 - test/invalid_test_app/vendor/gems/specifications/test-gem-two-0.0.0.gemspec
+- test/jam_test.rb
 - test/test_helper.rb
 - test/valid_test_app/Gemfile
 - test/valid_test_app/vendor/gems/dirs/test-gem-four/.document
@@ -210,6 +212,7 @@ test_files:
 - test/invalid_test_app/vendor/gems/dirs/test-gem-two/test/helper.rb
 - test/invalid_test_app/vendor/gems/dirs/test-gem-two/test/test_test-gem-two.rb
 - test/invalid_test_app/vendor/gems/environment.rb
+- test/jam_test.rb
 - test/test_helper.rb
 - test/valid_test_app/vendor/gems/dirs/test-gem-four/lib/test-gem-four.rb
 - test/valid_test_app/vendor/gems/dirs/test-gem-four/test/helper.rb

data/bin/jem

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-exec("javagem-exec", "java", *ARGV)

data/bin/jemc

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-exec("javagem-exec", "javac", *ARGV)