capistrano-golang 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4704029b1239ee96dc830abe03bafe0e78a4cce5
-  data.tar.gz: dcd1e39dac7bda303b992cd65e5fa4f53b8a3603
+  metadata.gz: f445ce8f9c6d5aac0f4fb59cc7ce416af516fd58
+  data.tar.gz: 2d664b9a16d323c29d085d770602e78a83b83147
 SHA512:
-  metadata.gz: e1f6ad88f91bf16a3698fa06fe2943832c53a1eca2a9766e25a02ead3c6c8141c709aa831aff9676956a76aa04577b731b932c663c24bcd01ee67ed684edcd3b
-  data.tar.gz: 7937f09942ac3d8ec9dca2026e6c9541694f42487e950b35b4785df96f1a40e056634c305ae26de37c3a9be7f1e2a22fd8955277614d5c5fb4f5304dd9b57e34
+  metadata.gz: 7a71dfd420ece4c2ed46ccd4e2e361c0e87ba7c2f8bf5ec0a6b38e2c99a76e95b1cd603c4c437ac3a5ef7817334974ff238421ff1d1249497fa4862b35343580
+  data.tar.gz: 5aa46cb3da313057e38e7e58d0995f8d5ac149b89e8115cedf8a9c2a49834307954c2f54a66ad0c4f910c61f562254f92db2213e140cce60ae18b1474350ce5f

data/capistrano-golang.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-golang"
-  gem.version       = '0.1.0'
+  gem.version       = '0.2.0'
   gem.authors       = ["Dimitrij Denissenko"]
   gem.email         = ["dimitrij@blacksquaremedia.com"]
   gem.description   = %q{Go deployment tasks for Capistrano}

data/lib/capistrano/tasks/golang.rake

@@ -8,26 +8,24 @@ namespace :go do
   end
 
   task :hook do
-    target = File.join(fetch(:go_root), fetch(:go_version))
-
+    goroot = fetch(:go_root)
     on roles(fetch(:go_roles)) do
-      SSHKit.config.command_map.prefix[:go].unshift "GOROOT=#{target} PATH=#{target}/bin:$PATH"
+      SSHKit.config.command_map.prefix[:go].unshift "GOROOT=#{goroot} PATH=#{goroot}/bin:$PATH"
     end
   end
 
   task :check do
-    target = File.join(fetch(:go_root), fetch(:go_version))
-
+    goroot = fetch(:go_root)
     on roles(fetch(:go_roles)) do
-      if not test "[ -d #{target}/src ]"
+      if not test "[ -d #{goroot}/src ]"
         info "Downloading #{fetch :go_version}"
-        execute :mkdir, "-p", target
-        execute :curl, "-L #{fetch :go_source}/#{fetch :go_version}.tar.gz | tar xvz --strip-components=1 -C #{target}"
+        execute :mkdir, "-p", goroot
+        execute :curl, "-sSL #{fetch :go_source} | tar xvz --strip-components=1 -C #{goroot}"
       end
 
-      if not test "[ -f #{target}/bin/go ]"
-        info "Installing #{fetch(:go_version)}"
-        execute %(cd #{target}/src && ./make.bash)
+      if not test "[ -f #{goroot}/bin/go ]"
+        info "Installing #{fetch :go_version}"
+        execute %(cd #{goroot}/src && ./make.bash --no-clean 2>&1)
       end
     end
   end
@@ -42,8 +40,12 @@ after 'deploy:check', 'go:check'
 namespace :load do
   task :defaults do
     set :go_version, "go1.4.1"
-    set :go_root, "~/.gos"
-    set :go_roles, :all
-    set :go_source, "https://github.com/golang/go/archive"
+    set :go_roles,   :all
+
+    set :go_install_path, "~/.gos"
+    set :go_archive,      "https://golang.org/dl/VERSION.src.tar.gz"
+
+    set :go_root,   -> { File.join(fetch(:go_install_path), fetch(:go_version)) }
+    set :go_source, -> { fetch(:go_archive).sub("VERSION", fetch(:go_version)) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-golang
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano