shopify-cli 1.6.0 → 1.9.1

data/lib/project_types/theme/commands/deploy.rb

@@ -5,14 +5,14 @@ module Theme
       prerequisite_task :ensure_themekit_installed
 
       options do |parser, flags|
-        parser.on('--env=ENV') { |env| flags[:env] = env }
-        parser.on('--allow-live') { flags['allow_live'] = true }
+        parser.on("--env=ENV") { |env| flags[:env] = env }
+        parser.on("--allow-live") { flags["allow_live"] = true }
       end
 
       def call(*)
-        CLI::UI::Frame.open(@ctx.message('theme.deploy.deploying')) do
-          unless CLI::UI::Prompt.confirm(@ctx.message('theme.deploy.confirmation'))
-            @ctx.abort(@ctx.message('theme.deploy.abort'))
+        CLI::UI::Frame.open(@ctx.message("theme.deploy.deploying")) do
+          unless CLI::UI::Prompt.confirm(@ctx.message("theme.deploy.confirmation"))
+            @ctx.abort(@ctx.message("theme.deploy.abort"))
           end
 
           if options.flags[:env]
@@ -23,15 +23,15 @@ module Theme
           flags = Themekit.add_flags(options.flags)
 
           unless Themekit.deploy(@ctx, flags: flags, env: env)
-            @ctx.abort(@ctx.message('theme.deploy.error'))
+            @ctx.abort(@ctx.message("theme.deploy.error"))
           end
         end
 
-        @ctx.done(@ctx.message('theme.deploy.info.deployed'))
+        @ctx.done(@ctx.message("theme.deploy.info.deployed"))
       end
 
       def self.help
-        ShopifyCli::Context.message('theme.deploy.help', ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("theme.deploy.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/project_types/theme/commands/generate.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module Theme
   module Commands
     class Generate < ShopifyCli::Command
       prerequisite_task :ensure_themekit_installed
 
-      subcommand :Env, 'env', Project.project_filepath('commands/generate/env')
+      subcommand :Env, "env", Project.project_filepath("commands/generate/env")
 
       def call(*)
         @ctx.puts(self.class.help)
       end
 
       def self.help
-        ShopifyCli::Context.message('theme.generate.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("theme.generate.help", ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/project_types/theme/commands/generate/env.rb

@@ -3,10 +3,10 @@ module Theme
     class Generate
       class Env < ShopifyCli::SubCommand
         options do |parser, flags|
-          parser.on('--store=STORE') { |url| flags[:store] = url }
-          parser.on('--password=PASSWORD') { |p| flags[:password] = p }
-          parser.on('--themeid=THEME_ID') { |id| flags[:themeid] = id }
-          parser.on('--env=ENV') { |env| flags[:env] = env }
+          parser.on("--store=STORE") { |url| flags[:store] = url }
+          parser.on("--password=PASSWORD") { |p| flags[:password] = p }
+          parser.on("--themeid=THEME_ID") { |id| flags[:themeid] = id }
+          parser.on("--env=ENV") { |env| flags[:env] = env }
         end
 
         def call(*)
@@ -20,19 +20,19 @@ module Theme
         end
 
         def self.help
-          ShopifyCli::Context.message('theme.generate.env.help', ShopifyCli::TOOL_NAME)
+          ShopifyCli::Context.message("theme.generate.env.help", ShopifyCli::TOOL_NAME)
         end
 
         private
 
         def fetch_credentials
-          unless File.exist?('config.yml')
+          unless File.exist?("config.yml")
             return nil
           end
 
-          config = YAML.load_file('config.yml')
-          store = config['development']['store']
-          password = config['development']['password']
+          config = YAML.load_file("config.yml")
+          store = config["development"]["store"]
+          password = config["development"]["password"]
 
           [store, password]
         end
@@ -40,9 +40,9 @@ module Theme
         def ask_store(default)
           store = options.flags[:store] ||
             if default
-              CLI::UI::Prompt.ask(@ctx.message('theme.generate.env.ask_store_default', default))
+              CLI::UI::Prompt.ask(@ctx.message("theme.generate.env.ask_store_default", default))
             else
-              CLI::UI::Prompt.ask(@ctx.message('theme.generate.env.ask_store'), allow_empty: false)
+              CLI::UI::Prompt.ask(@ctx.message("theme.generate.env.ask_store"), allow_empty: false)
             end
           return nil if store.empty?
           store
@@ -51,9 +51,9 @@ module Theme
         def ask_password(default)
           password = options.flags[:password] ||
             if default
-              CLI::UI::Prompt.ask(@ctx.message('theme.generate.env.ask_password_default', default))
+              CLI::UI::Prompt.ask(@ctx.message("theme.generate.env.ask_password_default", default))
             else
-              CLI::UI::Prompt.ask(@ctx.message('theme.generate.env.ask_password'), allow_empty: false)
+              CLI::UI::Prompt.ask(@ctx.message("theme.generate.env.ask_password"), allow_empty: false)
             end
           return nil if password.empty?
           password
@@ -65,9 +65,9 @@ module Theme
 
           themes = Themekit.query_themes(@ctx, store: store, password: password)
 
-          @ctx.abort(@ctx.message('theme.generate.env.no_themes', ShopifyCli::TOOL_NAME)) if themes.empty?
+          @ctx.abort(@ctx.message("theme.generate.env.no_themes", ShopifyCli::TOOL_NAME)) if themes.empty?
 
-          CLI::UI::Prompt.ask(@ctx.message('theme.generate.env.ask_theme')) do |handler|
+          CLI::UI::Prompt.ask(@ctx.message("theme.generate.env.ask_theme")) do |handler|
             themes.each do |name, id|
               handler.option(name) { id }
             end

data/lib/project_types/theme/commands/push.rb

@@ -5,16 +5,16 @@ module Theme
       prerequisite_task :ensure_themekit_installed
 
       options do |parser, flags|
-        parser.on('--remove') { flags['remove'] = true }
-        parser.on('--nodelete') { flags['nodelete'] = true }
-        parser.on('--allow-live') { flags['allow-live'] = true }
-        parser.on('--env=ENV') { |env| flags[:env] = env }
+        parser.on("--remove") { flags["remove"] = true }
+        parser.on("--nodelete") { flags["nodelete"] = true }
+        parser.on("--allow-live") { flags["allow-live"] = true }
+        parser.on("--env=ENV") { |env| flags[:env] = env }
       end
 
       def call(args, _name)
-        if options.flags['remove']
+        if options.flags["remove"]
           remove = true
-          options.flags.delete('remove')
+          options.flags.delete("remove")
         end
 
         if options.flags[:env]
@@ -25,30 +25,30 @@ module Theme
         flags = Themekit.add_flags(options.flags)
 
         if remove
-          CLI::UI::Frame.open(@ctx.message('theme.push.remove')) do
-            unless CLI::UI::Prompt.confirm(@ctx.message('theme.push.remove_confirm'))
-              @ctx.abort(@ctx.message('theme.push.remove_abort'))
+          CLI::UI::Frame.open(@ctx.message("theme.push.remove")) do
+            unless CLI::UI::Prompt.confirm(@ctx.message("theme.push.remove_confirm"))
+              @ctx.abort(@ctx.message("theme.push.remove_abort"))
             end
 
             unless Themekit.push(@ctx, files: args, flags: flags, remove: remove, env: env)
-              @ctx.abort(@ctx.message('theme.push.error.remove_error'))
+              @ctx.abort(@ctx.message("theme.push.error.remove_error"))
             end
           end
 
-          @ctx.done(@ctx.message('theme.push.info.remove', @ctx.root))
+          @ctx.done(@ctx.message("theme.push.info.remove", @ctx.root))
         else
-          CLI::UI::Frame.open(@ctx.message('theme.push.push')) do
+          CLI::UI::Frame.open(@ctx.message("theme.push.push")) do
             unless Themekit.push(@ctx, files: args, flags: flags, remove: remove, env: env)
-              @ctx.abort(@ctx.message('theme.push.error.push_error'))
+              @ctx.abort(@ctx.message("theme.push.error.push_error"))
             end
           end
 
-          @ctx.done(@ctx.message('theme.push.info.push', @ctx.root))
+          @ctx.done(@ctx.message("theme.push.info.push", @ctx.root))
         end
       end
 
       def self.help
-        ShopifyCli::Context.message('theme.push.help', ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("theme.push.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/project_types/theme/commands/serve.rb

@@ -5,9 +5,9 @@ module Theme
       prerequisite_task :ensure_themekit_installed
 
       options do |parser, flags|
-        parser.on('--env=ENV') { |env| flags[:env] = env }
-        parser.on('--allow-live') { flags['allow-live'] = true }
-        parser.on('--notify=FILES') { |files| flags['notify'] = files }
+        parser.on("--env=ENV") { |env| flags[:env] = env }
+        parser.on("--allow-live") { flags["allow-live"] = true }
+        parser.on("--notify=FILES") { |files| flags["notify"] = files }
       end
 
       def call(*)
@@ -18,13 +18,13 @@ module Theme
 
         flags = Themekit.add_flags(options.flags)
 
-        CLI::UI::Frame.open(@ctx.message('theme.serve.serve')) do
+        CLI::UI::Frame.open(@ctx.message("theme.serve.serve")) do
           Themekit.serve(@ctx, flags: flags, env: env)
         end
       end
 
       def self.help
-        ShopifyCli::Context.message('theme.serve.help', ShopifyCli::TOOL_NAME)
+        ShopifyCli::Context.message("theme.serve.help", ShopifyCli::TOOL_NAME)
       end
     end
   end

data/lib/project_types/theme/forms/connect.rb

@@ -5,14 +5,14 @@ module Theme
       flag_arguments :themeid, :password, :store, :env
 
       def ask
-        self.store ||= CLI::UI::Prompt.ask(ctx.message('theme.forms.ask_store'), allow_empty: false)
-        ctx.puts(ctx.message('theme.forms.connect.private_app', store))
-        self.password ||= CLI::UI::Prompt.ask(ctx.message('theme.forms.ask_password'), allow_empty: false)
+        self.store ||= CLI::UI::Prompt.ask(ctx.message("theme.forms.ask_store"), allow_empty: false)
+        ctx.puts(ctx.message("theme.forms.connect.private_app", store))
+        self.password ||= CLI::UI::Prompt.ask(ctx.message("theme.forms.ask_password"), allow_empty: false)
 
         errors = []
         errors << "store" if store.strip.empty?
         errors << "password" if password.strip.empty?
-        ctx.abort(ctx.message('theme.forms.errors', errors.join(", ").capitalize)) unless errors.empty?
+        ctx.abort(ctx.message("theme.forms.errors", errors.join(", ").capitalize)) unless errors.empty?
 
         self.themeid, self.name = ask_theme(store: store, password: password, themeid: themeid)
       end

data/lib/project_types/theme/forms/create.rb

@@ -5,17 +5,17 @@ module Theme
       flag_arguments :title, :password, :store, :env
 
       def ask
-        self.store ||= CLI::UI::Prompt.ask(ctx.message('theme.forms.ask_store'), allow_empty: false)
-        ctx.puts(ctx.message('theme.forms.create.private_app', store))
-        self.password ||= CLI::UI::Prompt.ask(ctx.message('theme.forms.ask_password'), allow_empty: false)
-        self.title ||= CLI::UI::Prompt.ask(ctx.message('theme.forms.create.ask_title'), allow_empty: false)
+        self.store ||= CLI::UI::Prompt.ask(ctx.message("theme.forms.ask_store"), allow_empty: false)
+        ctx.puts(ctx.message("theme.forms.create.private_app", store))
+        self.password ||= CLI::UI::Prompt.ask(ctx.message("theme.forms.ask_password"), allow_empty: false)
+        self.title ||= CLI::UI::Prompt.ask(ctx.message("theme.forms.create.ask_title"), allow_empty: false)
         self.name = self.title.downcase.split(" ").join("_")
 
         errors = []
         errors << "store" if store.strip.empty?
         errors << "password" if password.strip.empty?
         errors << "title" if title.strip.empty?
-        ctx.abort(ctx.message('theme.forms.errors', errors.join(", ").capitalize)) unless errors.empty?
+        ctx.abort(ctx.message("theme.forms.errors", errors.join(", ").capitalize)) unless errors.empty?
       end
     end
   end

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