lock_jar 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/lock_jar/resolver.rb

@@ -73,6 +73,7 @@ module LockJar
       @naether.add_remote_repository( repo )
     end
     
+    
     def resolve( dependencies, download_artifacts = true )
       @naether.dependencies = dependencies
       @naether.resolve_dependencies( download_artifacts )

data/lib/lock_jar/runtime.rb

@@ -88,12 +88,7 @@ module LockJar
             lock_data['local_repository'] = lock_data['local_repository'].force_encoding("UTF-8")
           end
         end
-          
-        lock_data['repositories'] = resolver(opts).remote_repositories
-        if needs_force_encoding
-          lock_data['repositories'].map! { |repo| repo.force_encoding("UTF-8") }
-        end     
-        
+                
         if lock_jar_file.maps.size > 0
           lock_data['maps'] = lock_jar_file.maps
         end
@@ -122,6 +117,11 @@ module LockJar
           if dependencies.size > 0
             resolved_notations = resolver(opts).resolve( dependencies, opts[:download] == true )
             
+            lock_data['repositories'] = resolver(opts).remote_repositories.uniq
+            if needs_force_encoding
+              lock_data['repositories'].map! { |repo| repo.force_encoding("UTF-8") }
+            end 
+            
             if lock_data['excludes']
               lock_data['excludes'].each do |exclude|
                 resolved_notations.delete_if { |dep| dep =~ /#{exclude}/ }

data/lock_jar.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]

data/spec/Jarfile

@@ -1,5 +1,5 @@
 local '~/.m2'
-repository 'http://repository.jboss.org/nexus/content/groups/public-jboss'
+repository 'http://mirrors.ibiblio.org/pub/mirrors/maven2'
 
 jar "org.apache.mina:mina-core:2.0.4"
 pom 'spec/pom.xml'

data/spec/lock_jar/dsl_spec.rb

@@ -7,7 +7,7 @@ describe LockJar::Dsl do
       
       jarfile.local_repository.should eql '~/.m2'
       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://repository.jboss.org/nexus/content/groups/public-jboss"] )
+      jarfile.repositories.should eql( ['http://mirrors.ibiblio.org/pub/mirrors/maven2'] )
     end
     
     it "should load a block" do

data/spec/lock_jar_spec.rb

@@ -17,7 +17,7 @@ describe LockJar, "#lock" do
     lockfile = LockJar.read('tmp/Jarfile.lock')
     lockfile.should eql( {
        "local_repository" => "~/.m2",
-       "repositories" => ["http://repo1.maven.org/maven2/", "http://repository.jboss.org/nexus/content/groups/public-jboss"],
+       "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"], 
@@ -44,6 +44,7 @@ describe LockJar, "#lock" do
     LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
     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"],
       "maps"=>{"junit:junit:4.10"=>["tmp"]}, 
       "scopes"=>{
         "compile"=>{
@@ -60,6 +61,7 @@ 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"=>{
@@ -78,6 +80,7 @@ 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"], 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2177112024216823600
+      hash: -1691747764608271872
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: