shopify-cli 1.8.0 → 1.12.0

data/lib/shopify-cli/method_object.rb

@@ -52,8 +52,8 @@ module ShopifyCli
       # invokes the original `call` implementation and wraps its return value
       # into a result object.
       #
-      def call(*args, **kwargs)
-        Result.wrap { super(*args, **kwargs) }.call
+      def call(*args, **kwargs, &block)
+        Result.wrap { kwargs.any? ? super(*args, **kwargs, &block) : super(*args, &block) }.call
       end
     end
 
@@ -64,10 +64,10 @@ module ShopifyCli
       # initializer or to `call`. If the keyword argument matches the name of
       # property, it is forwarded to the initializer, otherwise to call.
       #
-      def call(*args, **kwargs)
+      def call(*args, **kwargs, &block)
         properties.keys.yield_self do |properties|
           new(**kwargs.slice(*properties))
-            .call(*args, **kwargs.slice(*(kwargs.keys - properties)))
+            .call(*args, **kwargs.slice(*(kwargs.keys - properties)), &block)
         end
       end
 

data/lib/shopify-cli/oauth.rb

@@ -24,10 +24,10 @@ module ShopifyCli
     property! :service, accepts: String
     property! :client_id, accepts: String
     property! :scopes
-    property :store, default: ShopifyCli::DB.new
+    property :store, default: -> { ShopifyCli::DB.new }
     property :secret, accepts: String
     property :request_exchange, accepts: String
-    property :options, default: {}, accepts: Hash
+    property :options, default: -> { {} }, accepts: Hash
     property :auth_path, default: "/authorize", accepts: ->(path) { path.is_a?(String) && path.start_with?("/") }
     property :token_path, default: "/token", accepts: ->(path) { path.is_a?(String) && path.start_with?("/") }
     property :state_token, accepts: String, default: SecureRandom.hex(30)
@@ -80,7 +80,13 @@ module ShopifyCli
     end
 
     def output_authentication_info(uri)
-      login_location = ctx.message(service == "admin" ? "core.oauth.location.admin" : "core.oauth.location.partner")
+      login_location = if service == "admin"
+        ctx.message("core.oauth.location.admin")
+      elsif Shopifolk.acting_as_shopify_organization?
+        ctx.message("core.oauth.location.shopifolk")
+      else
+        ctx.message("core.oauth.location.partner")
+      end
       ctx.puts(ctx.message("core.oauth.authentication_required", login_location))
       ctx.open_url!(uri)
     end

data/lib/shopify-cli/packager.rb

@@ -99,7 +99,7 @@ module ShopifyCli
         raise <<~MESSAGE
 
           Could not find program #{program} which is required to build the package.
-          You can install it by running `#{installation_cmd}`.
+          You can install it by running #{installation_cmd}.
 
         MESSAGE
       end

data/lib/shopify-cli/partners_api/organizations.rb

@@ -4,7 +4,7 @@ module ShopifyCli
       class << self
         def fetch_all(ctx)
           resp = PartnersAPI.query(ctx, "all_organizations")
-          (resp.dig("data", "organizations", "nodes") || []).map do |org|
+          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
             org["stores"] = (org.dig("stores", "nodes") || [])
             org
           end
@@ -12,7 +12,7 @@ module ShopifyCli
 
         def fetch(ctx, id:)
           resp = PartnersAPI.query(ctx, "find_organization", id: id)
-          org = resp.dig("data", "organizations", "nodes").first
+          org = resp&.dig("data", "organizations", "nodes")&.first
           return nil if org.nil?
           org["stores"] = (org.dig("stores", "nodes") || [])
           org
@@ -20,7 +20,7 @@ module ShopifyCli
 
         def fetch_with_app(ctx)
           resp = PartnersAPI.query(ctx, "all_orgs_with_apps")
-          (resp.dig("data", "organizations", "nodes") || []).map do |org|
+          (resp&.dig("data", "organizations", "nodes") || []).map do |org|
             org["stores"] = (org.dig("stores", "nodes") || [])
             org["apps"] = (org.dig("apps", "nodes") || [])
             org

data/lib/shopify-cli/resolve_constant.rb

@@ -11,7 +11,7 @@
 module ShopifyCli
   class ResolveConstant
     include ShopifyCli::MethodObject
-    property! :namespace, accepts: ->(ns) { ns.respond_to?(:const_get) }, default: Kernel
+    property! :namespace, accepts: ->(ns) { ns.respond_to?(:const_get) }, default: -> { Kernel }
 
     def call(name)
       name

data/lib/shopify-cli/resources/env_file.rb

@@ -57,7 +57,7 @@ module ShopifyCli
       property :shop
       property :scopes
       property :host
-      property :extra, default: {}
+      property :extra, default: -> { {} }
 
       def to_h
         out = {}

data/lib/shopify-cli/shopifolk.rb

@@ -33,7 +33,7 @@ module ShopifyCli
       end
 
       def acting_as_shopify_organization?
-        !!@acting_as_shopify_organization || (Project.has_current? && Project.current.config["shopify_organization"])
+        !!(@acting_as_shopify_organization || (Project.has_current? && Project.current.config["shopify_organization"]))
       end
 
       def reset

data/lib/shopify-cli/tasks/select_org_and_shop.rb

@@ -35,14 +35,16 @@ module ShopifyCli
         @organization ||= if !organization_id.nil?
           org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
           if org.nil?
-            ctx.puts(ctx.message("core.tasks.select_org_and_shop.error.authentication_issue", ShopifyCli::TOOL_NAME))
+            ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCli::TOOL_NAME))
             ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.organization_not_found"))
           end
           org
         elsif organizations.count == 0
-          ctx.puts(ctx.message("core.tasks.select_org_and_shop.error.partners_notice"))
-          ctx.puts(ctx.message("core.tasks.select_org_and_shop.authentication_issue", ShopifyCli::TOOL_NAME))
-          ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.no_organizations"))
+          if Shopifolk.acting_as_shopify_organization?
+            ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.shopifolk_notice", ShopifyCli::TOOL_NAME))
+          else
+            ctx.abort(ctx.message("core.tasks.select_org_and_shop.error.no_organizations"))
+          end
         elsif organizations.count == 1
           org = organizations.first
           ctx.puts(ctx.message("core.tasks.select_org_and_shop.organization", org["businessName"], org["id"]))

data/lib/shopify-cli/transform_data_structure.rb

@@ -42,7 +42,7 @@ module ShopifyCli
     property! :symbolize_keys, accepts: [true, false], default: false, reader: :symbolize_keys?
     property! :associative_array_container,
       accepts: ->(c) { c.respond_to?(:new) && c.method_defined?(:[]=) },
-      default: Hash
+      default: -> { Hash }
 
     def call(object)
       case object

data/lib/shopify-cli/tunnel.rb

@@ -2,6 +2,7 @@ require "json"
 require "fileutils"
 require "shopify_cli"
 require "forwardable"
+require "uri"
 
 module ShopifyCli
   ##
@@ -11,7 +12,7 @@ module ShopifyCli
   class Tunnel
     extend SingleForwardable
 
-    def_delegators :new, :start, :stop, :auth, :stats, :urls
+    def_delegators :new, :start, :stop, :auth, :stats, :urls, :running_on?
 
     class FetchUrlError < RuntimeError; end
     class NgrokError < RuntimeError; end
@@ -26,6 +27,7 @@ module ShopifyCli
 
     NGROK_TUNNELS_URI = URI.parse("http://localhost:4040/api/tunnels")
     TUNNELS_FIELD = "tunnels"
+    TUNNEL_ADDRESS_KEY_PATH = ["config", "addr"]
     PUBLIC_URL_FIELD = "public_url"
 
     ##
@@ -120,6 +122,25 @@ module ShopifyCli
       []
     end
 
+    ##
+    # Returns Boolean if a tunnel is running on a given port
+    #
+    # #### Parameters
+    #
+    # * `port` - port to check
+    #
+    # #### Returns
+    #
+    # * true / false
+    #
+    def running_on?(port)
+      extract_port = ->(tunnel) { URI(tunnel.dig(*TUNNEL_ADDRESS_KEY_PATH)).port }
+      matches_port = ->(occupied_port) { occupied_port == port }
+      stats.fetch(TUNNELS_FIELD, []).map(&extract_port).any?(&matches_port)
+    rescue
+      false
+    end
+
     private
 
     def install(ctx)

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "1.8.0"
+  VERSION = "1.12.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"

