naether 0.5.5-java → 0.5.6-java

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/naether.rb

@@ -12,7 +12,7 @@ class Naether
   
   # Naether jar path will default to packaged in the gem
   JAR_LIB = "#{File.dirname(__FILE__)}/.."
-  JAR_PATH = "#{JAR_LIB}/naether-0.5.5.jar" #XXX: hardcoded, should be based on VERSION file
+  JAR_PATH = "#{JAR_LIB}/naether-0.5.6.jar" #XXX: hardcoded, should be based on VERSION file
   
   class << self
     
@@ -185,32 +185,36 @@ class Naether
   end
   
   # Resolve dependencies, finding related additional dependencies
-  def resolve_dependencies( download_artifacts = true )
-    @resolver.resolveDependencies( download_artifacts );
+  def resolve_dependencies( download_artifacts = true, properties = nil )
+    
+    if properties
+       # Convert to HashMap
+       map = Naether::Java.create( "java.util.HashMap" )
+       properties.each do |k,v|
+         map.put( k, v )
+       end
+    end
+    
+    @resolver.resolveDependencies( download_artifacts, map );
     dependenciesNotation
   end
   
   # Deploy artifact to remote repo url
   def deploy_artifact( notation, file_path, url, opts = {} )
-    if Naether.platform == 'java'
-      @instance = com.slackworks.naether.deploy.DeployArtifact.new 
-    else
-      deployArtifactClass = Rjb::import('com.slackworks.naether.deploy.DeployArtifact') 
-      @instance = deployArtifactClass.new
-    end
+    artifact = Naether::Java.create( "com.slackworks.naether.deploy.DeployArtifact" )
     
-    @instance.setRemoteRepo( url )
-    @instance.setNotation( notation )
-    @instance.setFilePath( file_path )
+    artifact.setRemoteRepo( url )
+    artifact.setNotation( notation )
+    artifact.setFilePath( file_path )
     if opts[:pom_path]
-      @instance.setPomPath( opts[:pom_path] )
+      artifact.setPomPath( opts[:pom_path] )
     end
     
     if opts[:username] || opts[:pub_key]
-      @instance.setAuth(opts[:username], opts[:password], opts[:pub_key], opts[:pub_key_passphrase] )
+      artifact.setAuth(opts[:username], opts[:password], opts[:pub_key], opts[:pub_key_passphrase] )
     end
     
-    @resolver.deployArtifact(@instance)
+    @resolver.deployArtifact(artifact)
   end
   
   # Install artifact or pom to local repo, must specify pom_path and/or jar_path
@@ -230,6 +234,7 @@ class Naether
     if Naether.platform == 'java'
       deps = @project_instance.getDependenciesNotation( scopes, true )
     else
+      list = nil
       if scopes
         list = Rjb::import("java.util.ArrayList").new
         scopes.each do |scope|

data/lib/naether/java.rb

@@ -10,16 +10,23 @@ require 'singleton'
 #
 class Naether
   class Java
+    include Singleton
     
-    # Jars loaded
-    def self.loaded_jars
+    attr_reader :java
+    
+    def initialize
       if Naether.platform == 'java'
-        Naether::Java::JRuby.instance.loaded_jars
+        @java = Naether::Java::JRuby.instance
       else
-        Naether::Java::Ruby.instance.loaded_jars
+        @java = Naether::Java::Ruby.instance
       end
     end
     
+    # Jars loaded
+    def self.loaded_jars
+      instance.java.loaded_jars
+    end
+    
   
     # Loads all jars from the array of paths
     def self.load_jars_dir(paths)
@@ -38,58 +45,23 @@ class Naether
     
     # Load jars for the runtime platform
     def self.load_jars(jars)
-      if Naether.platform == 'java'
-        Naether::Java::JRuby.instance.load_jars(jars)
-      else
-        Naether::Java::Ruby.instance.load_jars(jars)
-      end
+      instance.java.load_jars(jars)
+    end
+    
+    def self.set_log_level( level )
+      instance.java.set_log_level( level )
     end
     
     def self.create( java_class, *args )
