javagems 0.4.2 → 0.4.3

data/.gitignore

@@ -1,21 +1,4 @@
-## MAC OS
 .DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
 *.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
+*.swo
 pkg
-
-## PROJECT::SPECIFIC

data/Rakefile

@@ -6,6 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "javagems"
     gem.executables << "javagem"
+    gem.executables << "javagem-exec"
     gem.summary = %Q{A gem for the javagems system}
     gem.description = %Q{Provides gem-esque support to Java}
     gem.email = "gabriel.gironda@gmail.com"
@@ -14,6 +15,7 @@ begin
     gem.add_dependency "gemcutter"
     gem.add_dependency "jeweler"
     gem.add_dependency "bundler"
+    gem.add_dependency "cmdparse"
     gem.add_development_dependency "riot"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/bin/javagem

@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'javagems/commands/javagem_command'
-require 'rubygems/command_manager'
 require 'pathname'
 $: << (Pathname(__FILE__).parent.parent + "lib").expand_path.to_s
-
+require 'javagems/gem_overrides'
+require 'rubygems/command_manager'
 require "rubygems/commands/jeweler_command"
 require "rubygems/commands/classpath_command"
 

data/bin/javagem-exec

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+# NOT A GEM PLUGIN BECAUSE I'M CLEARLY TOO INEPT TO
+# WORK WITH OPTPARSE AS IT IS USED IN A GEM PLUGIN.
+require 'pathname'
+$: << Pathname(__FILE__).parent.parent + "lib"
+require 'javagems/gem_overrides'
+require 'javagems/classpath_builder'
+require 'optparse'
+
+if sep = ARGV.index("--")
+  rest = ARGV[(sep + 1)..-1]
+  opts = ARGV.slice(0, sep)
+else
+  rest = ARGV
+  opts = []
+end
+
+options = {}
+parser = OptionParser.new do |opt_parse|
+  opt_parse.banner = <<EOU.gsub(/^\s+/, '')
+  Usage: #{$0} [options] -- command
+  The -- is unnecessary if no options are specified.
+EOU
+
+  opt_parse.on("-m", "--manifest GEMFILE", "Gem manifest file to use") do |m|
+    options[:manifest] = m
+  end
+end
+
+if ARGV.empty?
+  puts parser.to_s
+  exit 1
+else
+  parser.parse(opts)
+  cp_builder = JavaGems::ClasspathBuilder.new
+  cp = cp_builder.classpath_for(options[:manifest])
+  ENV['CLASSPATH'] = ENV['CLASSPATH'] ? "#{cp}#{File::PATH_SEPARATOR}#{ENV['CLASSPATH']}" : cp
+  exec(*rest)
+end

data/javagems.gemspec

@@ -5,32 +5,29 @@
 
 Gem::Specification.new do |s|
   s.name = %q{javagems}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "jaknowlden"]
-  s.date = %q{2009-11-14}
+  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"]
+  s.executables = ["javagem", "javagem-exec", "javagem", "javagem-exec"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
-     ".gitignore",
-     "LICENSE",
+    ".gitignore",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "Rakefile",
      "VERSION",
      "bin/javagem",
+     "bin/javagem-exec",
      "javagems.gemspec",
      "lib/javagems.rb",
-     "lib/javagems/commands/javagem_command.rb",
+     "lib/javagems/classpath_builder.rb",
      "lib/javagems/gem_overrides.rb",
      "lib/rubygems/commands/classpath_command.rb",
      "lib/rubygems/commands/jeweler_command.rb",
@@ -125,6 +122,35 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A gem for the javagems system}
+  s.test_files = [
+    "test/classpath_command_test.rb",
+     "test/gem_overrides_test.rb",
+     "test/invalid_test_app/vendor/gems/dirs/test-gem-four/lib/test-gem-four.rb",
+     "test/invalid_test_app/vendor/gems/dirs/test-gem-four/test/helper.rb",
+     "test/invalid_test_app/vendor/gems/dirs/test-gem-four/test/test_test-gem-four.rb",
+     "test/invalid_test_app/vendor/gems/dirs/test-gem-one/lib/test-gem-one.rb",
+     "test/invalid_test_app/vendor/gems/dirs/test-gem-one/test/helper.rb",
+     "test/invalid_test_app/vendor/gems/dirs/test-gem-one/test/test_test-gem-one.rb",
+     "test/invalid_test_app/vendor/gems/dirs/test-gem-two/lib/test-gem-two.rb",
+     "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/jeweler_command_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",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-four/test/test_test-gem-four.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-one/lib/test-gem-one.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-one/test/helper.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-one/test/test_test-gem-one.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-three/lib/test-gem-three.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-three/test/helper.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-three/test/test_test-gem-three.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-two/lib/test-gem-two.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-two/test/helper.rb",
+     "test/valid_test_app/vendor/gems/dirs/test-gem-two/test/test_test-gem-two.rb",
+     "test/valid_test_app/vendor/gems/environment.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -134,17 +160,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<gemcutter>, [">= 0"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<bundler>, [">= 0"])
+      s.add_runtime_dependency(%q<cmdparse>, [">= 0"])
       s.add_development_dependency(%q<riot>, [">= 0"])
     else
       s.add_dependency(%q<gemcutter>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<cmdparse>, [">= 0"])
       s.add_dependency(%q<riot>, [">= 0"])
     end
   else
     s.add_dependency(%q<gemcutter>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<cmdparse>, [">= 0"])
     s.add_dependency(%q<riot>, [">= 0"])
   end
 end

data/lib/javagems/classpath_builder.rb

@@ -0,0 +1,38 @@
+require 'bundler'
+
+module JavaGems
+  class ClasspathBuilder
+    class ClasspathError < RuntimeError; end
+    
+    def classpath_for(gemfile)
+      with_hijacked_bundler_logging do
+        bundler_env = Bundler::Environment.load(gemfile)
+        deps = bundler_env.dependencies.map {|dep| dep.to_gem_dependency }
+        cp = Bundler::Resolver.resolve(deps, sources).collect do |spec|
+          (Pathname(spec.full_gem_path) + "lib").expand_path.to_s
+        end.join(File::PATH_SEPARATOR)
+      end
+
+    rescue => e
+      raise ClasspathError, "#{e.message} - #{@hijacked_out.read}"  
+    end
+
+  private
+
+    def with_hijacked_bundler_logging
+      @hijacked_out = StringIO.new
+      real_logger, Bundler.logger = Bundler.logger, Logger.new(@hijacked_out, Logger::INFO)
+      Bundler.logger.formatter = real_logger.formatter
+      yield
+    ensure
+      @hijacked_out.rewind
+      Bundler.logger = real_logger
+    end
+
+    # FIXME - Until we have actual bundler support, use the Gem home source index.
+    def sources
+      [Bundler::DirectorySource.new(:location => Gem.configuration.home)]
+    end
+
+  end # ClasspathBuilder
+end   # JavaGems

data/lib/javagems/gem_overrides.rb

@@ -3,6 +3,8 @@ require 'rubygems/gem_runner'
 require 'rubygems/exceptions'
 require 'bundler'
 
+ENV['GEMCUTTER_URL'] = ENV['JAVAGEMS_URL'] || "https://gems.javagems.org/"
+
 module Gem
   DefaultGemConfigName = ".javagemrc"
 
@@ -18,6 +20,7 @@ module Gem
     :gempath  => [File.join(Gem.user_home, ".javagem/java")]
   )
 
+  @configuration = nil # To force Gem to re-read the config
 end
 
 class Gem::AbstractCommand < Gem::Command

data/lib/rubygems/commands/classpath_command.rb

@@ -1,11 +1,14 @@
 require 'rubygems/command'
 require 'bundler'
+require 'javagems/classpath_builder'
 require 'stringio'
 
 class Gem::Commands::ClasspathCommand < Gem::Command
+  attr_reader :cp_builder
 
   def initialize
     super 'classpath', "Given a Gemfile, returns the classpath necessary to satisfy dependencies"
+    @cp_builder = JavaGems::ClasspathBuilder.new
   end
 
   def usage
@@ -13,37 +16,11 @@ class Gem::Commands::ClasspathCommand < Gem::Command
   end
 
   def execute
