lock_jar 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 890e8f58de1d05c870ec1254fd8922e1f3d300c7
-  data.tar.gz: 79eee178effcfbcf2da3cc50345e1fd23f31d93c
+  metadata.gz: b3a691a255e5c05a41c32741bb73b4dd39bfe13c
+  data.tar.gz: 9b6593b52c0d38d0816f25e7ea9e036d47b11192
 SHA512:
-  metadata.gz: 5d64ba05c2d2c4ee3ef4bb99b8d10437e91c16050ac060f76a70a3a2ed78b4780c2eb36b41e5e777b7ce7eba6322df39d99f1918dcf7c87d53d8d86cdf342395
-  data.tar.gz: 59ae69cb059f46c198f7336a30b01b9535bdfb53b37739c36d2aa1da8e6f90941179480da427703c1ecaceb0ab8c9e4ccb5211665f2d78c47fabae1d9a2cf123
+  metadata.gz: e9ecb0fae86af182cbbb69734516b7ed307d1e124483afa449e229246e16b5081b30e7df0b962dc68aabe440907062153ec48adc246a45705988837d808f26bd
+  data.tar.gz: 6e74c403ff8dc46efc2f8340d5950dd1f5368d50749bb6fe87629c202470888aa879ce0843518474766e4f3f24a1f5f9c8c4635a6488cace75f243792478113f

data/.gitignore

@@ -1,4 +1,7 @@
+# Dont save the Gemfile since JRuby and CRuby have incompatiable deps
+Gemfile.lock
 Jarfile.lock
+
 .*
 
 tmp
@@ -16,4 +19,41 @@ doc
 # bundler
 .bundle
 
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# ides:
+.redcar
+*.iml
+
+# For rubinius:
+#*.rbc
+
 autotest

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 * Add support for `without_default_maven_repo`
 
+### 0.12.1 (Feburary 25, 2015)
+
+* Fix for writing remote repositories to lockfile
+
 ### 0.10.0 (June 27, 2014)
 
 * Extract Bundler out to own Gem - https://github.com/mguymon/lock_jar_bundler

data/lib/lock_jar/runtime.rb

@@ -131,6 +131,7 @@ module LockJar
 
       jarfile.remote_repositories.each do |repo|
         resolver(opts).add_remote_repository( repo )
+        lockfile.remote_repositories << repo
       end
 
       unless jarfile.local_repository.nil?

data/lib/lock_jar/version.rb

@@ -1,3 +1,3 @@
 module LockJar
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

data/spec/lock_jar_spec.rb

@@ -18,7 +18,7 @@ describe LockJar do
 
   describe "#lock" do
     context "creates a lockfile" do
-      let(:lockfile) do        
+      let(:lockfile) do
         LockJar.lock( lockjar_source, :local_repo => "#{TEMP_DIR}/test-repo", :lockfile => "#{TEMP_DIR}/Jarfile.lock" )
         File.exists?( "#{TEMP_DIR}/Jarfile.lock" ).should be_true
         LockJar.read("#{TEMP_DIR}/Jarfile.lock")
@@ -85,6 +85,33 @@ describe LockJar do
 
       context "from a dsl" do
 
