jbundler 0.5.5 → 0.6.0

data/lib/jbundler/pom.rb

@@ -58,7 +58,65 @@ module JBundler
     end
 
     GROUP_ID = 'ruby.bundler'
-    
+
+    def start_write_pom( out, name, version, packaging )
+      outputFactory = XMLOutputFactory.newFactory()
+      xmlStreamWriter = outputFactory.createXMLStreamWriter( out )
+
+      xmlStreamWriter.writeStartDocument
+      xmlStreamWriter.writeStartElement("project")
+      
+      writeElement(xmlStreamWriter,"modelVersion","4.0.0")
+      writeElement(xmlStreamWriter,"groupId", GROUP_ID)
+      writeElement(xmlStreamWriter,"artifactId", name)
+      writeElement(xmlStreamWriter,"version", version.to_s.to_java)
+      writeElement(xmlStreamWriter,"packaging", packaging) if packaging  
+      xmlStreamWriter
+    end
+
+    def to_classifier_version( coords )
+      if coords.size == 4
+        [ nil, coords[3] ]
+      else
+        [ coords[3], coords[4] ]
+      end
+    end
+
+    def write_dep( xmlStreamWriter, coord )
+      coords = coord.split(/:/)
+      group_id = coords[0]
+      artifact_id = coords[1]
+      extension = coords[2]
+      classifier, version = to_classifier_version( coords )
+      
+      xmlStreamWriter.writeStartElement("dependency".to_java)
+      writeElement(xmlStreamWriter,"groupId", group_id)
+      writeElement(xmlStreamWriter,"artifactId", artifact_id)
+      writeElement(xmlStreamWriter,"version", version)
+      
+      writeElement(xmlStreamWriter,"type", extension) if extension != 'jar'
+      writeElement(xmlStreamWriter,"classifier", classifier) if classifier
+      xmlStreamWriter.writeEndElement #dependency
+    end
+
+    def write_dependencies( xmlStreamWriter, deps )
+      xmlStreamWriter.writeStartElement("dependencies".to_java)
+      
+      deps.each do |line|
+        coord = to_coordinate(line)
+        write_dep( xmlStreamWriter, coord ) if coord
+      end
+
+      xmlStreamWriter.writeEndElement #dependencies
+    end
+
+    def end_write_pom( xmlStreamWriter )
+      xmlStreamWriter.writeEndElement #project
+      
+      xmlStreamWriter.writeEndDocument
+      xmlStreamWriter.close
+    end
+
     public
     
     def coordinate
@@ -80,50 +138,15 @@ module JBundler
 
       @file = File.join(temp_dir, 'pom.xml')
 
-      out = java.io.BufferedOutputStream.new(java.io.FileOutputStream.new(@file.to_java))
-      outputFactory = XMLOutputFactory.newFactory()
-      xmlStreamWriter = outputFactory.createXMLStreamWriter(out)
-      xmlStreamWriter.writeStartDocument
-      xmlStreamWriter.writeStartElement("project")
-      
-      writeElement(xmlStreamWriter,"modelVersion","4.0.0")
-      writeElement(xmlStreamWriter,"groupId", GROUP_ID)
-      writeElement(xmlStreamWriter,"artifactId", name)
-      writeElement(xmlStreamWriter,"version", version.to_s.to_java)
-      writeElement(xmlStreamWriter,"packaging", packaging) if packaging
-      
-      xmlStreamWriter.writeStartElement("dependencies".to_java)
-      
-      deps.each do |line|
-        if coord = to_coordinate(line)
-          coords = coord.split(/:/)
-          group_id = coords[0]
-          artifact_id = coords[1]
-          extension = coords[2]
-          classifier = nil
-          if coords.size == 4
-            version = coords[3]
-          else
-            classifier = coords[3]
-            version = coords[4]
-          end
-
-          xmlStreamWriter.writeStartElement("dependency".to_java)
-          writeElement(xmlStreamWriter,"groupId", group_id)
-          writeElement(xmlStreamWriter,"artifactId", artifact_id)
-          writeElement(xmlStreamWriter,"version", version)
-          
-          writeElement(xmlStreamWriter,"type", extension) if extension != 'jar'
-          writeElement(xmlStreamWriter,"classifier", classifier) if classifier
-          xmlStreamWriter.writeEndElement #dependency
-        end
-      end
-      xmlStreamWriter.writeEndElement #dependencies
+      out = java.io.BufferedOutputStream.new( java.io.FileOutputStream.new( @file.to_java ) )
+
+      xmlStreamWriter = start_write_pom( out, name, version, packaging )
       
