lock_jar 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/lock_jar/dsl.rb

@@ -21,6 +21,7 @@ module LockJar
     attr_reader :local_repository
     attr_reader :scopes
     attr_reader :maps
+    attr_reader :excludes
     
     class << self
     
@@ -63,6 +64,11 @@ module LockJar
       
       @local_repository = nil
       @maps = {}
+      @excludes = []
+    end
+    
+    def exclude(*notations)
+      @excludes += notations
     end
     
     def jar(notation, *args)
@@ -94,6 +100,10 @@ module LockJar
         end
       end
       
+      dsl.excludes.each do |exclude|
+        @excludes << exclude
+      end
+      
       self
     end
   

data/lib/lock_jar/runtime.rb

@@ -58,20 +58,44 @@ module LockJar
 
         unless lock_jar_file.local_repository.nil?
           lock_data['local_repository'] = lock_jar_file.local_repository
+          
+          if needs_force_encoding
+            lock_data['local_repository'] = lock_data['local_repository'].force_encoding("UTF-8")
+          end
         end
           
         if lock_jar_file.repositories.size > 0
           lock_data['repositories'] = lock_jar_file.repositories
+            
+          if needs_force_encoding
+            lock_data['repositories'].map { |repo| repo.force_encoding("UTF-8") }
+          end
         end
         
         if lock_jar_file.maps.size > 0
           lock_data['maps'] = lock_jar_file.maps
+            
+          #if needs_force_encoding
+          #  lock_data['maps'].map { |maps| maps.map { |map| map.force_encoding("UTF-8") } }
+          #end
+        end
+        
+        if lock_jar_file.excludes.size > 0 
+          lock_data['excludes'] = lock_jar_file.excludes
+            
+          if needs_force_encoding
+            lock_data['excludes'].map { |exclude| exclude.force_encoding("UTF-8") }
+          end
         end
         
         lock_data['scopes'] = {} 
           
         lock_jar_file.notations.each do |scope, notations|
           
+          if needs_force_encoding
+            notations.map { |notation| notation.force_encoding("UTF-8") }
+          end
+          
           dependencies = []
           notations.each do |notation|
             dependencies << {notation => scope}
@@ -80,6 +104,12 @@ module LockJar
           if dependencies.size > 0
             resolved_notations = resolver(opts).resolve( dependencies )
             
+            if lock_data['excludes']
+              lock_data['excludes'].each do |exclude|
+                resolved_notations.delete_if { |dep| dep =~ /#{exclude}/ }
+              end
+            end
+            
             lock_data['scopes'][scope] = { 
               'dependencies' => notations,
               'resolved_dependencies' => resolved_notations } 
@@ -190,5 +220,11 @@ module LockJar
         
         dependencies
       end
+
+      private
+      def needs_force_encoding
+        @needs_force_encoding || @needs_force_encoding = RUBY_VERSION =~ /^1.9/
+      end
   end
+  
 end

data/lock_jar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = "2012-05-09"
+  s.date = "2012-05-10"
   s.description = "Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile\n  is used to generate a Jarfile.lock that contains all the resolved jar dependencies for scopes runtime, compile, and test.\n  The Jarfile.lock can be used to populate the classpath"
   s.email = "michael.guymon@gmail.com"
   s.extra_rdoc_files = [

data/spec/lock_jar_spec.rb

@@ -28,6 +28,23 @@ describe LockJar do
             "compile"=>{
               "dependencies"=>["junit:junit:4.10"], "resolved_dependencies"=>["junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"]}}} )      
       end
+      
+      it "should exclude excludes from dependencies" do
+        dsl = LockJar::Dsl.evaluate do
+          exclude 'commons-logging', 'logkit'
+          jar 'opensymphony:oscache:jar:2.4.1'
+        end
+        
+        LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
+        lockfile = LockJar.read('tmp/Jarfile.lock')
+        lockfile.should eql( {
+          "excludes"=>["commons-logging", "logkit"], 
+          "scopes"=>{
+            "compile"=>{
+              "dependencies"=>["opensymphony:oscache:jar:2.4.1"], 
+              "resolved_dependencies"=>["opensymphony:oscache:jar:2.4.1", "log4j:log4j:jar:1.2.12", "avalon-framework:avalon-framework:jar:4.1.3", "javax.jms:jms:jar:1.1", "javax.servlet:servlet-api:jar:2.3"]}}} )      
+      
+      end
     end
   
     context "list" do

metadata

@@ -1,99 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lock_jar
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Michael Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-05-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: naether
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.7.0
-  version_requirements: *id001
-  name: naether
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
-        version: 2.9.0
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id003
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  version_requirements: *id004
-  name: jeweler
-  prerelease: false
   type: :development
-description: |-
-  Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile
-    is used to generate a Jarfile.lock that contains all the resolved jar dependencies for scopes runtime, compile, and test.
-    The Jarfile.lock can be used to populate the classpath
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+description: ! "Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile\n  is
+  used to generate a Jarfile.lock that contains all the resolved jar dependencies
+  for scopes runtime, compile, and test.\n  The Jarfile.lock can be used to populate
+  the classpath"
 email: michael.guymon@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -119,37 +111,31 @@ files:
 - spec/pom.xml
 - spec/spec_helper.rb
 homepage: http://github.com/mguymon/lock_jar
-licenses: 
+licenses:
 - Apache
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1069555085123622793
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manage Jar files for Ruby
 test_files: []
-