hu 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e3b5270bf085d9b7027fba304081beafad7410
-  data.tar.gz: f109881ac2f36bb35e04b4d9bb98428d73b3f854
+  metadata.gz: e8a02a4340c2f4801397be2b132d2288cbf6753a
+  data.tar.gz: 7b2dc932c8dc82a4a67ce5b976b33d7e45de401a
 SHA512:
-  metadata.gz: adbb4b03a6c2d9159b4e50b6a2717c1c7f55f43833df29fb648ebca76989a3c8e4ab03360684d8f0e9a569489eef852ce87bad556093d659a845963eb82b5a56
-  data.tar.gz: 98a39b7b4499614550b9209fa6b4d63005110fc4a638200b3b73b6fbe7eb113c8b1e6240b6f0f99374861e2023247b7bb8ada282f625e81f0a464fcfd47302c9
+  metadata.gz: 65aa3c9352155a1c6a975a97b6cda88b26b6b923f44dddfb87a42e62919e594cb26422fdda354a3932ead1d63ae52d441644af8fe9df22648de53813d8df97d5
+  data.tar.gz: d3517a63fa07bce2035acaffbd3cb95415a59041b3241b1a05c3004ae5883956dcde6e1ef46c63bc242cb6df1f5532405b3563aace78467a20d70bb55a6c6ab9

data/.rubocop.yml

@@ -0,0 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+

data/.rubocop_todo.yml

@@ -0,0 +1,56 @@
+# Offense count: 13
+Metrics/AbcSize:
+  Max: 276
+
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 651
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+  Max: 45
+
+# Offense count: 83
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 176
+
+# Offense count: 14
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 230
+
+# Offense count: 4
+Metrics/PerceivedComplexity:
+  Max: 43
+
+# Offense count: 4
+Style/ClassVars:
+  Exclude:
+    - 'lib/hu/deploy.rb'
+
+# Offense count: 5
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/hu/cli.rb'
+    - 'lib/hu/collab.rb'
+    - 'lib/hu/common.rb'
+    - 'lib/hu/deploy.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'lib/hu/cli.rb'
+    - 'lib/hu/collab.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Exclude:
+    - 'lib/hu/deploy.rb'

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hu.gemspec

data/Rakefile

@@ -1 +1,2 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+require 'bundler/gem_tasks'

data/bin/hu

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'hu/cli'
 
 Optix.invoke!
-

data/hu.gemspec

@@ -1,41 +1,42 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'hu/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "hu"
+  spec.name          = 'hu'
   spec.version       = Hu::VERSION
-  spec.authors       = ["moe"]
-  spec.email         = ["moe@busyloop.net"]
-  spec.summary       = %q{Heroku Utility.}
-  spec.description   = %q{Heroku Utility.}
-  spec.homepage      = "https://github.com/busyloop/hu"
-  spec.license       = "MIT"
+  spec.authors       = ['moe']
+  spec.email         = ['moe@busyloop.net']
+  spec.summary       = 'Heroku Utility.'
+  spec.description   = 'Heroku Utility.'
+  spec.homepage      = 'https://github.com/busyloop/hu'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "bump"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'bump'
 
-  spec.add_dependency "optix", "~> 1.2.4"
-  spec.add_dependency "blackbox", "~> 3.1.4"
-  spec.add_dependency "platform-api", "~> 0.7.0"
-  spec.add_dependency "powerbar", ">= 1.0.16"
-  spec.add_dependency "hashdiff", "~> 0.3.0"
-  spec.add_dependency "version_sorter", "~> 2.0.0"
-  spec.add_dependency "versionomy", "~> 0.5.0"
-  spec.add_dependency "tty-prompt"
-  spec.add_dependency "tty-spinner"
-  spec.add_dependency "tty-table"
-  spec.add_dependency "rainbow"
-  spec.add_dependency "netrc"
-  spec.add_dependency "chronic_duration"
-  spec.add_dependency "thread_safe"
-  spec.add_dependency "rugged"
+  spec.add_dependency 'optix', '~> 1.2.4'
+  spec.add_dependency 'blackbox', '~> 3.1.4'
+  spec.add_dependency 'platform-api', '~> 0.7.0'
+  spec.add_dependency 'powerbar', '>= 1.0.16'
+  spec.add_dependency 'hashdiff', '~> 0.3.0'
+  spec.add_dependency 'version_sorter', '~> 2.0.0'
+  spec.add_dependency 'versionomy', '~> 0.5.0'
+  spec.add_dependency 'tty-prompt'
+  spec.add_dependency 'tty-spinner'
+  spec.add_dependency 'tty-table'
+  spec.add_dependency 'rainbow'
+  spec.add_dependency 'netrc'
+  spec.add_dependency 'chronic_duration'
+  spec.add_dependency 'thread_safe'
+  spec.add_dependency 'rugged'
 end

data/lib/hu/cli.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'hu/version'
 require 'optix'
 require 'powerbar'
@@ -11,18 +12,17 @@ require 'hu/deploy'
 
 module Hu
   class Cli < Optix::Cli
-    Optix::command do
+    Optix.command do
       text "Hu v#{Hu::VERSION} - Heroku Utility"
-      opt :quiet, "Quiet mode (no progress output)", :default => false
-      opt :version, "Print version and exit", :short => :none
+      opt :quiet, 'Quiet mode (no progress output)', default: false
+      opt :version, 'Print version and exit', short: :none
       trigger :version do
         puts "Hu v#{Hu::VERSION}"
       end
-      filter do |cmd, opts, argv|
+      filter do |_cmd, opts, _argv|
         $quiet = opts[:quiet]
         $quiet = true unless STDOUT.isatty
       end
     end
   end
 end
-

data/lib/hu/collab.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'powerbar'
 require 'yaml'
 require 'hashdiff'
@@ -12,25 +13,25 @@ module Hu
       class InvalidPlan < StandardError
         attr_accessor :invalid_plan
 
-        def initialize(message=nil, invalid_plan=nil)
+        def initialize(message = nil, invalid_plan = nil)
           super(message)
           self.invalid_plan = invalid_plan
         end
       end
 
-      text "Manage application/collaborator mapping."
-      text ""
-      text "Start by exporting the current mapping,"
-      text "edit to taste, then diff and import."
-      text ""
-      text "The environment variable HU_IGNORE_APPS"
-      text "may contain space delimited glob(7) patterns"
-      text "of apps to be ignored."
-      text ""
-      text "WARNING: If you remove yourself from an application"
+      text 'Manage application/collaborator mapping.'
+      text ''
+      text 'Start by exporting the current mapping,'
+      text 'edit to taste, then diff and import.'
+      text ''
+      text 'The environment variable HU_IGNORE_APPS'
+      text 'may contain space delimited glob(7) patterns'
+      text 'of apps to be ignored.'
+      text ''
+      text 'WARNING: If you remove yourself from an application'
       text "         then hu won't be able to see it anymore."
       if Hu::API_TOKEN.nil?
-        text ""
+        text ''
         text "\e[1mWARNING: Environment variable 'HEROKU_API_KEY' must be set.\e[0m"
       end
       filter do
@@ -44,14 +45,14 @@ module Hu
       OP_COLORS = {
         '+' => "\e[0;1;32m",
         '-' => "\e[0;1;34m",
-        '~' => "\e[0;32m",
-      }
-      desc "Read mapping from stdin and diff to heroku state"
-      text "Read mapping from stdin and diff to heroku state"
-      parent "collab"
-      def diff(cmd, opts, argv)
+        '~' => "\e[0;32m"
+      }.freeze
+      desc 'Read mapping from stdin and diff to heroku state'
+      text 'Read mapping from stdin and diff to heroku state'
+      parent 'collab'
+      def diff(_cmd, opts, _argv)
         parsed_state = parse_as_json_or_yaml(STDIN.read)
-        show_plan( plan(HashDiff.diff(heroku_state['apps'], parsed_state['apps']), opts) )
+        show_plan(plan(HashDiff.diff(heroku_state['apps'], parsed_state['apps']), opts))
       end
 
       def show_plan(plan)
@@ -61,7 +62,7 @@ module Hu
           icon = ' '
           if s[:method].nil?
             color = "\e[0m"
-            msg = "<-- Can not resolve this (NO-OP)"
+            msg = '<-- Can not resolve this (NO-OP)'
             icon = "⚠️"
           elsif s[:invalid]
             color = "\e[0m"
@@ -74,27 +75,27 @@ module Hu
         end
       end
 
-      desc "Print current mapping to stdout"
-      text "Print current mapping to stdout"
-      opt :format, "yaml|json", :default => 'yaml'
-      parent "collab", "Manage application collaborators"
-      def export(cmd, opts, argv)
+      desc 'Print current mapping to stdout'
+      text 'Print current mapping to stdout'
+      opt :format, 'yaml|json', default: 'yaml'
+      parent 'collab', 'Manage application collaborators'
+      def export(_cmd, opts, _argv)
         puts heroku_state.send("to_#{opts[:format]}".to_sym)
       end
 
-      desc "Read mapping from stdin and push to heroku"
-      text "Read mapping from stdin and push to heroku"
-      opt :allow_create, "Create new collaborators on heroku", :short => 'c'
-      opt :silent_create, "Suppress email invitation when creating collaborators"
-      parent "collab"
-      def import(cmd, opts, argv)
+      desc 'Read mapping from stdin and push to heroku'
+      text 'Read mapping from stdin and push to heroku'
+      opt :allow_create, 'Create new collaborators on heroku', short: 'c'
+      opt :silent_create, 'Suppress email invitation when creating collaborators'
+      parent 'collab'
+      def import(_cmd, opts, _argv)
         parsed_state = parse_as_json_or_yaml(STDIN.read)
         validators = {
-          :op_add_collaborators => Proc.new { |op|
-            unless heroku_state['collaborators'].include? op[:value] or opts[:allow_create]
+          op_add_collaborators: proc do |op|
+            unless heroku_state['collaborators'].include?(op[:value]) || opts[:allow_create]
               raise InvalidOperation, "Use -c to allow creation of new collaborator '#{op[:value]}'"
             end
-          }
+          end
         }
         begin
           plan(HashDiff.diff(heroku_state['apps'], parsed_state['apps']), opts, validators).each do |s|
@@ -104,14 +105,14 @@ module Hu
             eol = "\e[1G"
             if s[:method].nil?
               color = "\e[0;41;33;1m"
-              msg = "Skipped."
+              msg = 'Skipped.'
               icon = "\e[0;31;1m\u2718\e[0m" # X
               eol = "\n"
             end
             STDERR.printf "%s %s%6s %-30s %-15s %-30s %s\e[0m%s", icon, color, s[:op_name], s[:app_name], s[:role], s[:value], msg, eol
             next if s[:method].nil?
             begin
-              self.send(s[:method], s)
+              send(s[:method], s)
               STDERR.puts "\e[0;32;1m\u2713\e[0m\n" # check
             rescue => e
               STDERR.puts "\e[0;31;1m\u2718\e[0m\n" # X
@@ -130,9 +131,9 @@ module Hu
       OP_MAP = {
         '+' => 'add',
         '-' => 'remove',
-        '~' => 'change',
-      }
-      def plan(diff, env={}, validators={})
+        '~' => 'change'
+      }.freeze
+      def plan(diff, env = {}, validators = {})
         plan = []
         last_error = nil
         diff.each do |op, target, lval, rval|
@@ -146,10 +147,10 @@ module Hu
             app_name: app_name,
             op: op,
             op_name: op_name,
-            method: self.respond_to?(method_name) ? method_name : nil,
+            method: respond_to?(method_name) ? method_name : nil,
             value: value,
             role: role,
-            env: env,
+            env: env
           }
           if validators.include? method_name
             begin
@@ -160,12 +161,12 @@ module Hu
           end
           plan << operation
         end
-        raise InvalidPlan.new("Plan did not pass validation", plan) unless last_error.nil?
+        raise InvalidPlan.new('Plan did not pass validation', plan) unless last_error.nil?
         plan
       end
 
       def op_add_collaborators(args)
-        h.collaborator.create(args[:app_name], :user => args[:value], :silent => args[:env][:silent_create])
+        h.collaborator.create(args[:app_name], user: args[:value], silent: args[:env][:silent_create])
       end
 
       def op_remove_collaborators(args)
@@ -179,13 +180,13 @@ module Hu
           begin
             parsed = YAML.load(input)
             if parsed.is_a? String
-              raise ArgumentError, "Input parsed as YAML yields a String"
+              raise ArgumentError, 'Input parsed as YAML yields a String'
             end
           rescue => yex
-            STDERR.puts "Error: Could neither parse stdin as YAML nor as JSON."
-            STDERR.puts "-- JSON Error --"
+            STDERR.puts 'Error: Could neither parse stdin as YAML nor as JSON.'
+            STDERR.puts '-- JSON Error --'
             STDERR.puts jex
-            STDERR.puts "-- YAML Error --"
+            STDERR.puts '-- YAML Error --'
             STDERR.puts yex
             raise ArgumentError
           end
@@ -197,7 +198,7 @@ module Hu
         unless parsed.include? 'apps'
           raise ArgumentError, "Malformed input, key 'apps' not found."
         end
-        parsed['apps'].reject!{ |e| ignored_app?(e) }
+        parsed['apps'].reject! { |e| ignored_app?(e) }
         parsed['apps'].each do |app_name, v|
           unless heroku_state['apps'].include? app_name
             raise ArgumentError, "Unknown application: #{app_name}"
@@ -210,37 +211,37 @@ module Hu
       end
 
       def ignored_app?(app_name)
-        ENV.fetch('HU_IGNORE_APPS','').split(' ').each do |p|
+        ENV.fetch('HU_IGNORE_APPS', '').split(' ').each do |p|
           return true if File.fnmatch(p, app_name)
         end
         false
       end
 
-      def heroku_state(force_refresh=false)
-        return @heroku_state unless force_refresh or @heroku_state.nil?
+      def heroku_state(force_refresh = false)
+        return @heroku_state unless force_refresh || @heroku_state.nil?
         all_collaborators = Set.new
         data = { 'apps' => {} }
-        app_names = h.app.list.map{|e| e['name']}.reject{ |e| ignored_app?(e) }
+        app_names = h.app.list.map { |e| e['name'] }.reject { |e| ignored_app?(e) }
         threads = []
-        app_names.each_with_index do |app_name,i|
+        app_names.each_with_index do |app_name, _i|
           threads << Thread.new do
             d = data['apps'][app_name] = { 'collaborators' => [] }
-            h.collaborator.list(app_name).map{|e|
+            h.collaborator.list(app_name).map do |e|
               case e['role']
               when 'owner'
                 d['owner'] = e['user']['email']
               when nil
                 d['collaborators'] << e['user']['email']
               else
-                raise RuntimeError, "Unknown collaborator role: #{e['role']}"
+                raise "Unknown collaborator role: #{e['role']}"
               end
               all_collaborators << e['user']['email']
-            }
+            end
           end
         end
         threads.each_with_index do |t, i|
           t.join
-          pb :msg => app_names[i], :total => app_names.length, :done => i+1
+          pb msg: app_names[i], total: app_names.length, done: i + 1
         end
         pb :wipe
         data['collaborators'] = all_collaborators.to_a.sort
@@ -256,7 +257,6 @@ module Hu
         @pb ||= PowerBar.new
         show_opts == :wipe ? @pb.wipe : @pb.show(show_opts)
       end
-
     end
   end
 end

data/lib/hu/common.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'blackbox/gem'
 
 module Hu
@@ -11,9 +12,13 @@ class String
   end
 end
 
-version_info = BB::Gem.version_info(check_interval: 900)
-unless version_info[:installed_is_latest] == true
-  puts "\e[33;1mWARNING: \e[0mA newer version of #{version_info[:gem_name]} is available."
-  puts "         Please type '\e[1mgem install #{version_info[:gem_name]}\e[0m' to upgrade (v#{version_info[:gem_installed_version]} -> v#{version_info[:gem_latest_version]})."
-  sleep 1
+unless ENV['SKIP_VERSION_CHECK']
+  version_info = BB::Gem.version_info(check_interval: 900)
+  unless version_info[:installed_is_latest] == true
+    puts "\e[33;1mWoops! \e[0mA newer version of #{version_info[:gem_name]} is available."
+    puts "       Please type '\e[1mgem install #{version_info[:gem_name]}\e[0m' to upgrade (v#{version_info[:gem_installed_version]} -> v#{version_info[:gem_latest_version]})."
+    sleep 1
+    puts
+    exit 1
+  end
 end

data/lib/hu/deploy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'version_sorter'
 require 'versionomy'
 require 'tty-prompt'
@@ -24,10 +25,10 @@ module Hu
       @@shutting_down = false
       @@spinner = nil
 
-      text "Interactive deployment."
-      desc "Interactive deployment"
+      text 'Interactive deployment.'
+      desc 'Interactive deployment'
       if Hu::API_TOKEN.nil?
-        text ""
+        text ''
         text "\e[1mWARNING: Environment variable 'HEROKU_API_KEY' must be set.\e[0m"
       end
       filter do
@@ -37,22 +38,22 @@ module Hu
         end
       end
 
-      def deploy(cmd, opts, argv)
+      def deploy(_cmd, _opts, _argv)
         trap('INT') { shutdown; safe_abort; exit 1 }
-        at_exit {
-          if $!.class == SystemExit && 130 == $!.status
+        at_exit do
+          if $ERROR_INFO.class == SystemExit && 130 == $ERROR_INFO.status
             shutdown
             puts
             safe_abort
           end
-        }
+        end
 
         begin
           @git = Rugged::Repository.discover('.')
         rescue Rugged::RepositoryError => e
           puts
           puts "Git error: #{e}".color(:red)
-          puts "You need to be inside the working copy of the app that you wish to deploy.".color(:red)
+          puts 'You need to be inside the working copy of the app that you wish to deploy.'.color(:red)
           puts
           safe_abort
           print TTY::Cursor.prev_line
@@ -65,7 +66,7 @@ module Hu
           puts
           puts "ERROR: Remote of branch 'master' does not point to 'origin'.".color(:red)
           puts
-          puts "       Sorry, we need an origin here. We really do."
+          puts '       Sorry, we need an origin here. We really do.'
           puts
           exit 1
         end
@@ -82,16 +83,16 @@ module Hu
         unless @git.config['gitflow.prefix.versiontag'].nil? ||
                @git.config['gitflow.prefix.versiontag'].empty?
           puts
-          puts "ERROR: git-flow version prefix configured.".color(:red)
+          puts 'ERROR: git-flow version prefix configured.'.color(:red)
           puts
-          puts "       Please use this command to remove the prefix:"
+          puts '       Please use this command to remove the prefix:'
           puts
           puts "       git config --add gitflow.prefix.versiontag ''".bright
           puts
           exit 1
         end
 
-        push_url = get_heroku_git_remote
+        push_url = heroku_git_remote
 
         wc_update = Thread.new { update_working_copy }
 
@@ -100,7 +101,7 @@ module Hu
         if app.nil?
           puts
           puts "ERROR: Found no heroku app for git remote #{push_url}".color(:red)
-          puts "       Are you logged into the right heroku account?".color(:red)
+          puts '       Are you logged into the right heroku account?'.color(:red)
           puts
           puts "       Please run 'git remote rm heroku'. Then run 'hu deploy' again to select a new remote."
           puts
@@ -112,10 +113,10 @@ module Hu
         if app['id'] != stag_app_id
           puts
           puts "ERROR: The git remote 'heroku' points to app '#{app['name']}'".color(:red)
-          puts "       which is not in stage 'staging'".color(:red)+
+          puts "       which is not in stage 'staging'".color(:red) +
                " of pipeline '#{pipeline_name}'.".color(:red)
           puts
-          puts "       The referenced app MUST be the staging member of the pipeline."
+          puts '       The referenced app MUST be the staging member of the pipeline.'
 
           puts "       Please run 'git remote rm heroku'. Then run 'hu deploy' again to select a new remote."
           puts
@@ -139,14 +140,14 @@ module Hu
           highest_versionomy = Versionomy.parse('v0.0.0')
         end
 
-        all_tags = Set.new(@git.references.to_a("refs/tags/*").collect{|e| e.name[10..-1]})
+        all_tags = Set.new(@git.references.to_a('refs/tags/*').collect { |o| o.name[10..-1] })
 
         tiny_bump  = highest_versionomy.dup
         minor_bump = highest_versionomy.dup
         major_bump = highest_versionomy.dup
 
         loop do
-          tiny_bump  = tiny_bump.bump(:tiny)
+          tiny_bump = tiny_bump.bump(:tiny)
           break unless all_tags.include? tiny_bump.to_s
         end
         loop do
@@ -172,60 +173,57 @@ module Hu
           git_revisions = show_pipeline_status(pipeline_name, stag_app_name, prod_app_name, release_tag, clearscreen)
           clearscreen = true
 
-          changelog='Initial revision'
+          changelog = 'Initial revision'
           release_branch_exists = branch_exists?("release/#{release_tag}")
 
           if release_branch_exists
-            puts "\nThis release will be "+release_tag.color(:red).bright
+            puts "\nThis release will be " + release_tag.color(:red).bright
             unless highest_version == 'v0.0.0'
               env = {
                 'PREVIOUS_TAG' => highest_version,
                 'RELEASE_TAG'  => release_tag
               }
-              changelog=create_changelog(env) unless highest_version == 'v0.0.0'
+              changelog = create_changelog(env) unless highest_version == 'v0.0.0'
               unless changelog.empty?
-                puts "\nChanges since "+highest_version.bright+":"
+                puts "\nChanges since " + highest_version.bright + ':'
                 puts changelog
               end
             end
-            puts
           else
-            puts "\nThis is release "+release_tag.color(:green).bright
-            puts
+            puts "\nThis is release " + release_tag.color(:green).bright
           end
+          puts
 
-          unless git_revisions[:release] == git_revisions[stag_app_name] or !release_branch_exists
-            puts "Phase 1/3: The local release branch "+"release/#{release_tag}".bright+" was created."
-            puts "           Nothing else has happened so far. Push this branch to"
-            puts "           "+"#{stag_app_name}".bright+" to begin the deploy procedure."
+          unless git_revisions[:release] == git_revisions[stag_app_name] || !release_branch_exists
+            puts 'Phase 1/3: The local release branch ' + "release/#{release_tag}".bright + ' was created.'
+            puts '           Nothing else has happened so far. Push this branch to'
+            puts '           ' + stag_app_name.to_s.bright + ' to begin the deploy procedure.'
             puts
           end
 
           if release_branch_exists && git_revisions[:release] == git_revisions[stag_app_name]
