shopify-cli 2.7.1 → 2.7.2

data/lib/shopify_cli/environment.rb

@@ -86,6 +86,10 @@ module ShopifyCLI
       )
     end
 
+    def self.auth_token(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::AUTH_TOKEN]
+    end
+
     def self.env_variable_truthy?(variable_name, env_variables: ENV)
       TRUTHY_ENV_VARIABLE_VALUES.include?(env_variables[variable_name.to_s])
     end

data/lib/shopify_cli/identity_auth.rb

@@ -68,6 +68,24 @@ module ShopifyCLI
       request_exchange_tokens
     end
 
+    def self.fetch_or_auth_partners_token(ctx:)
+      env_var_auth_token = Environment.auth_token
+      return env_var_auth_token if env_var_auth_token
+
+      ShopifyCLI::DB.get(:partners_exchange_token) do
+        IdentityAuth.new(ctx: ctx).authenticate
+        ShopifyCLI::DB.get(:partners_exchange_token)
+      end
+    end
+
+    def self.environment_auth_token?
+      !!Environment.auth_token
+    end
+
+    def self.authenticated?
+      environment_auth_token? || IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCLI::DB.exists?(key) }
+    end
+
     def reauthenticate
       return if refresh_exchange_tokens || refresh_access_tokens
       ctx.abort(ctx.message("core.identity_auth.error.reauthenticate", ShopifyCLI::TOOL_NAME))

data/lib/shopify_cli/messages/messages.rb

@@ -457,6 +457,7 @@ module ShopifyCLI
             not_authenticated: "Failed to authenticate",
           },
           login_prompt: "Please ensure you've logged in with {{command:%s login}} and try again",
+          token_authentication: "%s environment variable. We'll authenticate using its value as a token.",
         },
 
         options: {

data/lib/shopify_cli/partners_api.rb

@@ -61,18 +61,11 @@ module ShopifyCLI
       def api_client(ctx)
         new(
           ctx: ctx,
-          token: access_token(ctx),
+          token: IdentityAuth.fetch_or_auth_partners_token(ctx: ctx),
           url: "https://#{Environment.partners_domain}/api/cli/graphql",
         )
       end
 
-      def access_token(ctx)
-        ShopifyCLI::DB.get(:partners_exchange_token) do
-          IdentityAuth.new(ctx: ctx).authenticate
-          ShopifyCLI::DB.get(:partners_exchange_token)
-        end
-      end
-
       def auth_failure_info(ctx, error)
         if error.response
           headers = %w(www-authenticate x-request-id)

data/lib/shopify_cli/services/app/serve/node_service.rb

@@ -14,7 +14,7 @@ module ShopifyCLI
 
           def call
             project = ShopifyCLI::Project.current
-            url = host || ShopifyCLI::Tunnel.start(context)
+            url = host || ShopifyCLI::Tunnel.start(context, port: port)
             raise ShopifyCLI::Abort,
               context.message("core.app.serve.error.host_must_be_https") if url.match(/^https/i).nil?
             project.env.update(context, :host, url)

data/lib/shopify_cli/services/app/serve/rails_service.rb

@@ -14,7 +14,7 @@ module ShopifyCLI
 
           def call
             project = ShopifyCLI::Project.current
-            url = host || ShopifyCLI::Tunnel.start(context)
+            url = host || ShopifyCLI::Tunnel.start(context, port: port)
             raise ShopifyCLI::Abort,
               context.message("core.app.serve.error.host_must_be_https") if url.match(/^https/i).nil?
             project.env.update(context, :host, url)

data/lib/shopify_cli/tasks/ensure_authenticated.rb

@@ -4,9 +4,15 @@ module ShopifyCLI
   module Tasks
     class EnsureAuthenticated < ShopifyCLI::Task
       def call(ctx)
-        ctx.abort(
-          ctx.message("core.identity_auth.login_prompt", ShopifyCLI::TOOL_NAME)
-        ) unless ShopifyCLI::IdentityAuth::IDENTITY_ACCESS_TOKENS.all? { |key| ShopifyCLI::DB.exists?(key) }
+        return if ShopifyCLI::Environment.acceptance_test?
+        unless ShopifyCLI::IdentityAuth.authenticated?
+          raise ShopifyCLI::Abort,
+            ctx.message("core.identity_auth.login_prompt", ShopifyCLI::TOOL_NAME)
+        end
+        if ShopifyCLI::IdentityAuth.environment_auth_token?
+          ctx.puts(ctx.message("core.identity_auth.token_authentication",
+            ShopifyCLI::Constants::EnvironmentVariables::AUTH_TOKEN))
+        end
       end
     end
   end

data/lib/shopify_cli/theme/dev_server.rb

@@ -24,7 +24,7 @@ module ShopifyCLI
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, http_bind: "127.0.0.1", port: 9292, poll: false)
+        def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false)
           @ctx = ctx
           theme = DevelopmentTheme.new(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
@@ -36,7 +36,7 @@ module ShopifyCLI
           @app = LocalAssets.new(ctx, @app, theme: theme)
           @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, ignore_filter: ignore_filter)
           stopped = false
-          address = "http://#{http_bind}:#{port}"
+          address = "http://#{host}:#{port}"
 
           theme.ensure_exists!
 
@@ -70,7 +70,7 @@ module ShopifyCLI
           watcher.start
           WebServer.run(
             @app,
-            BindAddress: http_bind,
+            BindAddress: host,
             Port: port,
             Logger: logger,
             AccessLog: [],
@@ -83,7 +83,7 @@ module ShopifyCLI
         rescue Errno::EADDRINUSE
           abort_address_already_in_use(address)
         rescue Errno::EADDRNOTAVAIL
-          raise AddressBindingError, "Error binding to the address #{http_bind}."
+          raise AddressBindingError, "Error binding to the address #{host}."
         end
 
         def stop

data/lib/shopify_cli/theme/syncer/error_reporter.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Syncer
+      ##
+      # ShopifyCLI::Theme::Syncer::ErrorReporter allows delaying log of errors,
+      # mainly to not break the progress bar.
+      #
+      class ErrorReporter
+        attr_reader :ctx, :delayed_errors
+
+        def initialize(ctx)
+          @ctx = ctx
+          @has_any_error = false
+          @delay_errors = false
+          @delayed_errors = []
+        end
+
+        def disable!
+          @delay_errors = true
+        end
+
+        def enable!
+          @delay_errors = false
+          @delayed_errors.each { |error| report(error) }
+          @delayed_errors.clear
+        end
+
+        def report(error_message)
+          if @delay_errors
+            @delayed_errors << error_message
+          else
+            @has_any_error = true
+            @ctx.error(error_message)
+          end
+        end
+
+        def has_any_error?
+          @has_any_error
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/syncer/operation.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Syncer
+      class Operation
+        attr_accessor :method, :file
+
+        COLOR_BY_STATUS = {
+          error: :red,
+          synced: :green,
+          fixed: :cyan,
+        }
+
+        def initialize(ctx, method, file)
+          @ctx = ctx
+          @method = method
+          @file = file
+        end
+
+        def to_s
+          "#{method} #{file_path}"
+        end
+
+        def as_error_message
+          as_message_with(status: :error)
+        end
+
+        def as_synced_message
+          as_message_with(status: :synced)
+        end
+
+        def as_fix_message
+          as_message_with(status: :fixed)
+        end
+
+        def file_path
+          file&.relative_path.to_s
+        end
+
+        private
+
+        def as_message_with(status:)
+          status_color = COLOR_BY_STATUS[status]
+          status_text = @ctx.message("theme.serve.operation.status.#{status}").ljust(6)
+
+          "#{timestamp} {{#{status_color}:#{status_text}}} {{>}} {{blue:#{self}}}"
+        end
+
+        def timestamp
+          Time.now.strftime("%T")
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/syncer/standard_reporter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module ShopifyCLI
+  module Theme
+    class Syncer
+      ##
+      # ShopifyCLI::Theme::Syncer::StdReporter allows disabling/enabling
+      # messages reported in the standard output (ShopifyCLI::Context#puts).
+      #
+      class StandardReporter
+        attr_reader :ctx
+
+        def initialize(ctx)
+          @enabled = true
+          @ctx = ctx
+        end
+
+        def disable!
+          @enabled = false
+        end
+
+        def enable!
+          @enabled = true
+        end
+
+        def report(message)
+          ctx.puts(message) if @enabled
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/theme/syncer.rb

@@ -2,24 +2,31 @@
 require "thread"
 require "json"
 require "base64"
+require "forwardable"
+
+require_relative "syncer/error_reporter"
+require_relative "syncer/standard_reporter"
+require_relative "syncer/operation"
 
 module ShopifyCLI
   module Theme
     class Syncer
-      class Operation < Struct.new(:method, :file)
-        def to_s
-          "#{method} #{file&.relative_path}"
-        end
-      end
+      extend Forwardable
+
       API_VERSION = "unstable"
 
       attr_reader :checksums
       attr_accessor :ignore_filter
 
+      def_delegators :@error_reporter, :has_any_error?
+
       def initialize(ctx, theme:, ignore_filter: nil)
         @ctx = ctx
         @theme = theme
         @ignore_filter = ignore_filter
+        @error_reporter = ErrorReporter.new(ctx)
+        @standard_reporter = StandardReporter.new(ctx)
+        @reporters = [@error_reporter, @standard_reporter]
 
         # Queue of `Operation`s waiting to be picked up from a thread for processing.
         @queue = Queue.new
@@ -30,12 +37,19 @@ module ShopifyCLI
         # Mutex used to pause all threads when backing-off when hitting API rate limits
         @backoff_mutex = Mutex.new
 
-        # Allows delaying log of errors, mainly to not break the progress bar.
-        @delay_errors = false
-        @delayed_errors = []
-
         # Latest theme assets checksums. Updated on each upload.
         @checksums = {}
+
+        # Checksums of assets with errors. 
+        @error_checksums = []
+      end
+
+      def lock_io!
+        @reporters.each { |reporter| reporter.disable! }
+      end
+
+      def unlock_io!
+        @reporters.each { |reporter| reporter.enable! }
       end
 
       def enqueue_updates(files)
@@ -103,25 +117,14 @@ module ShopifyCLI
               break if operation.nil? # shutdown was called
               perform(operation)
             rescue Exception => e
-              report_error(
-                "{{red:ERROR}} {{blue:#{operation}}}: #{e}" +
-                (@ctx.debug? ? "\n\t#{e.backtrace.join("\n\t")}" : "")
-              )
+              error_suffix = ": #{e}"
+              error_suffix += + "\n\t#{e.backtrace.join("\n\t")}" if @ctx.debug?
+              report_error(operation, error_suffix)
             end
           end
         end
       end
 
-      def delay_errors!
-        @delay_errors = true
-      end
-
-      def report_errors!
-        @delay_errors = false
-        @delayed_errors.each { |error| report_error(error) }
-        @delayed_errors.clear
-      end
-
       def upload_theme!(delay_low_priority_files: false, delete: true, &block)
         fetch_checksums!
 
@@ -177,21 +180,27 @@ module ShopifyCLI
 
       private
 
+      def report_error(operation, error_suffix = "")
+        @error_checksums << @checksums[operation.file_path]
+        @error_reporter.report("#{operation.as_error_message}#{error_suffix}")
+      end
+
       def enqueue(method, file)
         raise ArgumentError, "file required" unless file
 
-        operation = Operation.new(method, @theme[file])
+        operation = Operation.new(@ctx, method, @theme[file])
 
         # Already enqueued
         return if @pending.include?(operation)
 
-        if @ignore_filter&.ignore?(operation.file.relative_path)
-          @ctx.debug("ignore #{operation.file.relative_path}")
+        if @ignore_filter&.ignore?(operation.file_path)
+          @ctx.debug("ignore #{operation.file_path}")
           return
         end
 
         if [:update, :get].include?(method) && operation.file.exist? && !file_has_changed?(operation.file)
-          @ctx.debug("skip #{operation}")
+          is_fixed = !!@error_checksums.delete(operation.file.checksum)
+          @standard_reporter.report(operation.as_fix_message) if is_fixed
           return
         end
 
@@ -206,16 +215,16 @@ module ShopifyCLI
 
         response = send(operation.method, operation.file)
 
+        @standard_reporter.report(operation.as_synced_message)
+
         # Check if the API told us we're near the rate limit
         if !backingoff? && (limit = response["x-shopify-shop-api-call-limit"])
           used, total = limit.split("/").map(&:to_i)
           backoff_if_near_limit!(used, total)
         end
       rescue ShopifyCLI::API::APIRequestError => e
-        report_error(
-          "{{red:ERROR}} {{blue:#{operation}}}:\n  " +
-          parse_api_errors(e).join("\n  ")
-        )
+        error_suffix = ":\n  " + parse_api_errors(e).join("\n  ")
+        report_error(operation, error_suffix)
       ensure
         @pending.delete(operation)
       end
@@ -295,14 +304,6 @@ module ShopifyCLI
         file.checksum != @checksums[file.relative_path.to_s]
       end
 
-      def report_error(error)
-        if @delay_errors
-          @delayed_errors << error
-        else
-          @ctx.puts(error)
-        end
-      end
-
       def parse_api_errors(exception)
         parsed_body = JSON.parse(exception&.response&.body)
         message = parsed_body.dig("errors", "asset") || parsed_body["message"] || exception.message

data/lib/shopify_cli/theme/theme.rb

@@ -162,26 +162,38 @@ module ShopifyCLI
         }
       end
 
-      def self.all(ctx, root: nil)
-        _status, body = AdminAPI.rest_request(
-          ctx,
-          shop: AdminAPI.get_shop_or_abort(ctx),
-          path: "themes.json",
-          api_version: "unstable",
-        )
+      class << self
+        def all(ctx, root: nil)
+          _status, body = fetch_themes(ctx)
+
+          body["themes"]
+            .sort_by { |theme_attrs| Time.parse(theme_attrs["updated_at"]) }
+            .reverse
+            .map { |theme_attrs| new(ctx, root: root, **allowed_attrs(theme_attrs)) }
+        end
+
+        def live(ctx, root: nil)
+          _status, body = fetch_themes(ctx)
 
-        body["themes"]
-          .sort_by { |attributes| Time.parse(attributes["updated_at"]) }
-          .reverse
-          .map do |attributes|
-            new(
-              ctx,
-              root: root,
-              id: attributes["id"],
-              name: attributes["name"],
-              role: attributes["role"],
-            )
-          end
+          body["themes"]
+            .find { |theme_attrs| theme_attrs["role"] == "main" }
+            .tap { |theme_attrs| break new(ctx, root: root, **allowed_attrs(theme_attrs)) }
+        end
+
+        private
+
+        def allowed_attrs(attrs)
+          attrs.slice("id", "name", "role").transform_keys(&:to_sym)
+        end
+
+        def fetch_themes(ctx)
+          AdminAPI.rest_request(
+            ctx,
+            shop: AdminAPI.get_shop_or_abort(ctx),
+            path: "themes.json",
+            api_version: "unstable",
+          )
+        end
       end
 
       private

data/lib/shopify_cli/tunnel.rb

@@ -87,7 +87,7 @@ module ShopifyCLI
     #
     def auth(ctx, token)
       install(ctx)
-      ctx.system(ngrok_path, "authtoken", token)
+      ctx.system(ngrok_path(ctx), "authtoken", token)
     end
 
     ##
@@ -150,7 +150,7 @@ module ShopifyCLI
 
     def install(ctx)
       ngrok = "ngrok#{ctx.executable_file_extension}"
-      return if File.exist?(ngrok_path)
+      return if File.exist?(ngrok_path(ctx))
       check_prereq_command(ctx, "curl")
       check_prereq_command(ctx, ctx.linux? ? "unzip" : "tar")
       spinner = CLI::UI::SpinGroup.new
@@ -170,7 +170,7 @@ module ShopifyCLI
       spinner.wait
 
       # final check to see if ngrok is accessible
-      unless File.exist?(ngrok_path)
+      unless File.exist?(ngrok_path(ctx))
         ctx.abort(ctx.message("core.tunnel.error.ngrok", ngrok, ShopifyCLI.cache_dir))
       end
     end
@@ -182,12 +182,9 @@ module ShopifyCLI
       raise e.class, e.message
     end
 
-    def ngrok_path
-      File.join(ShopifyCLI.cache_dir, "ngrok")
-    end
-
-    def ngrok_command(port)
-      "\"#{ngrok_path}\" http -inspect=false -log=stdout -log-level=debug #{port}"
+    def ngrok_path(ctx)
+      ngrok = "ngrok#{ctx.executable_file_extension}"
+      File.join(ShopifyCLI.cache_dir, ngrok)
     end
 
     def seconds_to_hm(seconds)
@@ -195,7 +192,8 @@ module ShopifyCLI
     end
 
     def start_ngrok(ctx, port)
-      process = ShopifyCLI::ProcessSupervision.start(:ngrok, ngrok_command(port))
+      ngrok_command = "\"#{ngrok_path(ctx)}\" http -inspect=false -log=stdout -log-level=debug #{port}"
+      process = ShopifyCLI::ProcessSupervision.start(:ngrok, ngrok_command)
       log = fetch_url(ctx, process.log_path)
       [log.url, log.account]
     end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -275,12 +275,17 @@ files:
 - lib/project_types/script/commands/push.rb
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
+- lib/project_types/script/forms/ask_app.rb
+- lib/project_types/script/forms/ask_org.rb
+- lib/project_types/script/forms/ask_script_uuid.rb
 - lib/project_types/script/forms/create.rb
+- lib/project_types/script/forms/run_against_shopify_org.rb
 - lib/project_types/script/graphql/app_script_set.graphql
 - lib/project_types/script/graphql/get_app_scripts.graphql
 - lib/project_types/script/graphql/module_upload_url_generate.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
+- lib/project_types/script/layers/application/connect_app.rb
 - lib/project_types/script/layers/application/create_script.rb
 - lib/project_types/script/layers/application/extension_points.rb
 - lib/project_types/script/layers/application/project_dependencies.rb
@@ -308,7 +313,6 @@ files:
 - lib/project_types/script/layers/infrastructure/script_uploader.rb
 - lib/project_types/script/layers/infrastructure/service_locator.rb
 - lib/project_types/script/messages/messages.rb
-- lib/project_types/script/tasks/ensure_env.rb
 - lib/project_types/script/ui/error_handler.rb
 - lib/project_types/script/ui/printing_spinner.rb
 - lib/project_types/script/ui/strict_spinner.rb
@@ -454,6 +458,9 @@ files:
 - lib/shopify_cli/theme/ignore_filter.rb
 - lib/shopify_cli/theme/mime_type.rb
 - lib/shopify_cli/theme/syncer.rb
+- lib/shopify_cli/theme/syncer/error_reporter.rb
+- lib/shopify_cli/theme/syncer/operation.rb
+- lib/shopify_cli/theme/syncer/standard_reporter.rb
 - lib/shopify_cli/theme/theme.rb
 - lib/shopify_cli/transform_data_structure.rb
 - lib/shopify_cli/tunnel.rb