Auto-correct rubocop

Author: lavoiesl

Gemfile

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
-ruby '2.7.2'
+ruby "2.7.2"
 
 # None of these can actually be used in a development copy of dev
 # They are all for CI and tests
 # `dev` uses no gems
 
 group :development, :test do
-  gem 'rubocop'
-  gem 'rubocop-performance'
+  gem "rubocop"
+  gem "rubocop-performance"
   gem "rubocop-shopify", require: false
-  gem 'rake'
+  gem "rake"
 end
 
 group :test do
-  gem 'mocha', require: false
-  gem 'minitest', '>= 5.0.0', require: false
-  gem 'minitest-reporters', require: false
+  gem "mocha", require: false
+  gem "minitest", ">= 5.0.0", require: false
+  gem "minitest-reporters", require: false
 end

Rakefile

@@ -1,10 +1,11 @@
-require File.expand_path('../vendor/bootstrap.rb', __FILE__)
+# frozen_string_literal: true
+require File.expand_path("../vendor/bootstrap.rb", __FILE__)
 
-require 'rake'
-require 'rake/testtask'
+require "rake"
+require "rake/testtask"
 
 Rake::TestTask.new do |t|
   t.libs += %w(test)
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList["test/**/*_test.rb"]
   t.warning = false
 end

bin/console

@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require File.expand_path('../../vendor/bootstrap.rb', __FILE__)
-require 'git_chain'
+require File.expand_path("../../vendor/bootstrap.rb", __FILE__)
+require "git_chain"
 
 require "irb"
 require "irb/completion"
-require 'irb/ext/save-history'
+require "irb/ext/save-history"
 
 IRB_HISTORY_SIZE = 100
-IRB_HISTORY_FILE = File.expand_path('../../.console_history', __FILE__)
+IRB_HISTORY_FILE = File.expand_path("../../.console_history", __FILE__)
 if File.exist?(IRB_HISTORY_FILE)
   lines = IO.readlines(IRB_HISTORY_FILE).collect(&:chomp)
   Readline::HISTORY.push(*lines)

bin/git-chain

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby --disable-gems
+# frozen_string_literal: true
 
-require File.expand_path('../../vendor/bootstrap.rb', File.realpath(__FILE__))
-require 'git_chain'
+require File.expand_path("../../vendor/bootstrap.rb", File.realpath(__FILE__))
+require "git_chain"
 
 exit(GitChain::EntryPoint.call(ARGV.dup))

bin/update-deps

@@ -1,7 +1,8 @@
 #!/usr/bin/ruby --disable-gems
+# frozen_string_literal: true
 
-require 'open3'
-require 'fileutils'
+require "open3"
+require "fileutils"
 
 def bail(msg)
   $stderr.puts("[ERROR] #{msg}")
@@ -13,12 +14,12 @@ def warn(msg)
 end
 
 deps = {
-  'cli-ui' => 'lib',
-  'cli-kit' => 'lib',
+  "cli-ui" => "lib",
+  "cli-kit" => "lib",
 }
 
 deps.each do |dep, copy_path|
-  path = File.expand_path(dep, '~/src/github.com/Shopify')
+  path = File.expand_path(dep, "~/src/github.com/Shopify")
 
   unless Dir.exist?(path)
     bail("dependency is not checked out: #{dep} {{bold:{{blue:(try {{green:dev clone}})}}}}")
@@ -28,18 +29,18 @@ deps.each do |dep, copy_path|
   dirty = false
 
   Dir.chdir(path) do
-    _, _, stat = Open3.capture3('git fetch origin master')
+    _, _, stat = Open3.capture3("git fetch origin master")
     bail("couldn't git fetch in dependency: #{dep}") unless stat.success?
 
-    head_sha, stat = Open3.capture2('git rev-parse HEAD')
+    head_sha, stat = Open3.capture2("git rev-parse HEAD")
     bail("couldn't determine HEAD: #{dep}") unless stat.success?
     head_sha.chomp!
 
-    fetch_head_sha, stat = Open3.capture2('git rev-parse FETCH_HEAD')
+    fetch_head_sha, stat = Open3.capture2("git rev-parse FETCH_HEAD")
     bail("couldn't determine FETCH_HEAD: #{dep}") unless stat.success?
     fetch_head_sha.chomp!
 
-    git_status, stat = Open3.capture2('git status --porcelain')
+    git_status, stat = Open3.capture2("git status --porcelain")
     bail("couldn't determine git status: #{dep}") unless stat.success?
 
     if head_sha != fetch_head_sha

lib/git_chain.rb

@@ -1,22 +1,23 @@
-require 'cli/ui'
-require 'cli/kit'
+# frozen_string_literal: true
+require "cli/ui"
+require "cli/kit"
 
 module GitChain
   extend CLI::Kit::Autocall
 
   TOOL_NAME        = "git-chain"
-  CONFIG_HOME      = File.expand_path(ENV.fetch('XDG_CONFIG_HOME', '~/.config'))
+  CONFIG_HOME      = File.expand_path(ENV.fetch("XDG_CONFIG_HOME", "~/.config"))
   TOOL_CONFIG_PATH = File.join(CONFIG_HOME, TOOL_NAME)
-  DEBUG_LOG_FILE   = File.join(TOOL_CONFIG_PATH, 'logs', 'debug.log')
+  DEBUG_LOG_FILE   = File.join(TOOL_CONFIG_PATH, "logs", "debug.log")
 
   autocall(:Logger) { CLI::Kit::Logger.new(debug_log_file: DEBUG_LOG_FILE) }
 
-  autoload :Commands, 'git_chain/commands'
-  autoload :EntryPoint, 'git_chain/entry_point'
-  autoload :Git, 'git_chain/git'
-  autoload :Models, 'git_chain/models'
-  autoload :Options, 'git_chain/options'
-  autoload :Util, 'git_chain/util'
+  autoload :Commands, "git_chain/commands"
+  autoload :EntryPoint, "git_chain/entry_point"
+  autoload :Git, "git_chain/git"
+  autoload :Models, "git_chain/models"
+  autoload :Options, "git_chain/options"
+  autoload :Util, "git_chain/util"
 
   GenericAbort = CLI::Kit::GenericAbort
   Abort        = CLI::Kit::Abort

lib/git_chain/commands.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 module GitChain
   module Commands
-    autoload :Branch, 'git_chain/commands/branch'
-    autoload :Command, 'git_chain/commands/command'
-    autoload :List, 'git_chain/commands/list'
-    autoload :Rebase, 'git_chain/commands/rebase'
-    autoload :Push, 'git_chain/commands/push'
-    autoload :Setup, 'git_chain/commands/setup'
+    autoload :Branch, "git_chain/commands/branch"
+    autoload :Command, "git_chain/commands/command"
+    autoload :List, "git_chain/commands/list"
+    autoload :Rebase, "git_chain/commands/rebase"
+    autoload :Push, "git_chain/commands/push"
+    autoload :Setup, "git_chain/commands/setup"
 
     ArgError = Class.new(ArgumentError)
 

lib/git_chain/commands/branch.rb

@@ -1,4 +1,5 @@
-require 'optparse'
+# frozen_string_literal: true
+require "optparse"
 
 module GitChain
   module Commands
@@ -39,7 +40,7 @@ def parse_branch_options(options)
           raise(ArgError, "Expected 1 or 2 arguments")
         end
 
-        raise(Abort, "#{start_point} is not a branch") if Git.exec('branch', '--list', start_point).empty?
+        raise(Abort, "#{start_point} is not a branch") if Git.exec("branch", "--list", start_point).empty?
 
         [start_point, branch_name]
       end
@@ -98,12 +99,12 @@ def run(options)
         end
 
         begin
-          Git.exec('checkout', start_point, '-B', branch_name)
+          Git.exec("checkout", start_point, "-B", branch_name)
         rescue Git::Failure => e
           raise(Abort, e)
         end
 
-        Setup.new.call(['--chain', chain.name, *branch_names])
+        Setup.new.call(["--chain", chain.name, *branch_names])
       end
     end
   end

lib/git_chain/commands/command.rb

@@ -1,12 +1,13 @@
-require 'optparse'
+# frozen_string_literal: true
+require "optparse"
 
 module GitChain
   module Commands
     class Command
       include Util::Output
 
       def self.command_name
-        @command_name ||= name.split('::')
+        @command_name ||= name.split("::")
           .last
           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1-\2')
           .gsub(/([a-z\d])([A-Z])/, '\1-\2')

lib/git_chain/commands/list.rb

@@ -1,4 +1,5 @@
-require 'optparse'
+# frozen_string_literal: true
+require "optparse"
 
 module GitChain
   module Commands
@@ -37,14 +38,14 @@ def run(options)
           chain_names.each(&GitChain::Logger.method(:info))
         else
           current = current_chain
-          prefix = ''
+          prefix = ""
 
           chain_names.each do |cn|
             chain = Models::Chain.from_config(cn)
             branches = chain.branch_names.map { |b| "{{cyan:#{b}}}" }
 
             prefix = cn == current ? "{{yellow:*}} " : "  " if current
-            GitChain::Logger.info("#{prefix}{{blue:#{chain.name}}} [#{branches.join(' -> ')}]")
+            GitChain::Logger.info("#{prefix}{{blue:#{chain.name}}} [#{branches.join(" -> ")}]")
           end
         end
       end

lib/git_chain/commands/push.rb

@@ -1,4 +1,5 @@
-require 'optparse'
+# frozen_string_literal: true
+require "optparse"
 
 module GitChain
   module Commands
@@ -33,7 +34,7 @@ def run(options)
         chain.branch_names[1..-1].each do |b|
           upstream = Git.upstream_branch(branch: b)
           if upstream
-            branch_remote, upstream_branch = upstream.split('/', 2)
+            branch_remote, upstream_branch = upstream.split("/", 2)
             if remote && branch_remote != remote
               raise(Abort, "Multiple remotes detected: #{remote}, #{branch_remote}") if remote != branch_remote
             else
@@ -53,16 +54,16 @@ def run(options)
         pairs = upstreams.map { |b, u| "#{b}:#{u}" }
 
         cmd = %w(git push)
-        cmd << '--force-with-lease' if options[:force]
+        cmd << "--force-with-lease" if options[:force]
         cmd += [remote, *pairs]
 
-        puts_info("Pushing {{info:#{pairs.size}}} branch#{pairs.size > 1 ? 'es' : ''} to #{remote}")
+        puts_info("Pushing {{info:#{pairs.size}}} branch#{pairs.size > 1 ? "es" : ""} to #{remote}")
         puts_debug(cmd.join(" "))
         raise(Abort, "git push failed") unless system(*cmd)
 
         if options[:set_upstream]
           upstreams.each do |local, upstream|
-            args = ['branch', "--set-upstream-to=#{remote}/#{upstream}", local]
+            args = ["branch", "--set-upstream-to=#{remote}/#{upstream}", local]
             puts_debug_git(*args)
             Git.exec(*args)
           end

lib/git_chain/commands/rebase.rb

@@ -1,4 +1,5 @@
-require 'optparse'
+# frozen_string_literal: true
+require "optparse"
 
 module GitChain
   module Commands
@@ -19,7 +20,7 @@ def run(options)
         chain = GitChain::Models::Chain.from_config(options[:chain_name])
         raise(Abort, "Chain '#{options[:chain_name]}' does not exist.") if chain.empty?
 
-        log_names = chain.branch_names.map { |b| "{{cyan:#{b}}}" }.join(' -> ')
+        log_names = chain.branch_names.map { |b| "{{cyan:#{b}}}" }.join(" -> ")
         puts_debug("Rebasing chain {{info:#{chain.name}}} [#{log_names}]")
 
         branches_to_rebase = chain.branches[1..-1]
@@ -29,33 +30,31 @@ def run(options)
         updates = 0
 
         branches_to_rebase.each do |branch|
-          begin
-            parent_sha = Git.rev_parse(branch.parent_branch)
-            if parent_sha == branch.branch_point
-              puts_debug("Branch {{info:#{branch.name}}} is already up-to-date.")
-              next
-            end
-
-            updates += 1
-
-            if parent_sha != branch.branch_point && forwardable_branch_point?(branch)
-              puts_info("Auto-forwarding #{branch.name} to #{branch.parent_branch}")
-              Git.set_config("branch.#{branch.name}.branchPoint", parent_sha)
-              branch.branch_point = parent_sha
-            end
-
-            args = ["rebase", "--keep-empty", "--onto", branch.parent_branch, branch.branch_point, branch.name]
-            puts_debug_git(*args)
-            Git.exec(*args)
-            Git.set_config("branch.#{branch.name}.branchPoint", parent_sha, scope: :local)
-            # validate the parameters
-          rescue GitChain::Git::Failure => e
-            puts_warning(e.message)
-
-            puts_error("Cannot merge #{branch.name} onto #{branch.parent_branch}.")
-            puts_error("Fix the rebase and run {{command:git chain rebase}} again.")
-            raise(AbortSilent)
+          parent_sha = Git.rev_parse(branch.parent_branch)
+          if parent_sha == branch.branch_point
+            puts_debug("Branch {{info:#{branch.name}}} is already up-to-date.")
+            next
           end
+
+          updates += 1
+
+          if parent_sha != branch.branch_point && forwardable_branch_point?(branch)
+            puts_info("Auto-forwarding #{branch.name} to #{branch.parent_branch}")
+            Git.set_config("branch.#{branch.name}.branchPoint", parent_sha)
+            branch.branch_point = parent_sha
+          end
+
+          args = ["rebase", "--keep-empty", "--onto", branch.parent_branch, branch.branch_point, branch.name]
+          puts_debug_git(*args)
+          Git.exec(*args)
+          Git.set_config("branch.#{branch.name}.branchPoint", parent_sha, scope: :local)
+          # validate the parameters
+        rescue GitChain::Git::Failure => e
+          puts_warning(e.message)
+
+          puts_error("Cannot merge #{branch.name} onto #{branch.parent_branch}.")
+          puts_error("Fix the rebase and run {{command:git chain rebase}} again.")
+          raise(AbortSilent)
         end
 
         if updates.positive?

lib/git_chain/commands/setup.rb

@@ -1,4 +1,5 @@
-require 'optparse'
+# frozen_string_literal: true
+require "optparse"
 
 module GitChain
   module Commands
@@ -25,7 +26,7 @@ def run(options)
         branch_names = options[:args]
 
         unless (missing = branch_names - Git.branches).empty?
-          raise(Abort, "Branch does not exist: #{missing.join(', ')}")
+          raise(Abort, "Branch does not exist: #{missing.join(", ")}")
         end
 
         raise(Abort, "Branches are not all connected") if Git.merge_base(*branch_names).nil?
@@ -92,10 +93,10 @@ def run(options)
         end
 
         unless removed.empty?
-          puts_warning("Removed #{removed.map { |b| "{{info:#{b}}}" }.join(', ')} from the chain.")
+          puts_warning("Removed #{removed.map { |b| "{{info:#{b}}}" }.join(", ")} from the chain.")
         end
 
-        log_names = branch_names.map { |b| "{{cyan:#{b}}}" }.join(' -> ')
+        log_names = branch_names.map { |b| "{{cyan:#{b}}}" }.join(" -> ")
         puts_success("Configured chain {{info:#{chain.name}}} {{reset:[#{log_names}]}}")
       end
     end

lib/git_chain/entry_point.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module GitChain
   module EntryPoint
     PRELUDE = "git chain"