shopify-cli 1.6.0 → 1.7.0

data/lib/shopify-cli/partners_api.rb

@@ -1,4 +1,4 @@
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   ##
@@ -6,7 +6,7 @@ module ShopifyCli
   # schema.
   #
   class PartnersAPI < API
-    autoload :Organizations, 'shopify-cli/partners_api/organizations'
+    autoload :Organizations, "shopify-cli/partners_api/organizations"
 
     # Defines the environment variable that this API looks for to operate on local
     # services. If you set this environment variable in your shell then the partners
@@ -16,7 +16,7 @@ module ShopifyCli
     #
     #  SHOPIFY_APP_CLI_LOCAL_PARTNERS=1 shopify create
     #
-    LOCAL_DEBUG = 'SHOPIFY_APP_CLI_LOCAL_PARTNERS'
+    LOCAL_DEBUG = "SHOPIFY_APP_CLI_LOCAL_PARTNERS"
 
     class << self
       ##
@@ -52,7 +52,7 @@ module ShopifyCli
 
       def partners_url_for(organization_id, api_client_id, local_debug)
         if ShopifyCli::Shopifolk.acting_as_shopify_organization?
-          organization_id = 'internal'
+          organization_id = "internal"
         end
         "#{partners_endpoint(local_debug)}/#{organization_id}/apps/#{api_client_id}"
       end
@@ -65,7 +65,7 @@ module ShopifyCli
         authenticate(ctx)
         retry
       rescue API::APIRequestNotFoundError
-        ctx.puts(ctx.message('core.partners_api.error.account_not_found', ShopifyCli::TOOL_NAME))
+        ctx.puts(ctx.message("core.partners_api.error.account_not_found", ShopifyCli::TOOL_NAME))
       end
 
       def api_client(ctx)
@@ -86,7 +86,7 @@ module ShopifyCli
       def authenticate(ctx)
         OAuth.new(
           ctx: ctx,
-          service: 'identity',
+          service: "identity",
           client_id: cli_id,
           scopes: scopes.join(" "),
           request_exchange: partners_id,
@@ -94,30 +94,30 @@ module ShopifyCli
       end
 
       def partners_id
-        return '271e16d403dfa18082ffb3d197bd2b5f4479c3fc32736d69296829cbb28d41a6' if ENV[LOCAL_DEBUG].nil?
-        'df89d73339ac3c6c5f0a98d9ca93260763e384d51d6038da129889c308973978'
+        return "271e16d403dfa18082ffb3d197bd2b5f4479c3fc32736d69296829cbb28d41a6" if ENV[LOCAL_DEBUG].nil?
+        "df89d73339ac3c6c5f0a98d9ca93260763e384d51d6038da129889c308973978"
       end
 
       def cli_id
-        return 'fbdb2649-e327-4907-8f67-908d24cfd7e3' if ENV[LOCAL_DEBUG].nil?
-        'e5380e02-312a-7408-5718-e07017e9cf52'
+        return "fbdb2649-e327-4907-8f67-908d24cfd7e3" if ENV[LOCAL_DEBUG].nil?
+        "e5380e02-312a-7408-5718-e07017e9cf52"
       end
 
       def auth_endpoint
-        return 'https://accounts.shopify.com' if ENV[LOCAL_DEBUG].nil?
-        'https://identity.myshopify.io'
+        return "https://accounts.shopify.com" if ENV[LOCAL_DEBUG].nil?
+        "https://identity.myshopify.io"
       end
 
       def endpoint
-        return 'https://partners.shopify.com' if ENV[LOCAL_DEBUG].nil?
-        'https://partners.myshopify.io/'
+        return "https://partners.shopify.com" if ENV[LOCAL_DEBUG].nil?
+        "https://partners.myshopify.io/"
       end
 
       def partners_endpoint(local_debug)
         domain = if local_debug
-          'partners.myshopify.io'
+          "partners.myshopify.io"
         else
-          'partners.shopify.com'
+          "partners.shopify.com"
         end
         "https://#{domain}"
       end

data/lib/shopify-cli/partners_api/organizations.rb

@@ -3,26 +3,26 @@ module ShopifyCli
     class Organizations
       class << self
         def fetch_all(ctx)
-          resp = PartnersAPI.query(ctx, 'all_organizations')
-          (resp.dig('data', 'organizations', 'nodes') || []).map do |org|
-            org['stores'] = (org.dig('stores', 'nodes') || [])
+          resp = PartnersAPI.query(ctx, "all_organizations")
+          (resp.dig("data", "organizations", "nodes") || []).map do |org|
+            org["stores"] = (org.dig("stores", "nodes") || [])
             org
           end
         end
 
         def fetch(ctx, id:)
-          resp = PartnersAPI.query(ctx, 'find_organization', id: id)
-          org = resp.dig('data', 'organizations', 'nodes').first
+          resp = PartnersAPI.query(ctx, "find_organization", id: id)
+          org = resp.dig("data", "organizations", "nodes").first
           return nil if org.nil?
-          org['stores'] = (org.dig('stores', 'nodes') || [])
+          org["stores"] = (org.dig("stores", "nodes") || [])
           org
         end
 
         def fetch_with_app(ctx)
-          resp = PartnersAPI.query(ctx, 'all_orgs_with_apps')
-          (resp.dig('data', 'organizations', 'nodes') || []).map do |org|
-            org['stores'] = (org.dig('stores', 'nodes') || [])
-            org['apps'] = (org.dig('apps', 'nodes') || [])
+          resp = PartnersAPI.query(ctx, "all_orgs_with_apps")
+          (resp.dig("data", "organizations", "nodes") || []).map do |org|
+            org["stores"] = (org.dig("stores", "nodes") || [])
+            org["apps"] = (org.dig("apps", "nodes") || [])
             org
           end
         end

data/lib/shopify-cli/process_supervision.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module ShopifyCli
   ##
@@ -19,7 +19,7 @@ module ShopifyCli
     class << self
       def run_dir
         # is the directory where the pid and logfile are kept
-        File.join(ShopifyCli.cache_dir, 'sv')
+        File.join(ShopifyCli.cache_dir, "sv")
       end
 
       ##
@@ -36,7 +36,7 @@ module ShopifyCli
       #   will be nil if the process is not running.
       #
       def for_ident(identifier)
-        pid, time = File.read(File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.pid")).split(':')
+        pid, time = File.read(File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.pid")).split(":")
         new(identifier, pid: Integer(pid), time: time)
       rescue Errno::ENOENT
         nil
@@ -66,7 +66,7 @@ module ShopifyCli
           pid_file = new(identifier)
 
           # Make sure the file exists and is empty, otherwise Windows fails
-          File.open(pid_file.log_path, 'w') {}
+          File.open(pid_file.log_path, "w") {}
           pid = Process.spawn(
             *args,
             out: pid_file.log_path,
@@ -128,7 +128,7 @@ module ShopifyCli
       end
     end
 
-    def initialize(identifier, pid: nil, time: Time.now.strftime('%s')) # :nodoc:
+    def initialize(identifier, pid: nil, time: Time.now.strftime("%s")) # :nodoc:
       @identifier = identifier
       @pid = pid
       @time = time
@@ -204,13 +204,13 @@ module ShopifyCli
 
       # Windows does not handle SIGTERM, go straight to SIGKILL
       unless ctx.windows?
-        Process.kill('TERM', id)
+        Process.kill("TERM", id)
         50.times do
           sleep(0.1)
           break unless stat(id)
         end
       end
-      Process.kill('KILL', id) if stat(id)
+      Process.kill("KILL", id) if stat(id)
       sleep(0.1) if ctx.windows? # Give Windows a second to actually close the process
     end
 

data/lib/shopify-cli/project.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'shopify_cli'
+require "shopify_cli"
 
 module ShopifyCli
   ##
@@ -64,7 +64,7 @@ module ShopifyCli
       #
       def current_project_type
         return unless has_current?
-        current.config['project_type'].to_sym
+        current.config["project_type"].to_sym
       end
 
       ##
@@ -84,13 +84,13 @@ module ShopifyCli
       #   type = ShopifyCli::Project.current_project_type
       #
       def write(ctx, project_type:, organization_id:, **identifiers)
-        require 'yaml' # takes 20ms, so deferred as late as possible.
+        require "yaml" # takes 20ms, so deferred as late as possible.
         content = Hash[{ project_type: project_type, organization_id: organization_id.to_i }
           .merge(identifiers)
           .collect { |k, v| [k.to_s, v] }]
-        content['shopify_organization'] = true if Shopifolk.acting_as_shopify_organization?
+        content["shopify_organization"] = true if Shopifolk.acting_as_shopify_organization?
 
-        ctx.write('.shopify-cli.yml', YAML.dump(content))
+        ctx.write(".shopify-cli.yml", YAML.dump(content))
         clear
       end
 
@@ -113,7 +113,7 @@ module ShopifyCli
       def at(dir)
         proj_dir = directory(dir)
         unless proj_dir
-          raise(ShopifyCli::Abort, Context.message('core.project.error.not_in_project'))
+          raise(ShopifyCli::Abort, Context.message("core.project.error.not_in_project"))
         end
         @at ||= Hash.new { |h, k| h[k] = new(directory: k) }
         @at[proj_dir]
@@ -121,8 +121,8 @@ module ShopifyCli
 
       def __directory(curr)
         loop do
-          return nil if curr == '/' || /^[A-Z]:\/$/.match?(curr)
-          file = File.join(curr, '.shopify-cli.yml')
+          return nil if curr == "/" || /^[A-Z]:\/$/.match?(curr)
+          file = File.join(curr, ".shopify-cli.yml")
           return curr if File.exist?(file)
           curr = File.dirname(curr)
         end
@@ -168,15 +168,15 @@ module ShopifyCli
     #
     def config
       @config ||= begin
-        config = load_yaml_file('.shopify-cli.yml')
+        config = load_yaml_file(".shopify-cli.yml")
         unless config.is_a?(Hash)
-          raise ShopifyCli::Abort, Context.message('core.yaml.error.not_hash', '.shopify-cli.yml')
+          raise ShopifyCli::Abort, Context.message("core.yaml.error.not_hash", ".shopify-cli.yml")
         end
 
         # The app_type key was deprecated in favour of project_type, so replace it
-        if config.key?('app_type')
-          config['project_type'] = config['app_type']
-          config.delete('app_type')
+        if config.key?("app_type")
+          config["project_type"] = config["app_type"]
+          config.delete("app_type")
         end
 
         config
@@ -187,16 +187,16 @@ module ShopifyCli
 
     def load_yaml_file(relative_path)
       f = File.join(directory, relative_path)
-      require 'yaml' # takes 20ms, so deferred as late as possible.
+      require "yaml" # takes 20ms, so deferred as late as possible.
       begin
         YAML.load_file(f)
       rescue Psych::SyntaxError => e
-        raise(ShopifyCli::Abort, Context.message('core.yaml.error.invalid', relative_path, e.message))
+        raise(ShopifyCli::Abort, Context.message("core.yaml.error.invalid", relative_path, e.message))
       # rescue Errno::EACCES => e
       # TODO
       #   Dev::Helpers::EaccesHandler.diagnose_and_raise(f, e, mode: :read)
       rescue Errno::ENOENT
-        raise ShopifyCli::Abort, Context.message('core.yaml.error.not_found', f)
+        raise ShopifyCli::Abort, Context.message("core.yaml.error.not_found", f)
       end
     end
   end

data/lib/shopify-cli/project_type.rb

@@ -21,7 +21,7 @@ module ShopifyCli
       end
 
       def load_type(current_type, shallow = false)
-        filepath = File.join(ShopifyCli::ROOT, 'lib', 'project_types', current_type.to_s, 'cli.rb')
+        filepath = File.join(ShopifyCli::ROOT, "lib", "project_types", current_type.to_s, "cli.rb")
         return unless File.exist?(filepath)
         @shallow_load = shallow
         @current_type = current_type
@@ -32,7 +32,7 @@ module ShopifyCli
       end
 
       def load_all
-        Dir.glob(File.join(ShopifyCli::ROOT, 'lib', 'project_types', '*', 'cli.rb')).map do |filepath|
+        Dir.glob(File.join(ShopifyCli::ROOT, "lib", "project_types", "*", "cli.rb")).map do |filepath|
           load_type(filepath.split(File::Separator)[-2].to_sym, true)
         end
       end
@@ -74,7 +74,7 @@ module ShopifyCli
       def register_command(const, cmd)
         return if project_load_shallow
         Context.new.abort(
-          Context.message('core.project_type.error.cannot_override_core', cmd, const)
+          Context.message("core.project_type.error.cannot_override_core", cmd, const)
         ) if Commands.core_command?(cmd)
         Commands.register(const, cmd)
       end

data/lib/shopify-cli/resources.rb

@@ -1,5 +1,5 @@
 module ShopifyCli
   module Resources
-    autoload :EnvFile, 'shopify-cli/resources/env_file'
+    autoload :EnvFile, "shopify-cli/resources/env_file"
   end
 end

data/lib/shopify-cli/resources/env_file.rb

@@ -4,13 +4,13 @@ module ShopifyCli
   module Resources
     class EnvFile
       include SmartProperties
-      FILENAME = '.env'
+      FILENAME = ".env"
       KEY_MAP = {
-        'SHOPIFY_API_KEY' => :api_key,
-        'SHOPIFY_API_SECRET' => :secret,
-        'SHOP' => :shop,
-        'SCOPES' => :scopes,
-        'HOST' => :host,
+        "SHOPIFY_API_KEY" => :api_key,
+        "SHOPIFY_API_SECRET" => :secret,
+        "SHOP" => :shop,
+        "SCOPES" => :scopes,
+        "HOST" => :host,
       }
 
       class << self
@@ -72,7 +72,7 @@ module ShopifyCli
 
       def write(ctx)
         spin_group = CLI::UI::SpinGroup.new
-        spin_group.add(ctx.message('core.env_file.saving_header', FILENAME)) do |spinner|
+        spin_group.add(ctx.message("core.env_file.saving_header", FILENAME)) do |spinner|
           output = []
           KEY_MAP.each do |key, value|
             output << "#{key}=#{send(value)}" if send(value)
@@ -80,9 +80,9 @@ module ShopifyCli
           extra.each do |key, value|
             output << "#{key}=#{value}"
           end
-          ctx.print_task(ctx.message('core.env_file.saving', FILENAME))
+          ctx.print_task(ctx.message("core.env_file.saving", FILENAME))
           ctx.write(FILENAME, output.join("\n") + "\n")
-          spinner.update_title(ctx.message('core.env_file.saved', FILENAME))
+          spinner.update_title(ctx.message("core.env_file.saved", FILENAME))
         end
         spin_group.wait
       end

data/lib/shopify-cli/result.rb

@@ -191,7 +191,7 @@ module ShopifyCli
       #    Success.new(1).unwrap(0) => 1
       #
       def unwrap(*args, &block)
-        raise ArgumentError, "expected either a fallback value or a block" unless args.one? ^ block
+        raise ArgumentError, "expected either a fallback value or a block" unless (args.length == 1) ^ block
         @value
       end
     end
@@ -304,12 +304,12 @@ module ShopifyCli
       #
       #   Failure
       #     .new(RuntimeError.new)
-      #     .resuce { "All good! "}
+      #     .rescue { "All good! "}
       #     .success? # => true
       #
       #   Failure
       #     .new(RuntimeError.new)
-      #     .resuce { Failure.new("Still broken!") }
+      #     .rescue { Failure.new("Still broken!") }
       #     .success? # => false
       #
       def rescue(&block)
@@ -336,7 +336,7 @@ module ShopifyCli
       # * `ArgumentError` if both a fallback argument and a block is provided
       #
       def unwrap(*args, &block)
-        raise ArgumentError, "expected either a fallback value or a block" unless args.one? ^ block
+        raise ArgumentError, "expected either a fallback value or a block" unless (args.length == 1) ^ block
         block ? block.call(@error) : args.pop
       end
     end
@@ -397,14 +397,14 @@ module ShopifyCli
     #   end
     #
     def self.wrap(*values, &block)
-      raise ArgumentError, "expected either a value or a block" unless values.one? ^ block
+      raise ArgumentError, "expected either a value or a block" unless (values.length == 1) ^ block
 
-      if values.one?
+      if values.length == 1
         values.pop.yield_self do |value|
           case value
           when Result::Success, Result::Failure
             value
-          when Exception
+          when NilClass, Exception
             Result.failure(value)
           else
             Result.success(value)
@@ -414,7 +414,7 @@ module ShopifyCli
         ->(*args) do
           begin
             wrap(block.call(*args))
-          rescue => error
+          rescue Exception => error # rubocop:disable Lint/RescueException
             wrap(error)
           end
         end

data/lib/shopify-cli/shopifolk.rb

@@ -5,10 +5,10 @@ module ShopifyCli
   # The Shopifolk Feature flag will persist between runs so if the flag is enabled or disabled,
   # it will still be in that same state until the next class invocation.
   class Shopifolk
-    GCLOUD_CONFIG_FILE = File.expand_path('~/.config/gcloud/configurations/config_default')
-    DEV_PATH = '/opt/dev'
-    SECTION = 'core'
-    FEATURE_NAME = 'shopifolk'
+    GCLOUD_CONFIG_FILE = File.expand_path("~/.config/gcloud/configurations/config_default")
+    DEV_PATH = "/opt/dev"
+    SECTION = "core"
+    FEATURE_NAME = "shopifolk"
 
     class << self
       attr_writer :acting_as_shopify_organization
@@ -25,8 +25,6 @@ module ShopifyCli
       #     ShopifyCli::Shopifolk.check
       #
       def check
-        return false unless ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
-
         ShopifyCli::Shopifolk.new.shopifolk?
       end
 
@@ -35,7 +33,7 @@ module ShopifyCli
       end
 
       def acting_as_shopify_organization?
-        !!@acting_as_shopify_organization || (Project.has_current? && Project.current.config['shopify_organization'])
+        !!@acting_as_shopify_organization || (Project.has_current? && Project.current.config["shopify_organization"])
       end
 
       def reset
@@ -52,7 +50,6 @@ module ShopifyCli
     # a valid google cloud config file with email ending in "@shopify.com"
     #
     def shopifolk?
-      return false unless ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
       return true if Feature.enabled?(FEATURE_NAME)
 
       if shopifolk_by_gcloud? && shopifolk_by_dev?
@@ -67,7 +64,7 @@ module ShopifyCli
     private
 
     def shopifolk_by_gcloud?
-      ini&.dig("[#{SECTION}]", 'account')&.match?(/@shopify.com\z/)
+      ini&.dig("[#{SECTION}]", "account")&.match?(/@shopify.com\z/)
     end
 
     def shopifolk_by_dev?