capistrano-simplegit 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05aaf03aaaf00d1f8b9cb5f3afa593a1582ac9b6
-  data.tar.gz: b7f53fe7551b7d78385eede33da469817a7cd9d1
+  metadata.gz: 46049bdab782dc9e6f9f997338b11e5f194d19c2
+  data.tar.gz: cf217e0e381a2fc499457e13d6714e9850fe2207
 SHA512:
-  metadata.gz: 64bddacf7fc272b97ca5e835c63f0ecb53ce55ed589e6c4c7872231c7e5e2ddb98f1a0d04055eeb9f4ff90b1436eba0f1ae31177774915c5b5133107442e6cf7
-  data.tar.gz: 754bb0cbf410aad5e16ff8d8155af6e7ab8edebcb72761a4c2d4c9cafaa2e990eec7ced52b8a24ad3cdb7e1165bc14f1a5511c510e07bbc52edcf5c561f3d3aa
+  metadata.gz: 50b7cd3738ed6a37f76088bed0cb8f58da7595ca192fc9d97525974972e7471a22e1d656a90f857c62561d015b488a02241dab939e02fb6b72d08c859dc6670f
+  data.tar.gz: 1137322c4125ccfde50c10456a583c5e09af3160847ead61298098e60280fbc7445650594b81cc2d44aa38dcdc3e8d547ef14012c2afb0c390f22ce3295313d5

data/capistrano-simplegit.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-simplegit'
-  spec.version       = '0.0.5'
+  spec.version       = '0.0.6'
   spec.authors       = ['Ross Riley']
   spec.email         = ['riley.ross@gmail.com']
   spec.description   = %q{A simple Git Deploy Command for Capistrano 3.x}

data/lib/capistrano/tasks/simplegit.rake

@@ -4,10 +4,10 @@ namespace :simplegit do
     task :deploy do
 
         on roles :all do
-            info "--> Deploy from #{fetch(:repo_url)} on branch #{fetch(:branch)}"
+            info "--> Deploy from #{fetch(:simplegit_repo)} on branch #{fetch(:simplegit_branch)}"
 
             begin
-                execute "ls #{fetch(:deploy_to)}/.git"
+                execute "ls #{fetch(:simplegit_deploy)}/.git"
             rescue
                 invoke 'simplegit:prepare'
             end
@@ -15,16 +15,16 @@ namespace :simplegit do
             info "--> Updating code from remote repository"
 
             begin
-                execute "cd #{fetch(:deploy_to)} && git fetch"
+                execute "cd #{fetch(:simplegit_deploy)} && git fetch"
             rescue
                 error "Unable to connect to remote repository, check your configuration, and that a valid ssh key exists for remote server."
                 exit
             end
 
             begin
-                execute "cd #{fetch(:deploy_to)} && git show-branch #{fetch(:branch)} && git checkout #{fetch(:branch)} ; git reset --hard origin/#{fetch(:branch)}"
+                execute "cd #{fetch(:simplegit_deploy)} && git show-branch #{fetch(:simplegit_branch)} && git checkout #{fetch(:simplegit_branch)} ; git reset --hard origin/#{fetch(:simplegit_branch)}"
             rescue
-                execute "cd #{fetch(:deploy_to)} && git checkout -b #{fetch(:branch)} origin/#{fetch(:branch)} ;"
+                execute "cd #{fetch(:simplegit_deploy)} && git checkout -b #{fetch(:simplegit_branch)} origin/#{fetch(:simplegit_branch)} ;"
             end
             execute "git submodule update --init --recursive"
         end
@@ -33,9 +33,20 @@ namespace :simplegit do
     desc 'Performs the initial setup and fetch of the repo'
     task :prepare do
         on roles :all do
-            execute "cd #{fetch(:deploy_to)} && git init"
-            execute "cd #{fetch(:deploy_to)} && git remote add origin #{fetch(:repo_url)}"
+            execute "cd #{fetch(:simplegit_deploy)} && git init"
+            execute "cd #{fetch(:simplegit_deploy)} && git remote add origin #{fetch(:simplegit_repo)}"
         end
     end
 
 end
+
+namespace :load do
+
+    task :defaults do
+        set :simplegit_deploy, ->   { fetch(:deploy_to) }
+        set :simplegit_repo, ->     { fetch(:repo_url) }
+        set :simplegit_branch, ->   { fetch(:branch) }
+
+    end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-simplegit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ross Riley