Merge pull request #2643 from Shopify/prep-for-deprecating-cli2

Deprecate CLI2 (DO NOT MERGE UNTIL CLI3 FOR THEMES IS RELEASED)

Author: amcaplan

lib/shopify_cli/packager.rb

@@ -69,14 +69,13 @@ def build_rpm
     def build_homebrew
       root_dir = File.join(PACKAGING_DIR, "homebrew")
 
-      build_path = File.join(BUILDS_DIR, "shopify-cli.rb")
-      build_path_2 = File.join(BUILDS_DIR, "shopify-cli@2.rb")
-      puts "\nBuilding Homebrew packages"
+      build_path = File.join(BUILDS_DIR, "shopify-cli@2.rb")
+      puts "\nBuilding Homebrew package"
 
-      puts "Generating formulae…"
+      puts "Generating formula…"
       File.delete(build_path) if File.exist?(build_path)
 
-      spec_contents = File.read(File.join(root_dir, "shopify-cli.base.rb"))
+      spec_contents = File.read(File.join(root_dir, "shopify-cli@2.base.rb"))
       spec_contents = spec_contents.gsub("SHOPIFY_CLI_VERSION", ShopifyCLI::VERSION)
 
       puts "Grabbing sha256 checksum from Rubygems.org"
@@ -90,15 +89,7 @@ def build_homebrew
       spec_contents = spec_contents.gsub("SHOPIFY_CLI_GEM_CHECKSUM", gem_checksum)
 
       puts "Writing generated formula\n  To: #{build_path}\n\n"
-      File.write(build_path, spec_contents.gsub("SHOPIFY_CLI_BINSTUB_SUFFIX", ""))
-
-      puts "Writing generated formula\n  To: #{build_path_2}\n\n"
-      File.write(
-        build_path_2,
-        spec_contents
-          .sub("class ShopifyCli < Formula", "class ShopifyCliAT2 < Formula")
-          .sub("SHOPIFY_CLI_BINSTUB_SUFFIX", "2")
-      )
+      File.write(build_path, spec_contents)
     end
 
     private

packaging/homebrew/shopify-cli.base.rb packaging/homebrew/shopify-cli@2.base.rbpackaging/homebrew/shopify-cli.base.rb renamed to packaging/homebrew/shopify-cli@2.base.rb

@@ -10,7 +10,7 @@
 require "formula"
 require "fileutils"
 
-class ShopifyCli < Formula
+class ShopifyCliAT2 < Formula
   module RubyBin
     def ruby_bin
       Formula["ruby"].opt_bin
@@ -95,7 +95,7 @@ def install
     ruby_libs = Dir.glob("#{prefix}/gems/*/lib")
     exe = "shopify"
     file = Pathname.new("#{brew_gem_prefix}/bin/#{exe}")
-    (bin + "#{file.basename}SHOPIFY_CLI_BINSTUB_SUFFIX").open("w") do |f|
+    (bin + "#{file.basename}2").open("w") do |f|
       f << <<~RUBY
         #!#{ruby_bin}/ruby -rjson --disable-gems
         ENV['ORIGINAL_ENV']=ENV.to_h.to_json