+        describe '#without_default_maven_repo' do
+          let(:lockjar_source) do
+            LockJar::Domain::Dsl.create do
+              without_default_maven_repo
+              remote_repo 'https://repository.jboss.org/nexus/content/groups/public'
+              jar 'junit:junit:4.10'
+            end
+          end
+
+          let(:expected_version) { LockJar::VERSION }
+          let(:expected_maps) { {"junit:junit:4.10"=>["#{TEMP_DIR}"] } }
+          let(:expected_remote_repositories) { %w[https://repository.jboss.org/nexus/content/groups/public] }
+          let(:expected_groups) do
+            {
+              "default"=>{
+                "dependencies"=>["junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"],
+                "artifacts"=>[{
+                  "jar:junit:junit:jar:4.10"=>{
+                    "transitive"=>{"org.hamcrest:hamcrest-core:jar:1.1"=>{}}}
+                }]
+              }
+            }
+          end
+
+          it_behaves_like 'a lockfile'
+        end
+
         describe '#map' do
           let(:lockjar_source) do
             LockJar::Domain::Dsl.create do
@@ -95,11 +122,7 @@ describe LockJar do
 
           let(:expected_version) { LockJar::VERSION }
           let(:expected_maps) { {"junit:junit:4.10"=>["#{TEMP_DIR}"] } }
-          let(:expected_remote_repositories) do
-            %w[
-                http://repo1.maven.org/maven2/
-              ]
-          end
+          let(:expected_remote_repositories) { %w[http://repo1.maven.org/maven2/] }
           let(:expected_groups) do
             {
               "default"=>{
@@ -126,7 +149,7 @@ describe LockJar do
 
           let(:expected_version) { LockJar::VERSION }
           let(:expected_excludes) { %w[commons-logging logkit] }
-          let(:expected_remote_repositories) { %w[http://repo1.maven.org/maven2/] }
+          let(:expected_remote_repositories) { %w[http://repo1.maven.org/maven2/ https://repository.jboss.org/nexus/content/groups/public] }
           let(:expected_groups) do
             { "default" =>
               {
@@ -315,20 +338,25 @@ describe LockJar do
   end
 
   describe "#load" do
-    it "by Jarfile.lock" do
+
+    def expect_java_class_not_loaded(java_class)
       if Naether.platform == 'java'
-        lambda { java_import 'org.apache.mina.core.IoUtil' }.should raise_error
+        lambda { java_import java_class }.should raise_error
       else
-        lambda { Rjb::import('org.apache.mina.core.IoUtil') }.should raise_error
+        lambda { Rjb::import(java_class) }.should raise_error
       end
+    end
 
+    def expect_java_class_loaded(java_class)
+      if Naether.platform == 'java'
+        lambda { java_import java_class }.should_not raise_error
+      else
+        lambda { Rjb::import(java_class) }.should_not raise_error
+      end
+    end
 
-      LockJar.lock( "spec/fixtures/Jarfile", :local_repo => "#{TEMP_DIR}/test-repo", :lockfile => "#{TEMP_DIR}/Jarfile.lock" )
-
-      jars = LockJar.load( "#{TEMP_DIR}/Jarfile.lock", ['default'], :local_repo => "#{TEMP_DIR}/test-repo" )
-      LockJar::Registry.instance.lockfile_registered?( "#{TEMP_DIR}/Jarfile.lock" ).should be_false
-
-      jars.should eql([
+    let(:expected_jars) do
+      [
         "spec/fixtures/naether-0.13.0.jar",
         File.expand_path("#{TEMP_DIR}/test-repo/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar"),
         File.expand_path("#{TEMP_DIR}/test-repo/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"),
@@ -340,22 +368,23 @@ describe LockJar do
         File.expand_path("#{TEMP_DIR}/test-repo/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"),
         File.expand_path("#{TEMP_DIR}/test-repo/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"),
         File.expand_path("#{TEMP_DIR}/test-repo/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"),
-      ])
-      if Naether.platform == 'java'
-        lambda { java_import 'org.apache.mina.core.IoUtil' }.should_not raise_error
-      else
-        lambda { Rjb::import('org.apache.mina.core.IoUtil') }.should_not raise_error
-      end
+      ]
+    end
+
+    it "by Jarfile.lock" do
+      expect_java_class_not_loaded('org.apache.mina.core.IoUtil')
+
+      LockJar.lock( "spec/fixtures/Jarfile", :local_repo => "#{TEMP_DIR}/test-repo", :lockfile => "#{TEMP_DIR}/Jarfile.lock" )
+      jars = LockJar.load( "#{TEMP_DIR}/Jarfile.lock", ['default'], :local_repo => "#{TEMP_DIR}/test-repo" )
+      LockJar::Registry.instance.lockfile_registered?( "#{TEMP_DIR}/Jarfile.lock" ).should be_false
 
+      jars.should eql(expected_jars)
 
+      expect_java_class_loaded('org.apache.mina.core.IoUtil')
     end
 
     it "by block with resolve option" do
-      if Naether.platform == 'java'
-        lambda { java_import 'org.modeshape.common.math.Duration' }.should raise_error
-      else
-        lambda { Rjb::import('org.modeshape.common.math.Duration') }.should raise_error
-      end
+      expect_java_class_not_loaded('org.modeshape.common.math.Duration')
 
       jars = LockJar.load(:local_repo => TEST_REPO, :resolve => true) do
         jar 'org.modeshape:modeshape-common:3.4.0.Final'
@@ -363,11 +392,7 @@ describe LockJar do
 
       jars.should eql( [File.expand_path(TEST_REPO + "/org/modeshape/modeshape-common/3.4.0.Final/modeshape-common-3.4.0.Final.jar")] )
 
-      if Naether.platform == 'java'
-        lambda { java_import 'org.modeshape.common.math.Duration' }.should_not raise_error
-      else
-        lambda { Rjb::import('org.modeshape.common.math.Duration') }.should_not raise_error
-      end
+      expect_java_class_loaded('org.modeshape.common.math.Duration')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Michael Guymon
@@ -51,7 +51,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md

data/Gemfile.lock

@@ -1,78 +0,0 @@
-PATH
-  remote: .
-  specs:
-    lock_jar (0.12.0)
-      naether (~> 0.14.0)
-      thor (>= 0.18.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    ffi (1.9.3)
-    ffi (1.9.3-java)
-    formatador (0.2.5)
-    guard (2.6.1)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-rspec (4.2.10)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    httpclient (2.6.0.1)
-    jruby-openssl (0.9.5-java)
-    listen (2.7.9)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.7)
-    method_source (0.8.2)
-    naether (0.14.0)
-      httpclient
-      rjb (~> 1.4.0)
-    naether (0.14.0-java)
-      httpclient
-    pry (0.10.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.0-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rjb (1.4.9)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    slop (3.5.0)
-    spoon (0.0.4)
-      ffi
-    thor (0.19.1)
-    timers (1.1.0)
-    yard (0.8.7.4)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  guard-rspec
-  jruby-openssl
-  lock_jar!
-  pry
-  rspec (~> 2.14.1)
-  yard