-      xmlStreamWriter.writeEndElement #project
+      write_dependencies( xmlStreamWriter, deps )
+
+      end_write_pom( xmlStreamWriter )
       
-      xmlStreamWriter.writeEndDocument
-      xmlStreamWriter.close
+    ensure
       out.close
     end
     

data/lib/jbundler/pom_runner.rb

@@ -0,0 +1,71 @@
+require 'maven/ruby/maven'
+module JBundler
+  
+  class PomRunner
+
+    def initialize( config )
+      @config = config
+    end
+
+    def method_missing( m, *args )
+      result = @config[ m ] || @config[ m.to_s ] 
+      result.nil? ? super : result
+    end
+
+    def maven_new
+      m = Maven::Ruby::Maven.new
+      m.property( 'base.dir', File.expand_path( basedir ) )
+      m.property( 'work.dir', File.expand_path( workdir ) ) if workdir
+      m.property( 'verbose', debug || verbose )
+      if debug
+        m.options[ '-X' ] = nil
+      elsif verbose
+        m.options[ '-e' ] = nil
+      else
+        m.options[ '-q' ] = nil
+      end
+      m.verbose = debug
+      m
+    end
+    private :maven_new
+
+    def maven
+      @m ||= maven_new
+    end
+
+    def basedir
+      File.expand_path( '.' )
+    end
+
+    def workdir
+       @config[ 'workdir' ]
+    end
+
+    def work_dir
+      # needs default here
+      workdir || 'pkg'
+    end
+
+    def debug
+       @config[ 'debug' ] || false
+    end
+
+    def verbose
+       @config[ 'verbose' ] || false
+    end
+
+    def clean?
+       @config[ 'clean' ] || false      
+    end
+
+    def pom_file
+      raise 'overwrite this method'
+    end
+
+    def exec( *args )
+      maven.options[ '-f' ] ||= pom_file
+      args.unshift :clean if clean?
+      maven.exec( *args )
+    end
+  end
+end

data/lib/jbundler/show.rb

@@ -13,30 +13,40 @@ module JBundler
       @classpath_file = JBundler::ClasspathFile.new( @config.classpath_file )
     end
 
-    def do_it( debug = false )
-      jarfile = Maven::Tools::Jarfile.new( @config.jarfile )
-      vendor = JBundler::Vendor.new( @config.vendor_dir )
-      gemfile_lock = JBundler::GemfileLock.new( jarfile, 
-                                                @config.gemfile_lock )
-    end
-
     def show_classpath
-      @classpath_file.require_classpath
-      warn "jruby core classpath:"
-      JBUNDLER_JRUBY_CLASSPATH.each do |path|
-        warn "\t#{path}"
-      end
-      warn "jbundler runtime classpath:"
-      JBUNDLER_CLASSPATH.each do |path|
-        warn "\t#{path}"
-      end
-      warn "jbundler test classpath:"
-      if JBUNDLER_TEST_CLASSPATH.empty?
-        warn "\t--- empty ---"
-      else
-        JBUNDLER_TEST_CLASSPATH.each do |path|
+      return if ! @config.verbose
+      vendor = JBundler::Vendor.new(@config.vendor_dir)
+      if vendor.vendored?
+        vendor.require_jars
+        warn "complete classpath:"
+        $CLASSPATH.each do |path|
           warn "\t#{path}"
         end
+      else
+        @classpath_file.load_classpath
+        warn ''
+        warn 'jbundler provided classpath:'
+        warn '----------------'
+        JBUNDLER_JRUBY_CLASSPATH.each do |path|
+          warn "#{path}"
+        end
+        warn ''
+        warn 'jbundler runtime classpath:'
+        warn '---------------------------'
+        JBUNDLER_CLASSPATH.each do |path|
+          warn "#{path}"
+        end
+        warn ''
+        warn 'jbundler test classpath:'
+        warn '------------------------'
+        if JBUNDLER_TEST_CLASSPATH.empty?
+          warn "\t--- empty ---"
+        else
+          JBUNDLER_TEST_CLASSPATH.each do |path|
+            warn "#{path}"
+          end
+        end
+        warn ''
       end
     end
   end

data/lib/jbundler/tree.rb

@@ -10,7 +10,8 @@ module JBundler
 
     def show_it( debug = false )
       m = Maven::Ruby::Maven.new
-      m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 'tree_pom.rb' )
+      m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 
+                                     'dependency_pom.rb' )
       m.options[ '-q' ] = nil unless debug
       m.verbose = debug
 
@@ -18,10 +19,13 @@ module JBundler
 
       puts '...'
 
-      m.exec( 'org.apache.maven.plugins:maven-dependency-plugin:2.8:tree' )
+      tree = File.join( File.expand_path( @config.work_dir ), 
+                                 'tree.txt' )
+      m.property( 'jbundler.outputFile', tree )
 
-      puts File.read( File.join( File.expand_path( @config.work_dir ), 
-                                 'tree.txt' ) )
+      m.exec( 'dependency:tree' )
+
+      puts File.read( tree )
     end
   end
 end

data/lib/jbundler/vendor.rb

@@ -1,3 +1,4 @@
+require 'jar_installer'
 module JBundler
   class Vendor
 
@@ -10,8 +11,16 @@ module JBundler
     end
 
     def require_jars
-      Dir[ File.join( @dir, '**', '*' ) ].each do |f|
-        require f
+      jars = File.join( @dir, 'jbundler.rb' )
+      if File.exists?( jars )
+        $LOAD_PATH << @dir unless $LOAD_PATH.include? @dir
+        require jars
+      else
+        Dir[ File.join( @dir, '**', '*' ) ].each do |f|
+          require f
+        end
+        Jars.freeze_loading
+        true
       end
     end
 
@@ -22,6 +31,14 @@ module JBundler
       end
     end
 
+    def vendor_dependencies( deps )
+      require_file = File.join( @dir, 'jbundler.rb' )
+      Jars::JarInstaller.install_deps( deps, @dir, require_file, true ) do |f|
+        f.puts
+        f.puts 'Jars.freeze_loading'
+      end
+    end
+
     def setup( classpath_file )
       classpath_file.require_classpath
       FileUtils.mkdir_p( @dir )
@@ -30,14 +47,6 @@ module JBundler
                                     File.basename( f ) ) )
       end
     end
-
-    def copy_jar( coord, file )
-      target = File.join( *coord.sub( /:jar:/, '-') .split( /:/ ) )
-      target_file = File.join( @dir, target ) + '.jar'
-      FileUtils.mkdir_p( File.dirname( target_file ) )
-      FileUtils.cp( file, target_file )
-      puts "\t#{coord} to #{target}"
-    end
   end
 end
 

data/spec/classpath_file_spec.rb

@@ -74,8 +74,8 @@ describe JBundler::ClasspathFile do
     subject.needs_update?(jarfile, gemfile_lock).must_equal true
   end
 
-  it 'generates a classpath ruby file' do
-    subject.generate("a:b:c:d:f:".split(File::PATH_SEPARATOR))
+  it 'generates a classpath ruby file without localrepo' do
+    subject.generate("a:b:c:d:f:".split(File::PATH_SEPARATOR) )
     File.read(cpfile).must_equal <<-EOF
 JBUNDLER_JRUBY_CLASSPATH = []
 JBUNDLER_JRUBY_CLASSPATH.freeze
@@ -88,7 +88,51 @@ JBUNDLER_CLASSPATH << 'c'
 JBUNDLER_CLASSPATH << 'd'
 JBUNDLER_CLASSPATH << 'f'
 JBUNDLER_CLASSPATH.freeze
-JBUNDLER_CLASSPATH.each { |c| require c }
 EOF
   end
+
+  it 'generates a classpath ruby file with localrepo' do
+    subject.generate("a:b:c:d:f:".split(File::PATH_SEPARATOR), [], [], '/tmp')
+    File.read(cpfile).must_equal <<-EOF
+require 'jar_dependencies'
+JBUNDLER_LOCAL_REPO = Jars.home
+JBUNDLER_JRUBY_CLASSPATH = []
+JBUNDLER_JRUBY_CLASSPATH.freeze
+JBUNDLER_TEST_CLASSPATH = []
+JBUNDLER_TEST_CLASSPATH.freeze
+JBUNDLER_CLASSPATH = []
+JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + 'a')
+JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + 'b')
+JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + 'c')
+JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + 'd')
+JBUNDLER_CLASSPATH << (JBUNDLER_LOCAL_REPO + 'f')
+JBUNDLER_CLASSPATH.freeze
+EOF
+  end
+
+  it 'require classpath using default with generated localrepo' do
+    ENV[ 'JARS_HOME' ] = '/tmp'
+    Jars.reset
+    subject.generate("/a:/b:/c:/d:/f:".split(File::PATH_SEPARATOR), [], [], '/tmp')
+    begin
+      subject.require_classpath
+    rescue LoadError
+      # there are no files to require
+    end
+    JBUNDLER_CLASSPATH.must_equal ["/tmp/a", "/tmp/b", "/tmp/c", "/tmp/d", "/tmp/f"]
+  end
+
+  it 'require classpath with generated localrepo' do
+    ENV[ 'JARS_HOME' ] = '/tmp'
+    subject.generate("/a:/b:/c:/d:/f:".split(File::PATH_SEPARATOR), [], [], '/tmp')
+    
+    begin
+      Jars.reset
+      ENV[ 'JARS_HOME' ] = '/temp'
+      subject.require_classpath
+    rescue LoadError
+      # there are no files to require
+    end
+    JBUNDLER_CLASSPATH.must_equal ["/temp/a", "/temp/b", "/temp/c", "/temp/d", "/temp/f"]
+  end
 end

data/spec/config_spec.rb

@@ -4,9 +4,19 @@ require 'fileutils'
 
 describe JBundler::Config do
 
-  before do     
+  let( :basedir ){ File.dirname( File.dirname( File.expand_path( __FILE__ ) ) ) }
+  let( :spec ){ 'spec' }
+  let( :spec_dir ){ File.join( basedir, spec ) }
+  let( :project ){ File.join( spec, 'project' ) }
+  let( :project_dir ) { File.join( basedir, project ) }
+
+  before do
+    # in case we have relative path __FILE__
+    basedir
+    Jars.reset
     ENV.keys.each do |k|
       ENV.delete( k ) if k.to_s.match /^(J?)BUNDLE/
+      ENV.delete( k ) if k.to_s.match /^JARS/
     end
     if defined? JRUBY_VERSION     
       java.lang.System.properties.keys.each do |k|
@@ -21,68 +31,82 @@ describe JBundler::Config do
     FileUtils.cd( 'spec' ) do
       c = JBundler::Config.new
       c.verbose.must_equal nil
