shopify-cli 2.6.1 → 2.6.5

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,26 @@ module Utilities
 
       def build_image_if_needed
         unless image_exists?(image_tag)
-          system("docker", "build", root_dir, "-t", image_tag) || abort
+          _, 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.1
+  version: 2.6.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-20 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
@@ -356,8 +356,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 +370,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 +388,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 +405,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 +415,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 +459,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/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