herkko 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ad6707152df95d3628eb7ba4a27fbe51e7dc596
-  data.tar.gz: fb7b02717ca7de3d3c60da871754e0ab3a01e161
+  metadata.gz: c1e2100d4e2787a0e4b82f31ae76cae01c01cae2
+  data.tar.gz: d84269eef9d2bfe6898cd3514a952b4383fc299b
 SHA512:
-  metadata.gz: 73a6ecec9219fc2f4acc5302a765cb2fece32190e0b649967163c1ee95c1b908edd533eb6e850a04113edd75194792aacc3d5f28564ab652a73ae6281e97479c
-  data.tar.gz: 27d0141de48b61f0b01408de3e1573d744ebbd257ae9b5c1ad4d889488373f8a4829b8e1a282c11b412f131885dadb479ad91fdc2f8d75eaf4aed5d9a5d7f2b1
+  metadata.gz: 93192575889e27eb04995b2cb9f723dc23a0dbeca40cb65d87ed3f6e395e5e34d779cc890bf793b820fff3530e81bb09973320d115807d406ea62e42a7b81e79
+  data.tar.gz: 718ca2b403d0b3233855d16f5a35878ae77e46d427116a5232349e85301397bdf8de270b11d1e62a3ec3deaf1dcb9d35ee92d65d57301d3739744ac11f262ad6

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "herkko"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/lib/herkko/runner.rb

@@ -36,7 +36,10 @@ module Herkko
     end
 
     def print_usage
-      Herkko.puts File.read(File.join(File.dirname(__FILE__), "..", "..", "usage.txt"))
+      usage_contents = File.read(
+        File.join(File.dirname(__FILE__), "..", "..", "usage.txt")
+      )
+      Herkko.puts usage_contents
     end
 
     def changelog
@@ -48,6 +51,9 @@ module Herkko
       Herkko.info "Doing #{forced? ? "forced(!) " : ""}deployment to #{environment}..."
       fetch_currently_deployed_version
 
+      Herkko.info "Pushing commit #{to_be_deployed_sha} from branch #{current_branch} to Heroku..."
+      puts
+
       Herkko.info("Deploying changes:")
 
       puts
@@ -104,9 +110,13 @@ module Herkko
     end
 
     def push_new_code
-      Herkko.info "Pushing commit #{to_be_deployed_sha} from branch #{current_branch} to Heroku..."
-      puts
-      Herkko.run_with_output("git", "push", environment, "#{to_be_deployed_sha}:master", forced? ? "--force" : nil)
+      Herkko.run_with_output(
+        "git",
+        "push",
+        environment,
+        "#{to_be_deployed_sha}:master",
+        forced? ? "--force" : nil
+      )
       puts
     end
 
@@ -129,27 +139,33 @@ module Herkko
     def deploy!
       run_migrations = migrations_needed?
 
-      if use_maintenace_mode?
-        enable_maintenance_mode
-      end
-
-      push_new_code
+      in_maintenance_mode do
+        push_new_code
+
+        if run_migrations
+          if procfile_release_defined?
+            Herkko.info "This release has new migrations but because project has Release Phase defined in Procfile, the migrations are not automatically run."
+          else
+            migrate
+          end
+        else
+          Herkko.info "No need to migrate."
+        end
 
-      if run_migrations
-        migrate
-      else
-        Herkko.info "No need to migrate."
+        if seed_file_changed?
+          Herkko.info "NOTE: Seed file seem the have changed. Make sure to run it if needed."
+        end
       end
 
-      if seed_file_changed?
-        Herkko.info "NOTE: Seed file seem the have changed. Make sure to run it if needed."
-      end
+      print_after_deployment_instructions
+    end
 
-      if use_maintenace_mode?
-        disable_maintenance_mode
-      end
+    def in_maintenance_mode
+      enable_maintenance_mode if use_maintenace_mode?
 
-      print_after_deployment_instructions
+      yield
+
+      disable_maintenance_mode if use_maintenace_mode?
     end
 
     def skip_ci_check?
@@ -168,6 +184,13 @@ module Herkko
       file_changed?("db/seeds.rb")
     end
 
+    def procfile_release_defined?
+      return false unless File.exist?("Procfile")
+
+      procfile_contents = File.read("Procfile")
+      !!procfile_contents.match(/^release:/)
+    end
+
     def current_branch
       Herkko.run("git", "rev-parse", "--abbrev-ref", "HEAD")[0].strip
     end
@@ -181,7 +204,13 @@ module Herkko
     end
 
     def file_changed?(file_path)
-      files = Herkko.run("git", "diff", "--name-only", currently_deployed_to(environment), to_be_deployed_sha)[0]
+      files = Herkko.run(
+        "git",
+        "diff",
+        "--name-only",
+        currently_deployed_to(environment),
+        to_be_deployed_sha
+      )[0]
 
       files.split("\n").any? {|filename| filename.match(Regexp.new(file_path)) }
     end
@@ -191,11 +220,19 @@ module Herkko
     end
 
     def git_changelog
-      Herkko.run("git", "log", "--pretty=format:%C(yellow)%h %Cblue%ad%Creset %an %Cgreen%s%Creset", "--date=short", "#{currently_deployed_to(environment)}..#{to_be_deployed_sha}")[0]
+      Herkko.run(
+        "git",
+        "log",
+        "--pretty=format:%C(yellow)%h %Cblue%ad%Creset %an %Cgreen%s%Creset",
+        "--date=short",
+        "#{currently_deployed_to(environment)}..#{to_be_deployed_sha}"
+      )[0]
     end
 
     def print_after_deployment_instructions
-      after_deployment_instructions = Dir.glob(File.join(Dir.pwd, "after_deployment.*"))
+      after_deployment_instructions = Dir.glob(
+        File.join(Dir.pwd, "after_deployment.*")
+      )
       if after_deployment_instructions.any?
         Herkko.info "After deployment instructions:"
         after_deployment_instructions.each do |file_name|

data/lib/herkko/travis.rb

@@ -1,29 +1,12 @@
 # travis login --pro
 # travis history -l1 -bmaster
 module Herkko
+  # Checks status of CI build from Travis.
   class Travis
     def status_for(branch)
       if travis_cli_installed?
         status = fetch_status(branch)
-        if status[1].length > 0
-          Herkko.info "There was an error with checking Travis: #{status[1]}"
-          :red
-        else
-          if status[0].strip.length == 0
-            :not_used
-          else
-            case status[0].split(":")[0]
-            when /passed/
-              :green
-            when /started/
-              :yellow
-            when /created/
-              :queued
-            else
-              :red
-            end
-          end
-        end
+        status_to_code(status)
       else
         Herkko.info "Travis CLI has not been installed, run: gem install travis"
         :unknown
@@ -33,11 +16,39 @@ module Herkko
     private
 
     def fetch_status(branch)
-      Herkko.run("travis", "history", "--skip-version-check", "-l", "1", "-b", branch)
+      Herkko.run(
+        "travis",
+        "history",
+        "--skip-version-check",
+        "-l",
+        "1",
+        "-b",
+        branch
+      )
     end
 
     def travis_cli_installed?
       system("which travis > /dev/null 2>&1")
     end
+
+    def status_to_code(status)
+      if status[1].empty?
+        Herkko.info "There was an error with checking Travis: #{status[1]}"
+        :red
+      elsif status[0].strip.empty?
+        :not_used
+      else
+        case status[0].split(":")[0]
+        when /passed/
+          :green
+        when /started/
+          :yellow
+        when /created/
+          :queued
+        else
+          :red
+        end
+      end
+    end
   end
 end

data/lib/herkko/version.rb

@@ -1,3 +1,3 @@
 module Herkko
-  VERSION = "0.0.17"
+  VERSION = "0.0.18".freeze
 end

data/lib/herkko.rb

@@ -1,6 +1,7 @@
 require "herkko/version"
 require "herkko/runner"
 
+# Main module of Herkko deployment tool.
 module Herkko
   @@debug = false
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herkko
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Vesa Vänskä
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,6 +44,7 @@ description: It's highly opinionated and might not suit your needs. It has certa
 email:
 - vesa@vesavanska.com
 executables:
+- console
 - herkko
 extensions: []
 extra_rdoc_files: []
@@ -53,6 +54,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - bin/herkko
 - herkko.gemspec
 - lib/herkko.rb