lock_jar 0.10.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d68df5093efbd081f06914ee57b4e5156dd781d
-  data.tar.gz: 79765d881efd41291a17b3e92a9425bf0ea4cd3a
+  metadata.gz: 890e8f58de1d05c870ec1254fd8922e1f3d300c7
+  data.tar.gz: 79eee178effcfbcf2da3cc50345e1fd23f31d93c
 SHA512:
-  metadata.gz: a62084efdb888edc8f91e0e0f499184c5db5fd34a672c35b2136fa7ed078d821171b6e8df408c9296416277130898f7dd8c3187265de5a27c829ca89f30466f2
-  data.tar.gz: fee22c9c5e96e51f90ee1f225d5d21e58e70275d88be8f014f1bb1634bb1013ef82c61330222ab225c5f632d8fb261cd5e1f197e9b6547d20b0e02f265d1f668
+  metadata.gz: 5d64ba05c2d2c4ee3ef4bb99b8d10437e91c16050ac060f76a70a3a2ed78b4780c2eb36b41e5e777b7ce7eba6322df39d99f1918dcf7c87d53d8d86cdf342395
+  data.tar.gz: 59ae69cb059f46c198f7336a30b01b9535bdfb53b37739c36d2aa1da8e6f90941179480da427703c1ecaceb0ab8c9e4ccb5211665f2d78c47fabae1d9a2cf123

data/.gitignore

@@ -1,7 +1,4 @@
-# Dont save the Gemfile since JRuby and CRuby have incompatiable deps
-Gemfile.lock
 Jarfile.lock
-
 .*
 
 tmp
@@ -19,41 +16,4 @@ 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/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode  
+  - jruby-19mode
+  - jruby-20mode
+  - jruby-21mode
 
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,26 +1,34 @@
 ## LockJar Changelog
 