-      c.local_repository.must_equal nil
-      c.jarfile.must_equal 'Jarfile'
-      c.gemfile.must_equal 'Gemfile'
+      c.local_repository.must_equal './.m2/repository'
+      c.jarfile.must_equal File.join( basedir, 'Jarfile' )
+      c.gemfile.must_equal File.join( basedir, 'Gemfile' )
       c.skip.must_equal nil
-      c.settings.must_equal nil 
+      c.settings.must_equal "./.m2/settings.xml"
       c.offline.must_equal false
-      c.work_dir.must_equal 'pkg'
-      c.vendor_dir.must_equal 'vendor/jars'
+      c.work_dir.must_equal File.join( basedir, 'pkg' )
+      c.vendor_dir.must_equal File.join( basedir, 'vendor/jars' )
     end
   end
 
   it 'has following defaults without home and with local config' do
     ENV['HOME'] = '.'
-    
-    FileUtils.cd( File.join( 'spec', 'project' ) ) do
+    FileUtils.cd( project ) do
       c = JBundler::Config.new
-
       c.verbose.must_equal true
-      c.local_repository.must_equal 'local'
-      c.jarfile.must_equal 'Jar_file'
-      c.gemfile.must_equal 'gemfile'
+      c.local_repository.must_equal File.join( project_dir, 'local' )
+      c.jarfile.must_equal File.join( project_dir, 'Jar_file' )
+      c.gemfile.must_equal File.join( project_dir, 'gemfile' )
       c.skip.must_equal false
-      c.settings.must_equal 'settings.xml'
+      c.settings.must_equal File.join( project_dir, 'settings.xml' )
       c.offline.must_equal true
-      c.work_dir.must_equal 'pkg'
-      c.vendor_dir.must_equal 'vendor/myjars'
+      c.work_dir.must_equal File.join( project_dir, 'pkg' )
+      c.vendor_dir.must_equal File.join( project_dir, 'vendor/myjars' )
     end
   end
 
   it 'has following defaults with home and without local config' do
     ENV['HOME'] = File.join( 'home' )
 
-    FileUtils.cd( 'spec' ) do
+    FileUtils.cd( spec ) do
       c = JBundler::Config.new
           
       c.verbose.must_equal false
-      c.local_repository.must_equal 'localrepo'
-      c.jarfile.must_equal 'jarfile'
-      c.gemfile.must_equal 'Gem_file'
+      c.local_repository.must_equal File.join( spec_dir, 'localrepo' )
+      c.jarfile.must_equal File.join( spec_dir, 'jarfile' )
+      c.gemfile.must_equal File.join( spec_dir, 'Gem_file' )
       c.skip.must_equal true
-      c.settings.must_equal 'Settings.xml'
+      c.settings.must_equal File.join( spec_dir, 'Settings.xml' )
       c.offline.must_equal false
-      c.work_dir.must_equal 'target/pkg'
-      c.vendor_dir.must_equal 'vendor/my_jars'
+      c.work_dir.must_equal File.join( spec_dir, 'target/pkg' )
+      c.vendor_dir.must_equal File.join( spec_dir, 'vendor/my_jars' )
     end
   end
 
   it 'has following defaults with home and with local config' do
     ENV['HOME'] = File.expand_path( File.join( 'spec', 'home' ) )
 
-    FileUtils.cd( File.join( 'spec', 'project' ) ) do
+    FileUtils.cd( project ) do
+      c = JBundler::Config.new
+    
+      c.verbose.must_equal true
+      c.local_repository.must_equal File.join( project_dir, 'local' )
+      c.jarfile.must_equal File.join( project_dir, 'Jar_file' )
+      c.gemfile.must_equal File.join( project_dir, 'gemfile' )
+      c.skip.must_equal false
+      c.settings.must_equal File.join( project_dir, 'settings.xml' )
+      c.offline.must_equal true
+      c.work_dir.must_equal File.join( project_dir, 'pkg' )
+      c.vendor_dir.must_equal File.join( project_dir, 'vendor/myjars' )
+    end
+  end
+
+  it 'has following defaults with local config starting from nested child directory' do
+    FileUtils.cd( File.join( project, 'some', 'more' ) ) do
       c = JBundler::Config.new
     
       c.verbose.must_equal true
-      c.local_repository.must_equal 'local'
-      c.jarfile.must_equal 'Jar_file'
-      c.gemfile.must_equal 'gemfile'
+      c.local_repository.must_equal File.join( project_dir, 'local' )
+      c.jarfile.must_equal File.join( project_dir, 'Jar_file' )
+      c.gemfile.must_equal File.join( project_dir, 'gemfile' )
       c.skip.must_equal false
-      c.settings.must_equal 'settings.xml'
+      c.settings.must_equal File.join( project_dir, 'settings.xml' )
       c.offline.must_equal true
-      c.work_dir.must_equal 'pkg'
-      c.vendor_dir.must_equal 'vendor/myjars'
+      c.work_dir.must_equal File.join( project_dir, 'pkg' )
+      c.vendor_dir.must_equal File.join( project_dir, 'vendor/myjars' )
     end
   end
 
@@ -107,20 +131,22 @@ describe JBundler::Config do
           ENV['HOME'] = eval "\"#{File.expand_path( home )}\""
           
           FileUtils.cd eval "\"#{dir}\"" do
+            pdir = eval "#{File.basename( dir )}_dir"
+            Jars.reset
             c = JBundler::Config.new
             c.verbose.must_equal true
-            c.local_repository.must_equal 'local_repository'
-            c.jarfile.must_equal 'JarFile'
-            c.gemfile.must_equal 'GemFile'
+            c.local_repository.must_equal File.join( pdir, 'local_repository' )
+            c.jarfile.must_equal File.join( pdir, 'JarFile' )
+            c.gemfile.must_equal File.join( pdir, 'GemFile' )
             c.skip.must_equal false
-            c.settings.must_equal 'Settings.xml'
+            c.settings.must_equal File.join( pdir, 'Settings.xml' )
             c.offline.must_equal true
-            c.work_dir.must_equal 'pkg/work'
-            c.vendor_dir.must_equal 'vendor/localjars'
+            c.work_dir.must_equal File.join( pdir, 'pkg/work' )
+            c.vendor_dir.must_equal File.join( pdir, 'vendor/localjars' )
           end
         end
         
-        it 'uses java.lang.System.properties with home #{home} and local dir #{dir}' do
+        it "uses java.lang.System.properties with home #{home} and local dir #{dir}" do
           ENV['HOME'] = eval "\"#{File.expand_path( home )}\""
 
           java.lang.System.set_property 'jbundle.verbose', 'false'
@@ -134,16 +160,17 @@ describe JBundler::Config do
           java.lang.System.set_property 'jbundle.vendor.dir', 'vendor/local_jars'
           
           FileUtils.cd eval "\"#{dir}\"" do
+            pdir = eval "#{File.basename( dir )}_dir"
             c = JBundler::Config.new
             c.verbose.must_equal false
-            c.local_repository.must_equal 'local_repo'
-            c.jarfile.must_equal 'Jar_File'
-            c.gemfile.must_equal 'Gem_File'
+            c.local_repository.must_equal File.join( pdir, 'local_repo' )
+            c.jarfile.must_equal File.join( pdir, 'Jar_File' )
+            c.gemfile.must_equal File.join( pdir, 'Gem_File' )
             c.skip.must_equal true
-            c.settings.must_equal 'settings.xml'
+            c.settings.must_equal File.join( pdir, 'settings.xml' )
             c.offline.must_equal false
-            c.work_dir.must_equal 'target/work'
-            c.vendor_dir.must_equal 'vendor/local_jars'
+            c.work_dir.must_equal File.join( pdir, 'target/work' )
+            c.vendor_dir.must_equal File.join( pdir, 'vendor/local_jars' )
           end
         end
       end