-      if Naether.platform == 'java'
-        java_class = eval(java_class)
-      else
-        java_class = Rjb::import(java_class) 
-      end
-      
-      java_class.new( *args )
+      instance.java.create( java_class, *args )
     end
     
     def self.convert_to_ruby_array( java_array, to_string = false )
-      if Naether.platform == 'java'
-        return java_array.to_a
-      else
-        ruby_array = java_array.toArray()
-        
-        if to_string
-          ruby_array = ruby_array.map { |x| x.toString()}
-        end
-        
-        return ruby_array
-      end 
+      instance.java.convert_to_ruby_array( java_array, to_string )
     end
     
     def self.convert_to_ruby_hash( java_hash, to_string = false )
-      if Naether.platform == 'java'
-        return java_hash.to_hash
-      else
-        hash = {}
-        keys = java_hash.keySet()
-        iterator = keys.iterator()
-        if to_string
-          while iterator.hasNext()
-            key = iterator.next().toString()
-            hash[key] = java_hash.get( key ).toString()
-          end
-        else
-          while iterator.hasNext()
-            key = iterator.next()
-            hash[key] = java_hash.get( key )              
-          end
-        end
-        
-        return hash
-      end
+      instance.java.convert_to_ruby_hash( java_hash, to_string )
     end
     
     #
@@ -106,6 +78,15 @@ class Naether
         @loaded_jars = []
       end
       
+      def create( java_class, *args )
+        java_class = eval(java_class)
+        java_class.new( *args )
+      end
+      
+      def set_log_level( level )
+        com.slackworks.naether.LogUtil.changeLevel( 'com.slackworks', level )
+      end
+      
       def load_jars(jars)
         loaded_jars = []
         unless jars.is_a? Array
@@ -123,6 +104,15 @@ class Naether
         
         loaded_jars
       end
+      
+      def convert_to_ruby_array( java_array, to_string = false )
+        java_array.to_a
+      end
+      
+      def convert_to_ruby_hash( java_hash, to_string = false )
+        java_hash.to_hash
+      end
+    
     end
     
     #
@@ -143,6 +133,15 @@ class Naether
         @loaded_jars = []
       end
       
+      def create( java_class, *args )
+        java_class = Rjb::import(java_class) 
+        java_class.new( *args )
+      end
+      
+      def set_log_level( level )
+        Rjb::import('com.slackworks.naether.LogUtil').changeLevel( 'com.slackworks', level )
+      end
+      
       def load_jars(jars)
         loadable_jars = []
         unless jars.is_a?( Array )
@@ -163,6 +162,37 @@ class Naether
         
         loadable_jars
       end
+      
+      def convert_to_ruby_array( java_array, to_string = false )
+        ruby_array = java_array.toArray()
+        
+        if to_string
+          ruby_array = ruby_array.map { |x| x.toString()}
+        end
+        
+        ruby_array
+      end
+      
+      def convert_to_ruby_hash( java_hash, to_string = false )
+        
+        hash = {}
+        keys = java_hash.keySet()
+        iterator = keys.iterator()
+        if to_string
+          while iterator.hasNext()
+            key = iterator.next().toString()
+            hash[key] = java_hash.get( key ).toString()
+          end
+        else
+          while iterator.hasNext()
+            key = iterator.next()
+            hash[key] = java_hash.get( key )              
+          end
+        end
+        
+        hash
+        
+      end
     end
   end
 end

data/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.slackworks</groupId>
     <artifactId>naether</artifactId>
-    <version>0.5.5</version>
+    <version>0.5.6</version>
     <packaging>jar</packaging>
     <name>naether</name>
     <url>https://github.com/mguymon/naether</url>

metadata

@@ -2,7 +2,7 @@
 name: naether
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.5
+  version: 0.5.6
 platform: java
 authors: 
   - Michael Guymon
@@ -74,7 +74,7 @@ files:
   - lib/naether.rb
   - lib/naether/bootstrap.rb
   - lib/naether/java.rb
-  - naether-0.5.5.jar
+  - naether-0.5.6.jar
   - pom.xml
 has_rdoc: true
 homepage: http://github.com/mguymon/naether