obbistrano 1.1.68 → 1.1.69

data/lib/obbistrano_tasks.rb

@@ -160,12 +160,14 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       logger.level = 2
       run "cd #{deploy_to} && git fetch"
-      begin
-        run "cd #{deploy_to} && git checkout -b #{branch} origin/#{branch} && git submodule update --init --recursive"
-      rescue
-        run "cd #{deploy_to} && git pull origin #{branch}"
-        run "cd #{deploy_to} && git checkout #{branch} && git submodule update --init --recursive"
-        run "cd #{deploy_to} && git checkout #{commit} && git submodule update --init --recursive" if defined? "#{commit}"
+      if defined? "#{commit}"
+        run "cd #{deploy_to} && git checkout #{commit} && git submodule update --init --recursive"
+      else
+        begin
+          run "cd #{deploy_to} && git show-branch #{branch} && git checkout #{branch} && git reset --hard origin/#{branch} && git submodule update --init --recursive"
+        rescue
+          run "cd #{deploy_to} && git checkout -b #{branch} origin/#{branch} && git submodule update --init --recursive"
+        end
       end
       
       logger.info "Application has been updated on branch #{branch}"
@@ -251,7 +253,6 @@ Capistrano::Configuration.instance(:must_exist).load do
           run "rm -f /etc/apache2/sites-enabled/#{user_to_config}.conf; ln -s /home/#{user_to_config}/#{deploy_to}/app/platform/apache.conf /etc/apache2/sites-enabled/#{user_to_config}.conf"
         end
         user_cron_tasks = capture("cat #{deploy_to}/app/platform/crontab")
-        logger.info "Writing Cron: #{user_cron_tasks}"
         write_crontab(user_cron_tasks)
       rescue
         

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.68"
+  s.version = "1.1.69"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.date = Time.now
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: obbistrano
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 153
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 68
-  version: 1.1.68
+  - 69
+  version: 1.1.69
 platform: ruby
 authors: 
 - Ross Riley
@@ -15,16 +16,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 +00:00
-default_executable: 
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 5
@@ -35,9 +37,11 @@ dependencies:
   name: activeresource
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         version: "2"
@@ -47,9 +51,11 @@ dependencies:
   name: httparty
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 4
@@ -73,7 +79,6 @@ files:
 - lib/slicehost.rb
 - lib/obbistrano_tasks.rb
 - lib/templates/apache_vhost.erb
-has_rdoc: true
 homepage: http://github.com/oneblackbear/obbistrano
 licenses: []
 
@@ -83,23 +88,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: Adds extra namespaces to Capistrano to allow simple setup, deploys and maintenance.