shopify-cli 2.6.3 → 2.7.0

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

@@ -0,0 +1,48 @@
+module ShopifyCLI
+  module Services
+    module App
+      module Serve
+        class RailsService < BaseService
+          attr_accessor :host, :port, :context
+
+          def initialize(host:, port:, context:)
+            @host = host
+            @port = port
+            @context = context
+            super()
+          end
+
+          def call
+            project = ShopifyCLI::Project.current
+            url = host || ShopifyCLI::Tunnel.start(context)
+            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)
+            ShopifyCLI::Tasks::UpdateDashboardURLS.call(
+              context,
+              url: url,
+              callback_url: "/auth/shopify/callback",
+            )
+
+            if project.env.shop
+              project_url = "#{project.env.host}/login?shop=#{project.env.shop}"
+              context.puts("\n" + context.message("core.app.serve.open_info", project_url) + "\n")
+            end
+
+            CLI::UI::Frame.open(context.message("core.app.serve.running_server")) do
+              env = ShopifyCLI::Project.current.env.to_h
+              env.delete("HOST")
+              env["PORT"] = port.to_s
+              env["GEM_PATH"] = Rails::Gem.gem_path(context)
+              if context.windows?
+                context.system("ruby bin\\rails server", env: env)
+              else
+                context.system("bin/rails server", env: env)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/services/app/tunnel/auth_service.rb

@@ -0,0 +1,21 @@
+module ShopifyCLI
+  module Services
+    module App
+      module Tunnel
+        class AuthService < BaseService
+          attr_accessor :context, :token
+
+          def initialize(token:, context:)
+            @context = context
+            @token = token
+            super()
+          end
+
+          def call
+            ShopifyCLI::Tunnel.auth(context, token)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/services/app/tunnel/start_service.rb

@@ -0,0 +1,20 @@
+module ShopifyCLI
+  module Services
+    module App
+      module Tunnel
+        class StartService < BaseService
+          attr_accessor :context
+
+          def initialize(context:)
+            @context = context
+            super()
+          end
+
+          def call
+            ShopifyCLI::Tunnel.start(context)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/services/app/tunnel/stop_service.rb

@@ -0,0 +1,20 @@
+module ShopifyCLI
+  module Services
+    module App
+      module Tunnel
+        class StopService < BaseService
+          attr_accessor :context
+
+          def initialize(context:)
+            @context = context
+            super()
+          end
+
+          def call
+            ShopifyCLI::Tunnel.stop(context)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/services/base_service.rb

@@ -0,0 +1,13 @@
+module ShopifyCLI
+  module Services
+    class BaseService
+      def self.call(*args, **kwargs, &block)
+        new(*args, **kwargs).call(&block)
+      end
+
+      def call
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/shopify_cli/services/reporting_service.rb

@@ -0,0 +1,16 @@
+module ShopifyCLI
+  module Services
+    class ReportingService < BaseService
+      attr_reader :enable
+
+      def initialize(enable:)
+        @enable = enable
+        super()
+      end
+
+      def call
+        ReportingConfigurationController.enable_reporting(enable)
+      end
+    end
+  end
+end

data/lib/shopify_cli/services.rb

@@ -0,0 +1,37 @@
+module ShopifyCLI
+  module Services
+    autoload :BaseService, "shopify_cli/services/base_service"
+    autoload :ReportingService, "shopify_cli/services/reporting_service"
+
+    module App
+      module Serve
+        autoload :NodeService, "shopify_cli/services/app/serve/node_service"
+        autoload :RailsService, "shopify_cli/services/app/serve/rails_service"
+        autoload :PHPService, "shopify_cli/services/app/serve/php_service"
+      end
+
+      module Create
+        autoload :NodeService, "shopify_cli/services/app/create/node_service"
+        autoload :RailsService, "shopify_cli/services/app/create/rails_service"
+        autoload :PHPService, "shopify_cli/services/app/create/php_service"
+      end
+
+      module Deploy
+        module Heroku
+          autoload :NodeService, "shopify_cli/services/app/deploy/heroku/node_service"
+          autoload :RailsService, "shopify_cli/services/app/deploy/heroku/rails_service"
+          autoload :PHPService, "shopify_cli/services/app/deploy/heroku/php_service"
+        end
+      end
+
+      module Tunnel
+        autoload :StartService, "shopify_cli/services/app/tunnel/start_service"
+        autoload :StopService, "shopify_cli/services/app/tunnel/stop_service"
+        autoload :AuthService, "shopify_cli/services/app/tunnel/auth_service"
+      end
+
+      autoload :ConnectService, "shopify_cli/services/app/connect_service"
+      autoload :OpenService, "shopify_cli/services/app/open_service"
+    end
+  end
+end

data/lib/shopify_cli/theme/dev_server/local_assets.rb

@@ -4,7 +4,7 @@ module ShopifyCLI
   module Theme
     module DevServer
       class LocalAssets
-        ASSET_REGEX = %r{//cdn.shopify.com/s/.*?/(assets/.+\.(?:css|js))}
+        ASSET_REGEX = %r{//cdn\.shopify\.com/s/.+?/(assets/.+?\.(?:css|js))}
 
         class FileBody
           def initialize(path)

data/lib/shopify_cli/theme/dev_server/watcher.rb

@@ -9,12 +9,12 @@ module ShopifyCLI
       class Watcher
         include Observable
 
-        def initialize(ctx, theme:, syncer:, ignore_filter: nil)
+        def initialize(ctx, theme:, syncer:, ignore_filter: nil, poll: false)
           @ctx = ctx
           @theme = theme
           @syncer = syncer
           @ignore_filter = ignore_filter
-          @listener = Listen.to(@theme.root) do |modified, added, removed|
+          @listener = Listen.to(@theme.root, force_polling: poll) do |modified, added, removed|
             changed
             notify_observers(modified, added, removed)
           end

data/lib/shopify_cli/theme/dev_server.rb

@@ -17,15 +17,19 @@ require "pathname"
 module ShopifyCLI
   module Theme
     module DevServer
+      # Errors
+      Error = Class.new(StandardError)
+      AddressBindingError = Class.new(Error)
+
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, port: 9292)
+        def start(ctx, root, http_bind: "127.0.0.1", port: 9292, poll: false)
           @ctx = ctx
           theme = DevelopmentTheme.new(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
           @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter)
-          watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, ignore_filter: ignore_filter)
+          watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, ignore_filter: ignore_filter, poll: poll)
 
           # Setup the middleware stack. Mimics Rack::Builder / config.ru, but in reverse order
           @app = Proxy.new(ctx, theme: theme, syncer: @syncer)
@@ -74,6 +78,7 @@ module ShopifyCLI
           watcher.start
           WebServer.run(
             @app,
+            BindAddress: http_bind,
             Port: port,
             Logger: logger,
             AccessLog: [],
@@ -84,6 +89,8 @@ module ShopifyCLI
                ShopifyCLI::API::APIRequestUnauthorizedError
           @ctx.abort("You are not authorized to edit themes on #{theme.shop}.\n" \
                      "Make sure you are a user of that store, and allowed to edit themes.")
+        rescue Errno::EADDRNOTAVAIL
+          raise AddressBindingError, "Error binding to the address #{http_bind}."
         end
 
         def stop

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.6.3"
+  VERSION = "2.7.0"
 end

data/lib/shopify_cli.rb

@@ -96,11 +96,13 @@ module ShopifyCLI
     )
   end
 
+  autoload :AppTypeDetector, "shopify_cli/app_type_detector"
   autoload :Constants, "shopify_cli/constants"
   autoload :Environment, "shopify_cli/environment"
   autoload :AdminAPI, "shopify_cli/admin_api"
   autoload :API, "shopify_cli/api"
   autoload :Command, "shopify_cli/command"
+  autoload :CommandOptions, "shopify_cli/command_options"
   autoload :Commands, "shopify_cli/commands"
   autoload :Connect, "shopify_cli/connect"
   autoload :Context, "shopify_cli/context"
@@ -109,6 +111,7 @@ module ShopifyCLI
   autoload :Feature, "shopify_cli/feature"
   autoload :Form, "shopify_cli/form"
   autoload :Git, "shopify_cli/git"
+  autoload :GitHub, "shopify_cli/github"
   autoload :Helpers, "shopify_cli/helpers"
   autoload :Heroku, "shopify_cli/heroku"
   autoload :IdentityAuth, "shopify_cli/identity_auth"
@@ -121,13 +124,13 @@ module ShopifyCLI
   autoload :PartnersAPI, "shopify_cli/partners_api"
   autoload :ProcessSupervision, "shopify_cli/process_supervision"
   autoload :Project, "shopify_cli/project"
-  autoload :ProjectCommands, "shopify_cli/project_commands"
   autoload :ProjectType, "shopify_cli/project_type"
+  autoload :ReportingConfigurationController, "shopify_cli/reporting_configuration_controller"
   autoload :ResolveConstant, "shopify_cli/resolve_constant"
   autoload :Resources, "shopify_cli/resources"
   autoload :Result, "shopify_cli/result"
+  autoload :Services, "shopify_cli/services"
   autoload :Shopifolk, "shopify_cli/shopifolk"
-  autoload :SubCommand, "shopify_cli/sub_command"
   autoload :Task, "shopify_cli/task"
   autoload :Tasks, "shopify_cli/tasks"
   autoload :TransformDataStructure, "shopify_cli/transform_data_structure"

data/shopify-cli.gemspec

@@ -33,11 +33,7 @@ Gem::Specification.new do |spec|
   end
   spec.bindir = "bin"
   spec.require_paths = ["lib", "vendor"]
-  spec.extensions = ["ext/shopify-cli/extconf.rb"]
-  # Do NOT include `shopify` as a listed executable via `spec.executables`.
-  # `ext/shopify-cli/extconf.rb` will dynamically create a script and soft-link
-  # `/usr/local/bin/shopify` to that script, in order to "lock" the Ruby used to
-  # a single Ruby (useful for debugging in multi-Ruby environments)
+  spec.executables << "shopify"
 
   spec.add_development_dependency("bundler", "~> 2.2.2")
   spec.add_development_dependency("rake", "~> 12.3", ">= 12.3.3")
@@ -45,12 +41,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("bugsnag", "~> 6.22")
   spec.add_dependency("listen", "~> 3.7.0")
-
-  # Note: theme-check is _intentionally_ not specifying the third
-  # digit. We _want_ new features to make their way into new installs
-  # of the Shopify CLI. Otherwise updates need to be released twice.
-  #
-  # That is, DO USE ~> 1.X, DO NOT USE ~> 1.X.Y, this would unnecessarily
-  # fix the feature version.
-  spec.add_dependency("theme-check", "~> 1.7")
+  spec.add_dependency("theme-check", "~> 1.8.0")
 end

data/shopify-dev

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require_relative "./bin/load_shopify"
+
+exit(proc do
+  begin
+    ShopifyCLI::ErrorHandler.call do
+      ShopifyCLI::Core::EntryPoint.call(ARGV.dup)
+    end
+  rescue StandardError => error
+    ShopifyCLI::ErrorHandler.exception = error
+    if ShopifyCLI::Environment.print_stacktrace?
+      raise error
+    else
+      1
+    end
+  end
+end.call)

data/utilities/constants.rb

@@ -0,0 +1,7 @@
+module Utilities
+  module Constants
+    module Paths
+      ROOT = File.expand_path("..", __dir__)
+    end
+  end
+end

data/utilities/docker/container.rb

@@ -0,0 +1,104 @@
+require "open3"
+require "colorize"
+
+module Utilities
+  module Docker
+    class Container
+      SHOPIFY_PATH = "/usr/src/app"
+      SHOPIFY_BIN_PATH = "/usr/src/app/bin/shopify"
+
+      Error = Class.new(StandardError)
+
+      attr_reader :id, :env, :cwd, :xdg_config_home, :xdg_cache_home
+
+      def initialize(id:, env:, cwd:)
+        @id = id
+        @cwd = cwd
+        @xdg_config_home = File.join(cwd, ".config")
+        @xdg_cache_home = File.join(cwd, ".cache")
+        @env = env.merge({
+          "XDG_CONFIG_HOME" => @xdg_config_home,
+          "XDG_CACHE_HOME" => @xdg_cache_home,
+        })
+      end
+
+      def remove
+        _, stderr, stat = Open3.capture3(
+          "docker", "rm", "-f", @id
+        )
+        raise Error, stderr unless stat.success?
+      end
+
+      def capture_shopify(*args)
+        capture(*([SHOPIFY_BIN_PATH] + args))
+      end
+
+      def capture(*args, relative_dir: nil)
+        command = ["docker", "exec"]
+        cwd = if relative_dir.nil?
+          @cwd
+        else
+          File.join(@cwd, relative_dir)
+        end
+        command += ["-w", cwd]
+        @env.each do |env_name, env_value|
+          command += ["--env", "#{env_name}=#{env_value}"]
+        end
+        command << @id
+        command += args
+
+        out, err, stat = Open3.capture3(*command)
+        raise Error, err unless stat.success?
+        out
+      end
+
+      def exec_shopify(*args, relative_dir: nil)
+        exec(*([SHOPIFY_BIN_PATH] + args), relative_dir: relative_dir)
+      end
+
+      def exec(*args, relative_dir: nil)
+        if ARGV.include?("--verbose")
+          running_prefix = "Running command: #{args.join(" ")}"
+          STDOUT.puts(running_prefix.colorize(:yellow).bold)
+        end
+        command = ["docker", "exec"]
+        cwd = if relative_dir.nil?
+          @cwd
+        else
+          File.join(@cwd, relative_dir)
+        end
+        command += ["-w", cwd]
+        @env.each do |env_name, env_value|
+          command += ["--env", "#{env_name}=#{env_value}"]
+        end
+        command << @id
+        command += args
+
+        docker_prefix = "Docker (#{args.first}):"
+
+        if ARGV.include?("--verbose")
+          stat = Open3.popen3(*command) do |stdin, stdout, stderr, wait_thread|
+            Thread.new do
+              stdout.each { |l| STDOUT.puts("#{docker_prefix.colorize(:cyan).bold} #{l}") } unless stdout&.nil?
+            end
+            Thread.new do
+              stderr.each { |l| STDERR.puts("#{docker_prefix.colorize(:red).bold} #{l}") } unless stderr&.nil?
+            end
+            stdin.close
+
+            status = wait_thread.value
+
+            stdout.close
+            stderr.close
+
+            status
+          end
+          raise StandardError, "The command #{args.first} failed" unless stat.success?
+        else
+          out, stat = Open3.capture2e(*command)
+          raise Error, out unless stat.success?
+        end
+      end
+    end
+  end
+end

data/utilities/docker.rb

@@ -1,10 +1,43 @@
 require "open3"
+require "securerandom"
 
 module Utilities
   module Docker
+    autoload :Container, "docker/container"
+
     Error = Class.new(StandardError)
 
     class << self
+      def create_container(env: {})
+        id = SecureRandom.hex
+        cwd = "/tmp/#{SecureRandom.hex}"
+
+        build_image_if_needed
+
+        _, stderr, stat = Open3.capture3(
+          "docker", "run",
+          "-t", "-d",
+          "--name", id,
+          "--volume", "#{Shellwords.escape(root_dir)}:/usr/src/app",
+          image_tag,
+          "tail", "-f", "/dev/null"
+        )
+        raise Error, stderr unless stat.success?
+
+        _, stderr, stat = Open3.capture3(
+          "docker", "exec",
+          id,
+          "mkdir", "-p", cwd
+        )
+        raise Error, stderr unless stat.success?
+
+        Container.new(
+          id: id,
+          cwd: cwd,
+          env: env
+        )
+      end
+
       def run_and_rm_container(*args)
         build_image_if_needed
         system(
@@ -24,18 +57,27 @@ module Utilities
 
       def build_image_if_needed
         unless image_exists?(image_tag)
-          system("docker", "build", root_dir, "-t", image_tag) || abort
+          puts "Rebuilding the Docker image..."
+          _, err, stat = Open3.capture3(
+            "docker", "build", "-t", image_tag, "-f", File.join(root_dir, "Tests.dockerfile"), root_dir
+          )
+          raise Error, err unless stat.success?
         end
       end
 
       def image_tag
         gemfile_lock_path = File.expand_path("./Gemfile.lock", root_dir)
-        image_sha = Digest::SHA256.hexdigest(File.read(gemfile_lock_path))
+        dockerfile_path = File.expand_path("./Tests.dockerfile", root_dir)
+        fingerprintable_strings = [
+          File.read(gemfile_lock_path),
+          File.read(dockerfile_path),
+        ]
+        image_sha = Digest::SHA256.hexdigest(fingerprintable_strings.join("-"))
         "shopify-cli-#{image_sha}"
       end
 
       def image_exists?(tag)
-        _, stat = Open3.capture2(
+        _, stat = Open3.capture2e(
           "docker", "inspect",
           "--type=image",
           tag

data/utilities/utilities.rb

@@ -2,4 +2,5 @@ $LOAD_PATH.unshift(__dir__) unless $LOAD_PATH.include?(__dir__)
 
 module Utilities
   autoload :Docker, "docker"
+  autoload :Constants, "constants"
 end