naether 0.5.1-java → 0.5.2-java

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

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.1.jar" #XXX: hardcoded, should be based on VERSION file
+  JAR_PATH = "#{JAR_LIB}/naether-0.5.2.jar" #XXX: hardcoded, should be based on VERSION file
   
   class << self
     
@@ -208,26 +208,13 @@ class Naether
     @resolver.deployArtifact(@instance)
   end
   
-  # Install artifact to local repo
-  def install_artifact( notation, file_path, 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
-    
-    @instance.setNotation( notation )
-    @instance.setFilePath( file_path )
-    if opts[:pom_path]
-      @instance.setPomPath( opts[:pom_path] )
-    end
-    
-    @resolver.installArtifact(@instance)
+  # Install artifact or pom to local repo, must specify pom_path and/or jar_path
+  def install( notation, pom_path =nil, jar_path = nil )
+    @resolver.install(notation, pom_path, jar_path)
   end
   
   def load_pom( file_path )
-    @project_instance = Naether::Java.create_maven_project( file_path )
+    @project_instance = Naether::Java.create("com.slackworks.naether.maven.Project", file_path )
   end
   
   def pom_dependencies( file_path=nil, scopes = nil)
@@ -264,7 +251,7 @@ class Naether
   #
   # loads all resolved dependencies into pom
   def write_pom( notation, file_path )
-    @project_instance = Naether::Java.create_maven_project
+    @project_instance = Naether::Java.create("com.slackworks.naether.maven.Project")
     @project_instance.setProjectNotation( notation )
     
     dependencies().each do |notation|

data/lib/naether/bootstrap.rb

@@ -160,7 +160,7 @@ class Naether
           jar = jars.select { |x| x =~ /#{name}/ }
           if jar.size > 0
             jar = jar[0]
-            @naether.install_artifact( dep, jar )
+            @naether.install( dep, nil, jar )
           else
             puts "Could not find jar for #{dep}"
           end

data/lib/naether/java.rb

@@ -45,19 +45,14 @@ class Naether
       end
     end
     
-    def self.create_maven_project(path = nil)
-      projectClass = nil
+    def self.create( java_class, *args )
       if Naether.platform == 'java'
-        projectClass = com.slackworks.naether.maven.Project 
+        java_class = eval(java_class)
       else
-        projectClass = Rjb::import('com.slackworks.naether.maven.Project') 
+        java_class = Rjb::import(java_class) 
       end
       
-      unless path.nil?
-        projectClass.new( path )
-      else
-        projectClass.new
-      end
+      java_class.new( *args )
     end
     
     def self.convert_to_ruby_array( java_array, to_string = false )
@@ -126,7 +121,7 @@ class Naether
       end
       
       def load_jars(jars)
-        loaded_jars = []
+        loadable_jars = []
         unless jars.is_a?( Array )
           jars = [jars]
         end
@@ -134,16 +129,16 @@ class Naether
         jars.each do |jar|
           expanded_jar = File.expand_path(jar)
           if !@loaded_jars.include? expanded_jar
-            loaded_jars << expanded_jar
+            loadable_jars << expanded_jar
             @loaded_jars << expanded_jar
           end
         end
         
-        unless loaded_jars.empty?
-          Rjb::add_jar( loaded_jars )
+        unless loadable_jars.empty?
+          Rjb::add_jar( loadable_jars )
         end
         
-        loaded_jars
+        loadable_jars
       end
     end
   end

data/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.slackworks</groupId>
     <artifactId>naether</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2</version>
     <packaging>jar</packaging>
     <name>naether</name>
     <url>https://github.com/mguymon/naether</url>
@@ -125,27 +125,28 @@
   </dependencies>
   
   <build>
-	<plugins>
-	  <plugin>
-	    <groupId>org.apache.maven.plugins</groupId>
-	    <artifactId>maven-dependency-plugin</artifactId>
-	    <executions>
-	      <execution>
-	        <id>copy-dependencies</id>
-	        <phase>package</phase>
-	        <goals>
-	          <goal>copy-dependencies</goal>
-	        </goals>
-	        <configuration>
-	          <outputDirectory>${project.build.directory}/lib</outputDirectory>
-	          <overWriteReleases>false</overWriteReleases>
-	          <overWriteSnapshots>false</overWriteSnapshots>
-	          <overWriteIfNewer>true</overWriteIfNewer>
-	        </configuration>
-	      </execution>
-	    </executions>
-	  </plugin>
-	</plugins>
+  	
+		<plugins>
+		  <plugin>
+		    <groupId>org.apache.maven.plugins</groupId>
+		    <artifactId>maven-dependency-plugin</artifactId>
+		    <executions>
+		      <execution>
+		        <id>copy-dependencies</id>
+		        <phase>package</phase>
+		        <goals>
+		          <goal>copy-dependencies</goal>
+		        </goals>
+		        <configuration>
+		          <outputDirectory>${project.build.directory}/lib</outputDirectory>
+		          <overWriteReleases>false</overWriteReleases>
+		          <overWriteSnapshots>false</overWriteSnapshots>
+		          <overWriteIfNewer>true</overWriteIfNewer>
+		        </configuration>
+		      </execution>
+		    </executions>
+		  </plugin>
+		</plugins>
   </build>
   
   <reporting>

metadata

@@ -2,7 +2,7 @@
 name: naether
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: java
 authors: 
   - Michael Guymon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 -05:00
+date: 2011-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ files:
   - lib/naether.rb
   - lib/naether/bootstrap.rb
   - lib/naether/java.rb
-  - naether-0.5.1.jar
+  - naether-0.5.2.jar
   - pom.xml
 has_rdoc: true
 homepage: http://github.com/mguymon/naether