data/vendor/deps/smart_properties/REVISION

@@ -1 +1 @@
-691028e47d022a29405b7f0ccc8683c9d062c502
+cfe83ef361e68ba7c471af75144f2b85cf1e1ec6

data/vendor/deps/smart_properties/lib/smart_properties/property.rb

@@ -1,6 +1,7 @@
 module SmartProperties
   class Property
     MODULE_REFERENCE = :"@_smart_properties_method_scope"
+    ALLOWED_DEFAULT_CLASSES = [Proc, Numeric, String, Range, TrueClass, FalseClass, NilClass, Symbol, Module].freeze
 
     attr_reader :name
     attr_reader :converter
@@ -27,6 +28,11 @@ module SmartProperties
 
       @instance_variable_name = :"@#{name}"
 
+      unless ALLOWED_DEFAULT_CLASSES.any? { |cls| @default.is_a?(cls) }
+        raise ConfigurationError, "Default attribute value #{@default.inspect} cannot be specified as literal, "\
+          "use the syntax `default: -> { ... }` instead."
+      end
+
       unless attrs.empty?
         raise ConfigurationError, "SmartProperties do not support the following configuration options: #{attrs.keys.map { |m| m.to_s }.sort.join(', ')}."
       end
@@ -66,7 +72,7 @@ module SmartProperties
     end
 
     def default(scope)
-      @default.kind_of?(Proc) ? scope.instance_exec(&@default) : @default
+      @default.kind_of?(Proc) ? scope.instance_exec(&@default) : @default.dup
     end
 
     def accepts?(value, scope)

data/vendor/deps/smart_properties/lib/smart_properties/version.rb

@@ -1,3 +1,3 @@
 module SmartProperties
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-05-28 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
@@ -144,6 +144,9 @@ files:
 - lib/project_types/extension/features/argo.rb
 - lib/project_types/extension/features/argo_config.rb
 - lib/project_types/extension/features/argo_dependencies.rb
+- lib/project_types/extension/features/argo_runtime.rb
+- lib/project_types/extension/features/argo_serve.rb
+- lib/project_types/extension/features/argo_serve_options.rb
 - lib/project_types/extension/features/argo_setup.rb
 - lib/project_types/extension/features/argo_setup_step.rb
 - lib/project_types/extension/features/argo_setup_steps.rb
@@ -155,13 +158,16 @@ files:
 - lib/project_types/extension/messages/messages.rb
 - lib/project_types/extension/models/app.rb
 - lib/project_types/extension/models/lazy_specification_handler.rb
+- lib/project_types/extension/models/npm_package.rb
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/specification.rb
+- lib/project_types/extension/models/specification_handlers/checkout_argo_extension.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
 - lib/project_types/extension/models/specification_handlers/default.rb
 - lib/project_types/extension/models/specifications.rb
 - lib/project_types/extension/models/validation_error.rb
 - lib/project_types/extension/models/version.rb
+- lib/project_types/extension/tasks/choose_next_available_port.rb
 - lib/project_types/extension/tasks/configure_features.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
 - lib/project_types/extension/tasks/converters/registration_converter.rb
@@ -169,6 +175,7 @@ files:
 - lib/project_types/extension/tasks/converters/version_converter.rb
 - 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/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/update_draft.rb
@@ -208,20 +215,15 @@ files:
 - lib/project_types/rails/ruby.rb
 - lib/project_types/script/cli.rb
 - lib/project_types/script/commands/create.rb
-- lib/project_types/script/commands/disable.rb
-- lib/project_types/script/commands/enable.rb
 - lib/project_types/script/commands/push.rb
 - lib/project_types/script/config/extension_points.yml
 - 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/graphql/shop_script_delete.graphql
-- lib/project_types/script/graphql/shop_script_update_or_create.graphql
 - lib/project_types/script/layers/application/build_script.rb
 - lib/project_types/script/layers/application/create_script.rb
-- lib/project_types/script/layers/application/disable_script.rb
-- lib/project_types/script/layers/application/enable_script.rb
 - lib/project_types/script/layers/application/extension_points.rb
 - lib/project_types/script/layers/application/project_dependencies.rb
 - lib/project_types/script/layers/application/push_script.rb
@@ -230,19 +232,21 @@ files:
 - lib/project_types/script/layers/domain/extension_point.rb
 - lib/project_types/script/layers/domain/metadata.rb
 - lib/project_types/script/layers/domain/push_package.rb
+- lib/project_types/script/layers/domain/script_project.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb
 - lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb
-- lib/project_types/script/layers/infrastructure/config_ui_repository.rb
+- lib/project_types/script/layers/infrastructure/command_runner.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/project_creator.rb
 - lib/project_types/script/layers/infrastructure/push_package_repository.rb
 - lib/project_types/script/layers/infrastructure/rust_project_creator.rb
 - lib/project_types/script/layers/infrastructure/rust_task_runner.rb
+- lib/project_types/script/layers/infrastructure/script_project_repository.rb
 - 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/script_project.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
@@ -467,7 +471,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Shopify CLI helps you build Shopify apps faster.

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

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

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Commands
-    class Disable < ShopifyCli::Command
-      def call(_args, _name)
-        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
-        project = ScriptProject.current
-        Layers::Application::DisableScript.call(
-          ctx: @ctx,
-          api_key: project.env[:api_key],
-          shop_domain: project.env[:shop],
-          extension_point_type: project.extension_point_type
-        )
-        @ctx.puts(@ctx.message("script.disable.script_disabled"))
-      rescue StandardError => e
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.disable.error.operation_failed"))
-      end
-
-      def self.help
-        ShopifyCli::Context.message("script.disable.help", ShopifyCli::TOOL_NAME)
-      end
-    end
-  end
-end

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

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Commands
-    class Enable < ShopifyCli::Command
-      options do |parser, flags|
-        parser.on("--config_props=KEYVALUEPAIRS", Array) { |t| flags[:config_props] = t }
-        parser.on("--config-props=KEYVALUEPAIRS", Array) { |t| flags[:config_props] = t }
-        parser.on("--config_file=CONFIGFILEPATH") { |t| flags[:config_file] = t }
-        parser.on("--config-file=CONFIGFILEPATH") { |t| flags[:config_file] = t }
-      end
-
-      def call(_args, _name)
-        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
-        project = ScriptProject.current
-        api_key = project.env[:api_key]
-        shop_domain = project.env[:shop]
-
-        Layers::Application::EnableScript.call(
-          ctx: @ctx,
-          api_key: api_key,
-          shop_domain: shop_domain,
-          configuration: acquire_configuration(**slice(options.flags, :config_file, :config_props)),
-          extension_point_type: project.extension_point_type,
-          title: project.script_name
-        )
-        @ctx.puts(@ctx.message(
-          "script.enable.script_enabled",
-          api_key: api_key,
-          shop_domain: shop_domain,
-          type: project.extension_point_type.capitalize,
-          title: project.script_name
-        ))
-        @ctx.puts(@ctx.message("script.enable.info"))
-      rescue Errors::InvalidConfigYAMLError => e
-        UI::ErrorHandler.pretty_print_and_raise(e)
-      rescue StandardError => e
-        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message("script.enable.error.operation_failed"))
-      end
-
-      def self.help
-        ShopifyCli::Context.message("script.enable.help", ShopifyCli::TOOL_NAME)
-      end
-
-      private
-
-      def acquire_configuration(config_file: nil, config_props: nil)
-        properties = {}
-        properties = YAML.load(File.read(config_file)) unless config_file.nil?
-        properties = properties.merge(parse_config_props(config_props)) unless config_props.nil?
-
-        configuration = { entries: [] }
-        properties.each do |key, value|
-          configuration[:entries].push({
-            key: key,
-            value: value,
-          })
-        end
-        configuration
-      rescue Errno::ENOENT, Psych::SyntaxError
-        raise Errors::InvalidConfigYAMLError, options.flags[:config_file]
-      end
-
-      def parse_config_props(config_props)
-        Hash[
-          config_props.map do |s|
-            args = s.split(":").map(&:strip)
-            raise Errors::InvalidConfigProps unless args.size == 2
-            args
-          end
-        ]
-      end
-
-      # No slice pre Ruby 2.5 so roll our own
-      def slice(hash, *keys)
-        Hash[hash.to_a - hash.select { |key, _value| !keys.include?(key) }.to_a]
-      end
-    end
-  end
-end