lib/jbundler/classpath_file.rb in jbundler-0.2.2 vs lib/jbundler/classpath_file.rb in jbundler-0.3.0

@@ -17,17 +17,17 @@
     def exists?
       File.exists?(@classpathfile)
     end
 
     def needs_update?(jarfile, gemfile_lock)
-      !exists? || !jarfile.exists_lock? || (jarfile.exists? && (jarfile.mtime > mtime)) || (jarfile.exists_lock? && (jarfile.mtime_lock > mtime)) || (gemfile_lock.mtime > mtime)
+      (jarfile.exists? || gemfile_lock.exists?) && (!exists? || !jarfile.exists_lock? || (jarfile.exists? && (jarfile.mtime > mtime)) || (jarfile.exists_lock? && (jarfile.mtime_lock > mtime)) || (gemfile_lock.exists? && (gemfile_lock.mtime > mtime)))
     end
 
-    def generate(classpath)
+    def generate(classpath_array)
       FileUtils.mkdir_p(File.dirname(@classpathfile))
       File.open(@classpathfile, 'w') do |f|
         f.puts "JBUNDLER_CLASSPATH = []"
-        classpath.split(/#{File::PATH_SEPARATOR}/).each do |path|
+        classpath_array.each do |path|
           f.puts "JBUNDLER_CLASSPATH << '#{path}'" unless path =~ /pom$/
         end
         f.puts "JBUNDLER_CLASSPATH.freeze"
         f.puts "JBUNDLER_CLASSPATH.each { |c| require c }"
         f.close