capistrano-maven 0.1.1 → 0.1.2

data/lib/capistrano-maven.rb

@@ -35,20 +35,24 @@ module Capistrano
           _cset(:mvn_common_environment, {})
           _cset(:mvn_default_environment) {
             environment = {}
-            environment["JAVA_HOME"] = fetch(:mvn_java_home) if exists?(:mvn_java_home)
-            if exists?(:mvn_java_options)
-              environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options, []) ].flatten.join(" ")
+            if mvn_setup_remotely
+              environment["JAVA_HOME"] = fetch(:mvn_java_home) if exists?(:mvn_java_home)
+              if exists?(:mvn_java_options)
+                environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options, []) ].flatten.join(" ")
+              end
+              environment["PATH"] = [ mvn_bin_path, "$PATH" ].join(":")
             end
-            environment["PATH"] = [ mvn_bin_path, "$PATH" ].join(":") if mvn_setup_remotely
             _merge_environment(mvn_common_environment, environment)
           }
           _cset(:mvn_default_environment_local) {
             environment = {}
-            environment["JAVA_HOME"] = fetch(:mvn_java_home_local) if exists?(:mvn_java_home_local)
-            if exists?(:mvn_java_options_local)
-              environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options_local, []) ].flatten.join(" ")
+            if mvn_setup_locally
+              environment["JAVA_HOME"] = fetch(:mvn_java_home_local) if exists?(:mvn_java_home_local)
+              if exists?(:mvn_java_options_local)
+                environment["MAVEN_OPTS"] = [ fetch(:mvn_java_options_local, []) ].flatten.join(" ")
+              end
+              environment["PATH"] = [ mvn_bin_path_local, "$PATH" ].join(":")
             end
-            environment["PATH"] = [ mvn_bin_path_local, "$PATH" ].join(":") if mvn_setup_locally
             _merge_environment(mvn_common_environment, environment)
           }
           _cset(:mvn_environment) { _merge_environment(mvn_default_environment, fetch(:mvn_extra_environment, {})) }
@@ -336,7 +340,7 @@ module Capistrano
                 system(cmdline)
               end
               if $?.to_i > 0 # $? is command exit code (posix style)
-                raise Capistrano::LocalArgumentError, "Command #{cmd} returned status code #{$?}"
+                raise Capistrano::LocalArgumentError, "Command #{cmdline} returned status code #{$?}"
               end
               logger.trace "command finished in #{(elapsed * 1000).round}ms"
             end

data/lib/capistrano-maven/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Maven
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/test/config/deploy.rb

@@ -99,6 +99,28 @@ def uninstall_mvn!
   reset_mvn!
 end
 
+def _test_mvn_exec_fails(args=[], options={})
+  failed = false
+  begin
+    mvn.exec(args, options)
+  rescue
+    failed = true
+  ensure
+    abort unless failed
+  end
+end
+
+def _test_mvn_exec_locally_fails(args=[], options={})
+    failed = false
+    begin
+      mvn.exec_locally(args, options)
+    rescue
+      failed = true
+    ensure
+      abort unless failed
+    end
+end
+
 task(:test_all) {
   find_and_execute_task("test_default")
   find_and_execute_task("test_with_remote")
@@ -163,10 +185,18 @@ namespace(:test_default) {
     mvn.exec("--version")
   }
 
+  task(:test_mvn_exec_fails) {
+    _test_mvn_exec_fails("--MUST-FAIL")
+  }
+
   task(:test_mvn_exec_locally) {
     mvn.exec_locally("--version")
   }
 
+  task(:test_mvn_exec_locally_fails) {
+    _test_mvn_exec_locally_fails("--MUST-FAIL")
+  }
+
   task(:test_mvn_artifact) {
     assert_file_exists(File.join(mvn_target_path, "capistrano-maven-0.0.1-SNAPSHOT.jar"))
   }
@@ -229,8 +259,16 @@ namespace(:test_with_remote) {
     mvn.exec("--version")
   }
 
+  task(:test_mvn_exec_fails) {
+    _test_mvn_exec_fails("--MUST-FAIL")
+  }
+
 # task(:test_mvn_exec_locally) {
 #   mvn.exec_locally("--version")
+# }
+
+# task(:test_mvn_exec_locally_fails) {
+#   _test_mvn_exec_locally_fails("--MUST-FAIL")
 # }
 
   task(:test_mvn_artifact) {
@@ -293,12 +331,20 @@ namespace(:test_with_local) {
 
 # task(:test_mvn_exec) {
 #   mvn.exec("--version")
+# }
+
+# task(:test_mvn_exec_fails) {
+#   _test_mvn_exec_fails("--MUST-FAIL")
 # }
 
   task(:test_mvn_exec_locally) {
     mvn.exec_locally("--version")
   }
 
+  task(:test_mvn_exec_locally_fails) {
+    _test_mvn_exec_locally_fails("--MUST-FAIL")
+  }
+
   task(:test_mvn_artifact) {
     assert_file_exists(File.join(mvn_target_path, "capistrano-maven-0.0.1-SNAPSHOT.jar"))
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-maven
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: