shopify-cli 1.6.0 → 1.7.0

data/lib/project_types/theme/tasks/ensure_themekit_installed.rb

@@ -1,29 +1,29 @@
 module Theme
   module Tasks
     class EnsureThemekitInstalled < ShopifyCli::Task
-      URL = 'https://shopify-themekit.s3.amazonaws.com/releases/latest.json'
+      URL = "https://shopify-themekit.s3.amazonaws.com/releases/latest.json"
       OSMAP = {
-        mac: 'darwin-amd64',
-        linux: 'linux-amd64',
-        windows: 'windows-amd64',
+        mac: "darwin-amd64",
+        linux: "linux-amd64",
+        windows: "windows-amd64",
       }
       VERSION_CHECK_INTERVAL = 604800
-      VERSION_CHECK_SECTION = 'themekit_version_check'
-      LAST_CHECKED_AT_FIELD = 'last_checked_at'
+      VERSION_CHECK_SECTION = "themekit_version_check"
+      LAST_CHECKED_AT_FIELD = "last_checked_at"
 
       def call(ctx)
         _out, stat = ctx.capture2e(Themekit::THEMEKIT)
         unless stat.success?
-          CLI::UI::Frame.open(ctx.message('theme.tasks.ensure_themekit_installed.installing_themekit')) do
+          CLI::UI::Frame.open(ctx.message("theme.tasks.ensure_themekit_installed.installing_themekit")) do
             install_themekit(ctx)
           end
         end
 
         now = Time.now.to_i
         if ShopifyCli::Feature.enabled?(:themekit_auto_update) && (time_of_last_check + VERSION_CHECK_INTERVAL) < now
-          CLI::UI::Frame.open(ctx.message('theme.tasks.ensure_themekit_installed.updating_themekit')) do
+          CLI::UI::Frame.open(ctx.message("theme.tasks.ensure_themekit_installed.updating_themekit")) do
             unless Themekit.update(ctx)
-              ctx.abort(ctx.message('theme.tasks.ensure_themekit_installed.errors.update_fail'))
+              ctx.abort(ctx.message("theme.tasks.ensure_themekit_installed.errors.update_fail"))
             end
             update_time_of_last_check(now)
           end
@@ -33,32 +33,32 @@ module Theme
       private
 
       def install_themekit(ctx)
-        require 'json'
-        require 'fileutils'
-        require 'digest'
-        require 'open-uri'
+        require "json"
+        require "fileutils"
+        require "digest"
+        require "open-uri"
 
         begin
           begin
             releases = JSON.parse(Net::HTTP.get(URI(URL)))
             release = releases["platforms"].find { |r| r["name"] == OSMAP[ctx.os] }
           rescue
-            ctx.abort(ctx.message('theme.tasks.ensure_themekit_installed.errors.releases_fail'))
+            ctx.abort(ctx.message("theme.tasks.ensure_themekit_installed.errors.releases_fail"))
           end
 
-          ctx.puts(ctx.message('theme.tasks.ensure_themekit_installed.downloading', releases['version']))
-          _out, stat = ctx.capture2e('curl', '-o', Themekit::THEMEKIT, release["url"])
-          ctx.abort(ctx.message('theme.tasks.ensure_themekit_installed.errors.write_fail')) unless stat.success?
+          ctx.puts(ctx.message("theme.tasks.ensure_themekit_installed.downloading", releases["version"]))
+          _out, stat = ctx.capture2e("curl", "-o", Themekit::THEMEKIT, release["url"])
+          ctx.abort(ctx.message("theme.tasks.ensure_themekit_installed.errors.write_fail")) unless stat.success?
 
-          ctx.puts(ctx.message('theme.tasks.ensure_themekit_installed.verifying'))
-          if Digest::MD5.file(Themekit::THEMEKIT) == release['digest']
+          ctx.puts(ctx.message("theme.tasks.ensure_themekit_installed.verifying"))
+          if Digest::MD5.file(Themekit::THEMEKIT) == release["digest"]
             FileUtils.chmod("+x", Themekit::THEMEKIT)
-            ctx.puts(ctx.message('theme.tasks.ensure_themekit_installed.successful'))
+            ctx.puts(ctx.message("theme.tasks.ensure_themekit_installed.successful"))
 
-            auto = CLI::UI.confirm(ctx.message('theme.tasks.ensure_themekit_installed.auto_update'))
+            auto = CLI::UI.confirm(ctx.message("theme.tasks.ensure_themekit_installed.auto_update"))
             ShopifyCli::Feature.set(:themekit_auto_update, auto)
           else
-            ctx.abort(ctx.message('theme.tasks.ensure_themekit_installed.errors.digest_fail'))
+            ctx.abort(ctx.message("theme.tasks.ensure_themekit_installed.errors.digest_fail"))
           end
         rescue StandardError, ShopifyCli::Abort => e
           FileUtils.rm(Themekit::THEMEKIT) if File.exist?(Themekit::THEMEKIT)

data/lib/project_types/theme/themekit.rb

@@ -12,7 +12,7 @@ module Theme
       end
 
       def connect(ctx, store:, password:, themeid:, env:)
-        command = build_command('get', env)
+        command = build_command("get", env)
         command << "--password=#{password}"
         command << "--store=#{store}"
         command << "--themeid=#{themeid}"
@@ -22,7 +22,7 @@ module Theme
       end
 
       def create(ctx, password:, store:, name:, env:)
-        command = build_command('new', env)
+        command = build_command("new", env)
         command << "--password=#{password}"
         command << "--store=#{store}"
         command << "--name=#{name}"
@@ -33,11 +33,11 @@ module Theme
 
       def deploy(ctx, flags: nil, env:)
         unless push(ctx, flags: flags, env: env)
-          ctx.abort(ctx.message('theme.deploy.push_fail'))
+          ctx.abort(ctx.message("theme.deploy.push_fail"))
         end
-        ctx.done(ctx.message('theme.deploy.info.pushed'))
+        ctx.done(ctx.message("theme.deploy.info.pushed"))
 
-        command = build_command('publish', env)
+        command = build_command("publish", env)
         (command << flags).compact!
         command.flatten!
 
@@ -46,7 +46,7 @@ module Theme
       end
 
       def generate_env(ctx, store:, password:, themeid:, env:)
-        command = build_command('configure', env)
+        command = build_command("configure", env)
         command << "--password=#{password}"
         command << "--store=#{store}"
         command << "--themeid=#{themeid}"
@@ -56,7 +56,7 @@ module Theme
       end
 
       def push(ctx, files: nil, flags: nil, remove: false, env:)
-        action = remove ? 'remove' : 'deploy'
+        action = remove ? "remove" : "deploy"
         command = build_command(action, env)
 
         (command << files << flags).compact!
@@ -75,28 +75,28 @@ module Theme
             path: "themes.json",
           )
         rescue ShopifyCli::API::APIRequestUnauthorizedError
-          ctx.abort(ctx.message('theme.themekit.query_themes.bad_password'))
+          ctx.abort(ctx.message("theme.themekit.query_themes.bad_password"))
         rescue StandardError
-          ctx.abort(ctx.message('theme.themekit.query_themes.not_connect'))
+          ctx.abort(ctx.message("theme.themekit.query_themes.not_connect"))
         end
 
-        resp[1]['themes'].map { |theme| [theme['name'], theme['id']] }.to_h
+        resp[1]["themes"].map { |theme| [theme["name"], theme["id"]] }.to_h
       end
 
       def serve(ctx, flags: nil, env:)
-        command = build_command('open', env)
+        command = build_command("open", env)
         out, stat = ctx.capture2e(*command)
         ctx.puts(out)
-        ctx.abort(ctx.message('theme.serve.open_fail')) unless stat.success?
+        ctx.abort(ctx.message("theme.serve.open_fail")) unless stat.success?
 
-        command = build_command('watch', env)
+        command = build_command("watch", env)
         (command << flags).compact!
         command.flatten!
         ctx.system(*command)
       end
 
       def update(ctx)
-        command = build_command('update')
+        command = build_command("update")
         ctx.system(*command)
       end
 
@@ -104,7 +104,7 @@ module Theme
 
       def build_command(action, env = nil)
         command = [THEMEKIT, action]
-        command << '--no-update-notifier'
+        command << "--no-update-notifier"
         command << "--env=#{env}" if env
         command
       end

data/lib/rubygems_plugin.rb

@@ -1,5 +1,5 @@
 Gem.post_uninstall do |uninstaller|
-  if uninstaller.spec.name == 'shopify-cli'
+  if uninstaller.spec.name == "shopify-cli"
     if RUBY_PLATFORM.match(/mingw32/)
       bat_path = File.dirname(RbConfig.ruby)
       bat = "#{bat_path}\\shopify.bat"
@@ -7,9 +7,9 @@ Gem.post_uninstall do |uninstaller|
       # delete the auto-generated batch script
       File.unlink(bat)
     else
-      require 'fileutils'
+      require "fileutils"
 
-      symlink = '/usr/local/bin/shopify'
+      symlink = "/usr/local/bin/shopify"
 
       # delete the symbolic link IFF it exists AND it does not point to a file
       # (i.e., it's been left hanging as a result of the uninstall, as expected)

data/lib/shopify-cli/admin_api.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   ##
@@ -6,8 +6,8 @@ module ShopifyCli
   # these concerns are taken care of.
   #
   class AdminAPI < API
-    autoload :PopulateResourceCommand, 'shopify-cli/admin_api/populate_resource_command'
-    autoload :Schema, 'shopify-cli/admin_api/schema'
+    autoload :PopulateResourceCommand, "shopify-cli/admin_api/populate_resource_command"
+    autoload :Schema, "shopify-cli/admin_api/schema"
 
     class << self
       ##
@@ -96,19 +96,19 @@ module ShopifyCli
         env = Project.current.env
         ShopifyCli::OAuth.new(
           ctx: ctx,
-          service: 'admin',
+          service: "admin",
           client_id: env.api_key,
           secret: env.secret,
           scopes: env.scopes,
           token_path: "/access_token",
-          options: { 'grant_options[]' => 'per user' },
+          options: { "grant_options[]" => "per user" },
         ).authenticate("https://#{shop}/admin/oauth")
       end
 
-      def api_client(ctx, api_version, shop, path: 'graphql.json')
+      def api_client(ctx, api_version, shop, path: "graphql.json")
         new(
           ctx: ctx,
-          auth_header: 'X-Shopify-Access-Token',
+          auth_header: "X-Shopify-Access-Token",
           token: admin_access_token(ctx, shop),
           url: "https://#{shop}/admin/api/#{fetch_api_version(ctx, api_version, shop)}/#{path}",
         )
@@ -125,13 +125,13 @@ module ShopifyCli
         return api_version unless api_version.nil?
         client = new(
           ctx: ctx,
-          auth_header: 'X-Shopify-Access-Token',
+          auth_header: "X-Shopify-Access-Token",
           token: admin_access_token(ctx, shop),
           url: "https://#{shop}/admin/api/unstable/graphql.json",
         )
-        versions = client.query('api_versions')['data']['publicApiVersions']
-        latest = versions.find { |version| version['displayName'].include?('Latest') }
-        latest['handle']
+        versions = client.query("api_versions")["data"]["publicApiVersions"]
+        latest = versions.find { |version| version["displayName"].include?("Latest") }
+        latest["handle"]
       end
     end
   end

data/lib/shopify-cli/admin_api/populate_resource_command.rb

@@ -1,5 +1,5 @@
-require 'shopify_cli'
-require 'optparse'
+require "shopify_cli"
+require "optparse"
 
 module ShopifyCli
   class AdminAPI
@@ -36,7 +36,7 @@ module ShopifyCli
 
         if @help
           output = display_parent_extended_help
-          output += "\n#{@ctx.message('core.populate.options.header', camel_case_resource_type)}\n"
+          output += "\n#{@ctx.message("core.populate.options.header", camel_case_resource_type)}\n"
           output += resource_options.help
           return @ctx.puts(output)
         end
@@ -45,7 +45,7 @@ module ShopifyCli
 
         if @silent
           spin_group = CLI::UI::SpinGroup.new
-          spin_group.add(@ctx.message('core.populate.populating', @count, camel_case_resource_type)) do |spinner|
+          spin_group.add(@ctx.message("core.populate.populating", @count, camel_case_resource_type)) do |spinner|
             populate
             spinner.update_title(completion_message)
           end
@@ -78,18 +78,18 @@ module ShopifyCli
           opts.on(
             "-c #{DEFAULT_COUNT}",
             "--count=#{DEFAULT_COUNT}",
-            @ctx.message('core.populate.options.count_help')
+            @ctx.message("core.populate.options.count_help")
           ) do |value|
             @count = value.to_i
           end
 
-          opts.on('-h', '--help', 'print help') do |value|
+          opts.on("-h", "--help", "print help") do |value|
             @help = value
           end
 
           opts.on("--silent") { |v| @silent = v }
 
-          opts.on('--shop=', '-s') { |value| @shop = value }
+          opts.on("--shop=", "-s") { |value| @shop = value }
         end
       end
 
@@ -100,12 +100,12 @@ module ShopifyCli
       end
 
       def input_options
-        schema.type(self.class.input_type)['inputFields'].each do |field|
+        schema.type(self.class.input_type)["inputFields"].each do |field|
           resource_options.on(
-            "--#{field['name']}=#{field['defaultValue']}",
-            field['description']
+            "--#{field["name"]}=#{field["defaultValue"]}",
+            field["description"]
           ) do |value|
-            @input[field['name']] = value
+            @input[field["name"]] = value
           end
         end
       end
@@ -120,14 +120,14 @@ module ShopifyCli
         resp = AdminAPI.query(
           @ctx, "create_#{snake_case_resource_type}", **kwargs
         )
-        @ctx.abort(resp['errors']) if resp['errors']
-        @ctx.done(message(resp['data'])) unless @silent
+        @ctx.abort(resp["errors"]) if resp["errors"]
+        @ctx.done(message(resp["data"])) unless @silent
       end
 
       def completion_message
         plural = @count > 1 ? "s" : ""
         @ctx.message(
-          'core.populate.completion_message',
+          "core.populate.completion_message",
           @count,
           "#{camel_case_resource_type}#{plural}",
           Project.current.env.shop,
@@ -142,7 +142,7 @@ module ShopifyCli
       end
 
       def price
-        format('%.2f', rand(1..10))
+        format("%.2f", rand(1..10))
       end
 
       private
@@ -155,7 +155,7 @@ module ShopifyCli
       end
 
       def camel_case_resource_type
-        @camel_case_resource_type ||= self.class.to_s.split('::').last
+        @camel_case_resource_type ||= self.class.to_s.split("::").last
       end
 
       def snake_case_resource_type
@@ -167,7 +167,7 @@ module ShopifyCli
       end
 
       def parent_command_klass
-        @parent_command_klass ||= Module.const_get(self.class.to_s.split('::')[0..-2].join('::'))
+        @parent_command_klass ||= Module.const_get(self.class.to_s.split("::")[0..-2].join("::"))
       end
     end
   end

data/lib/shopify-cli/admin_api/schema.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   class AdminAPI
@@ -7,7 +7,7 @@ module ShopifyCli
         def get(ctx)
           unless ShopifyCli::DB.exists?(:shopify_admin_schema)
             shop = Project.current.env.shop || get_shop(ctx)
-            schema = AdminAPI.query(ctx, 'admin_introspection', shop: shop)
+            schema = AdminAPI.query(ctx, "admin_introspection", shop: shop)
             ShopifyCli::DB.set(shopify_admin_schema: JSON.dump(schema))
           end
           # This is ruby magic for making a new hash with another hash.
@@ -30,7 +30,7 @@ module ShopifyCli
         data = self["data"]
         schema = data["__schema"]
         schema["types"].find do |object|
-          object['name'] == name.to_s
+          object["name"] == name.to_s
         end
       end
 

data/lib/shopify-cli/api.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   class API
@@ -19,7 +19,7 @@ module ShopifyCli
     class APIRequestThrottledError < APIRequestRetriableError; end
 
     def self.gid_to_id(gid)
-      gid.split('/').last
+      gid.split("/").last
     end
 
     def query(query_name, variables: {})
@@ -30,19 +30,19 @@ module ShopifyCli
       ctx.debug(resp)
       resp
     rescue API::APIRequestServerError, API::APIRequestUnexpectedError => e
-      ctx.puts(ctx.message('core.api.error.internal_server_error'))
-      ctx.debug(ctx.message('core.api.error.internal_server_error_debug', e.message))
+      ctx.puts(ctx.message("core.api.error.internal_server_error"))
+      ctx.debug(ctx.message("core.api.error.internal_server_error_debug", e.message))
     end
 
     def request(url:, body: nil, headers: {}, method: "POST")
       CLI::Kit::Util.begin do
         uri = URI.parse(url)
         unless uri.is_a?(URI::HTTP)
-          ctx.abort(ctx.message('core.api.error.invalid_url', url))
+          ctx.abort(ctx.message("core.api.error.invalid_url", url))
         end
 
         # we delay this require so as to avoid a performance hit on starting the CLI
-        require 'shopify-cli/http_request'
+        require "shopify-cli/http_request"
         headers = default_headers.merge(headers)
         response = if method == "POST"
           HttpRequest.post(uri, body, headers)
@@ -76,12 +76,12 @@ module ShopifyCli
     def load_query(name)
       project_type = ShopifyCli::Project.current_project_type
       project_file_path = File.join(
-        ShopifyCli::ROOT, 'lib', 'project_types', project_type.to_s, 'graphql', "#{name}.graphql"
+        ShopifyCli::ROOT, "lib", "project_types", project_type.to_s, "graphql", "#{name}.graphql"
       )
       if !project_type.nil? && File.exist?(project_file_path)
         File.read(project_file_path)
       else
-        File.read(File.join(ShopifyCli::ROOT, 'lib', 'graphql', "#{name}.graphql"))
+        File.read(File.join(ShopifyCli::ROOT, "lib", "graphql", "#{name}.graphql"))
       end
     end
 
@@ -93,9 +93,9 @@ module ShopifyCli
 
     def default_headers
       {
-        'User-Agent' => "Shopify App CLI #{ShopifyCli::VERSION} #{current_sha} | #{ctx.uname}",
+        "User-Agent" => "Shopify App CLI #{ShopifyCli::VERSION} #{current_sha} | #{ctx.uname}",
       }.tap do |headers|
-        headers['X-Shopify-Cli-Employee'] = '1' if Shopifolk.acting_as_shopify_organization?
+        headers["X-Shopify-Cli-Employee"] = "1" if Shopifolk.acting_as_shopify_organization?
       end.merge(auth_headers(token))
     end