heroku_rails_deploy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da83d3ca23cb65b722b0c91013bcb2c1a6b0ff2d
-  data.tar.gz: 47aa5f6bf6c60d75df5ce9e4e39e4a23917fb179
+  metadata.gz: bc3e6f646b7ef7c41f69b59029b2c1fdee7cff1c
+  data.tar.gz: 2f6e0b9b32170b947a47980f1d671118fd5ef3cb
 SHA512:
-  metadata.gz: d11f4dc879f0b65d01908dde8afa15795c03248dc6ea6bc1e66fcac95ecf3bf8da37af946a5dffa4d458de24966fa5a42d8d011a6a0da3cafdd6d92c737c1497
-  data.tar.gz: 70ec25ed4983969c61c26d6782f93499eb682a09a5b8e8390e81fb8cf8c58749acb3b689c975f5217ee89a653743b82b298f6ae644012b451c38ff648b2e9a29
+  metadata.gz: 8dbf1c200f8e9647d867a5ece168149fa2c1999d23e42842262a1f1ef76b7ab57b1f4419af1ea49d5a0724cdf213d1aafe834dc3ed8515a7a9a801f6504f023f
+  data.tar.gz: a6c5700adc7fd2b6e1b20567896a7dfaca655440978addd2bdada60aa0999c254d42fd1ea5416711a17b05cf56da213d305b1469e3e169ba2d5ecd10310196ff

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # heroku_rails_deploy
 
+## v0.2.2
+- Fixes bug in getting branch name from executing system command
+
 ## v0.2.1
 - Fixes bug in checking for valid production deploy
 

data/lib/heroku_rails_deploy/deployer.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'shellwords'
 require 'yaml'
 
 module HerokuRailsDeploy
@@ -47,7 +48,7 @@ module HerokuRailsDeploy
           "Must be in #{app_registry.keys.join(', ')}")
       end
 
-      raise 'Only master, release or hotfix branches can be deployed to production' if options.environment == 'production' && !production_branch?
+      raise 'Only master, release or hotfix branches can be deployed to production' if options.environment == 'production' && !production_branch?(options.revision)
 
       puts "Pushing code to Heroku app #{app_name} for environment #{options.environment}"
       push_code(app_name, options.revision)
@@ -63,16 +64,18 @@ module HerokuRailsDeploy
       end
     end
 
-    def production_branch?
-      git_branch_name.match(PRODUCTION_BRANCH_REGEX)
+    def production_branch?(revision)
+      git_branch_name(revision).match(PRODUCTION_BRANCH_REGEX)
     end
 
     def push_code(app_name, revision)
       run_command!("git push --force git@heroku.com:#{app_name}.git #{revision}:master")
     end
 
-    def git_branch_name
-      run_command('git rev-parse --abbrev-ref HEAD')
+    def git_branch_name(revision)
+      branch_name = `git rev-parse --abbrev-ref #{Shellwords.escape(revision)}`.strip
+      raise "Unable to get branch for #{revision}" unless $?.to_i == 0
+      branch_name
     end
 
     def run_migrations(app_name)

data/lib/heroku_rails_deploy/version.rb

@@ -1,3 +1,3 @@
 module HerokuRailsDeploy
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_rails_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails