capistrano-maven 0.0.4 → 0.0.5

data/README.md

@@ -41,6 +41,10 @@ Following options are available to manage your Maven build.
  * `:mvn_update_snapshots` - add `--update-snapshots` if Maven commands. false by default.
  * `:mvn_update_settings` - update `settings.xml` or not. false by default.
  * `:mvn_update_settings_locally` - udate `settings.xml` or not on local compilation. false by default.
+ * `:mvn_settings` - list of your optional setting files for Maven. use `%w(settings.xml)` by default.
+ * `:mvn_settings_local` - list of your optional setting files for Maven. use `%w(settings.xml)` by default.
+ * `:mvn_settings_path` - the destination path of the optional `settings.xml` file. use `:release_path` by default.
+ * `:mvn_settings_path_local` - the destination path of the optional `settings.xml` file. use `pwd` by default.
  * `:mvn_template_path` - specify ERB template path for settings.xml.
  * `:mvn_java_home` - optional `JAVA_HOME` settings for Maven commands.
  * `:mvn_java_home_local` - optional `JAVA_HOME` settings for Maven commands in localhost.

data/lib/capistrano-maven/deploy.rb

@@ -49,19 +49,17 @@ module Capistrano
             File.join(mvn_path_local, 'bin', 'mvn')
           }
           _cset(:mvn_cmd) {
-            settings = "--settings=#{mvn_settings_path}/settings.xml" if mvn_update_settings
             if fetch(:mvn_java_home, nil)
-              "env JAVA_HOME=#{mvn_java_home} #{mvn_bin} #{mvn_options.join(' ')} #{settings}"
+              "env JAVA_HOME=#{mvn_java_home} #{mvn_bin} #{mvn_options.join(' ')}"
             else
-              "#{mvn_bin} #{mvn_options.join(' ')} #{settings}"
+              "#{mvn_bin} #{mvn_options.join(' ')}"
             end
           }
           _cset(:mvn_cmd_local) {
-            settings = "--settings=#{mvn_settings_path_local}/settings.xml" if mvn_update_settings_locally
             if fetch(:mvn_java_home_local, nil)
-              "env JAVA_HOME=#{mvn_java_home_local} #{mvn_bin_local} #{mvn_options_local.join(' ')} #{settings}"
+              "env JAVA_HOME=#{mvn_java_home_local} #{mvn_bin_local} #{mvn_options_local.join(' ')}"
             else
-              "#{mvn_bin_local} #{mvn_options_local.join(' ')} #{settings}"
+              "#{mvn_bin_local} #{mvn_options_local.join(' ')}"
             end
           }
           _cset(:mvn_project_path) {
@@ -79,12 +77,8 @@ module Capistrano
           _cset(:mvn_template_path, File.join(File.dirname(__FILE__), 'templates'))
           _cset(:mvn_update_settings, false)
           _cset(:mvn_update_settings_locally, false)
-          _cset(:mvn_settings_path) {
-            mvn_project_path
-          }
-          _cset(:mvn_settings_path_local) {
-            mvn_project_path_local
-          }
+          _cset(:mvn_settings_path) { mvn_project_path }
+          _cset(:mvn_settings_path_local) { mvn_project_path_local }
           _cset(:mvn_settings, %w(settings.xml))
           _cset(:mvn_settings_local, %w(settings.xml))
           _cset(:mvn_cleanup_settings, [])
@@ -100,10 +94,20 @@ module Capistrano
             options
           }
           _cset(:mvn_options) {
-            mvn_common_options + fetch(:mvn_extra_options, [])
+            options = mvn_common_options + fetch(:mvn_extra_options, [])
+            if mvn_update_settings
+              settings = File.join(mvn_settings_path, mvn_settings.first)
+              options << "--settings=#{settings}"
+            end
+            options
           }
           _cset(:mvn_options_local) {
-            mvn_common_options + fetch(:mvn_extra_options_local, [])
+            options = mvn_common_options + fetch(:mvn_extra_options_local, [])
+            if mvn_update_settings_locally
+              settings = File.join(mvn_settings_path_local, mvn_settings_local.first)
+              options << "--settings=#{settings}"
+            end
+            options
           }
 
           desc("Setup maven.")
@@ -177,7 +181,7 @@ module Capistrano
             if File.file?(file)
               File.read(file)
             elsif File.file?("#{file}.erb")
-              ERB.new(File.read(file)).result(binding)
+              ERB.new(File.read("#{file}.erb")).result(binding)
             else
               abort("No such template: #{file} or #{file}.erb")
             end

data/lib/capistrano-maven/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Maven
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-maven
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano