obbistrano 1.1.109 → 1.1.110

data/lib/obbistrano_tasks.rb

@@ -112,7 +112,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       set :local_branch, $1 if `git branch` =~ /\* (\S+)\s/m
       if !local_branch.eql? branch
-        logger.info "You are on branch #{local_branch}, not #{branch}, please check out there before deploying to be able to combine the correct js and css files."
+        pretty_print "You are on branch #{local_branch}, not #{branch}, please check out there before deploying to be able to combine the correct js and css files.".red
         puts_fail
         exit
       end
@@ -140,9 +140,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         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"
+          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"
+          run "cd #{deploy_to} && git checkout -b #{branch} origin/#{branch} ; git submodule update --init --recursive"
         end
       end
       puts_ok

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.109"
+  s.version = "1.1.110"
   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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 109
-  version: 1.1.109
+  - 110
+  version: 1.1.110
 platform: ruby
 authors: 
 - Ross Riley