capistrano-sbt 0.0.3 → 0.0.4

data/README.md

@@ -32,8 +32,9 @@ To build you sbt projects during Capistrano `deploy` tasks, add following in you
 
 Following options are available to manage your sbt build.
 
- * `:sbt_version` - project sbt version
- * `:sbt_archive_url` - download URL for specified sbt version
+ * `:sbt_use_extras` - Use [sbt-extras](https://github.com/paulp/sbt-extras) to manage sbt. `false` by default.
+ * `:sbt_version` - Project sbt version. This value may be discarded if `sbt_use_extras` is turned `true`.
+ * `:sbt_archive_url` - Download URL for specified sbt version. This value may be discarded if `sbt_use_extras` is turned `true`.
  * `:sbt_compile_locally` - compile project on localhost. false by default.
  * `:sbt_goals` - sbt commands and tasks to execute. default is "reload clean package".
  * `:sbt_update_settings` - update `*.sbt` or not. false by default.
@@ -43,6 +44,8 @@ Following options are available to manage your sbt build.
  * `: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.
 
 ## Contributing
 

data/lib/capistrano-sbt/deploy.rb

@@ -26,18 +26,35 @@ module Capistrano
           _cset(:sbt_jar_file_local) {
             File.join(File.expand_path('.'), 'tools', 'sbt', "sbt-#{sbt_version}", File.basename(URI.parse(sbt_jar_url).path))
           }
+          _cset(:sbt_use_extras, false)
+          _cset(:sbt_extras_url, "https://raw.github.com/paulp/sbt-extras/master/sbt")
+          _cset(:sbt_extras_file) { File.join(shared_path, 'tools', 'sbt', 'sbt') }
+          _cset(:sbt_extras_file_local) { File.join(File.expand_path('.'), 'tools', 'sbt', 'sbt') }
+          _cset(:sbt_extras_check_interval, 86400)
+          _cset(:sbt_extras_check_timestamp) { (Time.now - sbt_extras_check_interval).strftime('%Y%m%d%H%M') }
           _cset(:sbt_cmd) {
             if fetch(:sbt_java_home, nil)
-              "env JAVA_HOME=#{sbt_java_home} #{sbt_java_home}/bin/java -jar #{sbt_jar_file} #{sbt_options.join(' ')}"
+              env = "env JAVA_HOME=#{sbt_java_home.dump}"
+              java = "#{sbt_java_home}/bin/java"
             else
-              "java -jar #{sbt_jar_file} #{sbt_options.join(' ')}"
+              env = ""
+              java = "java"
+            end
+            if sbt_use_extras
+              "#{env} #{sbt_extras_file} #{sbt_options.join(' ')}".strip
+            else
+              "#{env} #{java} -jar #{sbt_jar_file} #{sbt_options.join(' ')}".strip
             end
           }
           _cset(:sbt_cmd_local) {
             if fetch(:sbt_java_home_local, nil)
-              "env JAVA_HOME=#{sbt_java_home_local} #{sbt_java_home_local}/bin/java -jar #{sbt_jar_file_local} #{sbt_options_local.join(' ')}"
+              env = "env JAVA_HOME=#{sbt_java_home_local.dump}"
+              java = "#{sbt_java_home_local}/bin/java"
+            end
+            if sbt_use_extras
+              "#{env} #{sbt_extras_file_local} #{sbt_options_local.join(' ')}".strip
             else
-              "java -jar #{sbt_jar_file_local} #{sbt_options_local.join(' ')}"
+              "#{env} #{java} -jar #{sbt_jar_file_local} #{sbt_options_local.join(' ')}".strip
             end
           }
           _cset(:sbt_project_path) {
@@ -99,20 +116,30 @@ module Capistrano
 
           def _install(options={})
             execute = []
-            jar_file = options.delete(:jar_file)
-            jar_url = options.delete(:jar_url)
-            execute << "mkdir -p #{File.dirname(jar_file)}"
-            execute << "( test -f #{jar_file} || wget --no-verbose -O #{jar_file} #{jar_url} )"
-            execute << "test -f #{jar_file}"
+            if sbt_use_extras
+              extras_file = options.delete(:extras_file)
+              execute << "mkdir -p #{File.dirname(extras_file)}"
+              x = "/tmp/sbt-extras.#{$$}"
+              execute << "touch -t #{sbt_extras_check_timestamp} #{x}"
+              execute << "( test #{extras_file} -nt #{x} || wget --no-verbose -O #{extras_file} #{sbt_extras_url} )"
+              execute << "touch #{extras_file}"
+              execute << "rm -f #{x}"
+              execute << "( test -x #{extras_file} || chmod a+x #{extras_file} )"
+            else
+              jar_file = options.delete(:jar_file)
+              execute << "mkdir -p #{File.dirname(jar_file)}"
+              execute << "( test -f #{jar_file} || wget --no-verbose -O #{jar_file} #{sbt_jar_url} )"
+              execute << "test -f #{jar_file}"
+            end
             execute.join(' && ')
           end
 
           task(:install, :roles => :app, :except => { :no_release => true }) {
-            run(_install(:jar_file => sbt_jar_file, :jar_url => sbt_jar_url))
+            run(_install(:jar_file => sbt_jar_file, :extras_file => sbt_extras_file))
           }
 
           task(:install_locally, :except => { :no_release => true }) {
-            run_locally(_install(:jar_file => sbt_jar_file_local, :jar_url => sbt_jar_url))
+            run_locally(_install(:jar_file => sbt_jar_file_local, :extras_file => sbt_extras_file_local))
           }
 
           def template(file)

data/lib/capistrano-sbt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sbt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   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-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano