lock_jar 0.10.0 → 0.10.2

data/lib/lock_jar/registry.rb

@@ -1,93 +1,93 @@
-# 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 'singleton'
-
-#
-# Registry of resources loaded by LockJar
-#
-# @author Michael Guymon
-#
-class LockJar::Registry
-    include Singleton
-    
-    attr_accessor :loaded_gems
-    attr_accessor :loaded_jars
-    attr_accessor :loaded_lockfiles
-    
-    def initialize
-      @loaded_gems = {}
-      @loaded_jars = []
-      @loaded_lockfiles = []
-    end
-    
-    def lockfile_registered?( lockfile )
-      if lockfile
-        @loaded_lockfiles.include? File.expand_path( lockfile )
-      end
-    end
-    
-    def register_lockfile( lockfile )
-      if lockfile && !lockfile_registered?( lockfile )
-        @loaded_lockfiles << File.expand_path( lockfile )
-      end
-    end
-    
-    def register_jars( jars )
-      if jars
-        jars_to_load = jars - @loaded_jars
-        
-        @loaded_jars += jars_to_load
-        
-        jars_to_load
-      end
-    end
-    
-    def register_gem( spec )
-      @loaded_gems[spec.name] = spec
-    end
-    
-    def gem_registered?( spec )
-      !@loaded_gems[spec.name].nil?
-    end
-    
-    def load_gem( spec )
-      unless gem_registered?( spec )
-        register_gem(spec)
-        gem_dir = spec.gem_dir
-  		
-        lockfile = File.join( gem_dir, "Jarfile.lock" )
-       	
-        if File.exists?( lockfile )
-       	  puts "#{spec.name} has Jarfile.lock, loading jars"
-          LockJar.load( lockfile )
-        end 
-      end
-    end
-    
-    def load_jars_for_gems      
-      specs = Gem.loaded_specs
-      if specs 
-        gems = specs.keys - @loaded_gems.keys
-        if gems.size > 0
-          gems.each do |key|
-            spec = specs[key]
-            load_gem( spec )
-          end 
-        end
-      end
-    end
-
+# 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 'singleton'
+
+#
+# Registry of resources loaded by LockJar
+#
+# @author Michael Guymon
+#
+class LockJar::Registry
+    include Singleton
+    
+    attr_accessor :loaded_gems
+    attr_accessor :loaded_jars
+    attr_accessor :loaded_lockfiles
+    
+    def initialize
+      @loaded_gems = {}
+      @loaded_jars = []
+      @loaded_lockfiles = []
+    end
+    
+    def lockfile_registered?( lockfile )
+      if lockfile
+        @loaded_lockfiles.include? File.expand_path( lockfile )
+      end
+    end
+    
+    def register_lockfile( lockfile )
+      if lockfile && !lockfile_registered?( lockfile )
+        @loaded_lockfiles << File.expand_path( lockfile )
+      end
+    end
+    
+    def register_jars( jars )
+      if jars
+        jars_to_load = jars - @loaded_jars
+        
+        @loaded_jars += jars_to_load
+        
+        jars_to_load
+      end
+    end
+    
+    def register_gem( spec )
+      @loaded_gems[spec.name] = spec
+    end
+    
+    def gem_registered?( spec )
+      !@loaded_gems[spec.name].nil?
+    end
+    
+    def load_gem( spec )
+      unless gem_registered?( spec )
+        register_gem(spec)
+        gem_dir = spec.gem_dir
+  		
+        lockfile = File.join( gem_dir, "Jarfile.lock" )
+       	
+        if File.exists?( lockfile )
+       	  puts "#{spec.name} has Jarfile.lock, loading jars"
+          LockJar.load( lockfile )
+        end 
+      end
+    end
+    
+    def load_jars_for_gems      
+      specs = Gem.loaded_specs
+      if specs 
+        gems = specs.keys - @loaded_gems.keys
+        if gems.size > 0
+          gems.each do |key|
+            spec = specs[key]
+            load_gem( spec )
+          end 
+        end
+      end
+    end
+
 end

data/lib/lock_jar/resolver.rb

@@ -1,96 +1,96 @@
-# 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 'rubygems'
-require 'naether'
-require 'naether/bootstrap'
-require 'fileutils'
-
-module LockJar
-  class Resolver
-    
-    attr_reader :opts
-    attr_reader :naether
-        
-    def initialize( opts = {} )
-
-      @opts = opts
-      local_repo = opts[:local_repo] || Naether::Bootstrap.default_local_repo
-        
-      # Bootstrap Naether
-      Naether::Bootstrap.bootstrap_local_repo( local_repo, opts )
-      
-      # Bootstrapping naether will create an instance from downloaded jars. 
-      # If jars exist locally already, create manually
-      @naether = Naether.create
-      @naether.local_repo_path = local_repo if local_repo
-      @naether.clear_remote_repositories if opts[:offline]
-    end
-    
-    def remote_repositories
-      @naether.remote_repository_urls
-    end
-    
-    def add_remote_repository( repo )
-      @naether.add_remote_repository( repo )
-    end
-    
-    
-    def resolve( dependencies, download_artifacts = true )
-      @naether.dependencies = dependencies
-      @naether.resolve_dependencies( download_artifacts )
-      @naether.dependencies_notation
-    end
-    
-    def dependencies_graph
-      @naether.dependencies_graph
-    end
-    
-    def download( dependencies )
-      @naether.download_artifacts( dependencies )
-    end
-    
-    def to_local_paths( notations )
-      paths = []   
-      notations.each do |notation|
-        if File.exists?(notation)
-          paths << notation
-        else
-          paths = paths + @naether.to_local_paths( [notation] )
-        end
-      end
-      
-      paths
-    end
-    
-    def load_to_classpath( artifacts )
-      paths = [] 
-      notations = []
-
-      artifacts.each do |art|
-        if File.exists?(art)
-          paths << art
-        else
-          notations << art
-        end
-      end
-      
-      paths += @naether.to_local_paths( notations )
-      Naether::Java.load_paths( paths )
-      
-      paths
-    end
-  end
+# 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 'rubygems'
+require 'naether'
+require 'naether/bootstrap'
+require 'fileutils'
+
+module LockJar
+  class Resolver
+    
+    attr_reader :opts
+    attr_reader :naether
+        
+    def initialize( opts = {} )
+
+      @opts = opts
+      local_repo = opts[:local_repo] || Naether::Bootstrap.default_local_repo
+        
+      # Bootstrap Naether
+      Naether::Bootstrap.bootstrap_local_repo( local_repo, opts )
+      
+      # Bootstrapping naether will create an instance from downloaded jars. 
+      # If jars exist locally already, create manually
+      @naether = Naether.create
+      @naether.local_repo_path = local_repo if local_repo
+      @naether.clear_remote_repositories if opts[:offline]
+    end
+    
+    def remote_repositories
+      @naether.remote_repository_urls
+    end
+    
+    def add_remote_repository( repo )
+      @naether.add_remote_repository( repo )
+    end
+    
+    
+    def resolve( dependencies, download_artifacts = true )
+      @naether.dependencies = dependencies
+      @naether.resolve_dependencies( download_artifacts )
+      @naether.dependencies_notation
+    end
+    
+    def dependencies_graph
+      @naether.dependencies_graph
+    end
+    
+    def download( dependencies )
+      @naether.download_artifacts( dependencies )
+    end
+    
+    def to_local_paths( notations )
+      paths = []   
+      notations.each do |notation|
+        if File.exists?(notation)
+          paths << notation
+        else
+          paths = paths + @naether.to_local_paths( [notation] )
+        end
+      end
+      
+      paths
+    end
+    
+    def load_to_classpath( artifacts )
+      paths = [] 
+      notations = []
+
+      artifacts.each do |art|
+        if File.exists?(art)
+          paths << art
+        else
+          notations << art
+        end
+      end
+      
+      paths += @naether.to_local_paths( notations )
+      Naether::Java.load_paths( paths )
+      
+      paths
+    end
+  end
 end