lock_jar 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc96065e3e9627fc0db3267dfc96c2749c13bab
-  data.tar.gz: 405653c6f9961b07ce3009cf0c04cf9a0834da68
+  metadata.gz: bb1062ded1e751410d49d6b1b81666008048d662
+  data.tar.gz: 1b3ed787d557da58076dba1d60f5a4d0ecee3b64
 SHA512:
-  metadata.gz: 0841da259510056f369cda445a9aea607f1a85b0ffb2ab84fb283eb5a308393589c4138a7e2eca6502905020e3210e61fd67c902ab46aed6fe68b93efc708e79
-  data.tar.gz: 44c737e6d62349948a2ac1839d6199d66c1b0abaea839b5bf2df32a23e20ed266b0b8109272db0aa18313a799ed127759342ff64123cd31bdcb793ca6c9c1510
+  metadata.gz: 6041663c5fcdc7673e30286f3cdc624b25075592ff5c6befa30c998b5b6188dc442c14d3dd96ce5490a69c80a70d9fc229706b588d301d1533ba48d2f3ce8435
+  data.tar.gz: c247a4d5d5bac9fe488223c5b6943957f04f0186ea79d13f7f5291b235e47c315edc5b128a2ef6faf4bb8c549101518019e62ffa4c243a3c49024a0807d96a7e

data/.rubocop.yml

@@ -26,3 +26,6 @@ Style/PredicateName:
 
 Style/Lambda:
   Enabled: false
+
+Style/Alias:
+  Enabled: false

data/Gemfile

@@ -12,5 +12,5 @@ group :development do
   gem 'guard-rspec', require: false
   gem 'pry'
   gem 'yard'
-  gem 'rubocop'
+  gem 'rubocop', '~> 0.36.0'
 end

data/README.md

@@ -51,7 +51,7 @@ methods:
     end
 
     group 'test' do
-      jar 'junit:junit:jar:4.10', :group => 'test'
+      jar 'junit:junit:jar:4.12', :group => 'test'
     end
 
 ### Resolving dependencies
@@ -90,7 +90,7 @@ The _Jarfile.lock_ generated is a YAML file containing information on how to han
         - 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
-        - com.slackworks:modelcitizen:jar:0.2.2
+        - com.tobedevoured.modelcitizen:core:jar:0.8.1
         - commons-beanutils:commons-beanutils:jar:1.8.3
         - commons-io:commons-io:jar:1.4
         - commons-lang:commons-lang:jar:2.6
@@ -123,10 +123,10 @@ The _Jarfile.lock_ generated is a YAML file containing information on how to han
             transitive: {}
       test:
         dependencies:
-        - junit:junit:jar:4.10
+        - junit:junit:jar:4.12
         - org.hamcrest:hamcrest-core:jar:1.1
         artifacts:
-        - jar:junit:junit:jar:4.10:
+        - jar:junit:junit:jar:4.12:
             transitive:
               org.hamcrest:hamcrest-core:jar:1.1: {}
     ...
@@ -146,7 +146,7 @@ The _Jarfile.lock_ generated is a YAML file containing information on how to han
 * _[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
+  * **:resolve** _[Boolean]_ to `true` will make transitive dependences resolve before returning list of jars. Setting to `false` will list dependencies, excluding transitive dependencies.
 
 **LockJar.load(*args)**: Loads all dependencies to the classpath for groups from the Jarfile.lock. Default group is _default_. Default lock file is _Jarfile.lock_.
 * _[String]_ will set the Jarfile.lock, e.g. `'Better.lock'`
@@ -301,7 +301,7 @@ Sample buildfile with LockJar
     lock_jar do
 
          group 'test' do
-           jar 'junit:junit:jar:4.10'
+           jar 'junit:junit:jar:4.12'
          end
     end
 
@@ -329,13 +329,15 @@ Generated the following lock files using **lock_jar:lock**
 ## Bundler Integration
 
 [LockJar patches Bundler](https://github.com/mguymon/lock_jar/blob/master/lib/lock_jar/bundler.rb)
-to allow creation of a _Jarfile.lock_ when Bundler calls `install` and `update`. The dependencies from the _Jarfile.lock_ are automatically loaded when
-Bundler  calls `setup` and `require`. To enable this support, add this require to your _Gemfile_
+to allow creation of a _Jarfile.lock_ when Bundler calls `install` and `update`. To enable this support, add this exit callback your _Gemfile_
 
-    require 'lock_jar/bundler'
+    @@check ||= at_exit do
+      require 'lock_jar/bundler'
+      LockJar::Bundler.lock!(::Bundler)
+    end
 
 You can optionally create a _Jarfile_ that will automatically be included when you `bundle install` or `bundle update`. Otherwise
-Gems with a Jarfile will be merge to generate a _Jarfile.lock_. The Jarfile.lock will be loaded when Bundler calls `setup` or `require`.
+Gems with a Jarfile will be merge to generate a _Jarfile.lock_.
 
 ### Bundler to LockJar groups
 

data/lib/lock_jar.rb

@@ -168,37 +168,35 @@ module LockJar
       args = args.reject { |arg| arg.is_a? String }
       lock(combined, *args, &blk)
     end
-  end
-
-  private
 
-  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-  def self.extract_args(type, args, &blk)
-    lockfile_or_path = nil
-    opts = {}
-    groups = ['default']
-    args.each do |arg|
-      case arg
-      when Hash
-        opts.merge!(arg)
-      when String
-        lockfile_or_path = arg
-      when LockJar::Domain::Lockfile
-        lockfile_or_path = arg if type == :lockfile
-      when LockJar::Domain::Dsl
-        lockfile_or_path = arg if type == :jarfile
-      when Array
-        groups = arg
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def extract_args(type, args, &blk)
+      lockfile_or_path = nil
+      opts = {}
+      groups = ['default']
+      args.each do |arg|
+        case arg
+        when Hash
+          opts.merge!(arg)
+        when String
+          lockfile_or_path = arg
+        when LockJar::Domain::Lockfile
+          lockfile_or_path = arg if type == :lockfile
+        when LockJar::Domain::Dsl
+          lockfile_or_path = arg if type == :jarfile
+        when Array
+          groups = arg
+        end
       end
-    end
-    if blk.nil? && lockfile_or_path.nil?
-      if type == :lockfile
-        lockfile_or_path = opts.fetch(:lockfile, 'Jarfile.lock')
-      elsif type == :jarfile
-        lockfile_or_path = 'Jarfile'
+      if blk.nil? && lockfile_or_path.nil?
+        if type == :lockfile
+          lockfile_or_path = opts.fetch(:lockfile, 'Jarfile.lock')
+        elsif type == :jarfile
+          lockfile_or_path = 'Jarfile'
+        end
       end
+      [lockfile_or_path, groups, opts]
     end
-    [lockfile_or_path, groups, opts]
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
-  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 end

data/lib/lock_jar/buildr.rb

@@ -22,7 +22,7 @@ module Buildr
 
   class << self
     def project_to_lockfile(project)
-      "#{project.name.gsub(/:/, '-')}.lock"
+      "#{project.name.tr(':', '-')}.lock"
     end
   end
 

data/lib/lock_jar/bundler.rb

@@ -23,13 +23,13 @@ module LockJar
         jarfile = File.expand_path(jarfile_opt || 'Jarfile')
 
         # load local Jarfile
-        if File.exist?(jarfile)
-          dsl = LockJar::Domain::JarfileDsl.create(jarfile)
+        dsl = if File.exist?(jarfile)
+                LockJar::Domain::JarfileDsl.create(jarfile)
 
-        # Create new Dsl
-        else
-          dsl = LockJar::Domain::Dsl.new
-        end
+              # Create new Dsl
+              else
+                LockJar::Domain::Dsl.new
+              end
 
         gems_with_jars = []
         ::Bundler.definition.groups.each do |group|

data/lib/lock_jar/domain/artifact.rb

@@ -25,11 +25,9 @@ module LockJar
       attr_reader :type
 
       def <=>(other)
-        if other.is_a? Artifact
-          to_urn <=> other.to_urn
-        else
-          to_urn <=> other.to_s
-        end
+        return to_urn <=> other.to_urn if other.is_a? Artifact
+
+        to_urn <=> other.to_s
       end
 
       def resolvable?
@@ -104,11 +102,9 @@ module LockJar
 
       def <=>(other)
         if other.is_a? Pom
-          if to_urn == other.to_urn
-            return Set.new(scopes) <=> Set.new(other.scopes)
-          else
-            to_urn <=> other.to_urn
-          end
+          return Set.new(scopes) <=> Set.new(other.scopes) if to_urn == other.to_urn
+
+          to_urn <=> other.to_urn
         else
           super
         end

data/lib/lock_jar/domain/dsl.rb

@@ -21,7 +21,7 @@ module LockJar
   module Domain
     #
     class Dsl
-      DEFAULT_GROUP = ['default']
+      DEFAULT_GROUP = ['default'].freeze
 
       attr_accessor :artifacts, :remote_repositories, :local_repository, :groups,
                     :maps, :excludes, :merged, :clear_repositories

data/lib/lock_jar/runtime.rb

@@ -76,7 +76,7 @@ module LockJar
 
       groups.each do |group|
         next unless lockfile.groups[group.to_s]
-        dependencies += lockfile.groups[group.to_s]['dependencies']
+        dependencies += yield lockfile.groups[group.to_s]
 
         if with_locals
           locals = lockfile.groups[group.to_s]['locals']

data/lib/lock_jar/runtime/list.rb

@@ -10,13 +10,8 @@ module LockJar
         with_locals = { with_locals: true }.merge(opts).delete(:with_locals)
 
         if lockfile_or_path
-          if lockfile_or_path.is_a? LockJar::Domain::Lockfile
-            lockfile = lockfile_or_path
-          elsif lockfile_or_path
-            lockfile = LockJar::Domain::Lockfile.read(lockfile_or_path)
-          end
-
-          dependencies = lockfile_dependencies(lockfile, groups, with_locals)
+          lockfile = build_lockfile(lockfile_or_path)
+          dependencies = dependencies_from_lockfile(lockfile, groups, with_locals, opts)
           maps = lockfile.maps
         end
 
@@ -41,15 +36,42 @@ module LockJar
 
         dependencies = resolver(opts).resolve(dependencies) if opts[:resolve]
 
-        if opts[:local_paths]
-          opts.delete(:local_paths) # remove list opts so resolver is not reset
-          resolver(opts).to_local_paths(dependencies)
+        # local_paths and !resolve are mutualally exclusive
+        if opts[:local_paths] && opts[:resolve] != false
+          # remove local_paths opt so resolver is not reset
+          resolver(opts.reject { |k| k == :local_paths }).to_local_paths(dependencies)
 
         else
           dependencies
         end
       end
       # rubocop:enable Metrics/PerceivedComplexity, MethodLength
+
+      def build_lockfile(lockfile_or_path)
+        if lockfile_or_path.is_a? LockJar::Domain::Lockfile
+          lockfile_or_path
+        elsif lockfile_or_path
+          LockJar::Domain::Lockfile.read(lockfile_or_path)
+        end
+      end
+
+      def dependencies_from_lockfile(lockfile, groups, with_locals, opts)
+        # Only list root dependencies
+        if opts[:resolve] == false
+          lockfile_dependencies(lockfile, groups, with_locals) do |group|
+            group['artifacts'].flat_map(&:keys).map do |notation|
+              # remove the prefix from artifacts, such as jar: or pom:
+              notation.gsub(/^.+?:/, '')
+            end
+          end
+
+        # List all dependencies
+        else
+          lockfile_dependencies(lockfile, groups, with_locals) do |group|
+            group['dependencies']
+          end
+        end
+      end
     end
   end
 end

data/lib/lock_jar/runtime/load.rb

@@ -17,12 +17,11 @@ module LockJar
           if lockfile_or_path.is_a? LockJar::Domain::Lockfile
             lockfile = lockfile_or_path
 
-          # check if lockfile path is already loaded
-          elsif LockJar::Registry.instance.lockfile_registered?(lockfile_or_path)
-            return
-
-          # convert lockfile path to a Lockfile instance
           else
+            # check if lockfile path is already loaded
+            return if LockJar::Registry.instance.lockfile_registered?(lockfile_or_path)
+
+            # convert lockfile path to a Lockfile instance
             lockfile = LockJar::Domain::Lockfile.read(lockfile_or_path)
           end
 

data/lib/lock_jar/runtime/lock.rb

@@ -38,11 +38,11 @@ module LockJar
 
       def create_dsl!(jarfile_or_dsl, &blk)
         if jarfile_or_dsl
-          if jarfile_or_dsl.is_a? LockJar::Domain::Dsl
-            @jarfile = jarfile_or_dsl
-          else
-            @jarfile = LockJar::Domain::JarfileDsl.create(jarfile_or_dsl)
-          end
+          @jarfile = if jarfile_or_dsl.is_a? LockJar::Domain::Dsl
+                       jarfile_or_dsl
+                     else
+                       LockJar::Domain::JarfileDsl.create(jarfile_or_dsl)
+                     end
         end
 
         return @jarfile if blk.nil?
@@ -132,7 +132,7 @@ module LockJar
           # iterate each dependency in Pom to map transitive dependencies
           transitive = {}
           artifact.notations.each do |notation|
-            transitive.merge!(notation => resolver(opts).dependencies_graph[notation])
+            transitive[notation] = resolver(opts).dependencies_graph[notation]
           end
           artifact_data['transitive'] = transitive
 

data/lib/lock_jar/version.rb

@@ -1,4 +1,4 @@
 # the version
 module LockJar
-  VERSION = '0.14.5'
+  VERSION = '0.14.6'.freeze
 end

data/spec/fixtures/Jarfile

@@ -4,11 +4,11 @@ repository 'http://mirrors.ibiblio.org/pub/mirrors/maven2'
 jar "org.apache.mina:mina-core:2.0.4"
 local "spec/fixtures/naether-0.13.0.jar"
 pom 'spec/pom.xml'
-    
+
 group 'development' do
     jar 'com.typesafe:config:jar:0.5.0'
 end
 
 group 'test' do
-    jar 'junit:junit:jar:4.10'
-end
+    jar 'org.testng:testng:jar:6.9.10'
+end

data/spec/lock_jar/domain/dsl_merger_spec.rb

@@ -15,7 +15,7 @@ describe LockJar::Domain::DslMerger do
       end
 
       group 'test' do
-        jar 'junit:junit:jar:4.10'
+        jar 'org.testng:testng:jar:6.9.10'
       end
     end
 
@@ -39,11 +39,13 @@ describe LockJar::Domain::DslMerger do
 
     dsl = LockJar::Domain::DslMerger.new(block1, block2).merge
 
-    expect(dsl.artifacts['default']).to eq([
-      LockJar::Domain::Jar.new('org.apache.mina:mina-core:2.0.4'),
-      LockJar::Domain::Pom.new('spec/pom.xml', %w(runtime compile)),
-      LockJar::Domain::Jar.new('compile-jar')
-    ])
+    expect(dsl.artifacts['default']).to eq(
+      [
+        LockJar::Domain::Jar.new('org.apache.mina:mina-core:2.0.4'),
+        LockJar::Domain::Pom.new('spec/pom.xml', %w(runtime compile)),
+        LockJar::Domain::Jar.new('compile-jar')
+      ]
+    )
     dsl.remote_repositories.should eql(['http://repository.jboss.org/nexus/content/groups/public-jboss', 'http://new-repo'])
   end
 end

data/spec/lock_jar/domain/dsl_spec.rb

@@ -15,7 +15,7 @@ describe LockJar::Domain::Dsl do
       expect(jarfile.artifacts['development'][0]).to eq LockJar::Domain::Jar.new('com.typesafe:config:jar:0.5.0')
       jarfile.artifacts['development'][1].should be_nil
 
-      expect(jarfile.artifacts['test'][0]).to eq LockJar::Domain::Jar.new('junit:junit:jar:4.10')
+      expect(jarfile.artifacts['test'][0]).to eq LockJar::Domain::Jar.new('org.testng:testng:jar:6.9.10')
       jarfile.artifacts['test'][1].should be_nil
 
       jarfile.remote_repositories.should eql(['http://mirrors.ibiblio.org/pub/mirrors/maven2'])
@@ -35,7 +35,7 @@ describe LockJar::Domain::Dsl do
         end
 
         group 'test' do
-          jar 'junit:junit:jar:4.10'
+          jar 'org.testng:testng:jar:6.9.10'
         end
       end
 
@@ -43,7 +43,7 @@ describe LockJar::Domain::Dsl do
       expect(block.artifacts).to eq(
         'default' => [LockJar::Domain::Jar.new('org.apache.mina:mina-core:2.0.4'), LockJar::Domain::Local.new('spec/fixtures/naether-0.13.0.jar'), LockJar::Domain::Pom.new('spec/pom.xml')],
         'pirate' => [LockJar::Domain::Jar.new('org.apache.tomcat:servlet-api:jar:6.0.35')],
-        'test' => [LockJar::Domain::Jar.new('junit:junit:jar:4.10')]
+        'test' => [LockJar::Domain::Jar.new('org.testng:testng:jar:6.9.10')]
       )
       block.remote_repositories.should eql(['http://repository.jboss.org/nexus/content/groups/public-jboss'])
     end

data/spec/lock_jar/resolver_spec.rb

@@ -18,8 +18,8 @@ describe LockJar::Resolver do
   end
 
   it 'should return local paths for notations' do
-    expect(@resolver.to_local_paths(['junit:junit:jar:4.10'])).to(
-      eql([File.expand_path("#{TEMP_DIR}/test-repo/junit/junit/4.10/junit-4.10.jar")])
+    expect(@resolver.to_local_paths(['org.testng:testng:jar:6.9.10'])).to(
+      eql([File.expand_path("#{TEMP_DIR}/test-repo/org/testng/testng/6.9.10/testng-6.9.10.jar")])
     )
   end
 end

data/spec/lock_jar/runtime_spec.rb

@@ -5,7 +5,7 @@ describe LockJar::Runtime do
   describe '#load' do
     it 'should set local repo' do
       LockJar::Runtime.instance.load(nil, [], resolve: true, local_repo: TEST_REPO) do
-        jar 'junit:junit:4.10'
+        jar 'org.testng:testng:jar:6.9.10'
       end
 
       LockJar::Runtime.instance.current_resolver.naether.local_repo_path.should eql TEST_REPO

data/spec/lock_jar_spec.rb

@@ -6,6 +6,8 @@ require 'naether'
 describe LockJar do
   include Spec::Helpers
 
+  let(:local_repo) { "#{TEMP_DIR}/test-repo" }
+
   before do
     LockJar::Runtime.instance.reset!
 
@@ -19,14 +21,26 @@ describe LockJar do
   describe '#lock' do
     context 'creates a lockfile' do
       let(:lockfile) do
-        LockJar.lock(lockjar_source, local_repo: "#{TEMP_DIR}/test-repo", lockfile: "#{TEMP_DIR}/Jarfile.lock")
+        LockJar.lock(lockjar_source, local_repo: local_repo, lockfile: "#{TEMP_DIR}/Jarfile.lock")
         expect(File).to exist("#{TEMP_DIR}/Jarfile.lock")
         LockJar.read("#{TEMP_DIR}/Jarfile.lock")
       end
+      let(:test_dependencies) { %w(com.beust:jcommander:jar:1.48 org.beanshell:bsh:jar:2.0b4 org.testng:testng:jar:6.9.10) }
+      let(:test_artifacts) do
+        [
+          {
+            'jar:org.testng:testng:jar:6.9.10' => {
+              'transitive' => {
+                'com.beust:jcommander:jar:1.48' => {},
+                'org.beanshell:bsh:jar:2.0b4' => {}
+              }
+            }
+          }
+        ]
+      end
 
       context 'from Jarfile' do
         let(:lockjar_source) { 'spec/fixtures/Jarfile' }
-
         let(:expected_version) { LockJar::VERSION }
         let(:expected_local_repository) { '~/.m2/repository' }
         let(:expected_excludes) { %w(commons-logging logkit) }
@@ -38,7 +52,7 @@ describe LockJar do
               'dependencies' => %w(
                 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
-                com.slackworks:modelcitizen:jar:0.2.2
+                com.tobedevoured.modelcitizen:core:jar:0.8.1
                 commons-beanutils:commons-beanutils:jar:1.8.3 commons-io:commons-io:jar:1.4
                 commons-lang:commons-lang:jar:2.6 commons-logging:commons-logging:jar:1.1.1
                 org.apache.mina:mina-core:jar:2.0.4
@@ -54,7 +68,7 @@ describe LockJar do
                   'pom:spec/pom.xml' => {
                     'scopes' => %w(runtime compile),
                     'transitive' => {
-                      'com.slackworks:modelcitizen:jar:0.2.2' => {
+                      'com.tobedevoured.modelcitizen:core:jar:0.8.1' => {
                         'com.metapossum:metapossum-scanner:jar:1.0' => {
                           'commons-io:commons-io:jar:1.4' => {}
                         },
@@ -78,14 +92,8 @@ describe LockJar do
               ]
             },
             'test' => {
-              'dependencies' => %w(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' => {} }
-                  }
-                }
-              ]
+              'dependencies' => test_dependencies,
+              'artifacts' => test_artifacts
             }
           }
         end
@@ -97,23 +105,18 @@ describe LockJar 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'
+              jar 'org.jboss.logging:jboss-logging:3.1.0.GA'
             end
           end
 
           let(:expected_version) { LockJar::VERSION }
-          let(:expected_maps) { { 'junit:junit:4.10' => [TEMP_DIR] } }
           let(:expected_remote_repositories) { ['https://repository.jboss.org/nexus/content/groups/public'] }
           let(:expected_groups) do
             {
               'default' => {
-                'dependencies' => %w(junit:junit:jar:4.10 org.hamcrest:hamcrest-core:jar:1.1),
+                'dependencies' => ['org.jboss.logging:jboss-logging:jar:3.1.0.GA'],
                 'artifacts' => [
-                  {
-                    'jar:junit:junit:jar:4.10' => {
-                      'transitive' => { 'org.hamcrest:hamcrest-core:jar:1.1' => {} }
-                    }
-                  }
+                  { 'jar:org.jboss.logging:jboss-logging:jar:3.1.0.GA' => { 'transitive' => {} } }
                 ]
               }
             }
@@ -125,25 +128,19 @@ describe LockJar do
         describe '#map' do
           let(:lockjar_source) do
             LockJar::Domain::Dsl.create do
-              map 'junit:junit:4.10', TEMP_DIR
-              jar 'junit:junit:4.10'
+              map 'org.testng:testng:jar:6.9.10', 'path/to/jar'
+              jar 'org.testng:testng:jar:6.9.10'
             end
           end
 
           let(:expected_version) { LockJar::VERSION }
-          let(:expected_maps) { { 'junit:junit:4.10' => [TEMP_DIR] } }
+          let(:expected_maps) { { 'org.testng:testng:jar:6.9.10' => ['path/to/jar'] } }
           let(:expected_remote_repositories) { ['http://repo1.maven.org/maven2/'] }
           let(:expected_groups) do
             {
               'default' => {
-                'dependencies' => %w(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' => {} }
-                    }
-                  }
-                ]
+                'dependencies' => test_dependencies,
+                'artifacts' => test_artifacts
               }
             }
           end
@@ -196,7 +193,7 @@ describe LockJar do
 
       context 'from a block' do
         let(:lockfile) do
-          LockJar.lock(local_repo: "#{TEMP_DIR}/test-repo", lockfile: "#{TEMP_DIR}/NoRepoJarfile.lock") do
+          LockJar.lock(local_repo: local_repo, lockfile: "#{TEMP_DIR}/NoRepoJarfile.lock") do
             jar 'org.eclipse.jetty:jetty-servlet:8.1.3.v20120416'
           end
 
@@ -248,22 +245,19 @@ describe LockJar do
   end
 
   describe '#install' do
+    let(:repo_path) { "#{TEMP_DIR}/test-repo-install" }
+
     it 'should install jars' do
       LockJar.lock('spec/fixtures/Jarfile', download_artifacts: false, local_repo: "#{TEMP_DIR}/test-repo-install", lockfile: "#{TEMP_DIR}/Jarfile.lock")
 
       jars = LockJar.install("#{TEMP_DIR}/Jarfile.lock", ['default'], local_repo: "#{TEMP_DIR}/test-repo-install")
-      jars.should eql([
-        File.expand_path("#{TEMP_DIR}/test-repo-install/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/commons-io/commons-io/1.4/commons-io-1.4.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo-install/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar")
-      ])
+      expect(jars).to eql(
+        [
+          File.expand_path("#{repo_path}/com/google/guava/guava/14.0.1/guava-14.0.1.jar"),
+          File.expand_path("#{repo_path}/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"),
+          File.expand_path("#{repo_path}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar")
+        ]
+      )
     end
   end
 
@@ -343,42 +337,56 @@ describe LockJar do
   end
 
   describe '#list' do
-    it 'should list jars' do
-      LockJar.lock('spec/fixtures/Jarfile', local_repo: "#{TEMP_DIR}/test-repo", lockfile: "#{TEMP_DIR}/Jarfile.lock")
+    let(:lockfile) { "#{TEMP_DIR}/Jarfile.lock" }
+    let(:lock) do
+      LockJar.lock('spec/fixtures/Jarfile', local_repo: local_repo, lockfile: lockfile)
+    end
+    let(:jars) do
+      lock
+      LockJar.list(lockfile, ['default', 'development', 'bad scope'], local_repo: local_repo)
+    end
 
-      jars = LockJar.list("#{TEMP_DIR}/Jarfile.lock", ['default', 'development', 'bad scope'], local_repo: "#{TEMP_DIR}/test-repo")
+    it 'should list jars' do
       jars.should eql(
         %w(
-          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 com.slackworks:modelcitizen:jar:0.2.2
-          commons-beanutils:commons-beanutils:jar:1.8.3 commons-io:commons-io:jar:1.4
-          commons-lang:commons-lang:jar:2.6 commons-logging:commons-logging:jar:1.1.1
-          org.apache.mina:mina-core:jar:2.0.4
-          org.slf4j:slf4j-api:jar:1.6.1 spec/fixtures/naether-0.13.0.jar com.typesafe:config:jar:0.5.0
+          com.google.guava:guava:jar:14.0.1 org.apache.mina:mina-core:jar:2.0.4
+          org.slf4j:slf4j-api:jar:1.6.1 spec/fixtures/naether-0.13.0.jar
+          com.typesafe:config:jar:0.5.0
         )
       )
     end
 
-    it 'should replace dependencies with maps' do
-      dsl = LockJar::Domain::Dsl.create do
-        map 'junit:junit', TEMP_DIR
-        jar 'junit:junit:4.10'
+    context 'with a dsl' do
+      let(:local_path) { "#{TEMP_DIR}/guava.jar" }
+      let(:lockfile) { "#{TEMP_DIR}/ListJarfile.lock" }
+      let(:dsl) do
+        LockJar::Domain::Dsl.create do
+          map 'com.google.guava:guava', "#{TEMP_DIR}/guava.jar"
+          jar 'com.google.guava:guava:14.0.1'
+        end
       end
+      let(:paths) { LockJar.list(lockfile, local_repo: local_repo) }
+
+      before { LockJar.lock(dsl, local_repo: local_repo, lockfile: lockfile) }
 
-      LockJar.lock(dsl, local_repo: "#{TEMP_DIR}/test-repo", lockfile: "#{TEMP_DIR}/ListJarfile.lock")
-      paths = LockJar.list("#{TEMP_DIR}/ListJarfile.lock", local_repo: "#{TEMP_DIR}/test-repo")
-      paths.should eql([TEMP_DIR, 'org.hamcrest:hamcrest-core:jar:1.1'])
+      it 'should replace dependencies with maps' do
+        paths.should eql([local_path])
+      end
     end
 
-    it 'should replace dependencies with maps and get local paths' do
-      dsl = LockJar::Domain::Dsl.create do
-        map 'junit:junit', TEMP_DIR
-        jar 'junit:junit:4.10'
+    context 'with resolve: false' do
+      let(:jars) do
+        lock
+        LockJar.list(lockfile, local_repo: local_repo, resolve: false)
       end
 
-      LockJar.lock(dsl, local_repo: "#{TEMP_DIR}/test-repo", lockfile: "#{TEMP_DIR}/ListJarfile.lock")
-      paths = LockJar.list("#{TEMP_DIR}/ListJarfile.lock", local_repo: "#{TEMP_DIR}/test-repo")
-      paths.should eql([TEMP_DIR, 'org.hamcrest:hamcrest-core:jar:1.1'])
+      it 'should only list root dependencies' do
+        jars.should eql(
+          %w(
+            org.apache.mina:mina-core:jar:2.0.4 spec/pom.xml spec/fixtures/naether-0.13.0.jar
+          )
+        )
+      end
     end
   end
 
@@ -399,42 +407,24 @@ describe LockJar do
       end
     end
 
-    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"),
-        File.expand_path("#{TEMP_DIR}/test-repo/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo/commons-io/commons-io/1.4/commons-io-1.4.jar"),
-        File.expand_path("#{TEMP_DIR}/test-repo/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"),
-        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")
-      ]
-    end
+    let(:repo_path) { "#{TEMP_DIR}/test-repo" }
 
     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
-
-      expect(jars).to eql(expected_jars)
+      LockJar.lock('spec/fixtures/Jarfile', local_repo: local_repo, lockfile: "#{TEMP_DIR}/Jarfile.lock")
+      LockJar.load("#{TEMP_DIR}/Jarfile.lock", ['default'], local_repo: local_repo)
+      expect(LockJar::Registry.instance.lockfile_registered?("#{TEMP_DIR}/Jarfile.lock")).to_not be
       expect_java_class_loaded('org.apache.mina.core.IoUtil')
     end
 
     it 'by block with resolve option' do
       expect_java_class_not_loaded('org.modeshape.common.math.Duration')
 
-      jars = LockJar.load(local_repo: TEST_REPO, resolve: true) do
+      LockJar.load(local_repo: TEST_REPO, resolve: true) do
         jar 'org.modeshape:modeshape-common:3.4.0.Final'
       end
 
-      jars.should eql([File.expand_path(TEST_REPO + '/org/modeshape/modeshape-common/3.4.0.Final/modeshape-common-3.4.0.Final.jar')])
-
       expect_java_class_loaded('org.modeshape.common.math.Duration')
     end
 

data/spec/pom.xml

@@ -14,9 +14,9 @@ ttp://maven.apache.org/maven-v4_0_0.xsd ">
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>com.slackworks</groupId>
-      <artifactId>modelcitizen</artifactId>
-      <version>0.2.2</version>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>14.0.1</version>
     </dependency>
     <dependency>
 			<groupId>org.jboss.unit</groupId>
@@ -24,11 +24,5 @@ ttp://maven.apache.org/maven-v4_0_0.xsd ">
 			<version>1.2.4</version>
       <scope>test</scope>
 		</dependency>
-	  <dependency>
-	      <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.8.2</version>
-          <scope>test</scope>
-	  </dependency>
   </dependencies>
 </project>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Michael Guymon