-            puts "Phase 2/3: Your local "+"release/#{release_tag}".bright+" (formerly "+"develop".bright+") is now live at #{stag_app_name}."
-            puts "           Please test thoroughly: "+"#{app['web_url']}".bright
-            puts "           If everything looks good, you may proceed and finish the release."
-            puts "           If there are problems: Quit, delete the release branch and start fixing."
+            puts 'Phase 2/3: Your local ' + "release/#{release_tag}".bright + ' (formerly ' + 'develop'.bright + ") is now live at #{stag_app_name}."
+            puts '           Please test thoroughly: ' + (app['web_url']).to_s.bright
+            puts '           If everything looks good, you may proceed and finish the release.'
+            puts '           If there are problems: Quit, delete the release branch and start fixing.'
             puts
-          elsif git_revisions[prod_app_name] != git_revisions[stag_app_name] and !release_branch_exists and git_revisions[:release] != git_revisions[stag_app_name]
-            puts "Phase 3/3: HEADS UP. This is the last chance to detect problems."
-            puts "           The final version of "+"release/#{release_tag}".bright+" is now staged."
+          elsif git_revisions[prod_app_name] != git_revisions[stag_app_name] && !release_branch_exists && git_revisions[:release] != git_revisions[stag_app_name]
+            puts 'Phase 3/3: HEADS UP. This is the last chance to detect problems.'
+            puts '           The final version of ' + "release/#{release_tag}".bright + ' is now staged.'
             puts
-            puts "           Test here: "+"#{app['web_url']}".bright
+            puts '           Test here: ' + (app['web_url']).to_s.bright
             sleep 1
             puts
-            puts "           This is the exact version that will be promoted to production."
+            puts '           This is the exact version that will be promoted to production.'
             puts "           From here you are on your own. Good luck #{`whoami`.chomp}!"
             puts
           end
 
-
-
-          choice = prompt.select("Choose your destiny") do |menu|
+          choice = prompt.select('Choose your destiny') do |menu|
             menu.enum '.'
-            menu.choice "Refresh", :refresh
-            menu.choice "Quit", :abort_ask
-            unless git_revisions[:release] == git_revisions[stag_app_name] or !release_branch_exists
+            menu.choice 'Refresh', :refresh
+            menu.choice 'Quit', :abort_ask
+            unless git_revisions[:release] == git_revisions[stag_app_name] || !release_branch_exists
               menu.choice "Push release/#{release_tag} to #{stag_app_name}", :push_to_staging
             end
             if release_branch_exists
@@ -242,7 +240,7 @@ module Hu
               end
 
               if git_revisions[:release] == git_revisions[stag_app_name]
-                menu.choice "Finish release (merge, tag and final stage)", :finish_release
+                menu.choice 'Finish release (merge, tag and final stage)', :finish_release
               end
             elsif git_revisions[prod_app_name] != git_revisions[stag_app_name]
               menu.choice "DEPLOY (promote #{stag_app_name} to #{prod_app_name})", :DEPLOY
@@ -252,66 +250,66 @@ module Hu
           puts
 
           case choice
-            when :DEPLOY
-              promote_to_production
-              anykey
-            when :finish_release
-              old_editor = ENV['EDITOR']
-              tf = Tempfile.new('hu-tag')
-              tf.write "#{release_tag}\n#{changelog}"
-              tf.close
-              ENV['EDITOR'] = "cp #{tf.path}"
-              env = {
-                'PREVIOUS_TAG' => highest_version,
-                'RELEASE_TAG'  => release_tag
-              }
-              unless 0 == finish_release(release_tag, env)
-                abort_merge
-                puts "*** ERROR! Could not finish release *** ".color(:red)
-                puts
-                puts "This usually means a merge conflict or"
-                puts "something similarly complicated has occured."
-                puts
-                puts "Please bring the universe into a state"
-                puts "where the above command succeeds, then try again."
-                puts
-                exit 1
-              end
-              ENV['EDITOR'] = old_editor
-              anykey
-            when :push_to_staging
-              run_each <<-EOS.strip_heredoc
+          when :DEPLOY
+            promote_to_production
+            anykey
+          when :finish_release
+            old_editor = ENV['EDITOR']
+            tf = Tempfile.new('hu-tag')
+            tf.write "#{release_tag}\n#{changelog}"
+            tf.close
+            ENV['EDITOR'] = "cp #{tf.path}"
+            env = {
+              'PREVIOUS_TAG' => highest_version,
+              'RELEASE_TAG'  => release_tag
+            }
+            unless 0 == finish_release(release_tag, env)
+              abort_merge
+              puts '*** ERROR! Could not finish release *** '.color(:red)
+              puts
+              puts 'This usually means a merge conflict or'
+              puts 'something similarly complicated has occured.'
+              puts
+              puts 'Please bring the universe into a state'
+              puts 'where the above command succeeds, then try again.'
+              puts
+              exit 1
+            end
+            ENV['EDITOR'] = old_editor
+            anykey
+          when :push_to_staging
+            run_each <<-EOS.strip_heredoc
               :stream
               git push #{push_url} release/#{release_tag}:master -f
               EOS
-              anykey
-            when :abort_ask
-              puts if delete_branch("release/#{release_tag}")
-              exit 0
-            when :bump_tiny
-              if delete_branch("release/#{release_tag}")
-                release_tag, branch_already_exists = prompt_for_release_tag(tiny_bump, tiny_bump)
-              end
-            when :bump_minor
-              if delete_branch("release/#{release_tag}")
-                release_tag, branch_already_exists = prompt_for_release_tag(minor_bump, minor_bump)
-              end
-            when :bump_major
-              if delete_branch("release/#{release_tag}")
-                release_tag, branch_already_exists = prompt_for_release_tag(major_bump, major_bump)
-              end
+            anykey
+          when :abort_ask
+            puts if delete_branch("release/#{release_tag}")
+            exit 0
+          when :bump_tiny
+            if delete_branch("release/#{release_tag}")
+              release_tag, branch_already_exists = prompt_for_release_tag(tiny_bump, tiny_bump)
+            end
+          when :bump_minor
+            if delete_branch("release/#{release_tag}")
+              release_tag, branch_already_exists = prompt_for_release_tag(minor_bump, minor_bump)
+            end
+          when :bump_major
+            if delete_branch("release/#{release_tag}")
+              release_tag, branch_already_exists = prompt_for_release_tag(major_bump, major_bump)
+            end
           end
         end
       end
 
-      def show_pipeline_status(pipeline_name, stag_app_name, prod_app_name, release_tag, clear=true)
-        table = TTY::Table.new header: %w{location commit tag app_last_modified app_last_modified_by dynos# state}
+      def show_pipeline_status(pipeline_name, stag_app_name, prod_app_name, release_tag, clear = true)
+        table = TTY::Table.new header: %w(location commit tag app_last_modified app_last_modified_by dynos# state)
         busy 'loading', :classic
         ts = []
         tpl_row = ['?', '', '', '', '', '', '']
         revs = ThreadSafe::Hash.new
 
-        [[0,stag_app_name],[1,prod_app_name]].each do |idx, app_name|
+        [[0, stag_app_name], [1, prod_app_name]].each do |idx, app_name|
           ts << Thread.new do
             table_row = tpl_row.dup
             table_row[0] = app_name
@@ -325,7 +323,7 @@ module Hu
               release_version = dynos.dig(0, 'release', 'version')
               break if release_version.nil?
 
-              state = Set.new(dynos.collect{|d| d['state']}).sort.join(', ')
+              state = Set.new(dynos.collect { |d| d['state'] }).sort.join(', ')
               state_color = (state == 'up') ? 32 : 31
               table_row[6] = "\e[#{state_color};1m#{state}"
 
@@ -340,15 +338,15 @@ module Hu
               revs[app_name] = table_row[1] = slug_info['commit'][0..5]
 
               table_row[2] = `git tag --points-at #{slug_info['commit']} 2>/dev/null`
-              table_row[2] = '' if $? != 0
+              table_row[2] = '' if $CHILD_STATUS != 0
 
               # heroku uses wrong timezone offset in the slug api... /facepalm
-              #table_row[3] = ChronicDuration.output(Time.now.utc - Time.parse(slug_info['updated_at']), :units => 1)
+              # table_row[3] = ChronicDuration.output(Time.now.utc - Time.parse(slug_info['updated_at']), :units => 1)
 
               delta = Time.now.utc - Time.parse(release_info['updated_at'])
-              table_row[3] = delta < 60 ? 'less than a minute' : ChronicDuration.output(delta, :units => 1)
-              table_row[3] += " ago"
-              #table_row[3] += "\n\e[30;1m" + slug_info['updated_at']
+              table_row[3] = delta < 60 ? 'less than a minute' : ChronicDuration.output(delta, units: 1)
+              table_row[3] += ' ago'
+              # table_row[3] += "\n\e[30;1m" + slug_info['updated_at']
 
               table_row[4] = release_info['user']['email']
               table_row[5] = dynos.length
@@ -386,21 +384,21 @@ module Hu
 
         unbusy
 
-        rows.each do |row|
-          table << row
+        rows.each do |r|
+          table << r
         end
 
         puts "\e[H\e[2J" if clear
         puts " PIPELINE #{pipeline_name} ".inverse
         puts
 
-        puts table.render(:unicode, padding: [0,1,0,1], multiline: true)
+        puts table.render(:unicode, padding: [0, 1, 0, 1], multiline: true)
         revs
       end
 
       def heroku_app_by_git(git_url)
         busy('fetching heroku apps', :dots)
-        r = h.app.list.select{ |e| e['git_url'] == git_url }
+        r = h.app.list.select { |e| e['git_url'] == git_url }
         unbusy
         raise "FATAL: Found multiple heroku apps with git_url=#{git_url}" if r.length > 1
         r[0]
@@ -410,16 +408,16 @@ module Hu
         busy('fetching heroku pipelines', :dots)
         couplings = h.pipeline_coupling.list
         unbusy
-        r = couplings.select{ |e| e['app']['id'] == app['id'] }
+        r = couplings.select { |e| e['app']['id'] == app['id'] }
         raise "FATAL: Found multiple heroku pipelines with app.id=#{r['id']}" if r.length > 1
         raise "FATAL: Found no heroku pipeline for app.id=#{r['id']}" if r.length != 1
         r = r[0]
         pipeline_name = r['pipeline']['name']
 
-        r = couplings.select{ |e| e['pipeline']['id'] == r['pipeline']['id'] and e['stage'] == 'staging' }[0]
+        r = couplings.select { |e| e['pipeline']['id'] == r['pipeline']['id'] && e['stage'] == 'staging' }[0]
         staging_app_id = r['app']['id']
 
-        r = couplings.select{ |e| e['pipeline']['id'] == r['pipeline']['id'] and e['stage'] == 'production' }[0]
+        r = couplings.select { |e| e['pipeline']['id'] == r['pipeline']['id'] && e['stage'] == 'production' }[0]
         raise "FATAL: No production app in pipeline #{pipeline_name}" if r.nil?
         prod_app_id = r['app']['id']
         [pipeline_name, staging_app_id, prod_app_id]
@@ -429,7 +427,7 @@ module Hu
         @h ||= PlatformAPI.connect_oauth(Hu::API_TOKEN)
       end
 
-      def run_each(script, opts={})
+      def run_each(script, opts = {})
         opts = {
           quiet: false,
           failfast: true,
@@ -441,23 +439,23 @@ module Hu
         script.lines.each_with_index do |line, i|
           line.chomp!
           case line[0]
-            when '#'
-              puts "\n" + line.bright unless opts[:quiet]
-            when ':'
-              opts[:quiet]    = true  if line == ':quiet'
-              opts[:failfast] = false if line == ':return'
-              opts[:spinner]  = false if line == ':nospinner'
-              if line == ':stream'
-                opts[:stream] = true
-                opts[:quiet] = false
-              end
+          when '#'
+            puts "\n" + line.bright unless opts[:quiet]
+          when ':'
+            opts[:quiet] = true if line == ':quiet'
+            opts[:failfast] = false if line == ':return'
+            opts[:spinner]  = false if line == ':nospinner'
+            if line == ':stream'
+              opts[:stream] = true
+              opts[:quiet] = false
+            end
           end
-          next if line.empty? or ['#', ':'].include? line[0]
+          next if line.empty? || ['#', ':'].include?(line[0])
 
           status = nil
           if opts[:stream]
             puts "\n> ".color(:green) + line.color(:black).bright
-            PTY.spawn(line) do |r,w,pid|
+            PTY.spawn(line) do |r, _w, pid|
               @tspin ||= Thread.new do
                 @minispin_last_char = Time.now
                 i = 0
@@ -467,48 +465,47 @@ module Hu
                     sleep 0.1
                     next
                   end
-                  @spinlock.synchronize {
+                  @spinlock.synchronize do
                     print "\e[?25l"
-                    print Paint[' ', '#000', Lol.rainbow(1, i/3.0)]
+                    print Paint[' ', '#000', Lol.rainbow(1, i / 3.0)]
                     sleep 0.12
                     print 8.chr
                     print ' '
                     print 8.chr
                     i += 1
                     print "\e[?25h"
-                  }
+                  end
                 end
               end
 
-              while !r.eof?
+              until r.eof?
                 c = r.getc
-                @spinlock.synchronize {
+                @spinlock.synchronize do
                   print c
                   @minispin_last_char = Time.now
-                }
+                end
               end
-              pid, status = Process.wait2(pid)
+              _pid, status = Process.wait2(pid)
               @minispin_last_char = :end
               @tspin.join
               @tspin = nil
-              #status = PTY.check(pid)
+              # status = PTY.check(pid)
             end
           else
             busy line if opts[:spinner]
             output, status = Open3.capture2e(line)
             unbusy if opts[:spinner]
             color = (status.exitstatus == 0) ? :green : :red
-            if status.exitstatus != 0 or !opts[:quiet]
+            if status.exitstatus != 0 || !opts[:quiet]
               puts "\n> ".color(color) + line.color(:black).bright
               puts output
             end
           end
-          if status.exitstatus != 0
-            shutdown if opts[:failfast]
-            puts "Error, exit #{status.exitstatus}: #{line} (L#{i})".color(:red).bright
-            exit status.exitstatus if opts[:failfast]
-            return status.exitstatus
-          end
+          next unless status.exitstatus != 0
+          shutdown if opts[:failfast]
+          puts "Error, exit #{status.exitstatus}: #{line} (L#{i})".color(:red).bright
+          exit status.exitstatus if opts[:failfast]
+          return status.exitstatus
         end
         0
       end
@@ -516,13 +513,13 @@ module Hu
       def find_highest_version_tag
         output, status = Open3.capture2e('git tag')
         if status.exitstatus != 0
-          puts "Error fetching git tags."
+          puts 'Error fetching git tags.'
           exit status.exitstatus
         end
 
-        versions = VersionSorter.sort(output.lines.map(&:chomp).map {|e| e[0].downcase == 'v' ? e.downcase : "v#{e.downcase}" })
+        versions = VersionSorter.sort(output.lines.map(&:chomp).map { |e| e[0].casecmp('v').zero? ? e.downcase : "v#{e.downcase}" })
         latest = versions[-1] || 'v0.0.0'
-        latest = "v#{latest}" unless latest[0] == "v"
+        latest = "v#{latest}" unless latest[0] == 'v'
         latest
       end
 
@@ -569,7 +566,7 @@ module Hu
         EOS
       end
 
-      def get_heroku_git_remote
+      def heroku_git_remote
         ensure_repo_has_heroku_remote
         `git remote show -n heroku | grep Push`.chomp.split(':', 2)[1][1..-1]
       end
@@ -586,23 +583,23 @@ module Hu
         # Setup git remote
         puts
         puts "This repository has no 'heroku' remote.".color(:red)
-        puts "We will set one up now. Please select the pipeline that you"
+        puts 'We will set one up now. Please select the pipeline that you'
         puts "wish to deploy to, and we will set the 'heroku' remote"
-        puts "to the staging application in that pipeline."
+        puts 'to the staging application in that pipeline.'
         puts
 
         busy
-        heroku_apps=JSON.parse(`heroku pipelines:list --json`)
+        heroku_apps = JSON.parse(`heroku pipelines:list --json`)
         unbusy
 
         prompt = TTY::Prompt.new
-        pipeline_name = prompt.select("Select pipeline:") do |menu|
+        pipeline_name = prompt.select('Select pipeline:') do |menu|
           menu.enum '.'
           heroku_apps.each do |app|
             menu.choice app['name']
           end
         end
-        staging_app=JSON.parse(`heroku pipelines:info #{pipeline_name} --json`)['apps'].select{|e| e['coupling']['stage'] == 'staging'}[0]
+        staging_app = JSON.parse(`heroku pipelines:info #{pipeline_name} --json`)['apps'].select { |e| e['coupling']['stage'] == 'staging' }[0]
         if staging_app.nil?
           puts "Error: Pipeline #{pipeline_name} has no staging app.".color(:red)
           exit 1
@@ -614,7 +611,7 @@ module Hu
         EOS
       end
 
-      def prompt_for_release_tag(propose_version='v0.0.1', try_version=nil, keep_existing=false)
+      def prompt_for_release_tag(propose_version = 'v0.0.1', try_version = nil, keep_existing = false)
         prompt = TTY::Prompt.new
         loop do
           if try_version
@@ -622,14 +619,12 @@ module Hu
             try_version = nil
           else
             show_existing_git_tags
-            release_tag = prompt.ask("Please enter a tag for this release", default: propose_version)
+            release_tag = prompt.ask('Please enter a tag for this release', default: propose_version)
             begin
               unless release_tag[0] == 'v'
-                raise ArgumentError, "Version string must start with the letter v"
-              end
-              if release_tag.length < 5
-                raise ArgumentError, "too short"
+                raise ArgumentError, 'Version string must start with the letter v'
               end
+              raise ArgumentError, 'too short' if release_tag.length < 5
               Versionomy.parse(release_tag)
             rescue => e
               puts "Error: Tag does not look like a semantic version (#{e})".color(:red)
@@ -638,32 +633,32 @@ module Hu
           end
 
           branches = `git for-each-ref refs/heads/ --format='%(refname:short)'`.lines.map(&:chomp)
-          existing_branch = branches.find {|e| e.start_with? 'release/'}
+          existing_branch = branches.find { |b| b.start_with? 'release/' }
           branch_already_exists = !existing_branch.nil?
           release_tag = existing_branch[8..-1] if keep_existing && branch_already_exists
 
           if branch_already_exists && !keep_existing
-            choice = prompt.expand("The branch '"+"release/#{release_tag}".color(:red)+"' already exists. What shall we do?",
-                                                          {default: 0}) do |q|
+            choice = prompt.expand("The branch '" + "release/#{release_tag}".color(:red) + "' already exists. What shall we do?",
+                                   default: 0) do |q|
               q.choice key: 'k', name: 'Keep, continue with the existing branch', value: :keep
               q.choice key: 'D', name: "Delete branch release/#{release_tag} and retry", value: :delete
               q.choice key: 'q', name: 'Quit', value: :quit
             end
 
             case choice
-              when :quit
-                puts
-                exit 0
-              when :delete
-                delete_branch("release/#{release_tag}")
-                next
+            when :quit
+              puts
+              exit 0
+            when :delete
+              delete_branch("release/#{release_tag}")
+              next
             end
           end
 
           if branch_already_exists
             checkout_branch("release/#{release_tag}")
           else
-            develop_tag=`git tag --points-at develop 2>/dev/null`.lines.find { |e| e[0] == 'v' }&.chomp
+            develop_tag = `git tag --points-at develop 2>/dev/null`.lines.find { |tag| tag[0] == 'v' }&.chomp
             if develop_tag
               release_tag = develop_tag
             else
@@ -697,7 +692,7 @@ module Hu
       end
 
       def finish_release(release_tag, env)
-        env.each { |k,v| ENV[k] = v }
+        env.each { |k, v| ENV[k] = v }
         if File.executable? '.hu/hooks/pre_release'
           run_each <<-EOS.strip_heredoc
           # Run pre-release hook
@@ -733,7 +728,7 @@ module Hu
 
       def create_changelog(env)
         if File.executable? '.hu/hooks/changelog'
-          env.each { |k,v| ENV[k] = v }
+          env.each { |k, v| ENV[k] = v }
           `.hu/hooks/changelog`
         else
           `git log --pretty=format:" - %s" #{env['PREVIOUS_TAG']}..HEAD 2>/dev/null`
@@ -745,10 +740,10 @@ module Hu
         unbusy
       end
 
-      def busy(msg='', format=:classic, clear=true)
+      def busy(msg = '', format = :classic, clear = true)
         return if @@shutting_down
         format ||= TTY::Formats::FORMATS.keys.sample
-        options = {format: format, hide_cursor: true, error_mark: "\e[31;1m✖\e[0m", success_mark: "\e[32;1m✔\e[0m", clear: clear}
+        options = { format: format, hide_cursor: true, error_mark: "\e[31;1m✖\e[0m", success_mark: "\e[32;1m✔\e[0m", clear: clear }
         @@spinner = TTY::Spinner.new("\e[0;1m#{msg}#{msg.empty? ? '' : ' '}\e[0m\e[32;1m:spinner\e[0m", options)
         @@spinner.start
       end
@@ -758,15 +753,15 @@ module Hu
         printf "\e[?25h"
       end
 
-      def with_spinner(msg='', format=:classic, &block)
+      def with_spinner(msg = '', format = :classic)
         busy(msg, format)
-        block.call
+        yield
         unbusy
       end
 
       def anykey
         puts TTY::Cursor.hide
-        print "--- Press any key ---".color(:cyan)
+        print '--- Press any key ---'.color(:cyan)
         STDIN.getch
         print TTY::Cursor.clear_line + TTY::Cursor.show
       end
@@ -774,7 +769,7 @@ module Hu
       def dp(label, *args)
         return unless ENV['DEBUG']
         puts "---  DEBUG #{label}  ---"
-        ap *args
+        ap(*args)
         puts "--- ^#{label}^ ---"
       end
 
@@ -800,4 +795,3 @@ module Hu
     end
   end
 end
-

data/lib/hu/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hu
-  VERSION = "1.3.6"
+  VERSION = '1.3.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
 platform: ruby
 authors:
 - moe
@@ -271,6 +271,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - LICENSE.txt
 - README.md