lib/jbundler.rb in jbundler-0.0.1 vs lib/jbundler.rb in jbundler-0.2.0

@@ -1,34 +1,39 @@
-require 'jbundler/mavenfile'
+require 'maven/tools/jarfile'
 require 'jbundler/classpath_file'
 require 'jbundler/gemfile_lock'
 require 'jbundler/aether'
 
 config = JBundler::AetherConfig.new
 
-mavenfile = JBundler::Mavenfile.new(config.mavenfile)
-classpath_file = JBundler::ClasspathFile.new('.jbundler/classpath.rb')
-gemfile_lock = JBundler::GemfileLock.new(mavenfile, config.gemfile + '.lock')
+jarfile = Maven::Tools::Jarfile.new(config.jarfile)
+if config.skip
+  warn "skip jbundler setup"
+else
+  classpath_file = JBundler::ClasspathFile.new('.jbundler/classpath.rb')
+  gemfile_lock = JBundler::GemfileLock.new(jarfile, config.gemfile + '.lock')
 
-if classpath_file.needs_update?(mavenfile, gemfile_lock)
-  aether = JBundler::AetherRuby.new(config)
+  if classpath_file.needs_update?(jarfile, gemfile_lock)
+    aether = JBundler::AetherRuby.new(config)
 
-  mavenfile.populate_unlocked(aether)
-  gemfile_lock.populate_depedencies(aether)
-  mavenfile.populate_locked(aether)
+    jarfile.populate_unlocked(aether)
+    gemfile_lock.populate_dependencies(aether)
+    jarfile.populate_locked(aether)
 
-  aether.resolve
+    aether.resolve
 
-  classpath_file.generate(aether.classpath)
-  mavenfile.generate_lockfile(aether.resolved_coordinates)
-end
+    classpath_file.generate(aether.classpath)
+    jarfile.generate_lockfile(aether.resolved_coordinates)
+  end
 
-if classpath_file.exists?
-  require 'java'
-  classpath_file.require_classpath
-  if config.verbose
-    warn "jbundler classpath:"
-    JBUNDLER_CLASSPATH.each do |path|
-      warn "\t#{path}"
+  if classpath_file.exists?
+    require 'java'
+    classpath_file.require_classpath
+    if config.verbose
+      warn "jbundler classpath:"
+      JBUNDLER_CLASSPATH.each do |path|
+        warn "\t#{path}"
+      end
     end
   end
+
 end