gjp 0.33.0 → 0.34.0

data/lib/gjp/maven_runner.rb

@@ -7,7 +7,7 @@ module Gjp
 
     # runs Maven in a subprocess
     def mvn(options)
-      run_executable("#{get_maven_commandline(@project.full_path)} #{options.join(' ')}")
+      run_executable(get_maven_commandline(@project.full_path, options))
     end
 
     # runs Maven to attempt getting a source jar
@@ -30,7 +30,7 @@ module Gjp
 
     # returns a command line for running Maven from the specified
     # prefix
-    def get_maven_commandline(prefix)
+    def get_maven_commandline(prefix, options)
       executable = find_executable("mvn")
 
       if executable != nil
@@ -38,7 +38,7 @@ module Gjp
         repo_path = File.join(prefix, "kit", "m2")
         config_path = File.join(prefix, "kit", "m2", "settings.xml")
 
-        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path}"
+        "#{mvn_path} -Dmaven.repo.local=#{repo_path} -s#{config_path} #{options.join(' ')}"
       else
         raise ExecutableNotFoundError.new("mvn")
       end

data/lib/gjp/script_generator.rb

@@ -30,7 +30,7 @@ module Gjp
         ] +
         relevant_lines.map do |line|
           if line =~ /gjp +mvn/
-            line.gsub(/gjp +mvn/, "#{@maven_runner.get_maven_commandline("$PROJECT_PREFIX")}")
+            line.gsub(/gjp +mvn/, "#{@maven_runner.get_maven_commandline("$PROJECT_PREFIX", ["-o"])}")
           elsif line =~ /gjp +ant/
             line.gsub(/gjp +ant/, "#{@ant_runner.get_ant_commandline("$PROJECT_PREFIX")}")
           else

data/lib/gjp/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Gjp
-  VERSION = "0.33.0"
+  VERSION = "0.34.0"
 end

data/spec/lib/maven_runner_spec.rb

@@ -21,12 +21,12 @@ describe Gjp::MavenRunner do
       executable_path = create_mock_executable("mvn")
 
       @project.from_directory do
-        commandline = @kit_runner.get_maven_commandline(".")
-        commandline.should eq "./#{executable_path} -Dmaven.repo.local=./kit/m2 -s./kit/m2/settings.xml"
+        commandline = @kit_runner.get_maven_commandline(".", ["--otheroption"])
+        commandline.should eq "./#{executable_path} -Dmaven.repo.local=./kit/m2 -s./kit/m2/settings.xml --otheroption"
       end
     end
     it "doesn't return commandline options if Maven is not available" do
-      expect { @kit_runner.get_maven_commandline(".") }.to raise_error(Gjp::ExecutableNotFoundError)
+      expect { @kit_runner.get_maven_commandline(".", []) }.to raise_error(Gjp::ExecutableNotFoundError)
     end
   end
 

data/spec/lib/script_generator_spec.rb

@@ -41,7 +41,7 @@ describe Gjp::ScriptGenerator do
 
         lines.should include("#!/bin/bash\n")
         lines.should include("cd somewhere significant\n")
-        lines.should include("$PROJECT_PREFIX/kit/mvn/bin/mvn -Dmaven.repo.local=$PROJECT_PREFIX/kit/m2 -s$PROJECT_PREFIX/kit/m2/settings.xml --options\n")
+        lines.should include("$PROJECT_PREFIX/kit/mvn/bin/mvn -Dmaven.repo.local=$PROJECT_PREFIX/kit/m2 -s$PROJECT_PREFIX/kit/m2/settings.xml -o --options\n")
 
         lines.should_not include("some earlier command\n")
         lines.should_not include("gjp dry-run --unwanted-options\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gjp
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake