obbistrano 1.1.69 → 1.1.70

data/lib/obbistrano_tasks.rb

@@ -149,7 +149,18 @@ Capistrano::Configuration.instance(:must_exist).load do
   
     task :git_deploy, :roles =>[:web] do
       logger.level = 2
-      logger.info "Deploying application from #{repository} on branch #{branch}"
+      
+      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." 
+        exit
+      end
+      
+      if defined? "#{commit}"
+        logger.info "Deploying application from #{repository} on commit #{commit}"
+      else
+        logger.info "Deploying application from #{repository} on branch #{branch}"
+      end
       logger.level = -1
       begin
         run "ls #{deploy_to}/.git"
@@ -159,7 +170,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cd #{deploy_to} && git remote add origin #{repository}"
       end
       logger.level = 2
+      
       run "cd #{deploy_to} && git fetch"
+      
       if defined? "#{commit}"
         run "cd #{deploy_to} && git checkout #{commit} && git submodule update --init --recursive"
       else

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.1.69"
+  s.version = "1.1.70"
   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,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: obbistrano
 version: !ruby/object:Gem::Version 
-  hash: 153
+  hash: 159
   prerelease: 
   segments: 
   - 1
   - 1
-  - 69
-  version: 1.1.69
+  - 70
+  version: 1.1.70
 platform: ruby
 authors: 
 - Ross Riley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 Z
+date: 2011-11-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano