jbundler 0.2.2 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbundler (0.2.2)
+    jbundler (0.3.0)
       ruby-maven (= 3.0.4.0.29.0)
 
 GEM
@@ -17,7 +17,7 @@ GEM
     diff-lcs (1.1.3)
     gherkin (2.9.3-java)
       json (>= 1.4.6)
-    json (1.7.3-java)
+    json (1.7.5-java)
     maven-tools (0.29.3)
     minitest (2.10.1)
     rake (0.9.2.2)

data/Readme.md

@@ -11,90 +11,97 @@ manage jar dependencies similar than **bundler** manages gem dependencies.
 
 ## get started
 
-just add it as **first** entry in your *Gemfile* (pending since no gem is released)
+install JBundler with
+
+    jruby -S gem install jbundler
+	
+first create a **Jarfile**, something like
+    
+	jar 'org.yaml:snakeyaml'
+	jar 'org.slf4j:slf4j-simple', '>1.1'
+
+### together with Bundler
+
+just add it as **first** entry in your *Gemfile* 
 
 ```gem 'jbundler'```
 
-such bundler config will trigger the classpath resolution on the first call of ```Bundler.require```, any successive runs will reuse the classpath from *.jbundler/classpath.rb* without any more action with maven.
+and now install the bundle both **gems and jars**
 
-if you use only **rubygems** or **isolate** then following require will trigger the classpath setup
+    jbundle install
 
-```require 'jbundler'```
+#### Gemfile only
 
-## example ##
+if there is only a **Gemfile** and no Jarfile **jbundler** just handles all the declared [jar dependencies of gems](https://github.com/mkristian/jbundler/wiki/Build). it will only look into gems which bundler loaded.
 
-**please first build the jar file for the jbundler gem, see [https://github.com/mkristian/jbundler/wiki/Build](Build).** 
+#### Gemfile and Jarfile
 
-*src/example/my_project* has a Gemfile which uses a gem which depends on jar dependency. see *src/example/gem_with_jar/gem_with_jar.gemspec* how the jar gets declared.
+if there is only a **Gemfile** and no Jarfile **jbundler** handles all the declared [jar dependencies of gems](https://github.com/mkristian/jbundler/wiki/Build) as well all the jars from the Jarfile. it will only look into gems which bundler loaded.
 
-execute *src/example/my_project/info.rb* to see it in action:
+### without Bundler - Jarfile only
 
-      cd src/example/my_project
-      jruby -S bundle install
-      jruby -S bundle exec info.rb
+requiring **jbundler** will trigger the classpath setup
 
-## limitations ##
+```require 'jbundler'```
 
-update of single artifacts is not possible.
+this you can use with **rubygems** or **isolate** or . . .
 
-since the version resolution happens in two steps - first the gems then the jars/poms - it is possible in case of failure of the second one there could be another set of versions for the gems which would then succeed the jars/poms resolution. but there is plenty of possible ways to improve this (maven could resolve the gems as well, etc)
+### Jarfile
 
-**Jarfile** is **not** a DSL, i.e. it is not ruby though it could use a ruby DSL to read the data (any contribution welcome).
+more info about the **[Jarfile](https://github.com/torquebox/maven-tools/wiki/Jarfile)** and about [versions](https://github.com/torquebox/maven-tools/wiki/Versions).
 
-jbundler does not obey the **$HOME/.m2/settings.xml** from maven where you usually declare proxies, mirrors, etc.
+for adding a maven repository see [Jarfile](https://github.com/torquebox/maven-tools/wiki/Jarfile).
+    
+## console ##
 
-## adding a maven repository ##
+like bundler there is a console which sets up the gems (if there is Gemfile otherwise that part get skipped) and sets up the classloader:
 
-the maven central is default repostory and is always there. adding another repository use following decalration
+    jbundler console
 
-    repository :first, "http://example.com/repo"
-    source 'second', "http://example.org/repo"
-    source "http://example.org/repo/3"
-	
-	
-## jar/pom dependencies ##
+further it adds two methods to the root level:
 
-a pom dependency is not associated with a jar file but has dependencies to other poms or jars. 
+    > jars
 
-dependencies can be declared either in **Jarfile**
+to list the loaded jars and
 
-    jar 'org.slf4j:slf4j-simple', '> 1.6.2', '< 1.7.0'
-    jar 'org.sonatype.aether:aether-api', '1.13'
+    > jar 'org.yaml:snakeyaml'
 
-or inside the gemspec through the requirements (see also the example directory of this project):
+using the same syntax as use in the **Jarfile**. there are limitations with such a lazy jar loading but it is very convenient when trying out things.
 
-    Gem::Specification.new do |s|
-      s.name = 'gem_with_jar'
-      s.version = '0.0.0'
-      s.requirements << "jar 'org.slf4j:slf4j-api', '1.5.10'"
-    end
-    
-### maven like version ###
+## lazy jar loading ##
 
-```jar 'my.group.id:my-artifact-id', '1.2.3'```
+    require 'jbundler/lazy'
+	include JBundler::Lazy
+	
+will offer the same `jar`/`jars` method than you have inside the console.
 
-this will add the jar dependency for the maven artifact **my.group.id:my-artifact-id** with version **1.2.3**. this version will be treated as **maven version**, i.e. in case of a version conflict the one which is closer to project root will be used (see also: TODO link)
+## example ##
 
-### rubygem like version ###
+**please first build the jar file for the jbundler gem, see [Build](https://github.com/mkristian/jbundler/wiki/Build).** 
 
-some example (see also: TODO link)
+*src/example/my_project* has a Gemfile which uses a gem which depends on jar dependency. see *src/example/gem_with_jar/gem_with_jar.gemspec* how the jar gets declared.
 
-    jar 'my.group.id:my-artifact-id', '1.2.3'
-    pom 'my.group:my-artifact-id', '=1.2.3'
-    jar 'my.group.id:artifact-id', '>1.2.3'
-    jar 'my.group:artifact-id', '>1.2.3', '=<2.0.1'
+execute *src/example/my_project/info.rb* to see it in action:
 
-the no version will default to **[0,)** (maven version range) which is **>=0** in the rubygems world.
+      cd src/example/my_project
+      jbundle install
+      bundle exec info.rb
+
+## limitations ##
 
-    jar 'group:artifact-id'
+update of single artifacts is not possible.
+
+since the version resolution happens in two steps - first the gems then the jars/poms - it is possible in case of a failure that there is a valid gems/jars version resolution which satisfies all version contraints. so there is plenty of space for improvements (like maven could resolve the gems as well, etc)
 
-the *not* version **!3.4.5** can not be mapped properly to a maven version ranges. **>3.4.5** is used instead in these (rare) cases.
+**Jarfile** is **not** a DSL but it could use a ruby DSL to read the data (any contribution welcome).
 
+jbundler does not yet obey the **$HOME/.m2/settings.xml** from maven where you usually declare proxies, mirrors, etc.
+	
 ## update ##
 
 update of a single artifact is not possible (yet). but to update the whole set of artifacts just delete the lockfile *Jarfile.lock*
 
-if jbundler sees that **Gemfile.lock** or **Jarfile** is newer then the **.jbundler/classpath.rb** file then jbundler tries to gracefully upgrade towards the changes. the is a maven-like behaviour and once there are command line tools for jbundler they can behave like bundler.
+if jbundler sees that **Gemfile.lock** or **Jarfile** is newer then the **.jbundler/classpath.rb** file then jbundler tries to gracefully upgrade towards the changes.
 
 ## meta-fu ##
 

data/bin/jbundle

@@ -9,11 +9,34 @@ if ARGV[0] == 'help'
 
 else
 
-  load Gem.bin_path('bundler', 'bundle')
-
   ARGV << 'install' if ARGV.size == 0
-  require 'jbundler/cli'
 
-  JBundler::Cli.start
+  if ARGV[0] == 'console'
+    require 'irb'
+    require 'jbundler/lazy'
+    include JBundler::Lazy
+  end
+
+  begin
+    load Gem.bin_path('bundler', 'bundle') 
+  rescue Exception
+    if ARGV[0] == 'console'
+      ARGV.shift
+      require 'jbundler'
+      if defined? JBUNDLER_CLASSPATH
+        warn 'Jarfile dependencies loaded'
+      else
+        warn 'Could not locate Jarfile'
+        
+      end
+      IRB.start
+    end
+  end
+
+  if ARGV[0] && ['install', 'update', 'show'].member?(ARGV[0])
+    require 'jbundler/cli'
+
+    JBundler::Cli.start
+  end
 
 end

data/lib/jbundler.rb

@@ -3,14 +3,14 @@ require 'jbundler/classpath_file'
 require 'jbundler/gemfile_lock'
 require 'jbundler/aether'
 
-config = JBundler::AetherConfig.new
+config = JBundler::Config.new
 
 jarfile = Maven::Tools::Jarfile.new(config.jarfile)
 if config.skip
   warn "skip jbundler setup"
 else
   classpath_file = JBundler::ClasspathFile.new(config.classpath_file)
-  gemfile_lock = JBundler::GemfileLock.new(jarfile, config.gemfile + '.lock')
+  gemfile_lock = JBundler::GemfileLock.new(jarfile, config.gemfile_lock)
 
   if classpath_file.needs_update?(jarfile, gemfile_lock)
     aether = JBundler::AetherRuby.new(config)
@@ -21,11 +21,11 @@ else
 
     aether.resolve
 
-    classpath_file.generate(aether.classpath)
+    classpath_file.generate(aether.classpath_array)
     jarfile.generate_lockfile(aether.resolved_coordinates)
   end
 
-  if classpath_file.exists?
+  if classpath_file.exists? && jarfile.exists_lock?
     require 'java'
     classpath_file.require_classpath
     if config.verbose

data/lib/jbundler/aether.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'jbundler/config'
 
 module JBundler
 
@@ -84,7 +85,7 @@ module JBundler
       java_import 'jbundler.Aether'
     end
 
-    def initialize(config = AetherConfig.new)
+    def initialize(config = Config.new)
       unless defined? Aether
         self.class.setup_classloader
       end
@@ -117,6 +118,10 @@ module JBundler
       end
     end
    
+    def classpath_array
+      classpath.split(/#{File::PATH_SEPARATOR}/)
+    end
+   
     def repositories
       @aether.repositories
     end

data/lib/jbundler/classpath_file.rb

@@ -19,14 +19,14 @@ module JBundler
     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"

data/lib/jbundler/cli.rb

@@ -5,11 +5,34 @@ module JBundler
       def mvn
         @mvn ||= Maven::RubyMaven.new
       end
+
+      def do_show
+        require 'java' 
+        require 'jbundler/config'
+        require 'jbundler/classpath_file'
+        config = JBundler::Config.new
+        classpath_file = JBundler::ClasspathFile.new(config.classpath_file)
+        if classpath_file.exists?
+          classpath_file.require_classpath
+          puts "JBundler classpath:"
+          JBUNDLER_CLASSPATH.each do |path|
+            puts "  * #{path}"
+          end
+        else
+          puts "JBundler classpath is not installed."
+        end
+      end
+    end
+    
+    desc 'console', 'irb session with gems and/or jars and with lazy jar loading.'
+    def console
+      # dummy - never executed !!!
     end
     
     desc 'install', "first `bundle install` is called and then the jar dependencies will be installed. for more details see `bundle help install`, jbundler will ignore all options. the install command is also the default when no command is given."
     def install
       require 'jbundler'
+      do_show
       puts 'Your jbundle is complete! Use `jbundle show` to see where the bundled jars are installed.'
     end
 
@@ -17,11 +40,12 @@ module JBundler
     def update
       if ARGV.size == 1
         require 'java'
-        require 'jbundler/aether'
-        config = JBundler::AetherConfig.new
-        FileUtils.rm_f(config.jarfile + '.lock')
+        require 'jbundler/config'
+        config = JBundler::Config.new
+        FileUtils.rm_f(config.jarfile_lock)
         
         require 'jbundler'
+        do_show
         puts 'Your jbundle is updated! Use `jbundle show` to see where the bundled jars are installed.'
       end
     end
@@ -29,21 +53,8 @@ module JBundler
     desc 'show', "first `bundle show` is called and if there are no options then the jar dependencies will be displayed. for more details see `bundle help show`."
     def show
       if ARGV.size == 1
-        require 'java' 
-        require 'jbundler/aether'
-        require 'jbundler/classpath_file'
-        config = JBundler::AetherConfig.new
-        classpath_file = JBundler::ClasspathFile.new('.jbundler/classpath.rb')#config.classpath_file)
-        if classpath_file.exists?
-          classpath_file.require_classpath
-          puts "JBundler classpath:"
-          JBUNDLER_CLASSPATH.each do |path|
-            puts "  * #{path}"
-          end
-        else
-          puts "JBundler classpath is not installed."
-        end
-      end
+        do_show
+     end
     end
   end
 end

data/lib/jbundler/config.rb

@@ -0,0 +1,71 @@
+require 'yaml'
+
+module JBundler
+
+  # allow yaml config in $HOME/.jbundlerrc and $PWD/.jbundlerrc
+  class Config
+
+    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip
+
+    def initialize
+      file = '.jbundlerrc'
+      homefile = File.join(ENV['HOME'], file)
+      home_config = YAML.load_file(homefile) if File.exists?(homefile)
+      pwd_config = YAML.load_file(file) if File.exists?(file)
+      @config = (home_config || {}).merge(pwd_config || {})
+    end
+
+    if defined? JRUBY_VERSION
+      def jbundler_env(key)
+        ENV[key.upcase.gsub(/./, '_')] || java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
+      end
+    else
+      def jbundler_env(key)
+        ENV[key.upcase.gsub(/./, '_')] || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
+      end
+    end
+    private :jbundler_env
+
+    def skip
+      skip = jbundler_env('JBUNDLE_SKIP')
+      # defaults to false
+      @skip ||= skip && skip != 'false'
+    end
+
+    def verbose
+      verbose = jbundler_env('JBUNDLE_VERBOSE')
+      # defaults to false
+      @verbose ||= verbose && verbose != 'false'
+    end
+
+    def jarfile
+      if File.exists?('Mvnfile')
+        warn "'Mvnfile' name is deprecated, please use 'Jarfile' instead"
+        @jarfile = 'Mvnfile'
+      end
+      @jarfile ||= jbundler_env('JBUNDLE_JARFILE') || 'Jarfile'
+    end
+
+    def jarfile_lock
+      "#{jarfile}.lock"
+    end
+
+    def gemfile
+      @gemfile ||= jbundler_env('BUNDLE_GEMFILE') || 'Gemfile'
+    end
+
+    def gemfile_lock
+      "#{gemfile}.lock"
+    end
+
+    def classpath_file
+      '.jbundler/classpath.rb'
+    end
+
+    def local_repository
+      # use maven default local repo as default
+      @local_maven_repository ||= (jbundler_env('JBUNDLE_LOCAL_REPOSITORY') ||
+                                   File.join( ENV['HOME'], ".m2", "repository"))
+    end
+  end
+end

data/lib/jbundler/config.rb~

@@ -0,0 +1,145 @@
+require 'yaml'
+
+module JBundler
+
+  # allow yaml config in $HOME/.jbundlerrc and $PWD/.jbundlerrc
+  class AetherConfig
+
+    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip
+
+    def initialize
+      file = '.jbundlerrc'
+      homefile = File.join(ENV['HOME'], file)
+      home_config = YAML.load_file(homefile) if File.exists?(homefile)
+      pwd_config = YAML.load_file(file) if File.exists?(file)
+      @config = (home_config || {}).merge(pwd_config || {})
+    end
+
+    if defined? JRUBY_VERSION
+      def jbundler_env(key)
+        ENV[key.upcase.gsub(/./, '_')] || java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
+      end
+    else
+      def jbundler_env(key)
+        ENV[key.upcase.gsub(/./, '_')] || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
+      end
+    end
+    private :jbundler_env
+
+    def skip
+      skip = jbundler_env('JBUNDLE_SKIP')
+      # defaults to false
+      @skip ||= skip && skip != 'false'
+    end
+
+    def verbose
+      verbose = jbundler_env('JBUNDLE_VERBOSE')
+      # defaults to false
+      @verbose ||= verbose && verbose != 'false'
+    end
+
+    def jarfile
+      if File.exists?('Mvnfile')
+        warn "'Mvnfile' name is deprecated, please use 'Jarfile' instead"
+        @jarfile = 'Mvnfile'
+      end
+      @jarfile ||= jbundler_env('JBUNDLE_JARFILE') || 'Jarfile'
+    end
+
+    def gemfile
+      @gemfile ||= jbundler_env('BUNDLE_GEMFILE') || 'Gemfile'
+    end
+
+    def classpath_file
+      '.jbundler/classpath.rb'
+    end
+
+    def local_repository
+      # use maven default local repo as default
+      @local_maven_repository ||= (jbundler_env('JBUNDLE_LOCAL_REPOSITORY') ||
+                                   File.join( ENV['HOME'], ".m2", "repository"))
+    end
+  end
+
+  class AetherRuby
+
+    def self.setup_classloader
+      require 'java'
+
+      maven_home = File.dirname(File.dirname(Gem.bin_path('ruby-maven', 
+                                                           'rmvn')))
+      # TODO reduce to the libs which are really needed
+      Dir.glob(File.join(maven_home, 'lib', "*jar")).each {|path| require path }
+      begin
+        require 'jbundler.jar'
+      rescue LoadError
+        # allow the classes already be added to the classloader
+        begin
+          java_import 'jbundler.Aether'
+        rescue NameError
+          # assume this happens only when working on the git clone
+          raise "jbundler.jar is missing - maybe you need to build it first ? try\n$ rmvn prepare-package -Dmaven.test.skip\n"
+        end
+      end
+      java_import 'jbundler.Aether'
+    end
+
+    def initialize(config = AetherConfig.new)
+      unless defined? Aether
+        self.class.setup_classloader
+      end
+      @aether = Aether.new(config.local_repository, config.verbose)
+    end
+
+    def add_artifact(coordinate, extension = nil)
+      if extension
+        coord = coordinate.split(/:/)
+        coord.insert(2, extension)
+        @aether.add_artifact(coord.join(":"))
+      else
+        @aether.add_artifact(coordinate)
+      end
+    end
+
+    def add_repository(name, url)
+      @aether.add_repository(name, url)
+    end
+
+    def resolve
+      @aether.resolve unless artifacts.empty?
+    end
+
+    def classpath 
+      if artifacts.empty?
+        ''
+      else
+        @aether.classpath
+      end
+    end
+   
+    def classpath_array
+      classpath.split(/#{File::PATH_SEPARATOR}/)
+    end
+   
+    def repositories
+      @aether.repositories
+    end
+
+    def artifacts
+      @aether.artifacts
+    end
+
+    def resolved_coordinates
+      if artifacts.empty?
+        []
+      else
+        @aether.resolved_coordinates
+      end
+    end
+
+    def install(coordinate, file)
+      @aether.install(coordinate, file)
+    end
+    
+  end
+end

data/lib/jbundler/gemfile_lock.rb

@@ -10,6 +10,10 @@ module JBundler
       @lockfile = lockfile if File.exists?(lockfile)
     end
 
+    def exists?
+      !@lockfile.nil?
+    end
+
     def mtime
       File.mtime(@lockfile) if @lockfile
     end

data/lib/jbundler/lazy.rb

@@ -0,0 +1,82 @@
+require 'jbundler/aether'
+require 'maven/tools/coordinate'
+module JBundler
+  module Lazy
+
+    include Maven::Tools::Coordinate
+
+    def self.included(clazz)
+      begin
+        require 'java'
+        warn ''
+        warn 'lazy jar loading does NOT garantee the consistency of the classloader.'
+        warn 'duplicated jars with different version and other dependency conflicts can easily occur.'
+        warn ''
+        warn 'add new jars with:'
+        warn ''
+        warn "\tjar 'org.yaml:snakeyaml'"
+        warn "\tjar 'org.slf4j:slf4j-simple', '>1.1'"
+        warn ''
+        warn 'show loaded jars with:'
+        warn "\tjars"
+        warn ''
+      rescue LoadError
+        warn 'no jar support possible without JRuby - just launching an IRB session'
+      end
+    end
+
+    def jars
+      if jb_classpath.empty?
+        puts "\tno jars loaded via jbundler"
+      else
+        jb_classpath.each do |path|
+          puts "\t#{path}"
+        end
+      end
+      nil
+    end
+
+    def jar(name, *version)
+      unless defined? JRUBY_VERSION
+        warn 'no jar support possible without JRuby'
+        return
+      end
+      aether.add_artifact("#{name}:#{to_version(*version)}")
+      aether.resolve
+      result = false
+      aether.classpath_array.each do |path|
+        if result ||= (require path)
+          warn "added #{path} to classloader"
+          jb_classpath << path
+        else
+          warn "already loaded: #{path}"
+        end
+      end
+      result
+    end
+
+    private
+    
+    def jb_classpath
+      @jb_cp ||= defined?(JBUNDLER_CLASSPATH) ? JBUNDLER_CLASSPATH.dup : []
+    end
+
+    def jb_config
+      @_jb_c ||= JBundler::Config.new
+    end
+
+    def aether
+      @_aether ||= 
+        begin
+          aether = JBundler::AetherRuby.new(jb_config)
+          jarfile = Maven::Tools::Jarfile.new(jb_config.jarfile)
+          gemfile_lock = JBundler::GemfileLock.new(jarfile, 
+                                                   jb_config.gemfile_lock)
+          jarfile.populate_unlocked(aether)
+          gemfile_lock.populate_dependencies(aether) if gemfile_lock.exists?
+          jarfile.populate_locked(aether)
+          aether
+        end
+    end
+  end
+end

data/lib/jbundler/lazy.rb~

@@ -0,0 +1,24 @@
+module JBundler
+  module Lazy
+
+    def jar(name, version = '[0,)')
+      aether = aether_new
+      aether.add_artifact("#{name}:#{version}")
+      aether.resolve
+      aehter.classpath.each do |path|
+        puts "add #{path} to classloader"
+        require path
+      end
+    end
+
+    private
+
+    def jb_config
+      @_jb_c =|| JBundler::AetherConfig.new
+    end
+
+    def aether_new
+      JBundler::AetherRuby.new(jb_config)
+    end
+  end
+end

data/spec/classpath_file_spec.rb

@@ -6,21 +6,26 @@ require 'jbundler/gemfile_lock'
 
 describe JBundler::ClasspathFile do
 
-  let(:workdir) { 'target' }
-  let(:jfile) { File.join(workdir, 'tmp-jarfile') }
-  let(:gfile_lock) { File.join(workdir, 'tmp-gemfile.lock') }
+  let(:workdir) { File.join('target', 'tmp') }
+  let(:jfile) { File.join(workdir, 'jarfile') }
+  let(:gfile_lock) { File.join(workdir, 'gemfile.lock') }
   let(:jfile_lock) { jfile + ".lock"}
-  let(:cpfile) { File.join(workdir, 'tmp-cp.rb') }
+  let(:cpfile) { File.join(workdir, 'cp.rb') }
   let(:jarfile) { Maven::Tools::Jarfile.new(jfile) }
   let(:gemfile_lock) { JBundler::GemfileLock.new(jarfile, gfile_lock) }
   subject { JBundler::ClasspathFile.new(cpfile) }
 
   before do
-    Dir[File.join(workdir, "tmp*")].each { |f| FileUtils.rm_f f }
-    FileUtils.touch gfile_lock #assume there is always a Gemfile.lock
+    FileUtils.mkdir_p(workdir)
+    Dir[File.join(workdir, '*')].each { |f| FileUtils.rm_f f }
   end
 
-  it 'needs update when all files are missing' do
+  it 'needs no update when all files are missing' do
+    subject.needs_update?(jarfile, gemfile_lock).must_equal false
+  end
+
+  it 'needs update when only gemfile' do
+    FileUtils.touch gfile_lock
     subject.needs_update?(jarfile, gemfile_lock).must_equal true
   end
 
@@ -30,6 +35,7 @@ describe JBundler::ClasspathFile do
   end
 
   it 'needs update when jarfilelock is missing' do
+    FileUtils.touch gfile_lock
     FileUtils.touch jfile
     FileUtils.touch cpfile
     subject.needs_update?(jarfile, gemfile_lock).must_equal true
@@ -42,7 +48,8 @@ describe JBundler::ClasspathFile do
     subject.needs_update?(jarfile, gemfile_lock).must_equal false
   end
 
-  it 'needs update when maven file is the youngest' do
+  it 'needs update when jar file is the youngest' do
+    FileUtils.touch gfile_lock
     FileUtils.touch jfile_lock
     FileUtils.touch cpfile
     sleep 1
@@ -50,7 +57,8 @@ describe JBundler::ClasspathFile do
     subject.needs_update?(jarfile, gemfile_lock).must_equal true
   end
 
-  it 'needs update when maven lockfile is the youngest' do
+  it 'needs update when jar lockfile is the youngest' do
+    FileUtils.touch gfile_lock
     FileUtils.touch jfile
     FileUtils.touch cpfile
     sleep 1
@@ -68,7 +76,7 @@ describe JBundler::ClasspathFile do
   end
 
   it 'generates a classpath ruby file' do
-    subject.generate("a:b:c:d:f:".gsub(/:/, File::PATH_SEPARATOR))
+    subject.generate("a:b:c:d:f:".split(File::PATH_SEPARATOR))
     File.read(cpfile).must_equal <<-EOF
 JBUNDLER_CLASSPATH = []
 JBUNDLER_CLASSPATH << 'a'

metadata

@@ -2,7 +2,7 @@
 name: jbundler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
   - Kristian Meier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-03 00:00:00 Z
+date: 2012-08-19 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: ruby-maven
@@ -49,7 +49,7 @@ dependencies:
     type: :development
     version_requirements: *id003
 description: |
-  using embedded maven to add jar support to bundler and add bundler like handling of version ranges to maven
+  managing jar dependencies with or without bundler. adding bundler like handling of version ranges for jar dependencies.
 
 email: 
   - m.kristian@web.de
@@ -70,13 +70,17 @@ files:
   - lib/jbundler/pom.rb~
   - lib/jbundler/mavenfile.rb~
   - lib/jbundler/cli.rb
+  - lib/jbundler/lazy.rb~
   - lib/jbundler/maven_version.rb~
+  - lib/jbundler/config.rb
   - lib/jbundler/classpath_file.rb
   - lib/jbundler/aether.rb
   - lib/jbundler/gemfile_lock.rb~
   - lib/jbundler/gemfile_lock.rb
   - lib/jbundler/classpath_file.rb~
+  - lib/jbundler/config.rb~
   - lib/jbundler/aether.rb~
+  - lib/jbundler/lazy.rb
   - lib/jbundler/maven_util.rb~
   - lib/jbundler/maven.rb~
   - spec/maven_util_spec.rb~
@@ -120,7 +124,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: bundler support for maven or/and maven support for bundler
+summary: managing jar dependencies
 test_files: 
   - spec/classpath_file_spec.rb
   - spec/pom_spec.rb