shopify-cli 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c41d92242b50f6d361cd7ad137799bffe507581437f25a1eb1bd183cc206c63
-  data.tar.gz: '06887cc6c8442a754bf9a9d60e10968c5c59325b98a50d452e6f849a80db7226'
+  metadata.gz: c2b12fdb1aec476c1b05eee2e33817d3636f76927d4cdc5700347344b687e28d
+  data.tar.gz: 83411b72925dbe120a4c89fa1d715f3fe61a7596ed4d356f03b537ea6bb31481
 SHA512:
-  metadata.gz: 23260cf14a8e617539fedb1bddf1beb5f91604fc5db87d147335649dd01f7fb9859c87da6a01bba5c19743dabc8aa0c1c55bf269cdaec57943f076a88fffcff9
-  data.tar.gz: eddd93f62bb2bd7f8364c4c423847568838d08fdbf77f777f03f2adb9fbfa67f7a3af83bedc48025f217e1787288f5b6e10424e5dbdad1156a8faaf80ddb041c
+  metadata.gz: 3557bcc2a93f0775a294b0c2d1c784949e84602155de21d3d3db89237ae7e50bbf3ba591bdc329ca6074ae27178444c6c939cd42ac361dcb5a9d50a9de4e8567
+  data.tar.gz: 78ebf53316d6bebf24bb04832a5b052512d46df48f9f71cc3f388305c6210cd0ec32b2f1ba9151cd80d8199a26142c8684775f93198d7d9b61bf1291d1d39732

data/.github/CODEOWNERS

@@ -1 +1,4 @@
 *       @shopify/platform-dev-tools-education
+
+/lib/project_types/script/ @shopify/scripts
+/test/project_types/script/ @shopify/scripts

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+Version 0.9.2
+------
+* Rebased to master, to pull in 7+ Pull Requests
+* Updates to dependencies to package files (updated Ruby version)
+
 Version 0.9.1
 ------
 * Updated required Ruby version for the CLI

data/RELEASING.md

@@ -13,7 +13,7 @@
 
 5. Commit the changes with a commit message like "Packaging for release X.Y.Z"
    ```
-   $ git commit -am "Packaging for release X.Y.Z"
+   $ git commit -am "Packaging for release vX.Y.Z"
    ```
 
 6. Push out the changes
@@ -21,7 +21,7 @@
    $ git push -u origin release_X_Y_Z
    ```
 
-7. Open a PR for the branch, get necessary approvals from code owners and merge into main branch
+7. Open a PR for the branch, get necessary approvals from code owners and merge into main branch. Note that the PR title will be the release note in Shipit, so make sure it mentions the release
 
 8. Deploy using Shipit
 
@@ -34,8 +34,8 @@
 10. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
     * create a branch named `release_X_Y_Z_of_shopify-cli`
     * update the brew formula in `shopify-cli.rb` with the generated formula in `packaging/builds/X.Y.Z/` in the `Shopify/shopify-app-cli` repo (from step 9)
-    * commit the change and create a PR
-    * when PR is approved, merge into main branch of `Shopify/homebrew-shopify` repository
+    * commit the change and create a PR on the [Shopify Homebrew repository](https://github.com/Shopify/homebrew-shopify)
+    * when PR is approved, merge into main branch
 
 11. Go to [releases](https://github.com/Shopify/shopify-app-cli/releases) page of `Shopify/shopify-app-cli` repo and create a new release:
     * use the tag created in step 8 by Shipit (should be "vX.Y.Z")

data/lib/project_types/script/cli.rb

@@ -51,15 +51,14 @@ module Script
       autoload :Errors, Project.project_filepath('layers/infrastructure/errors')
       autoload :AssemblyScriptDependencyManager,
                Project.project_filepath('layers/infrastructure/assemblyscript_dependency_manager')
+      autoload :AssemblyScriptTaskRunner, Project.project_filepath('layers/infrastructure/assemblyscript_task_runner')
       autoload :AssemblyScriptTsConfig, Project.project_filepath('layers/infrastructure/assemblyscript_tsconfig')
-      autoload :AssemblyScriptWasmBuilder,
-               Project.project_filepath('layers/infrastructure/assemblyscript_wasm_builder')
       autoload :DependencyManager, Project.project_filepath('layers/infrastructure/dependency_manager')
       autoload :PushPackageRepository, Project.project_filepath('layers/infrastructure/push_package_repository')
       autoload :ExtensionPointRepository, Project.project_filepath('layers/infrastructure/extension_point_repository')
-      autoload :ScriptBuilder, Project.project_filepath('layers/infrastructure/script_builder')
       autoload :ScriptRepository, Project.project_filepath('layers/infrastructure/script_repository')
       autoload :ScriptService, Project.project_filepath('layers/infrastructure/script_service')
+      autoload :TaskRunner, Project.project_filepath('layers/infrastructure/task_runner')
       autoload :TestSuiteRepository, Project.project_filepath('layers/infrastructure/test_suite_repository')
     end
   end

data/lib/project_types/script/commands/push.rb

@@ -19,6 +19,7 @@ module Script
           language: project.language,
           extension_point_type: project.extension_point_type,
           script_name: project.script_name,
+          source_file: project.source_file,
           api_key: form.api_key,
           force: form.force
         )

data/lib/project_types/script/layers/application/build_script.rb

@@ -5,11 +5,11 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, script:)
+          def call(ctx:, task_runner:, script:)
             return if CLI::UI::Frame.open(ctx.message('script.application.building')) do
               begin
                 UI::StrictSpinner.spin(ctx.message('script.application.building_script')) do |spinner|
-                  build(script)
+                  build(ctx, task_runner, script)
                   spinner.update_title(ctx.message('script.application.built'))
                 end
                 true
@@ -25,16 +25,13 @@ module Script
 
           private
 
-          def build(script)
-            script_repo = Infrastructure::ScriptRepository.new
-            script_builder = Infrastructure::ScriptBuilder.for(script)
-            compiled_type = script_builder.compiled_type
+          def build(ctx, task_runner, script)
+            script_repo = Infrastructure::ScriptRepository.new(ctx: ctx)
             script_content = script_repo.with_temp_build_context do
-              script_builder.build
+              task_runner.build
             end
-
-            Infrastructure::PushPackageRepository.new
-              .create_push_package(script, script_content, compiled_type)
+            Infrastructure::PushPackageRepository.new(ctx: ctx)
+              .create_push_package(script, script_content, task_runner.compiled_type)
           end
         end
       end

data/lib/project_types/script/layers/application/create_script.rb

@@ -9,15 +9,15 @@ module Script
         class << self
           def call(ctx:, language:, script_name:, extension_point_type:)
             extension_point = ExtensionPoints.get(type: extension_point_type)
-            create_project(ctx, language, script_name, extension_point)
+            project = create_project(ctx, script_name, extension_point)
+            install_dependencies(ctx, language, script_name, extension_point, project)
             create_definition(ctx, language, extension_point, script_name)
           end
 
           private
 
-          def create_project(ctx, language, script_name, extension_point)
-            ScriptProject.create(script_name)
-            ctx.root = File.join(ctx.root, script_name)
+          def create_project(ctx, script_name, extension_point)
+            ScriptProject.create(ctx, script_name)
             ScriptProject.write(
               ctx,
               project_type: :script,
@@ -25,17 +25,26 @@ module Script
               extension_point_type: extension_point.type,
               script_name: script_name
             )
+            ScriptProject.current
+          end
+
+          def install_dependencies(ctx, language, script_name, extension_point, project)
+            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, project.source_file)
             ProjectDependencies
               .bootstrap(ctx: ctx, language: language, extension_point: extension_point, script_name: script_name)
             ProjectDependencies
-              .install(ctx: ctx, language: language, extension_point: extension_point, script_name: script_name)
+              .install(ctx: ctx, task_runner: task_runner)
           end
 
           def create_definition(ctx, language, extension_point, script_name)
             script = nil
             UI::StrictSpinner.spin(ctx.message('script.create.creating')) do |spinner|
-              script = Infrastructure::ScriptRepository.new.create_script(language, extension_point, script_name)
-              Infrastructure::TestSuiteRepository.new.create_test_suite(script)
+              script = Infrastructure::ScriptRepository.new(ctx: ctx).create_script(
+                language,
+                extension_point,
+                script_name
+              )
+              Infrastructure::TestSuiteRepository.new(ctx: ctx).create_test_suite(script)
               spinner.update_title(ctx.message('script.create.created'))
             end
             script

data/lib/project_types/script/layers/application/project_dependencies.rb

@@ -7,15 +7,14 @@ module Script
           dep_manager.bootstrap
         end
 
-        def self.install(ctx:, language:, extension_point:, script_name:)
-          dep_manager = Infrastructure::DependencyManager.for(ctx, language, extension_point, script_name)
+        def self.install(ctx:, task_runner:)
           CLI::UI::Frame.open(ctx.message('script.project_deps.checking_with_npm')) do
             begin
-              if dep_manager.installed?
+              if task_runner.dependencies_installed?
                 ctx.puts(ctx.message('script.project_deps.none_required'))
               else
                 UI::StrictSpinner.spin(ctx.message('script.project_deps.installing')) do |spinner|
-                  dep_manager.install
+                  task_runner.install_dependencies
                   spinner.update_title(ctx.message('script.project_deps.installed'))
                 end
               end

data/lib/project_types/script/layers/application/push_script.rb

@@ -5,21 +5,23 @@ module Script
     module Application
       class PushScript
         class << self
-          def call(ctx:, language:, extension_point_type:, script_name:, api_key:, force:)
-            extension_point = ExtensionPoints.get(type: extension_point_type)
-            script = Infrastructure::ScriptRepository.new.get_script(language, extension_point_type, script_name)
-            ProjectDependencies
-              .install(ctx: ctx, language: language, extension_point: extension_point, script_name: script_name)
-            BuildScript.call(ctx: ctx, script: script)
-            push_script(ctx, script, api_key, force)
+          def call(ctx:, language:, extension_point_type:, script_name:, source_file:, api_key:, force:)
+            script = Infrastructure::ScriptRepository.new(ctx: ctx).get_script(
+              language,
+              extension_point_type,
+              script_name
+            )
+            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name, source_file)
+            ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
+            BuildScript.call(ctx: ctx, task_runner: task_runner, script: script)
+            push_script(ctx, task_runner, script, api_key, force)
           end
 
           private
 
-          def push_script(ctx, script, api_key, force)
-            compiled_type = Infrastructure::ScriptBuilder.for(script).compiled_type
-            Infrastructure::PushPackageRepository.new
-              .get_push_package(script, compiled_type)
+          def push_script(ctx, task_runner, script, api_key, force)
+            Infrastructure::PushPackageRepository.new(ctx: ctx)
+              .get_push_package(script, task_runner.compiled_type)
               .push(Infrastructure::ScriptService.new(ctx: ctx), api_key, force)
             ctx.puts(ctx.message('script.application.pushed'))
           end

data/lib/project_types/script/layers/infrastructure/assemblyscript_dependency_manager.rb

@@ -16,30 +16,8 @@ module Script
           write_package_json
         end
 
-        def installed?
-          # Assuming if node_modules folder exist at root of script folder, all deps are installed
-          Dir.exist?("node_modules")
-        end
-
-        def install
-          check_node_version!
-
-          output, status = @ctx.capture2e("npm", "install", "--no-audit", "--no-optional", "--loglevel error")
-          raise Errors::DependencyInstallError, output unless status.success?
-        end
-
         private
 
-        def check_node_version!
-          output, status = @ctx.capture2e("node", "--version")
-          raise Errors::DependencyInstallError, output unless status.success?
-
-          version = Semantic::Version.new(output[1..-1])
-          unless version >= Semantic::Version.new("12.16.0")
-            raise Errors::DependencyInstallError, "Node version must be >= v12.16.0 Current version: #{output}."
-          end
-        end
-
         def write_npmrc
           @ctx.system(
             'npm', '--userconfig', './.npmrc', 'config', 'set', '@shopify:registry', 'https://registry.npmjs.com'

data/lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class AssemblyScriptTaskRunner
+        BYTECODE_FILE = "%{name}.wasm"
+        SCRIPT_SDK_BUILD = "npx --no-install shopify-scripts-build --src=../%{source} --binary=#{BYTECODE_FILE} "\
+                           "-- --lib=../node_modules --validate --optimize"
+
+        attr_reader :ctx, :script_name, :script_source_file
+
+        def initialize(ctx, script_name, script_source_file)
+          @ctx = ctx
+          @script_name = script_name
+          @script_source_file = script_source_file
+        end
+
+        def build
+          compile
+          bytecode
+        end
+
+        def compiled_type
+          "wasm"
+        end
+
+        def install_dependencies
+          check_node_version!
+
+          output, status = ctx.capture2e("npm", "install", "--no-audit", "--no-optional", "--loglevel error")
+          raise Errors::DependencyInstallError, output unless status.success?
+        end
+
+        def dependencies_installed?
+          # Assuming if node_modules folder exist at root of script folder, all deps are installed
+          ctx.exist?("node_modules")
+        end
+
+        private
+
+        def check_node_version!
+          output, status = @ctx.capture2e("node", "--version")
+          raise Errors::DependencyInstallError, output unless status.success?
+
+          require 'semantic/semantic'
+          version = ::Semantic::Version.new(output[1..-1])
+          unless version >= ::Semantic::Version.new("12.16.0")
+            raise Errors::DependencyInstallError, "Node version must be >= v12.16.0. Current version: #{output.strip}."
+          end
+        end
+
+        def compile
+          out, status = ctx.capture2e(format(SCRIPT_SDK_BUILD, source: script_source_file, name: script_name))
+          raise Domain::Errors::ServiceFailureError, out unless status.success?
+        end
+
+        def bytecode
+          File.read(format(BYTECODE_FILE, name: script_name))
+        end
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/infrastructure/errors.rb

@@ -6,7 +6,6 @@ module Script
       module Errors
         class AppNotInstalledError < ScriptProjectError; end
         class AppScriptUndefinedError < ScriptProjectError; end
-        class BuilderNotFoundError < ScriptProjectError; end
         class BuildError < ScriptProjectError; end
         class DependencyError < ScriptProjectError; end
         class DependencyInstallError < ScriptProjectError; end
@@ -32,6 +31,7 @@ module Script
         class ShopAuthenticationError < ScriptProjectError; end
         class ShopScriptConflictError < ScriptProjectError; end
         class ShopScriptUndefinedError < ScriptProjectError; end
+        class TaskRunnerNotFoundError < ScriptProjectError; end
       end
     end
   end

data/lib/project_types/script/layers/infrastructure/push_package_repository.rb

@@ -4,6 +4,9 @@ module Script
   module Layers
     module Infrastructure
       class PushPackageRepository
+        include SmartProperties
+        property! :ctx, accepts: ShopifyCli::Context
+
         def create_push_package(script, script_content, compiled_type)
           build_file_path = file_path(script.name, compiled_type)
           write_to_path(build_file_path, script_content)
@@ -34,8 +37,8 @@ module Script
         private
 
         def write_to_path(path, content)
-          FileUtils.mkdir_p(File.dirname(path))
-          File.write(path, content)
+          ctx.mkdir_p(File.dirname(path))
+          ctx.write(path, content)
         end
 
         def file_path(script_name, compiled_type)

data/lib/project_types/script/layers/infrastructure/script_repository.rb

@@ -4,10 +4,13 @@ module Script
   module Layers
     module Infrastructure
       class ScriptRepository
+        include SmartProperties
+        property! :ctx, accepts: ShopifyCli::Context
+
         BOOTSTRAP_SRC = "npx --no-install shopify-scripts-bootstrap src %{src_base}"
 
         def create_script(language, extension_point, script_name)
-          FileUtils.mkdir_p(src_base)
+          ctx.mkdir_p(src_base)
           out, status = CLI::Kit::System.capture2e(format(BOOTSTRAP_SRC, src_base: src_base))
           raise Domain::Errors::ServiceFailureError, out unless status.success?
 
@@ -33,13 +36,13 @@ module Script
         def with_temp_build_context
           prev_dir = Dir.pwd
           temp_dir = "#{project_base}/temp"
-          FileUtils.mkdir_p(temp_dir)
-          Dir.chdir(temp_dir)
-          FileUtils.cp_r("#{src_base}/.", ".")
+          ctx.mkdir_p(temp_dir)
+          ctx.chdir(temp_dir)
+          ctx.cp_r("#{src_base}/.", ".")
           yield
         ensure
-          Dir.chdir(prev_dir)
-          FileUtils.rm_rf(temp_dir)
+          ctx.chdir(prev_dir)
+          ctx.rm_rf(temp_dir)
         end
 
         def relative_path_to_src

data/lib/project_types/script/layers/infrastructure/task_runner.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      class TaskRunner
+        TASK_RUNNERS = {
+          "ts" => Infrastructure::AssemblyScriptTaskRunner,
+        }
+
+        def self.for(ctx, language, script_name, script_source_file)
+          raise Errors::TaskRunnerNotFoundError unless TASK_RUNNERS[language]
+          TASK_RUNNERS[language].new(ctx, script_name, script_source_file)
+        end
+      end
+    end
+  end
+end

data/lib/project_types/script/layers/infrastructure/test_suite_repository.rb

@@ -6,6 +6,9 @@ module Script
   module Layers
     module Infrastructure
       class TestSuiteRepository
+        include SmartProperties
+        property! :ctx, accepts: ShopifyCli::Context
+
         ASPECT_DTS_FILENAME = "as-pect.d.ts"
         ASPECT_DTS_FILE_CONTENTS = "/// <reference types=\"@as-pect/assembly/types/as-pect\" />"
         BOOTSTRAP_TEST = "npx --no-install shopify-scripts-bootstrap test %{test_base}"
@@ -14,8 +17,8 @@ module Script
           # Remove this once we have a test suite for js
           return unless script.language == "ts"
 
-          FileUtils.mkdir_p(test_base)
-          FileUtils.copy(aspect_config_template(script.language), "#{test_base}/as-pect.config.js")
+          ctx.mkdir_p(test_base)
+          ctx.cp(aspect_config_template(script.language), "#{test_base}/as-pect.config.js")
           out, status = CLI::Kit::System.capture2e(format(BOOTSTRAP_TEST, test_base: test_base))
           raise Domain::Errors::ServiceFailureError, out unless status.success?
 
@@ -46,7 +49,7 @@ module Script
         end
 
         def relative_path_to_source_dir
-          src_path_from_root = ScriptRepository.new.relative_path_to_src
+          src_path_from_root = ScriptRepository.new(ctx: ctx).relative_path_to_src
           Pathname.new(src_path_from_root).relative_path_from(test_dir)
         end
 

data/lib/project_types/script/script_project.rb

@@ -3,14 +3,28 @@
 module Script
   class ScriptProject < ShopifyCli::Project
     SUPPORTED_LANGUAGES = %w(ts)
+    SOURCE_DIR = "src"
 
     attr_reader :extension_point_type, :script_name, :language
 
-    def initialize(dir)
-      super(dir)
+    def initialize(*args)
+      super
       @extension_point_type = lookup_config('extension_point_type')
       @script_name = lookup_config('script_name')
       @language = 'ts'
+      ShopifyCli::Core::Monorail.metadata = {
+        "script_name" => @script_name,
+        "extension_point_type" => @extension_point_type,
+        "language" => @language,
+      }
+    end
+
+    def source_file
+      "#{SOURCE_DIR}/#{file_name}"
+    end
+
+    def file_name
+      "script.#{language}"
     end
 
     private
@@ -21,16 +35,15 @@ module Script
     end
 
     class << self
-      def create(dir)
-        raise Errors::ScriptProjectAlreadyExistsError, dir if Dir.exist?(dir)
-
-        FileUtils.mkdir_p(dir)
-        Dir.chdir(dir)
+      def create(ctx, dir)
+        raise Errors::ScriptProjectAlreadyExistsError, dir if ctx.exist?(dir)
+        ctx.mkdir_p(dir)
+        ctx.chdir(dir)
       end
 
       def cleanup(ctx:, script_name:, root_dir:)
-        Dir.chdir(root_dir)
-        ctx.rm_r("#{root_dir}/#{script_name}") if Dir.exist?("#{root_dir}/#{script_name}")
+        ctx.chdir(root_dir)
+        ctx.rm_r("#{root_dir}/#{script_name}") if ctx.exist?("#{root_dir}/#{script_name}")
       end
     end
   end

data/lib/shopify-cli/api.rb

@@ -32,6 +32,8 @@ module ShopifyCli
       )
       ctx.debug(resp)
       resp
+    rescue API::APIRequestServerError, API::APIRequestUnexpectedError
+      ctx.puts(ctx.message('core.api.error.internal_server_error'))
     end
 
     protected

data/lib/shopify-cli/context.rb

@@ -131,6 +131,47 @@ module ShopifyCli
       File.write(ctx_path(fname), content)
     end
 
+    # will change directories and update the root, the filepath is relative to the command root unless absolute
+    #
+    # #### Parameters
+    # * `path` - the file path to a directory, relative to the context root to remove from the FS
+    #
+    def chdir(path)
+      Dir.chdir(ctx_path(path))
+      self.root = ctx_path(path)
+    end
+
+    # checks if a directory exists, the filepath is relative to the command root unless absolute
+    #
+    # #### Parameters
+    # * `path` - the file path to a directory, relative to the context root to remove from the FS
+    #
+    def exist?(path)
+      Dir.exist?(ctx_path(path))
+    end
+
+    # will recursively copy a directory from the FS, the filepath is relative to the command
+    # root unless absolute
+    #
+    # #### Parameters
+    # * `from` - the path of the original file
+    # * `to` - the destination path
+    #
+    def cp_r(from, to)
+      FileUtils.cp_r(ctx_path(from), ctx_path(to))
+    end
+
+    # will copy a directory from the FS, the filepath is relative to the command
+    # root unless absolute
+    #
+    # #### Parameters
+    # * `from` - the path of the original file
+    # * `to` - the destination path
+    #
+    def cp(from, to)
+      FileUtils.cp(ctx_path(from), ctx_path(to))
+    end
+
     # will rename a file from one place to another, relative to the command root
     # unless the path is absolute.
     #
@@ -162,6 +203,16 @@ module ShopifyCli
       FileUtils.rm_r(ctx_path(fname))
     end
 
+    # will force remove a directory from the FS, the filepath is relative to the command
+    # root unless absolute
+    #
+    # #### Parameters
+    # * `fname` - the file path to a directory, relative to the context root to remove from the FS
+    #
+    def rm_rf(fname)
+      FileUtils.rm_rf(ctx_path(fname))
+    end
+
     # will create a directory, recursively if it does not exist. So if you create
     # a directory `foo/bar/dun`, this will also create the directories `foo` and
     # `foo/bar` if they do not exist. The path will be made relative to the command

data/lib/shopify-cli/git.rb

@@ -46,10 +46,10 @@ module ShopifyCli
         if Dir.exist?(dest)
           ctx.abort(ctx.message('core.git.error.directory_exists'))
         else
-          CLI::UI::Frame.open(ctx.message('core.git.cloning', dest)) do
+          success_message = ctx.message('core.git.cloned', dest)
+          CLI::UI::Frame.open(ctx.message('core.git.cloning', repository, dest), success_text: success_message) do
             clone_progress('clone', '--single-branch', repository, dest, ctx: ctx)
           end
-          ctx.done(ctx.message('core.git.cloned', dest))
         end
       end
 
@@ -121,19 +121,23 @@ module ShopifyCli
       def clone_progress(*git_command, ctx:)
         CLI::UI::Progress.progress do |bar|
           msg = []
-          success = ctx.system('git', *git_command, '--progress') do |_out, err|
-            if err.strip.start_with?('Receiving objects:')
-              percent = (err.match(/Receiving objects:\s+(\d+)/)[1].to_f / 100).round(2)
+          require 'open3'
+
+          success = Open3.popen3('git', *git_command, '--progress') do |_stdin, _stdout, stderr, thread|
+            while (line = stderr.gets)
+              next unless line.strip.start_with?('Receiving objects:')
+              percent = (line.match(/Receiving objects:\s+(\d+)/)[1].to_f / 100).round(2)
               bar.tick(set_percent: percent)
               next
             end
-            msg << err
+
+            msg << stderr
+            thread.value
           end.success?
-          unless success
-            ctx.abort(msg.join("\n"))
-          end
+
+          ctx.abort(msg.join("\n")) unless success
           bar.tick(set_percent: 1.0)
-          true
+          success
         end
       end
     end

data/lib/shopify-cli/messages/messages.rb

@@ -60,8 +60,8 @@ module ShopifyCli
             no_commits_made: "No git commits have been made. Please make at least one commit.",
           },
 
-          cloning: "Cloning into %s...",
-          cloned: "Cloned into %s",
+          cloning: "Cloning %s into %s...",
+          cloned: "{{v}} Cloned into %s",
         },
 
         help: {
@@ -154,6 +154,12 @@ module ShopifyCli
           },
         },
 
+        api: {
+          error: {
+            internal_server_error: '{{red:{{x}} An unexpected error occurred on Shopify.}}',
+          },
+        },
+
         populate: {
           options: {
             header: "{{bold:{{cyan:%s}} options:}}",

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -229,15 +229,15 @@ files:
 - lib/project_types/script/layers/domain/push_package.rb
 - lib/project_types/script/layers/domain/script.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_dependency_manager.rb
+- lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_tsconfig.rb
-- lib/project_types/script/layers/infrastructure/assemblyscript_wasm_builder.rb
 - lib/project_types/script/layers/infrastructure/dependency_manager.rb
 - lib/project_types/script/layers/infrastructure/errors.rb
 - lib/project_types/script/layers/infrastructure/extension_point_repository.rb
 - lib/project_types/script/layers/infrastructure/push_package_repository.rb
-- lib/project_types/script/layers/infrastructure/script_builder.rb
 - lib/project_types/script/layers/infrastructure/script_repository.rb
 - lib/project_types/script/layers/infrastructure/script_service.rb
+- lib/project_types/script/layers/infrastructure/task_runner.rb
 - lib/project_types/script/layers/infrastructure/test_suite_repository.rb
 - lib/project_types/script/messages/messages.rb
 - lib/project_types/script/script_project.rb

data/lib/project_types/script/layers/infrastructure/assemblyscript_wasm_builder.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class AssemblyScriptWasmBuilder
-        BYTECODE_FILE = "%{name}.wasm"
-        SCRIPT_SDK_BUILD = "npx --no-install shopify-scripts-build --src=../%{source} --binary=#{BYTECODE_FILE} "\
-                           "-- --lib=../node_modules --validate --optimize"
-
-        attr_reader :script
-
-        def initialize(script)
-          @script = script
-        end
-
-        def build
-          compile
-          bytecode
-        end
-
-        def compiled_type
-          "wasm"
-        end
-
-        private
-
-        def compile
-          out, status = CLI::Kit::System.capture2e(format(SCRIPT_SDK_BUILD, source: script.id, name: script.name))
-          raise Domain::Errors::ServiceFailureError, out unless status.success?
-        end
-
-        def bytecode
-          File.read(format(BYTECODE_FILE, name: script.name))
-        end
-      end
-    end
-  end
-end

data/lib/project_types/script/layers/infrastructure/script_builder.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class NoopBuilder
-        def initialize(script)
-          @script = script
-        end
-
-        def build
-          File.read(@script.filename)
-        end
-
-        def compiled_type
-          @script.language
-        end
-      end
-
-      class ScriptBuilder
-        COMPILERS = {
-          "ts" => Infrastructure::AssemblyScriptWasmBuilder,
-          "js" => Infrastructure::NoopBuilder,
-          "json" => Infrastructure::NoopBuilder,
-        }
-
-        def self.for(script)
-          raise Errors::BuilderNotFoundError unless COMPILERS[script.language]
-          COMPILERS[script.language].new(script)
-        end
-      end
-    end
-  end
-end