-### 0.10.4 (Feburary 11, 2015)
+### 0.12.0 (Feburary 23, 2015)
+
+* Add support for `without_default_maven_repo`
+
+### 0.10.0 (June 27, 2014)
+
+* Extract Bundler out to own Gem - https://github.com/mguymon/lock_jar_bundler
+
+#### 0.10.5 (Feburary 13, 2015)
+
+* Use Naether 0.14.0, with support for NAETHER_MIRROR env
+
+#### 0.10.4 (Feburary 11, 2015)
 
 * Fix bug with excludes in Jarfiles (<a href="https://github.com/mguymon/lock_jar/pull/25">Pull #20</a>) [<a href="https://github.com/pangloss">pangloss</a>]
 
-### 0.10.3 (Januaray 13, 2015)
+#### 0.10.3 (Januaray 13, 2015)
 
 * Control the logging of Naether from LockJar::Logging
 
-### 0.10.2 (November 20, 2014)
+#### 0.10.2 (November 20, 2014)
 
 * Default to the correct file, based on desired type (<a href="https://github.com/mguymon/lock_jar/pull/22">Pull #20</a>) [<a href="https://github.com/pangloss">pangloss</a>]
 
-### 0.10.1 (November 19, 2014)
+#### 0.10.1 (November 19, 2014)
 
 * Use local_repository from Jarfile.lock in install() if none has been passed in (<a href="https://github.com/mguymon/lock_jar/pull/20">Pull #20</a>) [<a href="https://github.com/stewi2">stewi2</a>]
 * Add support for merging and locking multiple Jarfiles (<a href="https://github.com/mguymon/lock_jar/pull/21">Pull #21</a>) [<a href="https://github.com/pangloss">pangloss</a>]
 
-### 0.10.0 (June 27, 2014)
-
-* Extract Bundler out to own Gem - https://github.com/mguymon/lock_jar_bundler
-
 ### 0.9.0 (March 6, 2014)
 
 * Update to Naether 0.13.1 to fight the chatty log (<a href="https://github.com/mguymon/lock_jar/issues/14">Issue #14</a>)
@@ -29,14 +37,14 @@
 
 * Added `local` to DSL for adding local jars (<a href="https://github.com/mguymon/lock_jar/issues/6">Issue #6</a>)
 
-### 0.7.5 (August 23, 2013)
+### 0.7.0
 
-* Update Thor dep, improve specs (<a href="https://github.com/mguymon/lock_jar/pull/10">Pull #10</a>) [<a href="https://github.com/yokolet">yokolet</a>]
+* Sort dependences for Jarfile.lock (<a href="https://github.com/mguymon/lock_jar/pull/3">Pull #3</a>) [<a href="https://github.com/chetan">chetan</a>]
 
-### 0.7.4 (April 17, 2013)
+#### 0.7.5 (August 23, 2013)
 
-* Fixed Buildr integration (<a href="https://github.com/mguymon/lock_jar/issues/6">Issue #6</a>) [<a href="https://github.com/tobsch">tobsch</a>]
+* Update Thor dep, improve specs (<a href="https://github.com/mguymon/lock_jar/pull/10">Pull #10</a>) [<a href="https://github.com/yokolet">yokolet</a>]
 
-### 0.7.0
+#### 0.7.4 (April 17, 2013)
 
-* Sort dependences for Jarfile.lock (<a href="https://github.com/mguymon/lock_jar/pull/3">Pull #3</a>) [<a href="https://github.com/chetan">chetan</a>]
+* Fixed Buildr integration (<a href="https://github.com/mguymon/lock_jar/issues/6">Issue #6</a>) [<a href="https://github.com/tobsch">tobsch</a>]

data/Gemfile.lock

@@ -0,0 +1,78 @@
+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

data/README.md

@@ -26,20 +26,21 @@ JRuby is natively supported. Ruby 1.9.3 and 2.1 uses [Rjb](http://rjb.rubyforge.
 
 ### Jarfile
 
-A Jarfile is a simple file using a Ruby DSL for defining a project's dependencies using the following 
+A Jarfile is a simple file using a Ruby DSL for defining a project's dependencies using the following
 methods:
 
-* **local_repo( path )**: Set the local Maven repository, this were dependencies are downloaded to. 
+* **local_repo( path )**: Set the local Maven repository, this were dependencies are downloaded to.
 * **remote_repo( url )**: Add additional url of remote Maven repository.
 * **group( groups )**: Set the group for nested jar or pom. A single or Array of groups 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 group is _default_, can be specified by setting _opts = { :group => ['group_name'] }_
 * **local( path )**: Add a local path to a Jar
 * **pom( pom_path, opts = {} )**: Add a local Maven pom, default is to load dependencies for `runtime` and `compile` scopes. To select the scopes to be loaded from the pom, set the _opts = { :scopes => ['test'] }_
+* **without_default_maven_repo**: Do not use the default maven repo.
 
 #### Example Jarfile
 
     repository 'http://repository.jboss.org/nexus/content/groups/public-jboss'
-  	
+
     // Default group is default
     jar "org.apache.mina:mina-core:2.0.4"
     local 'spec/fixtures/naether-0.13.0.jar'
@@ -47,11 +48,11 @@ methods:
     group 'runtime' do
       jar 'org.apache.tomcat:servlet-api:jar:6.0.35'
     end
-  
+
     group 'test' do
       jar 'junit:junit:jar:4.10', :group => 'test'
     end
-	
+
 ### Resolving dependencies
 
 **LockJar.lock( *args )**: Using a Jarfile, creates a lock file. Depending on the type of arg, a different configuration is set.
@@ -66,14 +67,20 @@ When the Jarfile is locked, the transitive dependencies are resolved and saved t
 Example of locking a Jarfile to a Jarfile.lock
 
     LockJar.lock
-  
- 
+
+#### Default Remote Repository
+
+LockJar uses Naether's default remote repository, http://repo1.maven.org/maven2/.
+
+Jarfile.lock pior to _0.12.0_ did not write the default remote repository. As of version _0.12.0_, only repositories in the Jarfile.lock are used. This means older Jarfile.lock will need to be updated to include the default maven repo if they rely on it.
+
+
 ### Jarfile.lock
 
 The _Jarfile.lock_ generated is a YAML file containing information on how to handle the classpath for grouped dependencies and their nested transitive dependencies.
 
 #### The Jarfile.lock
-    
+
     ---
     version: 0.7.0
     groups:
@@ -123,15 +130,15 @@ The _Jarfile.lock_ generated is a YAML file containing information on how to han
               org.hamcrest:hamcrest-core:jar:1.1: {}
     ...
 
-  
-  
+
+
 ### Accessing Jars
 **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 groups, e.g. `['compile','test']`. Defaults group is _default_.
 * _[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 groups 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 groups, e.g. `['default', 'runtime']`. Defaults group is _default_.
@@ -139,24 +146,24 @@ The _Jarfile.lock_ generated is a YAML file containing information on how to han
   * **: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 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'`
 * _[Array<String>]_ will set the groups, e.g. `['default', 'runtime']`
 * _[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 
+  * **: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
-  
+
     jars = LockJar.list
-  
+
 or directly load all Jars into the classpath
-  
+
     jars = LockJar.load  
 
 Do not forget, if you change your _Jarfile_, you have to re-generate the _Jarfile.lock_.
-  
+
 See also [loading Jars into a custom ClassLoader](https://github.com/mguymon/lock_jar/wiki/ClassLoader).
 
 ### Shortcuts
@@ -172,13 +179,13 @@ You can skip the _Jarfile_ and _Jarfile.lock_ to directly play with dependencies
     end
 
 #### List without a Jarfile.lock
-    
+
     LockJar.list do
       jar 'org.eclipse.jetty:example-jetty-embedded:jar:8.1.2.v20120308'
     end
 
 #### Load without a Jarfile.lock
-    
+
     LockJar.load do
       jar 'org.eclipse.jetty:example-jetty-embedded:jar:8.1.2.v20120308'
     end
@@ -195,14 +202,14 @@ There is a simple command line helper. You can lock a _Jarfile_ with the followi
 
     lockjar lock
 
-List jars in a _Jarfile.lock_ with 
- 
+List jars in a _Jarfile.lock_ with
+
     lockjar list
-  
+
 Download all jars in a _Jarfile.lock_ with
 
     lockjar install
-  
+
 _lockjar_ _--help_ will give you list of all commands and their options.
 
 ## Gem Integration
@@ -224,18 +231,18 @@ Rakefile with default to install Jars using LockJar:
 
     task :prepare do
       require 'lock_jar'
-      
+
       # get jarfile relative the gem dir
-      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ ) 
-      
+      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ )
+
       LockJar.install( 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 
+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`.
 
@@ -245,19 +252,19 @@ Instead of rely in a Rakefile to install Jars when the Gem is installed, Jars ca
 Ruby needs to be called before calling `LockJar.load`. Only Jars that are missing are downloaded.
 
       #get jarfile relative the gem dir
-      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ ) 
-      
+      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ )
+
       # Download any missing Jars
       LockJar.install( lockfile )
 
 ### Loading
 
-With the Jars installed, loading the classpath for the Gem is simple. 
+With the Jars installed, loading the classpath for the Gem is simple.
 As part of the load process for the Gem (an entry file that is required, etc) use the following:
 
       #get jarfile relative the gem dir
-      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ ) 
-      
+      lockfile = File.expand_path( "../Jarfile.lock", __FILE__ )
+
       # Loads the ClassPath with Jars from the lockfile
       LockJar.load( lockfile )
 
@@ -270,7 +277,7 @@ LockJar integrates with [Buildr](http://buildr.apache.org/) using an [Addon](htt
 A new Buildr task is added to generate the lockfile for all projects
 
     buildr lock_jar:lock
-  
+
 and a task per project to generate the lockfile for a single project
 
     buildr <app>:<project>:lock_jar:lock
@@ -288,7 +295,7 @@ The _default_ group dependencies are automatically added to the classpath for co
 Sample buildfile with LockJar
 
     require 'lock_jar/buildr'
-    
+
     # app definition, inherited into all projects
     lock_jar do
 
@@ -317,10 +324,10 @@ Generated the following lock files using **lock_jar:lock**
 
 * _project1.lock_ - contains _junit_ and _mina_ jars.
 * _project2.lock_ - contains _junit_ and _pom.xml_ jars.
-  
+
 ## Bundler Integration
 
-Bundler integration is **experimental** right now. [LockJar patches Bundler](https://github.com/mguymon/lock_jar/blob/master/lib/lock_jar/bundler.rb) 
+Bundler integration is **experimental** right now. [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_
 
@@ -331,7 +338,7 @@ Gems with a Jarfile will be merge to generate a _Jarfile.lock_. The Jarfile.lock
 
 ### Bundler to LockJar groups
 
-LockJar will merge the dependencies from the `default` and `runtime` group of a Gem's _Jarfile_. These will be placed in the 
+LockJar will merge the dependencies from the `default` and `runtime` group of a Gem's _Jarfile_. These will be placed in the
 lockfile under Gem's corresponding Bundler group. For example, the following Gemfile:
 
     group :development do
@@ -355,7 +362,7 @@ Would produce the follow _Jarfile.lock_ excerpt:
          - com.google.guava:guava:jar:r05
 
 Since `solr_sail` is defined in the _Gemfile's_ `development` group, the corresponding _Jarfile.lock_ dependencies are also under the `development` group.
-      
+
 ## License
 
 Licensed to the Apache Software Foundation (ASF) under one or more
@@ -372,4 +379,3 @@ 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.
-

data/lib/lock_jar/domain/dsl.rb

@@ -20,71 +20,73 @@ require 'lock_jar/domain/artifact'
 module LockJar
   module Domain
     class Dsl
-  
+
       DEFAULT_GROUP = ['default']
-      
+
       attr_accessor :artifacts, :remote_repositories, :local_repository, :groups,
-                    :maps, :excludes, :merged
-                    
+                    :maps, :excludes, :merged, :clear_repositories
+
       attr_reader :file_path
-      
+
       class << self
-      
+
         def create(jarfile = nil, &blk)
           builder = new
           evaluate(builder, jarfile, &blk)
         end
-        
+
         def evaluate(builder, jarfile = nil, &blk)
           if jarfile.nil? && blk.nil?
             raise "jarfile or block must be set"
           end
-          
+
           if jarfile
             builder.instance_eval(DslHelper.read_file(jarfile.to_s), jarfile.to_s, 1)
-          end      
-              
+          end
+
           if blk
             builder.instance_eval(&blk)
-          end      
-          
+          end
+
           builder
         end
-        
+
       end
-      
+
       def initialize
-  
+
         @remote_repositories = []
         @artifacts = { 'default' => [] }
-         
+
         @group_changed = false
-          
+
         @present_group = 'default'
-        
+
         @local_repository = nil
         @maps = {}
-        
+
         @excludes = []
-        
+
         @merged = []
+
+        @clear_repositories = false
       end
-      
+
       def exclude(*notations)
         @excludes += notations
       end
-      
+
       def jar(notation, *args)
         opts = {}
         if args.last.is_a? Hash
           opts.merge!( args.last )
         end
-        
+
         artifact = Jar.new( notation )
-        
+
         assign_groups( artifact, opts[:group] )
       end
-      
+
       def local( *args )
         unless args.empty?
           if File.directory?( File.expand_path( args.first ) )
@@ -97,48 +99,48 @@ module LockJar
             if args.last.is_a? Hash
               opts.merge!( args.last )
             end
-            
+
             artifact = Local.new( path )
-            
+
             assign_groups( artifact, opts[:group] )
           end
         end
       end
-  
+
       def local_repo( path )
         @local_repository = path
       end
-      
+
       alias_method :name, :local_repository
-      
+
       # Map a dependency to another dependency or local directory.
       def map( notation, *args )
         @maps[notation] = args
       end
-      
-      # 
+
+      #
       def pom(path, *args)
         unless path =~ /\.xml$/i
-          raise "#{path} is an invalid pom path"  
+          raise "#{path} is an invalid pom path"
         end
-        
+
         opts = { :scopes => ['runtime', 'compile'] }
-          
+
         if args.last.is_a? Hash
           opts.merge! args.last
         end
-        
+
         artifact = Pom.new( path, opts[:scopes] )
-        
+
         assign_groups( artifact, opts[:groups] )
       end
-  
+
       def remote_repo( url, opts = {} )
         @remote_repositories << url
       end
       alias_method :remote_repository, :remote_repo
       alias_method :repository, :remote_repo
-      
+
       def group(*groups, &blk)
          @group_changed = true
          groups.each do |group|
@@ -147,32 +149,36 @@ module LockJar
          end
          @group_changed = false
          @present_group = 'default'
-      end   
-      
+      end
+
       # @deprecated Please use {#group} instead
       def scope(*scopes, &blk)
         warn "[DEPRECATION] `scope` is deprecated.  Please use `group` instead."
         group(*scopes,&blk)
       end
-      
-      private 
+
+      def without_default_maven_repo
+        @clear_repositories = true
+      end
+
+      private
       def assign_groups(artifact, groups=nil)
-        
+
         if groups
-          
+
           unless groups.is_a? Array
             groups = [groups]
           end
-          
+
           # include present group if within a group block
           if @group_changed
             groups << @present_group
           end
-          
+
         else
           groups = [@present_group]
         end
-        
+
         if artifact
           groups.uniq.each do |group|
             group_key = group.to_s
@@ -180,9 +186,9 @@ module LockJar
             @artifacts[group_key] << artifact
           end
         end
-        
+
       end
-      
+
     end
   end
-end
+end