jbundler.rb in jbundler-0.5.4

- old
+ new

@@ -1,7 +1,7 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 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
@@ -18,42 +18,52 @@
 # 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 'maven/tools/jarfile'
 require 'jbundler/classpath_file'
+require 'jbundler/vendor'
 require 'jbundler/gemfile_lock'
 require 'jbundler/aether'
 
 config = JBundler::Config.new
 
 jarfile = Maven::Tools::Jarfile.new(config.jarfile)
 if config.skip
   warn "skip jbundler setup"
 else
+  vendor = JBundler::Vendor.new(config.vendor_dir)
   classpath_file = JBundler::ClasspathFile.new(config.classpath_file)
   gemfile_lock = JBundler::GemfileLock.new(jarfile, config.gemfile_lock)
 
-  if classpath_file.needs_update?(jarfile, gemfile_lock)
+  if classpath_file.needs_update?(jarfile, gemfile_lock) && ! vendor.vendored?
     aether = JBundler::AetherRuby.new(config)
-
+    
     jarfile.populate_unlocked(aether)
     gemfile_lock.populate_dependencies(aether)
     jarfile.populate_locked(aether)
-
+    
     aether.resolve
-
+    
     classpath_file.generate(aether.classpath_array)
     jarfile.generate_lockfile(aether.resolved_coordinates)
   end
 
-  if classpath_file.exists? && jarfile.exists_lock?
+  if vendor.vendored?
+    jars = vendor.require_jars
+    if config.verbose
+      warn "jbundler classpath:"
+      jars.each do |path|
+        warn "\t#{path}"
+      end
+    end
+  elsif classpath_file.exists? && jarfile.exists_lock?
     require 'java'
     classpath_file.require_classpath
     if config.verbose
       warn "jbundler classpath:"
       JBUNDLER_CLASSPATH.each do |path|
         warn "\t#{path}"
       end
     end
   end
 
-end
\ No newline at end of file
+end