heroku_rails_deploy 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9735e2adea62cb3eb911e797afeaf47803517e44
-  data.tar.gz: db9355ebc07bf1013ef783aa782a4decd366cdd7
+  metadata.gz: da83d3ca23cb65b722b0c91013bcb2c1a6b0ff2d
+  data.tar.gz: 47aa5f6bf6c60d75df5ce9e4e39e4a23917fb179
 SHA512:
-  metadata.gz: 240b8f705fc58112e1616a92147befa4469d545828aa14989eb84ce0bbae892b61a1c53778dc4fb3f9e47bf5b6fd26fdd6d5d6fb584728e3ade96af1b29a4a6b
-  data.tar.gz: abb3a2c9cc963ad7be67bea6c9bd924721fd4c41752dade7b2107590fcd778f67502498514560dbac3a304d6f190345c74e127fd9f101ad9f08ba9146482f159
+  metadata.gz: d11f4dc879f0b65d01908dde8afa15795c03248dc6ea6bc1e66fcac95ecf3bf8da37af946a5dffa4d458de24966fa5a42d8d011a6a0da3cafdd6d92c737c1497
+  data.tar.gz: 70ec25ed4983969c61c26d6782f93499eb682a09a5b8e8390e81fb8cf8c58749acb3b689c975f5217ee89a653743b82b298f6ae644012b451c38ff648b2e9a29

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 # heroku_rails_deploy
 
+## v0.2.1
+- Fixes bug in checking for valid production deploy
+
+## v0.2.0
+- Can only deploy master or gitflow prefixed branches (hotfix/.+ and release/.+)
+
 ## v0.1.0
 - Initial version

data/README.md

@@ -12,7 +12,7 @@ Add this line to your application's Gemfile:
 
 ```ruby
 group :development do
-  gem 'heroku_rails_deploy'
+  gem 'heroku_rails_deploy', require: false
 end
 ```
 

data/lib/heroku_rails_deploy/deployer.rb

@@ -3,6 +3,8 @@ require 'yaml'
 
 module HerokuRailsDeploy
   class Deployer
+    PRODUCTION_BRANCH_REGEX = /\A((master)|(release\/.+)|(hotfix\/.+))\z/
+
     attr_reader :config_file, :args
 
     class Options < Struct.new(:environment, :revision)
@@ -45,6 +47,8 @@ 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?
+
       puts "Pushing code to Heroku app #{app_name} for environment #{options.environment}"
       push_code(app_name, options.revision)
 
@@ -59,10 +63,18 @@ module HerokuRailsDeploy
       end
     end
 
+    def production_branch?
+      git_branch_name.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')
+    end
+
     def run_migrations(app_name)
       run_heroku_command!(app_name, 'run rake db:migrate')
     end

data/lib/heroku_rails_deploy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_rails_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple deployment of Rails app to Heroku