lock_jar 0.5.6 → 0.6.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "naether", "~> 0.8.6"
+gem "naether", "~> 0.9.0"
 gem "thor",     "> 0.14.0"
 
 # Add dependencies to develop your gem here.

data/README.md

@@ -2,17 +2,17 @@
 
 LockJar manages Java Jars for Ruby. Powered by [Naether](https://github.com/mguymon/naether) to create a frankenstein of Bundler and Maven. A Jarfile ([example](https://github.com/mguymon/lock_jar/blob/master/spec/Jarfile)) is used to generate a Jarfile.lock that contains all the resolved jar dependencies for scopes runtime, compile, and test. The Jarfile.lock can be used to populate the classpath.
 
-LockJar can be used directly or integrates with Buildr.
+LockJar can be used directly, from the [command line](https://github.com/mguymon/lock_jar/blob/master/README.md#command-line), [triggered from a Gem install](https://github.com/mguymon/lock_jar/blob/master/README.md#gem-integration), and [integrates with Buildr](https://github.com/mguymon/lock_jar/blob/master/README.md#buildr-integration).
 
 https://github.com/mguymon/lock_jar
 
-[RDoc](http://rubydoc.info/github/mguymon/lock_jar/master/frames)
+[RDoc](http://rubydoc.info/gems/lock_jar/frames)
 
 ## Install
 
     gem install lock_jar
 
-## Usage
+## Ruby Usage
 
 ### Jarfile
 
@@ -21,7 +21,6 @@ methods:
 
 * **local( path )**: Set the local Maven repository, this were dependencies are downloaded to. 
 * **repository( url )**: Add additional urlr of remote Maven repository.
-* **map( notation, paths )**: Map local compiled class paths to a notation. The map is applied when loading or listing jar. This is useful for local development that overrides an artifact. A single or Array of paths can be set.
 * **exclude( excludes )**: Add a artifact:group that will be excluded from resolved dependencies. A single or Array of excludes can be set.
 * **jar( notations, opts = {} )**: Add Jar dependency in artifact notation, artifact:group:version as the bare minimum. A single or Array of notations can be passed. Default scope is _compile_, can be specified by setting _opts = { :scope => ['new_scope'] }_
 * **pom( pom_path, opts = {} )**: Add a local Maven pom, default is to load dependencies for all scopes. To select the scopes to be loaded from the pom, set the _opts = { :scopes => ['new_scope'] }_
@@ -38,19 +37,17 @@ methods:
       jar 'org.apache.tomcat:servlet-api:jar:6.0.35'
     end
   
-    scope 'test' do
-      jar 'junit:junit:jar:4.10'
-    end
+    jar 'junit:junit:jar:4.10', :scope => 'test'
   
 	
 ### Resolving dependencies
 
-* **LockJar.lock( *args )**: Using a Jarfile, creates a lock file. Depending on the type of arg, a different configuration is set.
-  * An arg of a String will set the Jarfile path, e.g. _'/somewhere/Jarfile.different'_. Default jarfile is _'Jarfile'_
-  * An arg of a Hash will set the options, e.g. _{ :local_repo => 'path' }_
-      * **:download** if true, will download jars to local repo. Defaults to true.
-      * **:local_repo** sets the local repo path
-      * **:lockfile** sets the Jarfile.lock path. Default lockfile is _Jarfile.lock_.
+**LockJar.lock( *args )**: Using a Jarfile, creates a lock file. Depending on the type of arg, a different configuration is set.
+* _[String]_ will set the Jarfile path, e.g. `'/somewhere/Jarfile.different'`. Default jarfile is `'Jarfile'`
+* _[Hash]_ will set the options, e.g. `{ :local_repo => 'path' }`
+  * **:download** _[Boolean]_ if true, will download jars to local repo. Defaults to true.
+  * **:local_repo** _[String]_ sets the local repo path. Defaults to `ENV['M2_REPO']` or `'~/.m2/repository'`
+  * **:lockfile** _[String]_ sets the Jarfile.lock path. Default lockfile is `'Jarfile.lock'`.
 
 When the Jarfile is locked, the transitive dependencies are resolved and saved to the Jarfile.lock file.
 
@@ -98,21 +95,26 @@ The _Jarfile.lock_ generated is a YAML file containing the scoped dependencies,
   
   
 ### Accessing Jars
-
-* **LockJar.list(*args)**: Lists all dependencies as notations for scopes from the Jarfile.lock.  Depending on the type of arg, a different configuration is set.  
-  * An arg of a String will set the Jarfile.lock path, e.g. _Better.lock_. Default lock file is _Jarfile.lock_.
-  * An arg of an Array will set the scopes, e.g. _['compile','test']_. Defaults scopes are _compile_ and _runtime_.
-  * An arg of a Hash will set the options, e.g. _{ :local_repo => 'path' }_
-      * **:local_repo** sets the local repo path
-      * **:local_paths** converts the notations to paths of jars in the local repo
-      * **:resolve** to true will make transitive dependences resolve before returning list of jars
-  
-* **LockJar.load(*args)**: Loads all dependencies to the classpath for scopes from the Jarfile.lock. Defaults scopes are _compile_ and _runtime_. Default lock file is _Jarfile.lock_.
-  * An arg of a String will set the Jarfile.lock, e.g. _'Better.lock'_
-  * An arg of an Array will set the scopes, e.g. _['compile','test']_
-  * An arg of a Hash will set the options, e.g. _{ :local_repo => 'path' }_
-     * **:local_repo** sets the local repo path
-     * **:resolve** to true will make transitive dependences resolve before loading to classpath 
+**LockJar.install(*args)**: Download Jars in the Jarfile.lock
+* _[String]_ will set the Jarfile.lock path, e.g. `'Better.lock'`. Default lock file is `'Jarfile.lock'`.
+* _[Array<String>]_ will set the scopes, e.g. `['compile','test']`. Defaults scopes are _compile_ and _runtime_.
+* _[Hash]_ will set the options, e.g. `{ :local_repo => 'path' }`
+  * **:local_repo** _[String]_ sets the local repo path. Defaults to `ENV['M2_REPO']` or `'~/.m2/repository'`
+  
+**LockJar.list(*args)**: Lists all dependencies as notations for scopes from the Jarfile.lock.  Depending on the type of arg, a different configuration is set.  
+* _[String]_ will set the Jarfile.lock path, e.g. `'Better.lock'`. Default lock file is `'Jarfile.lock'`.
+* _[Array<String>]_ will set the scopes, e.g. `['compile','test']`. Defaults scopes are _compile_ and _runtime_.
+* _[Hash]_ will set the options, e.g. `{ :local_repo => 'path' }`
+  * **:local_repo** _[String]_ sets the local repo path. Defaults to `ENV['M2_REPO']` or `'~/.m2/repository'`
+  * **:local_paths** _[Boolean]_ converts the notations to paths of jars in the local repo
+  * **:resolve** _[Boolean]_ to true will make transitive dependences resolve before returning list of jars
+  
+**LockJar.load(*args)**: Loads all dependencies to the classpath for scopes from the Jarfile.lock. Defaults scopes are _compile_ and _runtime_. Default lock file is _Jarfile.lock_.
+* _[String]_ will set the Jarfile.lock, e.g. `'Better.lock'`
+* _[Array<String>]_ will set the scopes, e.g. `['compile','test']`
+* _[Hash]_ will set the options, e.g. `{ :local_repo => 'path' }`
+  * **:local_repo** _[String]_ sets the local repo path
+  * **:resolve** _[Boolean]_ to true will make transitive dependences resolve before loading to classpath 
 
 Once a _Jarfile.lock_ is generated, you can list all resolved jars by
   
@@ -170,10 +172,49 @@ Download all jars in a _Jarfile.lock_ with
   
 _lockjar_ _--help_ will give you list of all commands and their options.
 
-## Bundler Integration
+## Gem Integration
+
+### Installing
+
+LockJar can be triggered when a Gem is installed by using a [Gem extension](http://docs.rubygems.org/read/chapter/20#extensions)
+of type _Rakefile_. The cavaet is the task to install the jars must be the default for the Rakefile.
+
+A Gem spec with _Rakefile_ extension:
+
+    Gem::Specification.new do |s|
+      s.extensions = ["Rakefile"]
+    end
+
+Rakefile with default to install Jars using LockJar:
+
+    task :default => :prepare
+
+    task :prepare do
+      require 'lock_jar'
+      
+      # get jarfile relative the gem dir
+      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ ) 
+      
+      LockJar.install( :lockfile => lockfile )
+    end
+    
+#### Work around for Rakefile default
+
+The downside of using the Gem extension Rakefile is it requires the default to 
+point at the task to download the jars (from the example Rakefile, 
+`task :default => :prepare`). To get around this, I used a Rakefile called 
+_PostInstallRakefile_ to handle the `task :prepare`. When packaging the gem, _PostInstallRakefile_ is
+renamed to `Rakefile`.
+
+### Loading
+
+With the Jars already installed, loading the classpath for the Gem is simple. As part of the load process for the Gem add (entry file that is required, etc):
+
+      #get jarfile relative the gem dir
+      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ ) 
+      
+      LockJar.load( :lockfile => lockfile )
 
-Has been deprecated to https://github.com/mguymon/lock_jar/tree/bundler_support
-  
 ## Buildr Integration
 
 LockJar integrates with [Buildr](http://buildr.apache.org/) using an [Addon](https://github.com/mguymon/lock_jar/blob/master/lib/lock_jar/buildr.rb). This allows the Jarfile to be defined directly into a _buildfile_. A global LockJar definition can be set and is inherited to all projects. Each project may have its own LockJar definition. A lock file is generated per project based on the project name.
@@ -226,9 +267,13 @@ Sample buildfile with LockJar
 
 Generated the following lock files using **lock_jar:lock**
 
-* project1.lock - contains _junit_ and _mina_ jars.
-* project2.lock - contains _junit_ and _pom.xml_ jars.
+* _project1.lock_ - contains _junit_ and _mina_ jars.
+* _project2.lock_ - contains _junit_ and _pom.xml_ jars.
   
+## Bundler Integration
+
+Direct Bundler integration has been deprecated to https://github.com/mguymon/lock_jar/tree/bundler_support. 
+Waiting for [Bundler plugin support](https://github.com/carlhuda/bundler/issues/1945)
 
 ## License
 

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.0

data/lib/lock_jar/maven.rb

@@ -14,6 +14,7 @@
 # the License.
 
 require 'lock_jar/runtime'
+require 'naether/maven'
 
 module LockJar
   
@@ -33,18 +34,42 @@ module LockJar
       #
       # @return [String] version of POM
       #
-      def pom_version( pom_path, opts = {} )
-        Runtime.instance.resolver(opts).naether.pom_version( pom_path )
+      def pom_version( pom_path )
+        maven = Naether::Maven.create_from_pom( pom_path )
+        maven.version()
       end
       
       #
       # Write a POM from list of notations
       #
-      # @param [Array] notations 
+      # @param [String] pom notation
       # @param [String] file_path path of new pom
-      # @param [Hash] options
-      def write_pom( notations, file_path, opts = {} )
-        Runtime.instance.resolver(opts).naether.write_pom( notations, file_path )
+      # @param [Hash] opts
+      # @option opts [Boolean] :include_resolved to add dependencies of resolve dependencies from Jarfile.lock. Default is true.
+      # @option opts [Array] :dependencies Array of of mixed dependencies:
+      #  * [String] Artifact notation, such as groupId:artifactId:version, e.g. 'junit:junit:4.7' 
+      #  * [Hash] of a single artifaction notation => scope - { 'junit:junit:4.7' => 'test' }
+      #
+      def write_pom( notation, file_path, opts = {} )
+        opts = {:include_resolved => true}.merge( opts )
+        
+        maven = Naether::Maven.create_from_notataion( notation )
+        
+        if opts[:include_resolved]
+          # Passes in nil to the resolver to get the cache
+          maven.load_naether( Runtime.instance.resolver.naether )
+        end
+        
+        if opts[:dependencies]
+          opts[:dependencies].each do |dep|
+            if dep.is_a? Array
+              maven.add_dependency(dep[0], dep[1])
+            else
+              maven.add_dependency(dep)
+            end
+          end
+        end
+        maven.write_pom( file_path )
       end
       
       #

data/lib/lock_jar/resolver.rb

@@ -24,44 +24,17 @@ module LockJar
     attr_reader :naether
     
     def initialize( opts = {} )
+
       @opts = opts
       local_repo = opts[:local_repo] || Naether::Bootstrap.default_local_repo
         
       # Bootstrap Naether
-      jars = []
-      temp_jar_dir = File.join(local_repo, '.lock_jar', 'naether' )
-      deps = Naether::Bootstrap.check_local_repo_for_deps( local_repo )
-      if deps[:missing].size > 0
-        deps = Naether::Bootstrap.download_dependencies( temp_jar_dir, deps.merge( :local_repo => local_repo ) )
-        if deps[:downloaded].size > 0
-                    
-          unless File.directory?( temp_jar_dir )
-            FileUtils.mkdir_p jar_dir
-          end
-          
-          @naether = Naether::Bootstrap.install_dependencies_to_local_repo( temp_jar_dir, :local_repo => local_repo )
-          jars = jars + deps[:downloaded].map{ |jar| jar.values[0] }
-        else
-          # XXX: download failed?            
-        end
-        
-      # Remove bootstrap jars, they have been installed to the local repo
-      elsif File.exists?( temp_jar_dir )        
-        FileUtils.rm_rf temp_jar_dir
-      end
+      Naether::Bootstrap.bootstrap_local_repo( local_repo, opts )
       
-      jars = jars + deps[:exists].map{ |jar| jar.values[0] }
-        
       # Bootstrapping naether will create an instance from downloaded jars. 
       # If jars exist locally already, create manually
-      if @naether.nil?  
-        jars << Naether::JAR_PATH
-        @naether = Naether.create_from_jars( jars )
-      end
-      
-      @naether.local_repo_path = opts[:local_repo].to_s if opts[:local_repo]
-      
-      
+      @naether = Naether.new
+      @naether.local_repo_path = local_repo if local_repo
       @naether.clear_remote_repositories if opts[:offline]
     end
     
@@ -77,7 +50,7 @@ module LockJar
     def resolve( dependencies, download_artifacts = true )
       @naether.dependencies = dependencies
       @naether.resolve_dependencies( download_artifacts )
-      @naether.dependenciesNotation
+      @naether.dependencies_notation
     end
     
     def download( dependencies )
@@ -112,7 +85,7 @@ module LockJar
       Naether::Java.load_paths( dirs )
       
       jars = @naether.to_local_paths( jars )
-      Naether::Java.load_jars( jars )
+      Naether::Java.load_paths( jars )
       
       dirs + jars
     end

data/lib/lock_jar/runtime.rb

@@ -31,8 +31,9 @@ module LockJar
         opts[:local_repo] = File.expand_path(opts[:local_repo])
       end
       
-      # XXX: opts for a method will cause resolver to reload
-      if @current_resolver.nil? || opts != @current_resolver.opts
+      # XXX: Caches the resolver by the options. Passing in nil opts will replay
+      #      from the cache. This need to change.
+      if @current_resolver.nil? || (!opts.nil? && opts != @current_resolver.opts)
         @current_resolver = LockJar::Resolver.new( opts )
       end
       

data/lock_jar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.5.6"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = "2012-09-01"
+  s.date = "2012-09-19"
   s.description = "Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile\n  is used to generate a Jarfile.lock that contains all the resolved jar dependencies for scopes runtime, compile, and test.\n  The Jarfile.lock can be used to populate the classpath"
   s.email = "michael@tobedevoured.com"
   s.executables = ["lockjar"]
@@ -53,14 +53,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<naether>, ["~> 0.8.6"])
+      s.add_runtime_dependency(%q<naether>, ["~> 0.9.0"])
       s.add_runtime_dependency(%q<thor>, ["> 0.14.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<yard>, ["~> 0.8.0"])
     else
-      s.add_dependency(%q<naether>, ["~> 0.8.6"])
+      s.add_dependency(%q<naether>, ["~> 0.9.0"])
       s.add_dependency(%q<thor>, ["> 0.14.0"])
       s.add_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.0"])
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, ["~> 0.8.0"])
     end
   else
-    s.add_dependency(%q<naether>, ["~> 0.8.6"])
+    s.add_dependency(%q<naether>, ["~> 0.9.0"])
     s.add_dependency(%q<thor>, ["> 0.14.0"])
     s.add_dependency(%q<rspec>, ["~> 2.9.0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.0"])

data/spec/Jarfile

@@ -1,4 +1,4 @@
-local '~/.m2'
+local '~/.m2/repository'
 repository 'http://mirrors.ibiblio.org/pub/mirrors/maven2'
 
 jar "org.apache.mina:mina-core:2.0.4"

data/spec/lock_jar/dsl_spec.rb

@@ -5,7 +5,7 @@ describe LockJar::Dsl do
     it "should load a Jarfile" do
       jarfile = LockJar::Dsl.evaluate( "spec/Jarfile" )
       
-      jarfile.local_repository.should eql '~/.m2'
+      jarfile.local_repository.should eql '~/.m2/repository'
       jarfile.notations.should eql( {"compile"=>["org.apache.mina:mina-core:2.0.4", "spec/pom.xml"], "runtime"=>["spec/pom.xml", "org.apache.tomcat:servlet-api:jar:6.0.35"], "test"=>["spec/pom.xml", "junit:junit:jar:4.10"]}  )
       jarfile.repositories.should eql( ['http://mirrors.ibiblio.org/pub/mirrors/maven2'] )
     end

data/spec/lock_jar/maven_spec.rb

@@ -4,6 +4,11 @@ require 'lib/lock_jar/maven'
 require 'naether'
 
 describe LockJar::Maven do
+  before do
+    # Bootstrap Naether
+    Naether::Bootstrap.bootstrap_local_repo
+  end
+  
   context "Class" do
     it "should get pom version" do
       LockJar::Maven.pom_version( "spec/pom.xml" ).should eql( "3" )

data/spec/lock_jar_spec.rb

@@ -16,23 +16,26 @@ describe LockJar, "#lock" do
     
     lockfile = LockJar.read('tmp/Jarfile.lock')
     lockfile.should eql( {
-       "local_repository" => "~/.m2",
-       "repositories" => ["http://repo1.maven.org/maven2/", 'http://mirrors.ibiblio.org/pub/mirrors/maven2', "http://repository.jboss.org/nexus/content/groups/public-jboss"],
-       "scopes" => {
-          "compile"=>{
-            "dependencies"=>["org.apache.mina:mina-core:2.0.4", "spec/pom.xml"], 
-            "resolved_dependencies"=>["org.apache.mina:mina-core:jar:2.0.4", 
-                "org.slf4j:slf4j-api:jar:1.6.1", "com.slackworks:modelcitizen:jar:0.2.2", 
-                "commons-lang:commons-lang:jar:2.6", "commons-beanutils:commons-beanutils:jar:1.8.3", 
-                "commons-logging:commons-logging:jar:1.1.1", "ch.qos.logback:logback-classic:jar:0.9.24", 
-                "ch.qos.logback:logback-core:jar:0.9.24", "com.metapossum:metapossum-scanner:jar:1.0", 
-                "commons-io:commons-io:jar:1.4", "junit:junit:jar:4.7"]}, 
-         "runtime"=>{
-            "dependencies"=>["spec/pom.xml", "org.apache.tomcat:servlet-api:jar:6.0.35"], 
-            "resolved_dependencies"=>["org.apache.tomcat:servlet-api:jar:6.0.35"]},
-         "test"=>{
-            "dependencies"=>["spec/pom.xml", "junit:junit:jar:4.10"], 
-            "resolved_dependencies"=>["org.jboss.unit:jboss-unit:jar:1.2.4", "junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"]} } } )
+      "local_repository"=>"~/.m2/repository", 
+      "scopes"=>{
+        "compile"=>{
+          "dependencies"=>["org.apache.mina:mina-core:2.0.4", "spec/pom.xml"], 
+          "resolved_dependencies"=>["com.metapossum:metapossum-scanner:jar:1.0", 
+            "org.apache.mina:mina-core:jar:2.0.4", "commons-beanutils:commons-beanutils:jar:1.8.3", 
+            "ch.qos.logback:logback-classic:jar:0.9.24", 
+            "commons-logging:commons-logging:jar:1.1.1", "junit:junit:jar:4.7", 
+            "ch.qos.logback:logback-core:jar:0.9.24", "commons-lang:commons-lang:jar:2.6", 
+            "com.slackworks:modelcitizen:jar:0.2.2", "org.slf4j:slf4j-api:jar:1.6.1", 
+            "commons-io:commons-io:jar:1.4"]}, 
+        "runtime"=>{
+          "dependencies"=>["spec/pom.xml", "org.apache.tomcat:servlet-api:jar:6.0.35"], 
+          "resolved_dependencies"=>["org.apache.tomcat:servlet-api:jar:6.0.35"]}, 
+        "test"=>{
+          "dependencies"=>["spec/pom.xml", "junit:junit:jar:4.10"], 
+          "resolved_dependencies"=>["junit:junit:jar:4.10", "org.jboss.unit:jboss-unit:jar:1.2.4",
+            "org.hamcrest:hamcrest-core:jar:1.1"]}}, 
+      "repositories"=>["http://repo1.maven.org/maven2/", "http://mirrors.ibiblio.org/pub/mirrors/maven2", "http://repository.jboss.org/nexus/content/groups/public-jboss"]
+    })
   end
   
   it "should not replace dependencies with maps" do
@@ -61,12 +64,17 @@ describe LockJar, "#lock" do
     File.exists?( 'tmp/Jarfile.lock' ).should be_true
     lockfile = LockJar.read('tmp/Jarfile.lock')
     lockfile.should eql( {
-      "repositories" => ["http://repo1.maven.org/maven2/", 'http://mirrors.ibiblio.org/pub/mirrors/maven2', "http://repository.jboss.org/nexus/content/groups/public-jboss"],
       "excludes"=>["commons-logging", "logkit"], 
       "scopes"=>{
-        "compile"=>{
-          "dependencies"=>["opensymphony:oscache:jar:2.4.1"], 
-          "resolved_dependencies"=>["opensymphony:oscache:jar:2.4.1", "log4j:log4j:jar:1.2.12", "avalon-framework:avalon-framework:jar:4.1.3", "javax.jms:jms:jar:1.1", "javax.servlet:servlet-api:jar:2.3"]}}} )      
+          "compile"=>{
+            "dependencies"=>["opensymphony:oscache:jar:2.4.1"], 
+            "resolved_dependencies"=>["log4j:log4j:jar:1.2.12", "javax.jms:jms:jar:1.1", 
+              "opensymphony:oscache:jar:2.4.1", "javax.servlet:servlet-api:jar:2.3", 
+              "avalon-framework:avalon-framework:jar:4.1.3"]}}, 
+      "repositories"=>["http://repo1.maven.org/maven2/", 
+        "http://mirrors.ibiblio.org/pub/mirrors/maven2", 
+        "http://repository.jboss.org/nexus/content/groups/public-jboss"]
+    })
   
   end
   
@@ -80,11 +88,18 @@ describe LockJar, "#lock" do
     
     lockfile = LockJar.read('tmp/NoRepoJarfile.lock')
     lockfile.should eql( {
-      "repositories" => ["http://repo1.maven.org/maven2/"],
       "scopes"=>{
         "compile"=>{
-            "dependencies"=>["org.eclipse.jetty:jetty-servlet:8.1.3.v20120416"], 
-            "resolved_dependencies"=>["org.eclipse.jetty:jetty-servlet:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-security:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-server:jar:8.1.3.v20120416", "org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016", "org.eclipse.jetty:jetty-continuation:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-http:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-io:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-util:jar:8.1.3.v20120416"]}}} )           
+          "dependencies"=>["org.eclipse.jetty:jetty-servlet:8.1.3.v20120416"], 
+          "resolved_dependencies"=>["org.eclipse.jetty:jetty-util:jar:8.1.3.v20120416", 
+            "org.eclipse.jetty:jetty-io:jar:8.1.3.v20120416", 
+            "org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016", 
+            "org.eclipse.jetty:jetty-security:jar:8.1.3.v20120416", 
+            "org.eclipse.jetty:jetty-continuation:jar:8.1.3.v20120416", 
+            "org.eclipse.jetty:jetty-servlet:jar:8.1.3.v20120416", 
+            "org.eclipse.jetty:jetty-server:jar:8.1.3.v20120416", 
+            "org.eclipse.jetty:jetty-http:jar:8.1.3.v20120416"]}}, 
+      "repositories"=>["http://repo1.maven.org/maven2/"]})
   end
 end
 
@@ -95,17 +110,17 @@ describe LockJar, "#install" do
           
     jars = LockJar.install( 'tmp/Jarfile.lock', ['compile'], :local_repo => 'tmp/test-repo-install' )
     jars.should eql( 
-      [ File.expand_path( "tmp/test-repo-install/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"), 
-        File.expand_path( "tmp/test-repo-install/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"), 
+      [ File.expand_path( "tmp/test-repo-install/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), 
+        File.expand_path( "tmp/test-repo-install/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), 
+        File.expand_path( "tmp/test-repo-install/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"), 
+        File.expand_path( "tmp/test-repo-install/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar" ), 
+        File.expand_path( "tmp/test-repo-install/junit/junit/4.7/junit-4.7.jar"), 
+        File.expand_path( "tmp/test-repo-install/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), 
+        File.expand_path( "tmp/test-repo-install/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"), 
         File.expand_path( "tmp/test-repo-install/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"), 
         File.expand_path( "tmp/test-repo-install/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"), 
-        File.expand_path( "tmp/test-repo-install/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar" ), 
-        File.expand_path( "tmp/test-repo-install/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" ), 
-        File.expand_path( "tmp/test-repo-install/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar" ), 
-        File.expand_path( "tmp/test-repo-install/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar" ), 
-        File.expand_path( "tmp/test-repo-install/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar" ), 
-        File.expand_path( "tmp/test-repo-install/commons-io/commons-io/1.4/commons-io-1.4.jar" ), 
-        File.expand_path( "tmp/test-repo-install/junit/junit/4.7/junit-4.7.jar" ) ] )
+        File.expand_path( "tmp/test-repo-install/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"), 
+        File.expand_path( "tmp/test-repo-install/commons-io/commons-io/1.4/commons-io-1.4.jar")] )
   end
   
 end
@@ -116,8 +131,13 @@ describe LockJar, "#list" do
     LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
           
     jars = LockJar.list( 'tmp/Jarfile.lock', ['compile', 'runtime', 'bad scope'], :local_repo => 'tmp/test-repo' )
-    jars.should eql( ["org.apache.mina:mina-core:jar:2.0.4", "org.slf4j:slf4j-api:jar:1.6.1", "com.slackworks:modelcitizen:jar:0.2.2", "commons-lang:commons-lang:jar:2.6", "commons-beanutils:commons-beanutils:jar:1.8.3", "commons-logging:commons-logging:jar:1.1.1", "ch.qos.logback:logback-classic:jar:0.9.24", "ch.qos.logback:logback-core:jar:0.9.24", "com.metapossum:metapossum-scanner:jar:1.0", "commons-io:commons-io:jar:1.4", "junit:junit:jar:4.7", "org.apache.tomcat:servlet-api:jar:6.0.35"] )
-    
+    jars.should eql([
+      "com.metapossum:metapossum-scanner:jar:1.0", "org.apache.mina:mina-core:jar:2.0.4", 
+      "commons-beanutils:commons-beanutils:jar:1.8.3", "ch.qos.logback:logback-classic:jar:0.9.24", 
+      "commons-logging:commons-logging:jar:1.1.1", "junit:junit:jar:4.7", 
+      "ch.qos.logback:logback-core:jar:0.9.24", "commons-lang:commons-lang:jar:2.6", 
+      "com.slackworks:modelcitizen:jar:0.2.2", "org.slf4j:slf4j-api:jar:1.6.1", 
+      "commons-io:commons-io:jar:1.4", "org.apache.tomcat:servlet-api:jar:6.0.35" ])
   end
   
   it "should replace dependencies with maps" do
@@ -155,8 +175,20 @@ describe LockJar, "#load" do
     LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
           
     jars = LockJar.load( 'tmp/Jarfile.lock', ['compile', 'runtime'], :local_repo => 'tmp/test-repo' )
-    jars.should eql( [File.expand_path("tmp/test-repo/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"), File.expand_path("tmp/test-repo/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"), File.expand_path("tmp/test-repo/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"), File.expand_path("tmp/test-repo/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"), File.expand_path("tmp/test-repo/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), File.expand_path("tmp/test-repo/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), File.expand_path("tmp/test-repo/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar"), File.expand_path("tmp/test-repo/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"), File.expand_path("tmp/test-repo/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), File.expand_path("tmp/test-repo/commons-io/commons-io/1.4/commons-io-1.4.jar"), File.expand_path("tmp/test-repo/junit/junit/4.7/junit-4.7.jar"), File.expand_path("tmp/test-repo/org/apache/tomcat/servlet-api/6.0.35/servlet-api-6.0.35.jar")] )
-      
+    jars.should eql( [
+      File.expand_path("tmp/test-repo/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), 
+      File.expand_path("tmp/test-repo/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"), 
+      File.expand_path("tmp/test-repo/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), 
+      File.expand_path("tmp/test-repo/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar"), 
+      File.expand_path("tmp/test-repo/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), 
+      File.expand_path("tmp/test-repo/junit/junit/4.7/junit-4.7.jar"), 
+      File.expand_path("tmp/test-repo/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"), 
+      File.expand_path("tmp/test-repo/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"), 
+      File.expand_path("tmp/test-repo/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"), 
+      File.expand_path("tmp/test-repo/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"), 
+      File.expand_path("tmp/test-repo/commons-io/commons-io/1.4/commons-io-1.4.jar"), 
+      File.expand_path("tmp/test-repo/org/apache/tomcat/servlet-api/6.0.35/servlet-api-6.0.35.jar") ]
+    )
     if Naether.platform == 'java'
       lambda { include_class 'org.apache.mina.core.IoUtil' }.should_not raise_error
     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naether
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3994584542198625779
+      hash: 3691790945900068517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: