shopify-cli 1.4.0 → 1.7.1

data/lib/shopify-cli/core/entry_point.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Core
@@ -14,23 +14,23 @@ module ShopifyCli
           rescue ArgumentError => e
             # This can happen on RVM, because it can use fd 9 itself and block access to it. That only happens if the fd
             # did not exist beforehand, so that means there was no fd 9 before Ruby started.
-            unless e.message == 'The given fd is not accessible because RubyVM reserves it'
+            unless e.message == "The given fd is not accessible because RubyVM reserves it"
               raise e
             end
           end
 
           if !ctx.testing? && is_shell_shim
-            ctx.puts(ctx.message('core.warning.shell_shim'))
+            ctx.puts(ctx.message("core.warning.shell_shim"))
             return
           end
 
           if ctx.development?
             ctx.puts(
-              ctx.message('core.warning.development_version', File.join(ShopifyCli::ROOT, 'bin', ShopifyCli::TOOL_NAME))
+              ctx.message("core.warning.development_version", File.join(ShopifyCli::ROOT, "bin", ShopifyCli::TOOL_NAME))
             )
           elsif !ctx.testing?
             new_version = ctx.new_version
-            ctx.puts(ctx.message('core.warning.new_version', ShopifyCli::VERSION, new_version)) unless new_version.nil?
+            ctx.puts(ctx.message("core.warning.new_version", ShopifyCli::VERSION, new_version)) unless new_version.nil?
           end
 
           ProjectType.load_type(Project.current_project_type)

data/lib/shopify-cli/core/executor.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   module Core

data/lib/shopify-cli/core/help_resolver.rb

@@ -1,4 +1,4 @@
-require 'cli/kit'
+require "cli/kit"
 
 module ShopifyCli
   module Core
@@ -6,7 +6,7 @@ module ShopifyCli
       def call(args)
         args = args.dup
         return super(args) unless args.first
-        if args.first.include?('-h') || args.first.include?('--help')
+        if args.first.include?("-h") || args.first.include?("--help")
           help = Commands::Help
           help.ctx = Context.new
           help.call([], nil)

data/lib/shopify-cli/core/monorail.rb

@@ -1,13 +1,13 @@
-require 'json'
-require 'net/http'
-require 'time'
-require 'rbconfig'
+require "json"
+require "net/http"
+require "time"
+require "rbconfig"
 
 module ShopifyCli
   module Core
     module Monorail
-      ENDPOINT_URI = URI.parse('https://monorail-edge.shopifycloud.com/v1/produce')
-      INVOCATIONS_SCHEMA = 'app_cli_command/4.0'
+      ENDPOINT_URI = URI.parse("https://monorail-edge.shopifycloud.com/v1/produce")
+      INVOCATIONS_SCHEMA = "app_cli_command/5.0"
 
       # Extra hash of data that will be sent in the payload
       @metadata = {}
@@ -46,25 +46,25 @@ module ShopifyCli
 
         # we only want to send Monorail events in production or when explicitly developing
         def enabled?
-          Context.new.system? || ENV['MONORAIL_REAL_EVENTS'] == '1'
+          Context.new.system? || ENV["MONORAIL_REAL_EVENTS"] == "1"
         end
 
         def consented?
-          ShopifyCli::Config.get_bool('analytics', 'enabled')
+          ShopifyCli::Config.get_bool("analytics", "enabled")
         end
 
         def prompt_for_consent
           return unless enabled?
-          return if ShopifyCli::Config.get_section('analytics').key?('enabled')
-          msg = Context.message('core.monorail.consent_prompt')
+          return if ShopifyCli::Config.get_section("analytics").key?("enabled")
+          msg = Context.message("core.monorail.consent_prompt")
           opt = CLI::UI::Prompt.confirm(msg)
-          ShopifyCli::Config.set('analytics', 'enabled', opt)
+          ShopifyCli::Config.set("analytics", "enabled", opt)
         end
 
         def send_event(start_time, commands, args, err = nil)
           end_time = now_in_milliseconds
           headers = {
-            'Content-Type': 'application/json; charset=utf-8',
+            'Content-Type': "application/json; charset=utf-8",
             'X-Monorail-Edge-Event-Created-At-Ms': start_time.to_s,
             'X-Monorail-Edge-Event-Sent-At-Ms': end_time.to_s,
           }
@@ -74,7 +74,7 @@ module ShopifyCli
               ENDPOINT_URI.port,
               # timeouts for opening a connection, reading, writing (in seconds)
               open_timeout: 0.2, read_timeout: 0.2, write_timeout: 0.2,
-              use_ssl: ENDPOINT_URI.scheme == 'https'
+              use_ssl: ENDPOINT_URI.scheme == "https"
             ) do |http|
               payload = build_payload(start_time, end_time, commands, args, err)
               post = Net::HTTP::Post.new(ENDPOINT_URI.request_uri, headers)
@@ -91,8 +91,8 @@ module ShopifyCli
             schema_id: INVOCATIONS_SCHEMA,
             payload: {
               project_type: Project.current_project_type.to_s,
-              command: commands.join(' '),
-              args: args.join(' '),
+              command: commands.join(" "),
+              args: args.join(" "),
               time_start: start_time,
               time_end: end_time,
               total_time: end_time - start_time,
@@ -101,14 +101,16 @@ module ShopifyCli
               uname: RbConfig::CONFIG["host"],
               cli_version: ShopifyCli::VERSION,
               ruby_version: RUBY_VERSION,
+              is_employee: ShopifyCli::Shopifolk.acting_as_shopify_organization?,
             }.tap do |payload|
-              payload[:metadata] = JSON.dump(metadata) unless metadata.empty?
-
+              payload[:api_key] = metadata.delete(:api_key)
+              payload[:partner_id] = metadata.delete(:organization_id)
               if Project.has_current?
-                project = Project.current
+                project = Project.current(force_reload: true)
                 payload[:api_key] = project.env&.api_key
-                payload[:partner_id] = project.config['organization_id']
+                payload[:partner_id] = project.config["organization_id"]
               end
+              payload[:metadata] = JSON.dump(metadata) unless metadata.empty?
             end,
           }
         end

data/lib/shopify-cli/db.rb

@@ -1,5 +1,5 @@
-require 'pstore'
-require 'forwardable'
+require "pstore"
+require "forwardable"
 
 module ShopifyCli
   # Persists transient data like access tokens that may be cleared

data/lib/shopify-cli/feature.rb

@@ -6,7 +6,7 @@ module ShopifyCli
   # Feature flags will persist between runs so if the flag is enabled or disabled,
   # it will still be in that same state on the next cli invocation.
   class Feature
-    SECTION = 'features'
+    SECTION = "features"
 
     ##
     # ShopifyCli::Feature::Set is included on commands and projects to allow you to hide
@@ -87,8 +87,6 @@ module ShopifyCli
         ShopifyCli::Config.get_bool(SECTION, feature.to_s)
       end
 
-      private
-
       def set(feature, value)
         ShopifyCli::Config.set(SECTION, feature.to_s, value)
       end

data/lib/shopify-cli/form.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   class Form

data/lib/shopify-cli/git.rb

@@ -21,7 +21,7 @@ module ShopifyCli
       #   ShopifyCli::Git.sha
       #
       def sha(dir: Dir.pwd, ctx: Context.new)
-        rev_parse('HEAD', dir: dir, ctx: ctx)
+        rev_parse("HEAD", dir: dir, ctx: ctx)
       end
 
       ##
@@ -44,11 +44,11 @@ module ShopifyCli
       #
       def clone(repository, dest, ctx: Context.new)
         if Dir.exist?(dest)
-          ctx.abort(ctx.message('core.git.error.directory_exists'))
+          ctx.abort(ctx.message("core.git.error.directory_exists"))
         else
-          success_message = ctx.message('core.git.cloned', dest)
-          CLI::UI::Frame.open(ctx.message('core.git.cloning', repository, dest), success_text: success_message) do
-            clone_progress('clone', '--single-branch', repository, dest, ctx: ctx)
+          success_message = ctx.message("core.git.cloned", dest)
+          CLI::UI::Frame.open(ctx.message("core.git.cloning", repository, dest), success_text: success_message) do
+            clone_progress("clone", "--single-branch", repository, dest, ctx: ctx)
           end
         end
       end
@@ -69,11 +69,11 @@ module ShopifyCli
       #   branches = ShopifyCli::Git.branches(@ctx)
       #
       def branches(ctx)
-        output, status = ctx.capture2e('git', 'branch', '--list', '--format=%(refname:short)')
-        ctx.abort(ctx.message('core.git.error.no_branches_found')) unless status.success?
+        output, status = ctx.capture2e("git", "branch", "--list", "--format=%(refname:short)")
+        ctx.abort(ctx.message("core.git.error.no_branches_found")) unless status.success?
 
-        branches = if output == ''
-          ['master']
+        branches = if output == ""
+          ["master"]
         else
           output.split("\n")
         end
@@ -94,14 +94,14 @@ module ShopifyCli
       #   ShopifyCli::Git.init(@ctx)
       #
       def init(ctx)
-        output, status = ctx.capture2e('git', 'status')
+        output, status = ctx.capture2e("git", "status")
 
         unless status.success?
-          ctx.abort(ctx.message('core.git.error.repo_not_initiated'))
+          ctx.abort(ctx.message("core.git.error.repo_not_initiated"))
         end
 
-        if output.include?('No commits yet')
-          ctx.abort(ctx.message('core.git.error.no_commits_made'))
+        if output.include?("No commits yet")
+          ctx.abort(ctx.message("core.git.error.no_commits_made"))
         end
       end
 
@@ -115,18 +115,18 @@ module ShopifyCli
       end
 
       def rev_parse(*args, dir: nil, ctx: Context.new)
-        exec('rev-parse', *args, dir: dir, ctx: ctx)
+        exec("rev-parse", *args, dir: dir, ctx: ctx)
       end
 
       def clone_progress(*git_command, ctx:)
         CLI::UI::Progress.progress do |bar|
           msg = []
-          require 'open3'
+          require "open3"
 
-          success = Open3.popen3('git', *git_command, '--progress') do |_stdin, _stdout, stderr, thread|
+          success = Open3.popen3("git", *git_command, "--progress") do |_stdin, _stdout, stderr, thread|
             while (line = stderr.gets)
               msg << line.chomp
-              next unless line.strip.start_with?('Receiving objects:')
+              next unless line.strip.start_with?("Receiving objects:")
               percent = (line.match(/Receiving objects:\s+(\d+)/)[1].to_f / 100).round(2)
               bar.tick(set_percent: percent)
               next

data/lib/shopify-cli/helpers.rb

@@ -1,5 +1,5 @@
 module ShopifyCli
   module Helpers
-    autoload :Haikunator, 'shopify-cli/helpers/haikunator'
+    autoload :Haikunator, "shopify-cli/helpers/haikunator"
   end
 end

data/lib/shopify-cli/helpers/haikunator.rb

@@ -28,7 +28,7 @@ module ShopifyCli
     module Haikunator
       class << self
         def title
-          build(0, ' ')
+          build(0, " ")
         end
 
         def haikunate(token_range = 9999, delimiter = "-")

data/lib/shopify-cli/heroku.rb

@@ -1,9 +1,9 @@
 module ShopifyCli
   class Heroku
     DOWNLOAD_URLS = {
-      linux: 'https://cli-assets.heroku.com/heroku-linux-x64.tar.gz',
-      mac: 'https://cli-assets.heroku.com/heroku-darwin-x64.tar.gz',
-      windows: 'https://cli-assets.heroku.com/heroku-x64.exe',
+      linux: "https://cli-assets.heroku.com/heroku-linux-x64.tar.gz",
+      mac: "https://cli-assets.heroku.com/heroku-darwin-x64.tar.gz",
+      windows: "https://cli-assets.heroku.com/heroku-x64.exe",
     }
 
     def initialize(ctx)
@@ -12,33 +12,33 @@ module ShopifyCli
 
     def app
       return nil unless (app = git_remote)
-      app = app.split('/').last
-      app = app.split('.').first
+      app = app.split("/").last
+      app = app.split(".").first
       app
     end
 
     def authenticate
-      result = @ctx.system(heroku_command, 'login')
-      @ctx.abort(@ctx.message('core.heroku.error.authentication')) unless result.success?
+      result = @ctx.system(heroku_command, "login")
+      @ctx.abort(@ctx.message("core.heroku.error.authentication")) unless result.success?
     end
 
     def create_new_app
-      output, status = @ctx.capture2e(heroku_command, 'create')
-      @ctx.abort(@ctx.message('core.heroku.error.creation')) unless status.success?
+      output, status = @ctx.capture2e(heroku_command, "create")
+      @ctx.abort(@ctx.message("core.heroku.error.creation")) unless status.success?
       @ctx.puts(output)
     end
 
     def deploy(branch_to_deploy)
-      result = @ctx.system('git', 'push', '-u', 'heroku', "#{branch_to_deploy}:master")
-      @ctx.abort(@ctx.message('core.heroku.error.deploy')) unless result.success?
+      result = @ctx.system("git", "push", "-u", "heroku", "#{branch_to_deploy}:master")
+      @ctx.abort(@ctx.message("core.heroku.error.deploy")) unless result.success?
     end
 
     def download
       return if installed?
 
-      result = @ctx.system('curl', '-o', download_path, DOWNLOAD_URLS[@ctx.os], chdir: ShopifyCli.cache_dir)
-      @ctx.abort(@ctx.message('core.heroku.error.download')) unless result.success?
-      @ctx.abort(@ctx.message('core.heroku.error.download')) unless File.exist?(download_path)
+      result = @ctx.system("curl", "-o", download_path, DOWNLOAD_URLS[@ctx.os], chdir: ShopifyCli.cache_dir)
+      @ctx.abort(@ctx.message("core.heroku.error.download")) unless result.success?
+      @ctx.abort(@ctx.message("core.heroku.error.download")) unless File.exist?(download_path)
     end
 
     def install
@@ -47,22 +47,22 @@ module ShopifyCli
       result = if @ctx.windows?
         @ctx.system("\"#{download_path}\"")
       else
-        @ctx.system('tar', '-xf', download_path, chdir: ShopifyCli.cache_dir)
+        @ctx.system("tar", "-xf", download_path, chdir: ShopifyCli.cache_dir)
       end
-      @ctx.abort(@ctx.message('core.heroku.error.install')) unless result.success?
+      @ctx.abort(@ctx.message("core.heroku.error.install")) unless result.success?
 
       @ctx.rm(download_path)
     end
 
     def select_existing_app(app_name)
-      result = @ctx.system(heroku_command, 'git:remote', '-a', app_name)
+      result = @ctx.system(heroku_command, "git:remote", "-a", app_name)
 
-      msg = @ctx.message('core.heroku.error.could_not_select_app', app_name)
+      msg = @ctx.message("core.heroku.error.could_not_select_app", app_name)
       @ctx.abort(msg) unless result.success?
     end
 
     def whoami
-      output, status = @ctx.capture2e(heroku_command, 'whoami')
+      output, status = @ctx.capture2e(heroku_command, "whoami")
       return output.strip if status.success?
       nil
     end
@@ -70,7 +70,7 @@ module ShopifyCli
     private
 
     def download_filename
-      URI.parse(DOWNLOAD_URLS[@ctx.os]).path.split('/').last
+      URI.parse(DOWNLOAD_URLS[@ctx.os]).path.split("/").last
     end
 
     def download_path
@@ -78,33 +78,33 @@ module ShopifyCli
     end
 
     def git_remote
-      output, status = @ctx.capture2e('git', 'remote', 'get-url', 'heroku')
+      output, status = @ctx.capture2e("git", "remote", "get-url", "heroku")
       status.success? ? output : nil
     end
 
     def heroku_command
-      local_path = File.join(ShopifyCli.cache_dir, 'heroku', 'bin', 'heroku').to_s
+      local_path = File.join(ShopifyCli.cache_dir, "heroku", "bin", "heroku").to_s
       if File.exist?(local_path)
         local_path
       elsif @ctx.windows?
         # Check if Heroku exists in the Windows registry and run it from there
-        require 'win32/registry'
+        require "win32/registry"
         begin
           windows_path = Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\heroku') do |reg|
-            reg[''] # This reads the 'Default' registry key
+            reg[""] # This reads the 'Default' registry key
           end
 
-          File.join(windows_path, 'bin', 'heroku').to_s
+          File.join(windows_path, "bin", "heroku").to_s
         rescue
-          'heroku'
+          "heroku"
         end
       else
-        'heroku'
+        "heroku"
       end
     end
 
     def installed?
-      _output, status = @ctx.capture2e(heroku_command, '--version')
+      _output, status = @ctx.capture2e(heroku_command, "--version")
       status.success?
     rescue
       false

data/lib/shopify-cli/http_request.rb

@@ -1,15 +1,27 @@
-require 'net/http'
+require "net/http"
 
 module ShopifyCli
   class HttpRequest
-    def self.call(uri, body, variables, headers)
-      http = ::Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      req = ::Net::HTTP::Post.new(uri.request_uri)
-      req.body = JSON.dump(query: body.tr("\n", ""), variables: variables)
-      req['Content-Type'] = 'application/json'
-      headers.each { |header, value| req[header] = value }
-      http.request(req)
+    class << self
+      def post(uri, body, headers)
+        req = ::Net::HTTP::Post.new(uri.request_uri)
+        request(uri, body, headers, req)
+      end
+
+      def get(uri, body, headers)
+        req = ::Net::HTTP::Get.new(uri.request_uri)
+        request(uri, body, headers, req)
+      end
+
+      def request(uri, body, headers, req)
+        http = ::Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+
+        req.body = body unless body.nil?
+        req["Content-Type"] = "application/json"
+        headers.each { |header, value| req[header] = value }
+        http.request(req)
+      end
     end
   end
 end