shopify-cli 0.9.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0d2feda9dda6ab4615cc2c15d8afb30f33cac588acd3f2672cd7456e4ad4fd8
-  data.tar.gz: 0b2ad4137e51ab352a41719e370b98fe147062386c6696f0be9a59bf884c1954
+  metadata.gz: d17f3e09b5ecfa047387eb3786b187bbb4e03068a28b71815c62a338e4d3b3a0
+  data.tar.gz: e7ae1f805df2f928ae5b1c043d9b864fc8151750f1869d4d23d8a73757ecbba0
 SHA512:
-  metadata.gz: 0564124577f1f85d2597250792c27e3de0eda4a02fcb7ba6f9dd8b7b2a3bf36492e6b7a3dce9d48b946af8bfb81f3f39e3d0fa06966082f40b0232e5d8597e8b
-  data.tar.gz: 07f8d25b7e123b5d9c09de7cd49a31017174e9a7251d50ca461381d06219b0560f6223e9d1dd3d89cd273b65965ab42eb1b007fe6151d9cfcff32bf4d16b3b0e
+  metadata.gz: 609ad36002ecb5b13d41cb4c6a0cfb397e18087878372acc59e3f3520fad32eb59d661f122307ac95b0d456c216327da317f9c30a26bfdd360370cc5f0aede1d
+  data.tar.gz: '094c183b361bd503a15d87e89b37c065361b78b3cfa69902a8176644c4f1d67c3890902889a069dc4049bd5a22ec4e6b9af258f19e12a0fc9a4e10aa72bab7e3'

data/CHANGELOG.md

@@ -1,18 +1,38 @@
-Version 0.9.3
+Version 1.0.4
+------
+* Fix a bug when running the `connect` command with an account with multiple organizations 
+
+Version 1.0.3
+------
+* Fix a bug which causes an error in the `populate` and `generate` commands when prompting for the shop name
+
+Version 1.0.2
+------
+* Fix missing shop parameter to AdminAPI.query() call (impacting populate and generate commands)
+
+Version 1.0.1
+------
+* Fixed an issue with RVM taking over the shell shim fd when it was not in use
+
+Version 1.0.0
+------
+* Release the installer-based version of the CLI
+
+Version 0.9.3 - Internal Test Version
 ------
 * Rebased to master
 * Removed auto-generated files from builds directory
 
-Version 0.9.2
+Version 0.9.2 - Internal Test Version
 ------
 * Rebased to master, to pull in 7+ Pull Requests
 * Updates to dependencies to package files (updated Ruby version)
 
-Version 0.9.1
+Version 0.9.1 - Internal Test Version
 ------
 * Updated required Ruby version for the CLI
 * Minor fixes for the build / release process
 
-Version 0.9.0
+Version 0.9.0 - Internal Test Version
 ------
 * Initial test release of gem-based CLI

data/docs/getting-started/install/index.md

@@ -36,4 +36,40 @@ $ sudo yum install shopify-cli-x.y.x.rpm
 
 ```console
 $ gem install shopify-cli
-```
+```
+
+### To check that Shopify App CLI is installed correctly:
+
+```console
+$ shopify version
+1.0.0
+$
+```
+
+> Note 1: the version displayed may be newer.
+
+> Note 2: If you have the `shopify_api` gem installed, you may see the following response:
+> ```console
+> shopify command is no longer bundled with shopify_api.
+> if you need these tools, install the shopify_cli gem
+> ```
+> 
+> If so, then you will also need to upgrade the `shopify_api` gem to v9.2.0+ to remove a deprecated `shopify` command that is contained in that gem.
+>
+> If you also have the `shopify_app` gem (which depends on `shopify_api` gem), you'll need to install or update `shopify_api` first, then uninstall the older version.
+> 
+> To get a list of the version(s) of `shopify_api` currently installed:
+> ```console
+> $ gem list shopify_api
+> ```
+> 
+> To install the latest version:
+> ```console
+> $ gem install shopify_api
+> ```
+> 
+> To uninstall the older version:
+> ```console
+> $ gem uninstall shopify_api -v x.y.z
+> ```
+> Replace x.y.z with a version number listed from the `gem list` command.  Repeat as needed.

data/docs/getting-started/migrate/index.md

@@ -22,6 +22,7 @@ There are two steps to completely uninstall the legacy version of Shopify App CL
 
 1. Delete the legacy CLI files
 1. Remove the legacy `shopify` command from your shell profile
+1. Reload your terminal
 
 ### 1. Delete the CLI files
 
@@ -51,7 +52,39 @@ if [[ -f /HOME_DIR/.shopify-cli/shopify.sh ]]; then source /HOME_DIR/.shopify-cl
 [ -f "/HOME_DIR/.shopify-app-cli/shopify.sh" ] && source "/HOME_DIR/.shopify-app-cli/shopify.sh"
 ```
 
-Deleting or commenting out the relevant line in your shell profile will remove `shopify` as a command. You may need to reload your shell.
+Deleting or commenting out the relevant line in your shell profile will remove `shopify` as a command.
+
+### 3. Reload your terminal
+
+For the changes above to take effect, exit your terminal, and start a new one.
+
+If you try running `shopify` now, you should get a `command not found` error.
+
+> If you have the `shopify_api` gem installed, you may see the following response:
+> ```console
+> shopify command is no longer bundled with shopify_api.
+> if you need these tools, install the shopify_cli gem
+> ```
+> 
+> If so, then you will also need to upgrade the `shopify_api` gem to v9.2.0+ to remove a deprecated `shopify` command that is contained in that gem.
+>
+> If you also have the `shopify_app` gem (which depends on `shopify_api` gem), you'll need to install or update `shopify_api` first, then uninstall the older version.
+> 
+> To get a list of the version(s) of `shopify_api` currently installed:
+> ```console
+> $ gem list shopify_api
+> ```
+> 
+> To install the latest version:
+> ```console
+> $ gem install shopify_api
+> ```
+> 
+> To uninstall the older version:
+> ```console
+> $ gem uninstall shopify_api -v x.y.z
+> ```
+> Replace x.y.z with a version number listed from the `gem list` command.  Repeat as needed.
 
 ## 2. Install the new version
 

data/lib/project_types/extension/cli.rb

@@ -2,7 +2,7 @@
 
 module Extension
   class Project < ShopifyCli::ProjectType
-    hidden_project_type
+    hidden_feature
     creator 'App Extension', 'Extension::Commands::Create'
 
     register_command('Extension::Commands::Build', "build")

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/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
 
@@ -66,6 +64,7 @@ module Script
 
   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,15 +19,15 @@ module Script
           return @ctx.puts(self.class.help)
         end
 
-        Layers::Application::CreateScript.call(
+        project = Layers::Application::CreateScript.call(
           ctx: @ctx,
           language: language,
           script_name: form.name,
           extension_point_type: form.extension_point
         )
-        project = ScriptProject.current
-        @ctx.puts(@ctx.message('script.create.script_path', folder: project.script_name))
-        @ctx.puts(@ctx.message('script.create.script_created', script_id: project.source_file))
+        @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) if form
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.create.error.operation_failed'))

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