capistrano-sbt 0.0.4 → 0.0.5

data/README.md

@@ -41,11 +41,14 @@ Following options are available to manage your sbt build.
  * `:sbt_update_settings_locally` - udate `*.sbt` or not on local compilation. false by default.
  * `:sbt_settings` - list of your optional `*.sbt` files
  * `:sbt_settings_local` - list of your optional `*.sbt` files in on local compilation.
+ * `:sbt_settings_path` - the destination path of the optional `*.sbt` files.
+ * `:sbt_settings_path_local` - the destination path of the optional `*.sbt` files.
  * `:sbt_template_path` - specify ERB template path for `*.sbt`.
  * `:sbt_java_home` - optional `JAVA_HOME` settings for sbt commands.
  * `:sbt_java_home_local` - optional `JAVA_HOME` settings for sbt commands in localhost.
  * `:sbt_extras_url` - Download URL of `sbt` script of sbt-extras.
  * `:sbt_extras_check_interval` - Check updates of sbt-extras every specified seconds. `86400` by default.
+ * `:sbt_log_noformat` - Do not colorize sbt outputs. `true` by default.
 
 ## Contributing
 

data/lib/capistrano-sbt/deploy.rb

@@ -72,12 +72,8 @@ module Capistrano
           _cset(:sbt_template_path, File.join(File.dirname(__FILE__), 'templates'))
           _cset(:sbt_update_settings, false)
           _cset(:sbt_update_settings_locally, false)
-          _cset(:sbt_settings_path) {
-            sbt_project_path
-          }
-          _cset(:sbt_settings_path_local) {
-            sbt_project_path_local
-          }
+          _cset(:sbt_settings_path) { File.join(sbt_project_path, 'sbt') }
+          _cset(:sbt_settings_path_local) { File.join(sbt_project_path_local, 'sbt') }
           _cset(:sbt_settings, [])
           _cset(:sbt_settings_local, [])
           _cset(:sbt_cleanup_settings, [])
@@ -86,14 +82,36 @@ module Capistrano
           _cset(:sbt_goals, %w(reload clean package))
           _cset(:sbt_common_options) {
             options = []
-            options << "-Dsbt.log.noformat=true" if fetch(:sbt_log_noformat, true)
+            if fetch(:sbt_log_noformat, true)
+              options << if sbt_use_extras
+                           "-no-colors"
+                         else
+                           "-Dsbt.log.noformat=true"
+                         end
+            end
             options
           }
           _cset(:sbt_options) {
-            sbt_common_options + fetch(:sbt_extra_options, [])
+            options = sbt_common_options + fetch(:sbt_extra_options, [])
+            if sbt_update_settings
+              options << if sbt_use_extras
+                           "-sbt-dir #{sbt_settings_path}"
+                         else
+                           "-Dsbt.global.base=#{sbt_settings_path}"
+                         end
+            end
+            options
           }
           _cset(:sbt_options_local) {
-            sbt_common_options + fetch(:sbt_extra_options_local, [])
+            options = sbt_common_options + fetch(:sbt_extra_options_local, [])
+            if sbt_update_settings_locally
+              options << if sbt_use_extras
+                           "-sbt-dir #{sbt_settings_path_local}"
+                         else
+                           "-Dsbt.global.base=#{sbt_settings_path_local}"
+                         end
+            end
+            options
           }
 
           desc("Setup sbt.")
@@ -146,7 +164,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-sbt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sbt
 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-19 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano