shopify-cli 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180a4674bfed27bb04ad09499b5c128980a93288666d3ab6aa58aa6d404d61c6
-  data.tar.gz: 8906cecf6a5a76db71e37ef5c1f756d417a3785c63618d4e70d808e3dcad5773
+  metadata.gz: ea41fa5cbfa0eb2bf575fe82111c6be56df6807ed7696e64acc741ef2fa2e6be
+  data.tar.gz: 899299251ed4b0a50b0c3a5c5ae55324ebd64e92fbb981da7d4a093df94d5596
 SHA512:
-  metadata.gz: 443523c8b3e6ec1bcf3b7aef21f0e45148f6c5d1c3ebbc90b7206600bfb2ba484e87e63db423bd1e9abf21e03cda550680283d37534a5879dbcfcb93ed3a80e7
-  data.tar.gz: 8b0c0c59a792fdc06cb2a990bc745ba1bcc64f44ed2c7caa31ef7a1daa11ccec868eb6539b3c195302b046dd1bd7fe80501a4fac2043462dc68224e0a1506b2d
+  metadata.gz: 8b757bbf4ef686593f3fe8fdf82da6c83468f40d04bc312476e2bea614d5f75e3d63afe097c149f3de34b35631032c096799f0728b12732dfbbb5bd3e5141384
+  data.tar.gz: 2059062ef9aff95cad44d2b4bcad442e2cf82636d6733c065bb83544ac4d0b8cef2a5de3c438d5f252a251fa0cf813b03fc064db407940e3469b476a26c35e0d

data/.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Ruby ${{ matrix.version }}
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        version:
+          - 3.0.0
+          - 2.6.6
+          - 2.7.1
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby ${{ matrix.version }}
+        uses: ruby/setup-ruby@v1
+        with: 
+          ruby-version: ${{ matrix.version }}
+          bundler-cache: true
+
+      - name: Install Dependencies
+        run: bundle install
+
+      - name: Run Tests
+        run: bundle exec rake

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Unreleased
 ------
 
+Version 1.10.0
+-------------
+* Updating internal features in development
+
 Version 1.9.1
 -------------
 * [1201](https://github.com/Shopify/shopify-app-cli/pull/1201) Determine Argo Renderer Dynamically. This fixes `shopify serve` and `shopify push` for extensions.

data/README.md

@@ -1,6 +1,7 @@
 # [Shopify App CLI](https://shopify.dev/tools/cli)
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE.md)[![Build Status](https://travis-ci.com/Shopify/shopify-app-cli.svg?token=qtPazgjyosjEEgxgq7VZ&branch=master)](https://travis-ci.com/Shopify/shopify-app-cli)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE.md)
+[![Build Status](https://github.com/Shopify/shopify-app-cli/workflows/CI/badge.svg)](https://github.com/Shopify/shopify-app-cli/actions)
 
 Shopify App CLI helps you build Shopify apps faster. It quickly generates Node.js and Ruby on Rails apps and automates many common development tasks.
 

data/lib/project_types/extension/features/argo.rb

@@ -61,7 +61,7 @@ module Extension
         yarn_list = YARN_LIST_COMMAND + YARN_LIST_PARAMETERS
         npm_list = NPM_LIST_COMMAND + NPM_LIST_PARAMETERS
 
-        result, error, status = ShopifyCli::JsSystem.call(
+        result, _error, _status = ShopifyCli::JsSystem.call(
           context,
           yarn: yarn_list,
           npm: npm_list,

data/lib/project_types/extension/features/argo_renderer_package.rb

@@ -10,7 +10,7 @@ module Extension
       PACKAGE_NAMES = [
         ARGO_CHECKOUT,
         ARGO_ADMIN,
-        ARGO_POST_PURCHASE
+        ARGO_POST_PURCHASE,
       ].freeze
       MINIMUM_ARGO_VERSION = "0.9.3".freeze
 
@@ -22,7 +22,7 @@ module Extension
           pattern = /(?<name>#{PACKAGE_NAMES.join("|")})@(?<version>\d.*)$/
           match = package_manager_output.match(pattern)
           raise PackageNotFound, package_manager_output if match.nil?
-          return new(package_name: match[:name], version: match[:version].strip)
+          new(package_name: match[:name], version: match[:version].strip)
         end
       end
 
@@ -38,7 +38,7 @@ module Extension
       # Temporarily returns false in all cases as the argo webpack server is
       # unable to handle the UUID flag.
       def supports_uuid_flag?
-        return false
+        false
         # return false if checkout?
         # Gem::Version.new(version) > Gem::Version.new(MINIMUM_ARGO_VERSION)
       end

data/lib/project_types/extension/messages/messages.rb

@@ -98,7 +98,8 @@ module Extension
               node_not_installed: "Node must be installed to create this extension.",
               version_too_low: "Your node version %s does not meet the minimum required version %s",
             },
-            argo_missing_renderer_package_error: "Extension template references invalid renderer package please contact Shopify for help.",
+            argo_missing_renderer_package_error: "Extension template references invalid renderer package "\
+              "please contact Shopify for help.",
             yarn_install_error: "Something went wrong while running 'yarn install'. %s.",
             yarn_run_script_error: "Something went wrong while running script. %s.",
           },

data/lib/project_types/script/cli.rb

@@ -24,6 +24,10 @@ module Script
     autoload :ScriptForm, Project.project_filepath("forms/script_form")
   end
 
+  module Tasks
+    autoload :EnsureEnv, Project.project_filepath("tasks/ensure_env")
+  end
+
   module Layers
     module Application
       autoload :BuildScript, Project.project_filepath("layers/application/build_script")

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

@@ -8,7 +8,7 @@ module Script
       end
 
       def call(_args, _name)
-        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
+        Tasks::EnsureEnv.call(@ctx)
 
         api_key = Layers::Infrastructure::ScriptProjectRepository.new(ctx: @ctx).get.api_key
         return @ctx.puts(self.class.help) unless api_key

data/lib/project_types/script/config/extension_points.yml

@@ -11,6 +11,7 @@ unit_limit_per_order:
     sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
 payment_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
     sdk-version: "^9.0.0"
@@ -19,6 +20,7 @@ payment_filter:
     beta: true
     package: "https://github.com/Shopify/scripts-apis-rs"
 shipping_filter:
+  deprecated: true
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
     sdk-version: "^9.0.0"

data/lib/project_types/script/graphql/get_app_scripts.graphql

@@ -0,0 +1,6 @@
+query GetAppScripts($appKey: String!, $extensionPointName: ExtensionPointName!) {
+  appScripts(appKeys: [$appKey], extensionPointName: $extensionPointName) {
+    uuid
+    title
+  }
+}

data/lib/project_types/script/layers/domain/script_project.rb

@@ -6,6 +6,8 @@ module Script
       class ScriptProject
         include SmartProperties
 
+        UUID_ENV_KEY = "UUID"
+
         property! :id, accepts: String
         property :env, accepts: ShopifyCli::Resources::EnvFile
 
@@ -29,8 +31,22 @@ module Script
           env&.api_key
         end
 
+        def api_secret
+          env&.secret
+        end
+
         def uuid
-          env&.extra&.[]("UUID")
+          uuid_defined? && !raw_uuid.empty? ? raw_uuid : nil
+        end
+
+        def uuid_defined?
+          !raw_uuid.nil?
+        end
+
+        private
+
+        def raw_uuid
+          env&.extra&.[](UUID_ENV_KEY)
         end
       end
     end

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

@@ -28,7 +28,6 @@ module Script
           raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
           script_content = ctx.binread(build_file_path)
-
           Domain::PushPackage.new(
             id: build_file_path,
             uuid: script_project.uuid,

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

@@ -76,6 +76,25 @@ module Script
           )
         end
 
+        def create_env(api_key:, secret:, uuid:)
+          ShopifyCli::Resources::EnvFile.new(
+            api_key: api_key,
+            secret: secret,
+            extra: {
+              Domain::ScriptProject::UUID_ENV_KEY => uuid,
+            }
+          ).write(ctx)
+
+          Domain::ScriptProject.new(
+            id: ctx.root,
+            env: project.env,
+            script_name: script_name,
+            extension_point_type: extension_point_type,
+            language: language,
+            config_ui: ConfigUiRepository.new(ctx: ctx).get(config_ui_file),
+          )
+        end
+
         private
 
         def capture_io(&block)
@@ -109,7 +128,7 @@ module Script
         end
 
         def project
-          ShopifyCli::Project.current
+          @project ||= ShopifyCli::Project.current(force_reload: true)
         end
 
         def default_config_ui_content(title)

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

@@ -58,6 +58,12 @@ module Script
           end
         end
 
+        def get_app_scripts(api_key:, extension_point_type:)
+          query_name = "get_app_scripts"
+          variables = { appKey: api_key, extensionPointName: extension_point_type.upcase }
+          script_service_request(query_name: query_name, api_key: api_key, variables: variables)["data"]["appScripts"]
+        end
+
         private
 
         class ScriptServiceAPI < ShopifyCli::API

data/lib/project_types/script/messages/messages.rb

@@ -192,6 +192,13 @@ module Script
           disabled: "Disabled",
           enabling: "Enabling",
           enabled: "Enabled",
+          ensure_env: {
+            organization_select: "Which partner organization do you want to use?",
+            app_select: "Which app do you want to push this script to?",
+            ask_connect_to_existing_script: "This app has some scripts. Do you want to replace any of the "\
+              "existing scripts with the current script?",
+            ask_which_script_to_connect_to: "Which script do you want to replace?",
+          },
         },
       },
     }.freeze

data/lib/project_types/script/tasks/ensure_env.rb

@@ -0,0 +1,77 @@
+require "shopify_cli"
+
+module Script
+  module Tasks
+    class EnsureEnv < ShopifyCli::Task
+      attr_accessor :ctx
+
+      def call(ctx)
+        self.ctx = ctx
+
+        script_project_repo = Layers::Infrastructure::ScriptProjectRepository.new(ctx: ctx)
+        script_project = script_project_repo.get
+
+        return if script_project.api_key && script_project.api_secret && script_project.uuid_defined?
+
+        org = ask_org
+        app = ask_app(org["apps"])
+        uuid = ask_script_uuid(app, script_project.extension_point_type)
+
+        script_project_repo.create_env(
+          api_key: app["apiKey"],
+          secret: app["apiSecretKeys"].first["secret"],
+          uuid: uuid
+        )
+      end
+
+      private
+
+      def ask_org
+        if ShopifyCli::Shopifolk.check && wants_to_run_against_shopify_org?
+          ShopifyCli::Shopifolk.act_as_shopify_organization
+        end
+
+        orgs = ShopifyCli::PartnersAPI::Organizations.fetch_with_app(ctx)
+        if orgs.count == 1
+          orgs.first
+        elsif orgs.count > 0
+          CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.organization_select")) do |handler|
+            orgs.each do |org|
+              handler.option("#{org["businessName"]} (#{org["id"]})") { org }
+            end
+          end
+        else
+          raise Errors::NoExistingOrganizationsError
+        end
+      end
+
+      def ask_app(apps)
+        if apps.count == 1
+          apps.first
+        elsif apps.count > 0
+          CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.app_select")) do |handler|
+            apps.each do |app|
+              handler.option(app["title"]) { app }
+            end
+          end
+        else
+          raise Errors::NoExistingAppsError
+        end
+      end
+
+      def ask_script_uuid(app, extension_point_type)
+        script_service = Layers::Infrastructure::ScriptService.new(ctx: ctx)
+        scripts = script_service.get_app_scripts(api_key: app["apiKey"], extension_point_type: extension_point_type)
+
+        return nil unless scripts.count > 0 &&
+          CLI::UI::Prompt.confirm(ctx.message("script.application.ensure_env.ask_connect_to_existing_script"))
+
+        CLI::UI::Prompt.ask(ctx.message("script.application.ensure_env.ask_which_script_to_connect_to")) do |handler|
+          scripts.each do |script|
+            handler.option("#{script["title"]} (#{script["uuid"]})") { script["uuid"] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "1.9.1"
+  VERSION = "1.10.0"
 end

data/lib/shopify_cli.rb

@@ -110,7 +110,6 @@ module ShopifyCli
   autoload :JsSystem, "shopify-cli/js_system"
   autoload :MethodObject, "shopify-cli/method_object"
   autoload :LazyDelegator, "shopify-cli/lazy_delegator"
-  autoload :Log, "shopify-cli/log"
   autoload :OAuth, "shopify-cli/oauth"
   autoload :Options, "shopify-cli/options"
   autoload :PartnersAPI, "shopify-cli/partners_api"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -77,6 +77,7 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
+- ".github/workflows/build.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/triage.yml"
 - ".gitignore"
@@ -85,7 +86,6 @@ files:
 - ".ruby-version"
 - ".tmp/.gitkeep"
 - ".tmp/sv/.gitkeep"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -215,6 +215,7 @@ files:
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
 - 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/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
 - lib/project_types/script/layers/application/create_script.rb
@@ -239,6 +240,7 @@ files:
 - lib/project_types/script/layers/infrastructure/script_service.rb
 - lib/project_types/script/layers/infrastructure/task_runner.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

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
- - 3.0.0
- - 2.5.8
- - 2.6.6
- - 2.7.1
-before_install:
-- gem install bundler -v '1.17.3'
-cache:
-  bundler: true
-install:
-- bundle install
-script:
-  - bundle exec rake