shopify-cli 2.6.2 → 2.6.6

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", root_dir, "-t", image_tag
+          )
+          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("./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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.2
 description: |
   Shopify CLI helps you build Shopify apps faster. It quickly scaffolds Node.js
   and Ruby on Rails embedded apps. It also automates many common tasks in the
@@ -107,9 +107,9 @@ description: |
   and webhooks.
 email:
 - dev-tools-education@shopify.com
-executables: []
-extensions:
-- ext/shopify-cli/extconf.rb
+executables:
+- shopify
+extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
@@ -155,7 +155,6 @@ files:
 - docs/getting-started/upgrade/index.md
 - docs/help/start-app/index.md
 - docs/index.md
-- ext/shopify-cli/extconf.rb
 - ext/shopify-extensions/extconf.rb
 - ext/shopify-extensions/shopify_extensions.rb
 - ext/shopify-extensions/version
@@ -250,6 +249,7 @@ files:
 - lib/project_types/extension/tasks/create_extension.rb
 - lib/project_types/extension/tasks/fetch_specifications.rb
 - lib/project_types/extension/tasks/find_npm_packages.rb
+- lib/project_types/extension/tasks/find_package_from_json.rb
 - lib/project_types/extension/tasks/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/get_extensions.rb
@@ -300,7 +300,6 @@ files:
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
 - lib/project_types/script/graphql/app_script_set.graphql
-- lib/project_types/script/graphql/app_script_update_or_create.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
@@ -356,8 +355,11 @@ files:
 - lib/shopify_cli/admin_api/populate_resource_command.rb
 - lib/shopify_cli/admin_api/schema.rb
 - lib/shopify_cli/api.rb
+- lib/shopify_cli/app_type_detector.rb
 - lib/shopify_cli/command.rb
 - lib/shopify_cli/command/app_sub_command.rb
+- lib/shopify_cli/command_options.rb
+- lib/shopify_cli/command_options/command_serve_options.rb
 - lib/shopify_cli/commands.rb
 - lib/shopify_cli/commands/config.rb
 - lib/shopify_cli/commands/help.rb
@@ -367,6 +369,7 @@ files:
 - lib/shopify_cli/commands/populate/customer.rb
 - lib/shopify_cli/commands/populate/draft_order.rb
 - lib/shopify_cli/commands/populate/product.rb
+- lib/shopify_cli/commands/reporting.rb
 - lib/shopify_cli/commands/store.rb
 - lib/shopify_cli/commands/switch.rb
 - lib/shopify_cli/commands/system.rb
@@ -384,7 +387,6 @@ files:
 - lib/shopify_cli/db.rb
 - lib/shopify_cli/environment.rb
 - lib/shopify_cli/exception_reporter.rb
-- lib/shopify_cli/exception_reporter/permission_controller.rb
 - lib/shopify_cli/feature.rb
 - lib/shopify_cli/form.rb
 - lib/shopify_cli/git.rb
@@ -402,6 +404,7 @@ files:
 - lib/shopify_cli/migrator.rb
 - lib/shopify_cli/migrator/migration.rb
 - lib/shopify_cli/migrator/migrations/1631709766_noop.rb
+- lib/shopify_cli/migrator/migrations/1633691650_merge_reporting_configuration.rb
 - lib/shopify_cli/options.rb
 - lib/shopify_cli/packager.rb
 - lib/shopify_cli/partners_api.rb
@@ -411,10 +414,14 @@ files:
 - lib/shopify_cli/project.rb
 - lib/shopify_cli/project_commands.rb
 - lib/shopify_cli/project_type.rb
+- lib/shopify_cli/reporting_configuration_controller.rb
 - lib/shopify_cli/resolve_constant.rb
 - lib/shopify_cli/resources.rb
 - lib/shopify_cli/resources/env_file.rb
 - lib/shopify_cli/result.rb
+- lib/shopify_cli/services.rb
+- lib/shopify_cli/services/base_service.rb
+- lib/shopify_cli/services/reporting_service.rb
 - lib/shopify_cli/shopifolk.rb
 - lib/shopify_cli/sub_command.rb
 - lib/shopify_cli/task.rb
@@ -451,6 +458,7 @@ files:
 - shopify.fish
 - shopify.sh
 - utilities/docker.rb
+- utilities/docker/container.rb
 - utilities/utilities.rb
 - vendor/deps/cli-kit/REVISION
 - vendor/deps/cli-kit/lib/cli/kit.rb

data/ext/shopify-cli/extconf.rb

@@ -1,60 +0,0 @@
-require "rbconfig"
-require "fileutils"
-require "date"
-
-gem = File.expand_path("../../../", __FILE__)
-exe = File.join(gem, "bin", "shopify")
-
-# `--skip-cli-build` will be passed from the brew `shopify-cli.rb` formula, so
-# as to prevent this extension builder doing the script and sym-link creation;
-# the brew install process takes care of these itself - see
-# https://github.com/Shopify/homebrew-shopify/shopify-cli.rb
-if ARGV && ARGV[0]&.match(/skip-cli-build/)
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean
-
-    clean: ;
-
-    install: ;
-  MAKEFILE
-elsif RUBY_PLATFORM.match(/mswin|mingw|cygwin/)
-  bat_path = File.dirname(RbConfig.ruby)
-  bat = "#{bat_path}\\shopify.bat"
-
-  script_content = "#{RbConfig.ruby} -I '#{gem}' '#{exe}' %*"
-
-  FileUtils.mkdir_p(bat_path)
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean install
-
-    clean:
-    \t rm -f "#{bat}"
-
-    install: clean
-    \t echo "@ECHO OFF"> "#{bat}"
-    \t echo "#{script_content}">> "#{bat}"
-  MAKEFILE
-else
-  script = exe + ".sh"
-  symlink = "/usr/local/bin/shopify"
-
-  script_content = <<~SCRIPT
-    #!/usr/bin/env bash
-    #{RbConfig.ruby} -I #{gem} #{exe} $@
-  SCRIPT
-
-  File.write(script, script_content)
-  FileUtils.chmod("+x", script)
-
-  makefile_content = <<~MAKEFILE
-    .PHONY: clean install
-
-    clean:
-    \t@sudo rm -f #{symlink}
-
-    install: clean
-    \t@sudo ln -s #{script} #{symlink}
-  MAKEFILE
-end
-
-File.write("Makefile", makefile_content)

data/lib/shopify_cli/exception_reporter/permission_controller.rb

@@ -1,54 +0,0 @@
-module ShopifyCLI
-  module ExceptionReporter
-    module PermissionController
-      def self.report_error?(context: ShopifyCLI::Context.new)
-        CLI::UI::Prompt.ask(context.message("core.error_reporting.report_error.question")) do |handler|
-          handler.option(context.message("core.error_reporting.report_error.yes")) { |_| true }
-          handler.option(context.message("core.error_reporting.report_error.no")) { |_| false }
-        end
-      end
-
-      def self.automatic_reporting_prompted?
-        ShopifyCLI::Config.get_section(Constants::Config::Sections::ErrorTracking::NAME).key?(
-          Constants::Config::Sections::ErrorTracking::Fields::AUTOMATIC_REPORTING
-        )
-      end
-
-      def self.can_report_automatically?(context: ShopifyCLI::Context.new)
-        # If the terminal is not interactive we can't prompt the user.
-        return false unless ShopifyCLI::Environment.interactive?
-
-        if automatic_reporting_prompted?
-          automatic_reporting_enabled?
-        else
-          prompt_user(context: context)
-        end
-      end
-
-      def self.prompt_user(context:)
-        enable_automatic_tracking = CLI::UI::Prompt.ask(
-          context.message("core.error_reporting.enable_automatic_reporting_prompt.question")
-        ) do |handler|
-          handler.option(context.message("core.error_reporting.enable_automatic_reporting_prompt.yes")) { |_| true }
-          handler.option(context.message("core.error_reporting.enable_automatic_reporting_prompt.no")) { |_| false }
-        end
-
-        ShopifyCLI::Config.set(
-          Constants::Config::Sections::ErrorTracking::NAME,
-          Constants::Config::Sections::ErrorTracking::Fields::AUTOMATIC_REPORTING,
-          enable_automatic_tracking
-        )
-
-        enable_automatic_tracking
-      end
-
-      def self.automatic_reporting_enabled?
-        ShopifyCLI::Config.get_bool(
-          Constants::Config::Sections::ErrorTracking::NAME,
-          Constants::Config::Sections::ErrorTracking::Fields::AUTOMATIC_REPORTING,
-          default: false
-        )
-      end
-    end
-  end
-end