shopify-cli 0.9.2 → 1.0.3

data/lib/project_types/extension/commands/build.rb

@@ -4,7 +4,7 @@ require 'shopify_cli'
 module Extension
   module Commands
     class Build < ExtensionCommand
-      hidden_command
+      hidden_feature
 
       YARN_BUILD_COMMAND = %w(build)
       NPM_BUILD_COMMAND = %w(run-script build)

data/lib/project_types/extension/commands/tunnel.rb

@@ -37,7 +37,7 @@ module Extension
       private
 
       def status
-        tunnel_url = Features::TunnelUrl.fetch
+        tunnel_url = ShopifyCli::Tunnel.urls.first
 
         if tunnel_url.nil?
           @ctx.puts(@ctx.message('tunnel.no_tunnel_running'))

data/lib/project_types/extension/forms/register.rb

@@ -16,13 +16,12 @@ module Extension
       attr_writer :app
 
       def ask_app
-        apps = load_apps
-
         if !api_key.nil?
-          found_app = apps.find { |app| app.api_key == api_key }
+          found_app = Tasks::GetApp.call(context: ctx, api_key: api_key)
           ctx.abort(ctx.message('register.invalid_api_key', api_key)) if found_app.nil?
           found_app
         else
+          apps = load_apps
           CLI::UI::Prompt.ask(ctx.message('register.ask_app')) do |handler|
             apps.each do |app|
               handler.option("#{app.title} by #{app.business_name}") { app }

data/lib/project_types/extension/graphql/get_app_by_api_key.graphql

@@ -0,0 +1,9 @@
+query getApp($api_key: String!) {
+  app(apiKey: $api_key) {
+    title
+    apiKey
+    apiSecretKeys{
+      secret
+    }
+  }
+}

data/lib/project_types/extension/tasks/converters/app_converter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+require 'shopify_cli'
+
+module Extension
+  module Tasks
+    module Converters
+      module AppConverter
+        API_KEY_FIELD = 'apiKey'
+        API_SECRET_KEYS_FIELD = 'apiSecretKeys'
+        API_SECRET_FIELD = 'secret'
+        TITLE_FIELD = 'title'
+        ORGANIZATION_NAME_FIELD = 'businessName'
+
+        def self.from_hash(hash, organization = {})
+          return nil if hash.nil?
+
+          Models::App.new(
+            api_key: hash[API_KEY_FIELD],
+            secret: hash[API_SECRET_KEYS_FIELD].first[API_SECRET_FIELD],
+            title: hash[TITLE_FIELD],
+            business_name: organization[ORGANIZATION_NAME_FIELD]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/get_app.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'shopify_cli'
+
+module Extension
+  module Tasks
+    class GetApp < ShopifyCli::Task
+      GRAPHQL_FILE = 'get_app_by_api_key'
+
+      RESPONSE_FIELD = %w(data)
+      APP_FIELD = 'app'
+
+      def call(context:, api_key:)
+        input = { api_key: api_key }
+
+        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, input).dig(*RESPONSE_FIELD)
+        context.abort(context.message('tasks.errors.parse_error')) if response.nil?
+
+        Converters::AppConverter.from_hash(response.dig(APP_FIELD))
+      end
+    end
+  end
+end

data/lib/project_types/extension/tasks/get_apps.rb

@@ -21,12 +21,7 @@ module Extension
         return [] unless organization.key?('apps') && organization['apps'].any?
 
         organization['apps'].map do |app|
-          Models::App.new(
-            api_key: app['apiKey'],
-            secret: app["apiSecretKeys"].first["secret"],
-            title: app['title'],
-            business_name: organization['businessName']
-          )
+          Converters::AppConverter.from_hash(app, organization)
         end
       end
     end

data/lib/project_types/node/forms/create.rb

@@ -10,8 +10,9 @@ module Node
         self.title ||= CLI::UI::Prompt.ask(ctx.message('node.forms.create.app_name'))
         self.type = ask_type
         self.name = self.title.downcase.split(" ").join("_")
-        self.organization_id ||= organization["id"].to_i
-        self.shop_domain ||= ask_shop_domain
+        res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
+        self.organization_id = res[:organization_id]
+        self.shop_domain = res[:shop_domain]
       end
 
       private
@@ -30,58 +31,6 @@ module Node
         ctx.puts(ctx.message('node.forms.create.app_type.selected', type))
         type
       end
-
-      def organizations
-        @organizations ||= ShopifyCli::PartnersAPI::Organizations.fetch_all(ctx)
-      end
-
-      def organization
-        @organization ||= if !organization_id.nil?
-          org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
-          if org.nil?
-            ctx.puts(ctx.message('node.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-            ctx.abort(ctx.message('node.forms.create.error.organization_not_found'))
-          end
-          org
-        elsif organizations.count == 0
-          ctx.puts(ctx.message('node.forms.create.partners_notice'))
-          ctx.puts(ctx.message('node.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-          ctx.abort(ctx.message('node.forms.create.error.no_organizations'))
-        elsif organizations.count == 1
-          org = organizations.first
-          ctx.puts(ctx.message('node.forms.create.organization',
-            ctx.message('core.partners_api.org_name_and_id', org['businessName'], org['id'])))
-          org
-        else
-          org_id = CLI::UI::Prompt.ask(ctx.message('node.forms.create.organization_select')) do |handler|
-            organizations.each do |o|
-              handler.option(ctx.message('core.partners_api.org_name_and_id', o['businessName'], o['id'])) { o['id'] }
-            end
-          end
-          organizations.find { |o| o['id'] == org_id }
-        end
-      end
-
-      def ask_shop_domain
-        valid_stores = organization['stores'].select do |store|
-          store['transferDisabled'] == true || store['convertableToPartnerTest'] == true
-        end
-
-        if valid_stores.count == 0
-          ctx.puts(ctx.message('node.forms.create.no_development_stores'))
-          ctx.puts(ctx.message('node.forms.create.create_store', organization['id']))
-          ctx.puts(ctx.message('node.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-        elsif valid_stores.count == 1
-          domain = valid_stores.first['shopDomain']
-          ctx.puts(ctx.message('node.forms.create.development_store', domain))
-          domain
-        else
-          CLI::UI::Prompt.ask(
-            ctx.message('node.forms.create.development_store_select'),
-            options: valid_stores.map { |s| s['shopDomain'] }
-          )
-        end
-      end
     end
   end
 end

data/lib/project_types/node/messages/messages.rb

@@ -28,8 +28,8 @@ module Node
           },
           info: {
             created: "{{v}} {{green:%s}} was created in your Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change into your new project folder {{green:%s}} and run {{command:%s serve}} to start a " \
-              "local server",
+            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
+              "to start a local server",
             install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
           },
           node_version: "node %s",
@@ -233,25 +233,14 @@ module Node
           create: {
             error: {
               invalid_app_type: "Invalid app type %s",
-              organization_not_found: "Cannot find a partner organization with that ID",
-              no_organizations: "No partner organizations available.",
             },
-
-            authentication_issue: "For authentication issues, run {{command:%s logout}} to clear invalid credentials",
-            partners_notice: "Please visit https://partners.shopify.com/ to create a partners account",
-            no_development_stores: "{{x}} No Development Stores available.",
-            create_store: "Visit {{underline:https://partners.shopify.com/%s/stores}} to create one",
-            app_name: "App Name",
+            app_name: "App name",
             app_type: {
               select: "What type of app are you building?",
               select_public: "Public: An app built for a wide merchant audience.",
               select_custom: "Custom: An app custom built for a single client.",
               selected: "App type {{green:%s}}",
             },
-            organization_select: "Select partner organization",
-            organization: "Partner organization {{green:%s}}",
-            development_store_select: "Select a development store",
-            development_store: "Using development store {{green:%s}}",
           },
         },
       },

data/lib/project_types/rails/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Rails
   class Project < ShopifyCli::ProjectType
-    # hidden_project_type
     creator 'Ruby on Rails App', 'Rails::Commands::Create'
 
     register_command('Rails::Commands::Deploy', "deploy")

data/lib/project_types/rails/forms/create.rb

@@ -22,8 +22,9 @@ module Rails
         self.title ||= CLI::UI::Prompt.ask(ctx.message('rails.forms.create.app_name'))
         self.type = ask_type
         self.name = self.title.downcase.split(" ").join("_")
-        self.organization_id ||= organization["id"].to_i
-        self.shop_domain ||= ask_shop_domain
+        res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
+        self.organization_id = res[:organization_id]
+        self.shop_domain = res[:shop_domain]
         self.db = ask_db
       end
 
@@ -44,56 +45,6 @@ module Rails
         type
       end
 
-      def organizations
-        @organizations ||= ShopifyCli::PartnersAPI::Organizations.fetch_all(ctx)
-      end
-
-      def organization
-        @organization ||= if !organization_id.nil?
-          org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
-          if org.nil?
-            ctx.puts(ctx.message('rails.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-            ctx.abort(ctx.message('rails.forms.create.error.organization_not_found'))
-          end
-          org
-        elsif organizations.count == 0
-          ctx.puts(ctx.message('rails.forms.create.partners_notice'))
-          ctx.puts(ctx.message('rails.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-          ctx.abort(ctx.message('rails.forms.create.error.no_organizations'))
-        elsif organizations.count == 1
-          org = organizations.first
-          ctx.puts(ctx.message('rails.forms.create.organization',
-            ctx.message('core.partners_api.org_name_and_id', org['businessName'], org['id'])))
-          org
-        else
-          org_id = CLI::UI::Prompt.ask(ctx.message('rails.forms.create.organization_select')) do |handler|
-            organizations.each { |o| handler.option(o['businessName']) { o['id'] } }
-          end
-          organizations.find { |o| o['id'] == org_id }
-        end
-      end
-
-      def ask_shop_domain
-        valid_stores = organization['stores'].select do |store|
-          store['transferDisabled'] == true || store['convertableToPartnerTest'] == true
-        end
-
-        if valid_stores.count == 0
-          ctx.puts(ctx.message('rails.forms.create.no_development_stores'))
-          ctx.puts(ctx.message('rails.forms.create.create_store', organization['id']))
-          ctx.puts(ctx.message('rails.forms.create.authentication_issue', ShopifyCli::TOOL_NAME))
-        elsif valid_stores.count == 1
-          domain = valid_stores.first['shopDomain']
-          ctx.puts(ctx.message('rails.forms.create.development_store', domain))
-          domain
-        else
-          CLI::UI::Prompt.ask(
-            ctx.message('rails.forms.create.development_store_select'),
-            options: valid_stores.map { |s| s['shopDomain'] }
-          )
-        end
-      end
-
       def ask_db
         if db.nil?
           return 'sqlite3' unless CLI::UI::Prompt.confirm(ctx.message('rails.forms.create.db.want_select'),

data/lib/project_types/rails/messages/messages.rb

@@ -37,8 +37,8 @@ module Rails
 
           info: {
             created: "{{v}} {{green:%s}} was created in your Partner Dashboard {{underline:%s}}",
-            serve: "{{*}} Change into your new project folder {{green:%s}} and run {{command:%s serve}} to start a " \
-              "local server",
+            serve: "{{*}} Change directories to your new project folder {{green:%s}} and run {{command:%s serve}} " \
+              "to start a local server",
             install: "{{*}} Then, visit {{underline:%s/test}} to install {{green:%s}} on your Dev Store",
           },
           installing_bundler: "Installing bundler…",
@@ -236,14 +236,7 @@ module Rails
             error: {
               invalid_app_type: "Invalid app type %s",
               invalid_db_type: "Invalid database type %s",
-              organization_not_found: "Cannot find a partner organization with that ID",
-              no_organizations: "No partner organizations available.",
             },
-
-            authentication_issue: "For authentication issues, run {{command:%s logout}} to clear invalid credentials",
-            partners_notice: "Please visit https://partners.shopify.com/ to create a partners account",
-            no_development_stores: "{{x}} No development stores available.",
-            create_store: "Visit {{underline:https://partners.shopify.com/%s/stores}} to create one",
             app_name: "App name",
             app_type: {
               select: "What type of app are you building?",
@@ -271,10 +264,6 @@ module Rails
               select_jdbc: "JDBC",
               selected: "Database Type {{green:%s}}",
             },
-            organization_select: "Select partner organization",
-            organization: "Partner organization {{green:%s}}",
-            development_store_select: "Select a development store",
-            development_store: "Using development store {{green:%s}}",
           },
         },
       },

data/lib/project_types/script/cli.rb

@@ -2,7 +2,7 @@
 
 module Script
   class Project < ShopifyCli::ProjectType
-    hidden_project_type
+    hidden_feature(feature_set: :script_project)
     creator 'Script', 'Script::Commands::Create'
 
     register_command('Script::Commands::Push', 'push')
@@ -24,8 +24,6 @@ module Script
   # define/autoload project specific Forms
   module Forms
     autoload :Create, Project.project_filepath('forms/create')
-    autoload :Push, Project.project_filepath('forms/push')
-    autoload :Enable, Project.project_filepath('forms/enable')
     autoload :ScriptForm, Project.project_filepath('forms/script_form')
   end
 
@@ -51,20 +49,22 @@ module Script
       autoload :Errors, Project.project_filepath('layers/infrastructure/errors')
       autoload :AssemblyScriptDependencyManager,
                Project.project_filepath('layers/infrastructure/assemblyscript_dependency_manager')
+      autoload :AssemblyScriptProjectCreator,
+               Project.project_filepath('layers/infrastructure/assemblyscript_project_creator')
       autoload :AssemblyScriptTaskRunner, Project.project_filepath('layers/infrastructure/assemblyscript_task_runner')
       autoload :AssemblyScriptTsConfig, Project.project_filepath('layers/infrastructure/assemblyscript_tsconfig')
-      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 :ProjectCreator, Project.project_filepath('layers/infrastructure/project_creator')
       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
 
   module UI
     autoload :ErrorHandler, Project.project_filepath('ui/error_handler')
+    autoload :PrintingSpinner, Project.project_filepath('ui/printing_spinner')
     autoload :StrictSpinner, Project.project_filepath('ui/strict_spinner')
   end
 

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

@@ -19,16 +19,17 @@ module Script
           return @ctx.puts(self.class.help)
         end
 
-        script = Layers::Application::CreateScript.call(
+        project = Layers::Application::CreateScript.call(
           ctx: @ctx,
           language: language,
           script_name: form.name,
           extension_point_type: form.extension_point
         )
-        @ctx.puts(@ctx.message('script.create.script_path', folder: script.name))
-        @ctx.puts(@ctx.message('script.create.script_created', script_id: File.join(script.name, script.id)))
+        @ctx.puts(@ctx.message('script.create.change_directory_notice', project.script_name))
+      rescue Script::Errors::ScriptProjectAlreadyExistsError => e
+        UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.create.error.operation_failed'))
       rescue StandardError => e
-        ScriptProject.cleanup(ctx: @ctx, script_name: form.name, root_dir: cur_dir)
+        ScriptProject.cleanup(ctx: @ctx, script_name: form.name, root_dir: cur_dir) if form
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.create.error.operation_failed'))
       end
 

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

@@ -3,20 +3,14 @@
 module Script
   module Commands
     class Disable < ShopifyCli::Command
-      options do |parser, flags|
-        parser.on('--api_key=APIKEY') { |t| flags[:api_key] = t }
-        parser.on('--shop_domain=MYSHOPIFYDOMAIN') { |t| flags[:shop_domain] = t }
-      end
-
-      def call(args, _name)
-        form = Forms::Enable.ask(@ctx, args, options.flags)
-        return @ctx.puts(self.class.help) unless form
+      prerequisite_task :ensure_env
 
+      def call(_args, _name)
         project = ScriptProject.current
         Layers::Application::DisableScript.call(
           ctx: @ctx,
-          api_key: form.api_key,
-          shop_domain: form.shop_domain,
+          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'))
@@ -27,10 +21,6 @@ module Script
       def self.help
         ShopifyCli::Context.message('script.disable.help', ShopifyCli::TOOL_NAME)
       end
-
-      def self.extended_help
-        ShopifyCli::Context.message('script.disable.extended_help', ShopifyCli::TOOL_NAME)
-      end
     end
   end
 end

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

@@ -3,29 +3,31 @@
 module Script
   module Commands
     class Enable < ShopifyCli::Command
+      prerequisite_task :ensure_env
       options do |parser, flags|
-        parser.on('--api_key=APIKEY') { |t| flags[:api_key] = t }
-        parser.on('--shop_domain=MYSHOPIFYDOMAIN') { |t| flags[:shop_domain] = t }
+        parser.on('--config_props=KEYVALUEPAIRS', Array) do |t|
+          flags[:config_props] = Hash[t.map { |s| s.split(':') }]
+        end
+        parser.on('--config_file=CONFIGFILEPATH') { |t| flags[:config_file] = t }
       end
 
-      def call(args, _name)
-        form = Forms::Enable.ask(@ctx, args, options.flags)
-        return @ctx.puts(self.class.help) unless form
-
+      def call(_args, _name)
         project = ScriptProject.current
+        api_key = project.env[:api_key]
+        shop_domain = project.env[:shop]
 
         Layers::Application::EnableScript.call(
           ctx: @ctx,
-          api_key: form.api_key,
-          shop_domain: form.shop_domain,
-          configuration: { entries: [] },
+          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: form.api_key,
-          shop_domain: form.shop_domain,
+          api_key: api_key,
+          shop_domain: shop_domain,
           type: project.extension_point_type.capitalize,
           title: project.script_name
         ))
@@ -41,6 +43,28 @@ module Script
       def self.extended_help
         ShopifyCli::Context.message('script.enable.extended_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(config_props) unless config_props.nil?
+
+        configuration = { entries: [] }
+        properties.each do |key, value|
+          configuration[:entries].push({
+            key: key,
+            value: value,
+          })
+        end
+        configuration
+      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