heroku_rails_deploy 0.4.2 → 0.4.3.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5225993d6fe08e1a17ac09674a703f621c046070
-  data.tar.gz: f5a03afd9a6a4679d15a2b4293a4072bd3ba26a2
+  metadata.gz: 9ffaf525815cb7503f3a8c5c5d7b7b9613074a29
+  data.tar.gz: 8ed722908e19e0b95674a11e22958a136e1e7e68
 SHA512:
-  metadata.gz: 729c4f961063b89e22abff5e016c36fe7274d553933daceb2ee0dd4addc41aff076314c72b71e4abd925cd2bfaae2f430328101f2065e8b29036f1ade91479e1
-  data.tar.gz: d88b8b09ae6cf39c90eb233b46c7d2ea7efdd8cb3848bacffc63edeb49bb9911a748e6f534be59d85764a576d377de68400f30b0cb90a04d7d417aea2e5c6905
+  metadata.gz: c4cf171bbcef19600b0edeb21df1c04ea8b15749450e5f4b23035ef68c188bccd262bf4cf008049efeaa173d81b47799c0bcb9a7bb009c529ba878408cb82d6c
+  data.tar.gz: df23c5cd81a6b32bb36d53d9d33bac81a0824528fc2ca8551e857595be9bf14b674d96373db24a302acfe09e787290ea3b80ad034e5453a3064f30536d1e32c7

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # heroku_rails_deploy
 
+## v0.4.3
+- Display output while running migration commands.
+
 ## v0.4.2
 - Fix test for pending migrations.
 

data/lib/heroku_rails_deploy/deployer.rb

@@ -135,10 +135,7 @@ module HerokuRailsDeploy
     end
 
     def pending_migrations?(app_name)
-      run_heroku_command!(app_name, 'run rake db:abort_if_pending_migrations')
-      false
-    rescue
-      true
+      run_heroku_command(app_name, 'run rake db:abort_if_pending_migrations')
     end
 
     def run_heroku_command!(app_name, command)
@@ -153,8 +150,11 @@ module HerokuRailsDeploy
         # If we're running a shell command, return the underlying
         # shell command exit code
         cli_command << ' --exit-code'
+        display_output = true
+      else
+        display_output = false
       end
-      run_command(cli_command, validate: validate)
+      run_command(cli_command, validate: validate, display_output: display_output)
     end
 
     def registry_url(app_name)
@@ -187,17 +187,21 @@ module HerokuRailsDeploy
       "git@heroku.com:#{app_name}.git"
     end
 
-    def run_command!(command, print_command: nil, quiet: false)
-      run_command(command, print_command: print_command, quiet: quiet, validate: true)
+    def run_command!(command, print_command: nil, quiet: false, display_output: false)
+      run_command(command, print_command: print_command, quiet: quiet, display_output: display_output, validate: true)
     end
 
-    def run_command(command, print_command: nil, validate: nil, quiet: false)
+    def run_command(command, print_command: nil, validate: nil, quiet: false, display_output: false)
       printed_command = print_command || command
       puts printed_command unless quiet
-      output = Bundler.with_clean_env { `#{command}` }
+      if display_output
+        Bundler.with_clean_env { system(command) }
+      else
+        output = Bundler.with_clean_env { `#{command}` }
+      end
       exit_status = $CHILD_STATUS.exitstatus
-      raise "Command '#{printed_command}' failed" if validate && exit_status.nonzero?
-      output
+      raise "Command '#{printed_command}' failed" if validate && !exit_status.success?
+      display_output ? exit_status.success? : output
     end
   end
 end

data/lib/heroku_rails_deploy/version.rb

@@ -1,3 +1,3 @@
 module HerokuRailsDeploy
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3.rc0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_rails_deploy
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3.rc0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,12 +165,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Simple deployment of Rails app to Heroku