jbundler 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6847586be4e702359fb9d976eb8182a0755ceaa
-  data.tar.gz: f2f2fdf3e409c2546f5fc7fe3e2667c366387a5f
+  metadata.gz: 275f83f5be90c00276878e73a1d4ef53702107d8
+  data.tar.gz: 3704bde15e98b5ea6b5f0f3c76d7a3e2d4f45662
 SHA512:
-  metadata.gz: ff23acbae92baba94fa31523d692d3638ca834790fee3579ebb165eff8d31d24c374db8bb570122002c5336a50b0ff1ad1c11452b3cb35246d426ce1cb39e61c
-  data.tar.gz: cf96c9d43080f190daa6485c65c24d2733dfa3b4828005ca4cb4759164d2b5b44d3765602be07694ce005d88ae814f0f74428ca84354ce927063e93465be7f3f
+  metadata.gz: a6d85deca5ed0c0bbb374da66d137c0168c250c8cc5131d282e0d537853df3d5d870cb7978da89ea44623d20d7faae12fa7455cfad0cab8796293dc5a7a4aca6
+  data.tar.gz: 0819bdf611d0b905b73b493f19a4cfc312c3c75d298995ce48dbe8636f1eb6f216bc5d55e4d792f7ed58ed9a80290f26d047ce4889caf9f0c8f0f1c38861a9c6

data/Gemfile

@@ -4,4 +4,3 @@ source 'https://rubygems.org'
 gemspec
 
 gem "copyright-header", "1.0.8", :platform => :mri, :group => :copyright
-

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    jbundler (0.6.4)
+    jbundler (0.6.5.dev)
       bundler (~> 1.5)
-      jar-dependencies (~> 0.1.3)
+      jar-dependencies (~> 0.1.5.dev)
+      maven-tools (= 1.0.6.dev)
       ruby-maven (>= 3.1.1.0.6, < 3.1.2)
 
 GEM
@@ -19,11 +20,11 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.9)
     ice_nine (0.11.0)
-    jar-dependencies (0.1.3)
-    maven-tools (1.0.5)
+    jar-dependencies (0.1.5.dev)
+    maven-tools (1.0.6.dev)
       virtus (~> 1.0)
-    minitest (5.4.2)
-    rake (10.3.2)
+    minitest (5.4.3)
+    rake (10.4.0)
     ruby-maven (3.1.1.0.8)
       maven-tools (~> 1.0.1)
       ruby-maven-libs (= 3.1.1)

data/lib/jbundler.rb

@@ -20,6 +20,7 @@
 #
 
 require 'jbundler/context'
+require 'jbundler/lock_down'
 
 module JBundler
 
@@ -32,29 +33,6 @@ module JBundler
     context.config
   end
 
-  def self.update
-    if( context.classpath.needs_update?( context.jarfile, 
-                                         context.gemfile_lock ) and
-        not context.vendor.vendored? )
-      
-      warn ''
-      warn 'jar bundle is outdated - use jbundle install to update bundle'
-      warn ''
-
-      aether = JBundler::AetherRuby.new( context.config )
-      
-      context.jarfile.populate_unlocked( aether )
-      context.gemfile_lock.populate_dependencies( aether )
-      context.jarfile.populate_locked( aether )
-      
-      aether.resolve
-      
-      context.classpath.generate( aether.classpath_array, [], [], 
-                                  context.config.local_repository )
-      context.jarfile.generate_lockfile( aether.resolved_coordinates )
-    end
-  end
-
   def self.require_jars
     if context.vendor.vendored?
       jars = context.vendor.require_jars
@@ -77,11 +55,16 @@ module JBundler
     end
   end
     
+  def self.install( debug = false, verbose = false )
+    jbundler = JBundler::LockDown.new( context.config )
+    msg = jbundler.lock_down( false, debug, verbose )
+    puts msg if msg
+  end
+
   def self.setup
     if context.config.skip
       warn "skip jbundler setup" if context.config.verbose
     else
-      update
       require_jars
     end
   end

data/lib/jbundler/classpath_file.rb

@@ -25,6 +25,10 @@ module JBundler
     def initialize(classpathfile = '.jbundler/classpath.rb')
       @classpathfile = classpathfile
     end
+    
+    def file
+      @classpathfile
+    end
 
     def load_classpath
       load File.expand_path @classpathfile
@@ -61,7 +65,7 @@ module JBundler
     end
        
     def needs_update?(jarfile, gemfile_lock)