-    with_hijacked_bundler_logging do
-      bundler_env = Bundler::Environment.load(options[:args].first)
-      deps = bundler_env.dependencies.map {|dep| dep.to_gem_dependency }
-
-      cp = Bundler::Resolver.resolve(deps, sources).collect do |spec|
-        (Pathname(spec.full_gem_path) + "lib").expand_path.to_s
-      end.join(File::PATH_SEPARATOR)
-      say(cp)
-    end
+    say(@cp_builder.classpath_for(options[:args].first))
   rescue => e
     alert_error(e.message)
-    @hijacked_out.readlines.each { |l| alert_error(l.strip) }
     exit 1
   end
 
-private
-  
-  def with_hijacked_bundler_logging
-    @hijacked_out = StringIO.new
-    real_logger, Bundler.logger = Bundler.logger, Logger.new(@hijacked_out, Logger::INFO)
-    Bundler.logger.formatter = real_logger.formatter
-    yield
-  ensure
-    @hijacked_out.rewind
-    Bundler.logger = real_logger
-  end
-
-  # FIXME - Until we have actual bundler support, use the system source index.
-  def sources
-    [Bundler::SystemGemSource.instance]
-  end
-
 end 
 

data/test/classpath_command_test.rb

@@ -8,7 +8,8 @@ context "the classpath command" do
     setup do
       @command = Gem::Commands::ClasspathCommand.new
       # FIXME - ghetto-mock
-      def @command.sources
+      cp_builder = @command.cp_builder
+      def cp_builder.sources
         [Bundler::DirectorySource.new(:location => (TestRoot + "valid_test_app/vendor").expand_path.to_s)]
       end
     end
@@ -27,7 +28,8 @@ context "the classpath command" do
     setup do
       @command = Gem::Commands::ClasspathCommand.new
       # FIXME - ghetto-mock
-      def @command.sources
+      cp_builder = @command.cp_builder
+      def cp_builder.sources
         [Bundler::DirectorySource.new(:location => (TestRoot + "invalid_test_app/vendor").expand_path.to_s)]
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: javagems
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - gabrielg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 -06:00
+date: 2009-11-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: cmdparse
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: riot
   type: :development
@@ -57,23 +67,25 @@ description: Provides gem-esque support to Java
 email: gabriel.gironda@gmail.com
 executables: 
 - javagem
+- javagem-exec
 - javagem
+- javagem-exec
 extensions: []
 
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
 files: 
-- .document
 - .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/javagem
+- bin/javagem-exec
 - javagems.gemspec
 - lib/javagems.rb
-- lib/javagems/commands/javagem_command.rb
+- lib/javagems/classpath_builder.rb
 - lib/javagems/gem_overrides.rb
 - lib/rubygems/commands/classpath_command.rb
 - lib/rubygems/commands/jeweler_command.rb
@@ -190,5 +202,31 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A gem for the javagems system
-test_files: []
-
+test_files: 
+- test/classpath_command_test.rb
+- test/gem_overrides_test.rb
+- test/invalid_test_app/vendor/gems/dirs/test-gem-four/lib/test-gem-four.rb
+- test/invalid_test_app/vendor/gems/dirs/test-gem-four/test/helper.rb
+- test/invalid_test_app/vendor/gems/dirs/test-gem-four/test/test_test-gem-four.rb
+- test/invalid_test_app/vendor/gems/dirs/test-gem-one/lib/test-gem-one.rb
+- test/invalid_test_app/vendor/gems/dirs/test-gem-one/test/helper.rb
+- test/invalid_test_app/vendor/gems/dirs/test-gem-one/test/test_test-gem-one.rb
+- test/invalid_test_app/vendor/gems/dirs/test-gem-two/lib/test-gem-two.rb
+- 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/jeweler_command_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
+- test/valid_test_app/vendor/gems/dirs/test-gem-four/test/test_test-gem-four.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-one/lib/test-gem-one.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-one/test/helper.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-one/test/test_test-gem-one.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-three/lib/test-gem-three.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-three/test/helper.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-three/test/test_test-gem-three.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-two/lib/test-gem-two.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-two/test/helper.rb
+- test/valid_test_app/vendor/gems/dirs/test-gem-two/test/test_test-gem-two.rb
+- test/valid_test_app/vendor/gems/environment.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/lib/javagems/commands/javagem_command.rb

@@ -1,2 +0,0 @@
-ENV['GEMCUTTER_URL'] = ENV['JAVAGEMS_URL'] || "https://gems.javagems.org/"
-require 'javagems/gem_overrides'