lock_jar 0.10.0 → 0.10.2

data/bundler/spec/lock_jar_bundler_spec.rb

@@ -1,49 +1,49 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'spec_helper'))
-
-require 'lock_jar'
-require 'lock_jar_bundler'
-
-describe LockJar::Bundler, "#bundled_jarfiles" do
-  it "should give a list of jarfile paths" do
-    jar_files = LockJar::Bundler.bundled_jarfiles([:test])
-    expect(jar_files).to eql [File.expand_path('spec/dummy_gem/Jarfile')]
-  end
-
-  it "should create a Jarfile.lock including bundler Jarfiles" do
-    LockJar.lock( "spec/Jarfile", :local_repo => TEST_REPO, :lockfile => "#{TEMP_DIR}/BundledJarfile.lock" )
-    lockfile = LockJar.read("#{TEMP_DIR}/BundledJarfile.lock")
-    expect(lockfile.to_hash).to eql({
-      "version"=>"0.10.0",
-      "merged" => [File.expand_path('spec/dummy_gem/Jarfile')],
-      "groups"=>{
-          "default"=>{
-              "dependencies"=> %w(
-                com.google.guava:guava:jar:14.0.1
-                com.metapossum:metapossum-scanner:jar:1.0.1
-                com.tobedevoured.command:core:jar:0.3.2
-                com.typesafe:config:jar:0.5.0
-                commons-beanutils:commons-beanutils:jar:1.8.3
-                commons-io:commons-io:jar:2.3
-                commons-lang:commons-lang:jar:2.6
-                commons-logging:commons-logging:jar:1.1.1
-                org.modeshape:modeshape-common:jar:2.8.2.Final
-                org.slf4j:slf4j-api:jar:1.6.6),
-              "artifacts"=>[
-                {"jar:com.tobedevoured.command:core:jar:0.3.2"=>{
-                    "transitive"=>{
-                        "commons-beanutils:commons-beanutils:jar:1.8.3"=>{
-                            "commons-logging:commons-logging:jar:1.1.1"=>{}},
-                        "com.typesafe:config:jar:0.5.0"=>{},
-                        "com.metapossum:metapossum-scanner:jar:1.0.1"=>{
-                            "commons-io:commons-io:jar:2.3"=>{}, "commons-lang:commons-lang:jar:2.6"=>{}},
-                        "org.slf4j:slf4j-api:jar:1.6.6"=>{},
-                        "org.modeshape:modeshape-common:jar:2.8.2.Final"=>{}
-                    }
-                }},
-                {"jar:com.google.guava:guava:jar:14.0.1"=>{"transitive"=>{}}}
-              ]
-          }
-      }
-    })
-  end
+require File.expand_path(File.join(File.dirname(__FILE__),'spec_helper'))
+
+require 'lock_jar'
+require 'lock_jar_bundler'
+
+describe LockJar::Bundler, "#bundled_jarfiles" do
+  it "should give a list of jarfile paths" do
+    jar_files = LockJar::Bundler.bundled_jarfiles([:test])
+    expect(jar_files).to eql [File.expand_path('spec/dummy_gem/Jarfile')]
+  end
+
+  it "should create a Jarfile.lock including bundler Jarfiles" do
+    LockJar.lock( "spec/Jarfile", :local_repo => TEST_REPO, :lockfile => "#{TEMP_DIR}/BundledJarfile.lock" )
+    lockfile = LockJar.read("#{TEMP_DIR}/BundledJarfile.lock")
+    expect(lockfile.to_hash).to eql({
+      "version"=>"0.10.0",
+      "merged" => [File.expand_path('spec/dummy_gem/Jarfile')],
+      "groups"=>{
+          "default"=>{
+              "dependencies"=> %w(
+                com.google.guava:guava:jar:14.0.1
+                com.metapossum:metapossum-scanner:jar:1.0.1
+                com.tobedevoured.command:core:jar:0.3.2
+                com.typesafe:config:jar:0.5.0
+                commons-beanutils:commons-beanutils:jar:1.8.3
+                commons-io:commons-io:jar:2.3
+                commons-lang:commons-lang:jar:2.6
+                commons-logging:commons-logging:jar:1.1.1
+                org.modeshape:modeshape-common:jar:2.8.2.Final
+                org.slf4j:slf4j-api:jar:1.6.6),
+              "artifacts"=>[
+                {"jar:com.tobedevoured.command:core:jar:0.3.2"=>{
+                    "transitive"=>{
+                        "commons-beanutils:commons-beanutils:jar:1.8.3"=>{
+                            "commons-logging:commons-logging:jar:1.1.1"=>{}},
+                        "com.typesafe:config:jar:0.5.0"=>{},
+                        "com.metapossum:metapossum-scanner:jar:1.0.1"=>{
+                            "commons-io:commons-io:jar:2.3"=>{}, "commons-lang:commons-lang:jar:2.6"=>{}},
+                        "org.slf4j:slf4j-api:jar:1.6.6"=>{},
+                        "org.modeshape:modeshape-common:jar:2.8.2.Final"=>{}
+                    }
+                }},
+                {"jar:com.google.guava:guava:jar:14.0.1"=>{"transitive"=>{}}}
+              ]
+          }
+      }
+    })
+  end
 end

data/bundler/spec/spec_helper.rb

@@ -1,88 +1,88 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, make a
-# separate helper file that requires this one and then use it only in the specs
-# that actually need it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-
-require 'pry'
-
-TEMP_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".spec-tmp"))
-TEST_REPO = File.expand_path(File.join(TEMP_DIR, "test-repo"))
-
-RSpec.configure do |config|
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-    expectations.syntax = :expect
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-    mocks.syntax = :expect
-
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended.
-    mocks.verify_partial_doubles = true
-  end
-=end
-
-  config.before(:suite) do
-    FileUtils.mkdir_p(TEST_REPO)
-  end
-end
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, make a
+# separate helper file that requires this one and then use it only in the specs
+# that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'pry'
+
+TEMP_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".spec-tmp"))
+TEST_REPO = File.expand_path(File.join(TEMP_DIR, "test-repo"))
+
+RSpec.configure do |config|
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
+=end
+
+  config.before(:suite) do
+    FileUtils.mkdir_p(TEST_REPO)
+  end
+end

data/lib/lock_jar/buildr.rb

@@ -1,145 +1,145 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with this
-# work for additional information regarding copyright ownership. The ASF
-# licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-require 'lock_jar'
-require 'lock_jar/domain/dsl'
-
-module Buildr
-  
-  @@global_lockjar_dsl = nil
-  
-  class << self
-    def project_to_lockfile( project )
-      "#{project.name.gsub(/:/,'-')}.lock"
-    end
-    
-    def global_lockjar_dsl
-      @@global_lockjar_dsl 
-    end
-  end
-  
-  def lock_jar( &blk )
-    @@global_lockjar_dsl = ::LockJar::Domain::Dsl.create(&blk) 
-  end
-  
-  namespace "lock_jar" do
-    desc "Lock dependencies for each project"    
-    task("lock") do 
-      projects.each do |project|   
-        if project.lockjar_dsl
-          # add buildr repos
-          repositories.remote.each do |repo|
-            project.lockjar_dsl.repository repo
-          end
-          ::LockJar.lock( project.lockjar_dsl, :lockfile => Buildr.project_to_lockfile(project) )       
-        end
-      end
-    end
-  end
-  
-  module LockJar
-    module ProjectExtension
-      include Extension
-    
-      def lock_jar( &blk )
-          @lockjar_dsl = ::LockJar::Domain::Dsl.create(&blk)    
-                   
-          unless Buildr.global_lockjar_dsl.nil?
-            @lockjar_dsl.merge( Buildr.global_lockjar_dsl )
-          end        
-      end
-      
-      def lock_jars( *args )
-        lockfile = Buildr.project_to_lockfile(project)
-        opts = {}
-        groups = ['default']
-          
-        args.each do |arg|
-          if arg.is_a?(Hash)
-            opts.merge!( arg )
-          elsif arg.is_a?( String )
-            lockfile = arg
-          elsif arg.is_a?( Array )
-            groups = arg
-          end
-        end
-          
-        ::LockJar.list( lockfile, groups, opts )
-      end
-      
-      def lockjar_dsl
-        @lockjar_dsl || Buildr.global_lockjar_dsl
-      end
-      
-      after_define do |project|      
-        task :compile => 'lock_jar:compile'
-        task 'test:compile' => 'lock_jar:test:compile'
-        
-        task 'eclipse' => 'lock_jar:eclipse'
-        
-        namespace "lock_jar" do
-            desc "Lock dependencies to JarFile"
-            task("lock") do 
-              dsl = project.lockjar_dsl
-              if dsl
-                # add buildr repos
-                repositories.remote do |repo|
-                  puts repo
-                  dsl.repository repo
-                end
-                ::LockJar.lock( dsl, :lockfile => "#{project.name}.lock" )
-              else
-                # XXX: output that there were no dependencies to lock
-                puts "No lock_jar dependencies to lock for #{project.name}" 
-              end              
-            end      
-            
-            task("compile") do
-              if project.lockjar_dsl && !File.exists?( Buildr.project_to_lockfile(project) )
-                raise "#{project.name}.lock does not exist, run #{project.name}:lockjar:lock first"
-              end
-              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['default'] )
-              project.compile.with( jars )
-            end
-            
-            task("test:compile") do
-              if project.lockjar_dsl && !File.exists?( Buildr.project_to_lockfile(project) )
-                raise "#{Buildr.project_to_lockfile(project)} does not exist, run #{project.name}:lockjar:lock first"
-              end
-              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['test'] )
-              
-              project.test.compile.with( jars )
-              project.test.with( jars )
-            end
-            
-            task("eclipse") do
-              if project.lockjar_dsl && !File.exists?( Buildr.project_to_lockfile(project) )
-                raise "#{Buildr.project_to_lockfile(project)} does not exist, run #{project.name}:lockjar:lock first"
-              end
-              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['default'] )
-              project.compile.with( jars )
-              
-              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['test'] )
-              project.test.compile.with( jars )
-            end
-        end
-      end
-    end
-  end
-end
-
-class Buildr::Project
-  include Buildr::LockJar::ProjectExtension
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership. The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'lock_jar'
+require 'lock_jar/domain/dsl'
+
+module Buildr
+  
+  @@global_lockjar_dsl = nil
+  
+  class << self
+    def project_to_lockfile( project )
+      "#{project.name.gsub(/:/,'-')}.lock"
+    end
+    
+    def global_lockjar_dsl
+      @@global_lockjar_dsl 
+    end
+  end
+  
+  def lock_jar( &blk )
+    @@global_lockjar_dsl = ::LockJar::Domain::Dsl.create(&blk) 
+  end
+  
+  namespace "lock_jar" do
+    desc "Lock dependencies for each project"    
+    task("lock") do 
+      projects.each do |project|   
+        if project.lockjar_dsl
+          # add buildr repos
+          repositories.remote.each do |repo|
+            project.lockjar_dsl.repository repo
+          end
+          ::LockJar.lock( project.lockjar_dsl, :lockfile => Buildr.project_to_lockfile(project) )       
+        end
+      end
+    end
+  end
+  
+  module LockJar
+    module ProjectExtension
+      include Extension
+    
+      def lock_jar( &blk )
+          @lockjar_dsl = ::LockJar::Domain::Dsl.create(&blk)    
+                   
+          unless Buildr.global_lockjar_dsl.nil?
+            @lockjar_dsl.merge( Buildr.global_lockjar_dsl )
+          end        
+      end
+      
+      def lock_jars( *args )
+        lockfile = Buildr.project_to_lockfile(project)
+        opts = {}
+        groups = ['default']
+          
+        args.each do |arg|
+          if arg.is_a?(Hash)
+            opts.merge!( arg )
+          elsif arg.is_a?( String )
+            lockfile = arg
+          elsif arg.is_a?( Array )
+            groups = arg
+          end
+        end
+          
+        ::LockJar.list( lockfile, groups, opts )
+      end
+      
+      def lockjar_dsl
+        @lockjar_dsl || Buildr.global_lockjar_dsl
+      end
+      
+      after_define do |project|      
+        task :compile => 'lock_jar:compile'
+        task 'test:compile' => 'lock_jar:test:compile'
+        
+        task 'eclipse' => 'lock_jar:eclipse'
+        
+        namespace "lock_jar" do
+            desc "Lock dependencies to JarFile"
+            task("lock") do 
+              dsl = project.lockjar_dsl
+              if dsl
+                # add buildr repos
+                repositories.remote do |repo|
+                  puts repo
+                  dsl.repository repo
+                end
+                ::LockJar.lock( dsl, :lockfile => "#{project.name}.lock" )
+              else
+                # XXX: output that there were no dependencies to lock
+                puts "No lock_jar dependencies to lock for #{project.name}" 
+              end              
+            end      
+            
+            task("compile") do
+              if project.lockjar_dsl && !File.exists?( Buildr.project_to_lockfile(project) )
+                raise "#{project.name}.lock does not exist, run #{project.name}:lockjar:lock first"
+              end
+              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['default'] )
+              project.compile.with( jars )
+            end
+            
+            task("test:compile") do
+              if project.lockjar_dsl && !File.exists?( Buildr.project_to_lockfile(project) )
+                raise "#{Buildr.project_to_lockfile(project)} does not exist, run #{project.name}:lockjar:lock first"
+              end
+              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['test'] )
+              
+              project.test.compile.with( jars )
+              project.test.with( jars )
+            end
+            
+            task("eclipse") do
+              if project.lockjar_dsl && !File.exists?( Buildr.project_to_lockfile(project) )
+                raise "#{Buildr.project_to_lockfile(project)} does not exist, run #{project.name}:lockjar:lock first"
+              end
+              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['default'] )
+              project.compile.with( jars )
+              
+              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['test'] )
+              project.test.compile.with( jars )
+            end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::LockJar::ProjectExtension
 end