-      if jarfile.exists? || gemfile_lock.exists? || jarfile.exists_lock?
+      if ( jarfile.exists? || gemfile_lock.exists? || jarfile.exists_lock? )
         missing?( jarfile ) || jarfile_newer?( jarfile ) || jarlock_newer?( jarfile ) || gemfile_lock.newer?( mtime )
       else
         false
@@ -87,14 +91,25 @@ module JBundler
     def dump_array( file, array, prefix, local_repo )
       file.puts "JBUNDLER_#{prefix}CLASSPATH = []"
       array.each do |path|
-        if local_repo
-          path.sub!( /#{local_repo}/, '' )
-          file.puts "JBUNDLER_#{prefix}CLASSPATH << (JBUNDLER_LOCAL_REPO + '#{path}')" unless path =~ /pom$/
-        else
-          file.puts "JBUNDLER_#{prefix}CLASSPATH << '#{path}'" unless path =~ /pom$/
-        end
+        dump_jar( file, path, prefix, local_repo )
       end
       file.puts "JBUNDLER_#{prefix}CLASSPATH.freeze"
     end
+
+    def dump_jar( file, path, prefix, local_repo )
+      return if path =~ /pom$/
+      if local_repo
+        path.sub!( /#{local_repo}/, '' )
+        unless File.exists?( path )
+          file.puts "JBUNDLER_#{prefix}CLASSPATH << (JBUNDLER_LOCAL_REPO + '#{path}')"
+          path = nil
+        end
+      end
+      if path
+        # either we do not have a local_repo or the path is a absolute
+        # path from system artifact
+        file.puts "JBUNDLER_#{prefix}CLASSPATH << '#{path}'"        
+      end
+    end
   end
 end

data/lib/jbundler/cli.rb

@@ -89,12 +89,16 @@ module JBundler
     method_option :no_cache, :type => :boolean
     method_option :quiet, :type => :boolean
     def install
-      JBundler::LockDown.new( config ).lock_down( options[ :vendor ],
-                                                  options[ :debug ] ,
-                                                  options[ :verbose ] )
+      msg = JBundler::LockDown.new( config ).lock_down( options[ :vendor ],
+                                                        options[ :debug ] ,
+                                                        options[ :verbose ] )
       config.verbose = ! options[ :quiet ]
       Show.new( config ).show_classpath
-      puts 'jbundle complete' unless options[ :quiet ]
+      unless options[ :quiet ]
+        puts 'jbundle complete !'
+        puts
+      end
+      puts msg if msg
     end
 
     desc 'executable', 'create an executable jar with a given bootstrap.rb file\nLIMITATION: only for jruby 1.6.x and newer'

data/lib/jbundler/dependency_pom.rb

@@ -9,7 +9,7 @@ if basedir != bdir
   self.instance_variable_set( :@basedir, bdir )
 end
 
-jarfile( jfile, :skip_locked => true )
+jarfile( jfile )
 
 ( 0..(java.lang.System.getProperty( "jbundler.jars.size" ).to_i - 1) ).each do |i|
   dependency_artifact Maven::Tools::Artifact.from_coordinate( java.lang.System.getProperty( "jbundler.jars.#{i}" ).to_s )

data/lib/jbundler/jarfile_lock.rb

@@ -0,0 +1,67 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'jar_dependencies'
+require 'maven/tools/dsl/jarfile_lock'
+module JBundler
+  class JarfileLock < Maven::Tools::DSL::JarfileLock
+
+    def require( scope = :runtime )
+      coordinates( scope ).each do |coord|
+        Jars.require_jar( coord.split( /:/ ) )
+      end
+    end
+
+    def classpath( scope = :runtime )
+      coordinates( scope ).collect do |coord|
+        path_to_jar( coord.split( /:/ ) )
+      end
+    end
+
+    def downloaded?
+      classpath.member?( nil ) == false &&
+        classpath( :test ).member?( nil ) == false
+    end
+
+    private
+
+    # TODO should move into jar-dependencies
+    def to_path( group_id, artifact_id, *classifier_version )
+      version = classifier_version[ -1 ]
+      classifier = classifier_version[ -2 ]
+      
+      jar = to_jar( group_id, artifact_id, version, classifier )
+      ( [ Jars.home ] + $LOAD_PATH ).each do |path|
+        if File.exists?( f = File.join( path, jar ) )
+          return f
+        end
+      end
+      nil
+    end
+    
+    # TODO this is copy and paste from jar-dependncies
+    def to_jar( group_id, artifact_id, version, classifier )
+      file = "#{group_id.gsub( /\./, '/' )}/#{artifact_id}/#{version}/#{artifact_id}-#{version}"
+      file << "-#{classifier}" if classifier
+      file << '.jar'
+      file
+    end
+  end
+end

data/lib/jbundler/lock_down.rb

@@ -32,23 +32,28 @@ module JBundler
     end
     
     def lock_down( needs_vendor = false, debug = false, verbose = false )
+      jarfile = Maven::Tools::Jarfile.new( @config.jarfile )
       classpath = JBundler::ClasspathFile.new( @config.classpath_file )
-      needs_update = needs_update?( classpath )
+      if jarfile.exists_lock? && classpath.exists?
+        needs_update = false
+      else
+        needs_update = needs_update?( jarfile, classpath )
+      end
       if ( ! needs_update && ! needs_vendor ) || vendor.vendored?
 
         puts 'Jar dependencies are up to date !'
 
+        if needs_update?( jarfile, classpath )
+          f = classpath.file.sub(/#{Dir.pwd}#{File::SEPARATOR}/, '' )
+          "the #{f} is stale, i.e. Gemfile or Jarfile is newer. `jbundle update` will update it"
+        end
       else
 
         puts '...'
        
-        locked = StringIO.new
-
         deps = install_dependencies( debug, verbose )
 
-        jars = collect_jars( deps, locked, debug, verbose )
-
-        update_files( classpath, locked, jars ) if needs_update
+        update_files( classpath, collect_jars( deps ) ) if needs_update
 
         vendor_it( vendor, deps ) if needs_vendor
 
@@ -57,11 +62,9 @@ module JBundler
 
     private
 
-    def needs_update?( classpath )
-      jarfile = Maven::Tools::Jarfile.new( @config.jarfile )
+    def needs_update?( jarfile, classpath )
       gemfile_lock = JBundler::GemfileLock.new( jarfile, 
                                                 @config.gemfile_lock )
-
       classpath.needs_update?( jarfile, gemfile_lock )
     end
 
@@ -71,37 +74,32 @@ module JBundler
       puts
     end
 
-    def collect_jars( deps, locked, debug, verbose )
+    def collect_jars( deps )
       jars = {}
       deps.each do |d|
         case d.scope
         when :provided
-          ( jars[ :jruby ] ||= [] ) << d.file
+          ( jars[ :jruby ] ||= [] ) << d
         when :test
-          ( jars[ :test ] ||= [] ) << d.file
+          ( jars[ :test ] ||= [] ) << d
         else
-          ( jars[ :runtime ] ||= [] ) << d.file
-          if( ! d.gav.match( /^ruby.bundler:/ ) )
-            # TODO make Jarfile.lock depend on jruby version as well on
-            # include test as well, i.e. keep the scope in place
-            locked.puts d.coord
-          end
+          ( jars[ :runtime ] ||= [] ) << d
         end
       end
       jars
     end
 
-    def update_files( classpath_file, locked, jars )
-      if locked.string.empty?
+    def update_files( classpath_file, jars )
+      if jars.values.flatten.size == 0
         FileUtils.rm_f @config.jarfile_lock
       else
-        File.open( @config.jarfile_lock, 'w' ) do |f|
-          f.print locked.string
-        end
+        lock = Maven::Tools::DSL::JarfileLock.new( @config.jarfile )
+        lock.replace( jars )
+        lock.dump
       end
-      classpath_file.generate( jars[ :runtime ],
-                               jars[ :test ],
-                               jars[ :jruby ],
+      classpath_file.generate( (jars[ :runtime ] || []).collect { |j| j.file },
+                               (jars[ :test ] || []).collect { |j| j.file },
+                               (jars[ :jruby ] || []).collect { |j| j.file },
                                @config.local_repository )
     end
 
@@ -147,6 +145,7 @@ module JBundler
       done = []
       index = 0
       Gem.loaded_specs.each do |name, spec|
+        # TODO get rid of this somehow
         deps = Maven::Tools::GemspecDependencies.new( spec )
         deps.java_dependency_artifacts.each do |a|
           unless done.include? a.key

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jbundler
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-04 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: maven-tools
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,12 +64,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.7
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -99,6 +113,7 @@ files:
 - lib/jbundler.rb
 - lib/jbundler/aether.rb
 - lib/jbundler/classpath_file.rb
+- lib/jbundler/jarfile_lock.rb
 - lib/jbundler/tree.rb
 - lib/jbundler/gemfile_lock.rb
 - lib/jbundler/executable_pom.rb