capistrano-simplegit 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469834aa216deeda12f802e0fdf3a6e3e6782dbc
-  data.tar.gz: 097c3d8f11e544182fc8ae837feb1c06b9035ad1
+  metadata.gz: 6f2185fa8df96263b510dd22c1f1dabdff174556
+  data.tar.gz: 270ccbddab8ecae86329bdb5531973f7f93a32ae
 SHA512:
-  metadata.gz: 775b003891aa5cb6c0dc1119bbc8a5f7c65e55802cc7ab0ce9ce2cd3ffab02bb4454196d5d0917947dc485ce2c411caa37bca1bcaef704bdbcadd567c398a3a9
-  data.tar.gz: 484ec191a4c3f576e0541fbe2c7a575c694f36b78bc76ae4a23ff244dfd44540bf47c6735254b799bc234b40f2cb723087b5000bdddad9d16622e725335ef151
+  metadata.gz: 463c95ba2f610046bf8a9e6e2d393d215b49d97d124c68f9f01e2d0b156d55eb3c464d31c2f86f2eb284ac5a2d5e6a15dad6b2048e365cd8df6a74d490197fb7
+  data.tar.gz: 17fa3df66acd9063e68f091e6fced5e51dc58197182de9fc6942e45adb1c2f3b38f984526287609e504be85f7eba1e09883a190ea0ec9973253866d2f28b802a

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.8'
+  spec.version       = '0.0.9'
   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

@@ -10,21 +10,16 @@ namespace :simplegit do
                 execute "cd #{fetch(:simplegit_deploy)} && git remote add origin #{fetch(:simplegit_repo)}"
             end
 
-            info "--> Updating code from remote repository"
-
-            begin
-                execute "cd #{fetch(:simplegit_deploy)} && git fetch"
-            rescue
+            unless test :git, :'ls-remote', fetch(:repo_url)
                 error "Unable to connect to remote repository, check your configuration, and that a valid ssh key exists for remote server."
-                exit
+                exit 1
             end
 
-            begin
-                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(:simplegit_deploy)} && git checkout -b #{fetch(:simplegit_branch)} origin/#{fetch(:simplegit_branch)} ;"
+            within fetch(:simplegit_deploy) do
+                execute "cd #{fetch(:simplegit_deploy)} && git fetch"
+                execute "git checkout -b #{fetch(:simplegit_branch)} origin/#{fetch(:simplegit_branch)}"
+                execute "git submodule update --init --recursive"
             end
-            execute "git submodule update --init --recursive"
         end
     end
 

metadata

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