shopify-cli 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f47a49090da5b25b266e4186c08b377e91e6fe240620076f24bb0174accc854
-  data.tar.gz: 68be2a02c00aa4e0c67295024d0997c453eb40b9d92f4cec9ae06dc5c0b3d0fa
+  metadata.gz: 8765adff2578420b0bbaaf7aa30e7e3f6b28b20363671f9e64a419f8b97fe647
+  data.tar.gz: 17e00973e6c881c58c1e0ade838a98e93a17a39f7d960261a36f9cdc74a87940
 SHA512:
-  metadata.gz: f0cd5e1c1e79ec89fcba9834eb1c1ea98d53a98ad46f2fcc45e5fefebfabcd9b1655cb73c1431c503b9c1a26f2d684d6a1c330813423733601670839c7e82efc
-  data.tar.gz: a3f83e966247aee450f3a73615dce3d324f82ab944304be131dec81973d1984c405d060844601047ceb259163faaa79524d859bbe9a874479ea4a26c21530152
+  metadata.gz: '08b07fe290962b6ba6416214165dde7d9c78d01c7eade8662917ec530af18af1a773b08957c58be5b6c10c733bd4be8e2c40a24c2241153d575a158d3988bb84'
+  data.tar.gz: 171f11dd5a4e740cb91345ed51e10485f9499e328bc6dec0ab3027c415b35fd312b616c451137639c224c07862d8651836074ef5bbb85563229ca93d85aa944a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+Version 1.1.1
+------
+* Fix a bug where usernames with spaces caused issues on Windows
+
 Version 1.1.0
 ------
 * Add native Windows 10 support, including variety of stability fixes.

data/docs/getting-started/index.md

@@ -8,14 +8,15 @@ Developers should have some prior knowledge of the [Shopify app ecosystem](https
 
 ## Requirements
 
-- [Ruby](https://www.ruby-lang.org) 2.5.1+ 
 - A [Shopify partner account](https://partners.shopify.com/signup)
 - A [Shopify development store](https://help.shopify.com/en/partners/dashboard/development-stores#create-a-development-store) to install and test apps
+- [Ruby](https://www.ruby-lang.org) 2.5.1+ 
 
 ### Windows requirements
 
-You’ll need to install the following tools to use Shopify App CLI on Windows:
+If you wish to use Shopify App CLI natively on **Windows 10**, we recommend installing Ruby using [RubyInstaller for Windows](https://rubyinstaller.org/downloads/).
 
+Alternatively, you can also use Shopify App CLI using **Windows Subsystem for Linux**, in which case you need:
 - [Linux Subsystem for Windows](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
 - [Ubuntu VM](https://www.microsoft.com/en-ca/p/ubuntu/9nblggh4msv6)
 

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

@@ -5,9 +5,15 @@ toc: false
 redirect_from: "/install/"
 ---
 
-Shopify App CLI can be installed using a variety of package managers.
+Shopify App CLI can be installed on a variety of systems, using a variety of package managers.
+> Note that for systems that have multiple installation options, you only need to use one of these methods to install.
 
-### Homebrew (macOS)
+---
+### macOS
+
+Shopify App CLI is available through Homebrew _or_ RubyGems.
+
+**Homebrew**
 
 You’ll need to run `brew tap` first to add Shopify’s third-party repositories to Homebrew.
 
@@ -16,28 +22,68 @@ $ brew tap shopify/shopify
 $ brew install shopify-cli
 ```
 
-### apt (Debian, Ubuntu)
+**RubyGems**
+
+See the [RubyGems]({{ site.baseurl }}/getting-started/install/#rubygems-all-platforms) section for further details.
+
+---
+
+### Debian/Ubuntu Linux
 
-You’ll need to install a downloaded .deb file with an explicit version number. Check the [releases page](https://github.com/Shopify/shopify-app-cli/releases) to make sure you install the latest package.
+On Debian-based Linux systems, Shopify App CLI is available through the `apt` command _or_ RubyGems.
 
+**apt**
+
+You’ll need to install a downloaded `.deb` file with an explicit version number. Check the [releases page](https://github.com/Shopify/shopify-app-cli/releases) to make sure you install the latest package.
+
+1. Download the `.deb` file from the [releases page](https://github.com/Shopify/shopify-app-cli/releases)
+1. Install the downloaded file
 ```console
-$ sudo apt install shopify-cli-x.y.z.deb
+$ sudo apt install /path/to/downloaded/shopify-cli-x.y.z.deb
 ```
 
-### yum (CentOS 8+, Fedora, Red Hat, SUSE)
+**RubyGems**
+
+See the [RubyGems]({{ site.baseurl }}/getting-started/install/#rubygems-all-platforms) section for further details.
+
+---
+
+### CentOS 8+/Fedora/Red Hat/SUSE Linux
 
-You’ll need to install a downloaded .rpm file with an explicit version number. Check the [releases page](https://github.com/Shopify/shopify-app-cli/releases) to make sure you install the latest package.
+On RPM-based Linux systems, Shopify App CLI is available through the `yum` command _or_ RubyGems.
 
+**yum**
+
+You’ll need to install a downloaded `.rpm` file with an explicit version number. Check the [releases page](https://github.com/Shopify/shopify-app-cli/releases) to make sure you install the latest package.
+
+1. Download the `.rpm` file from the [releases page](https://github.com/Shopify/shopify-app-cli/releases)
+1. Install the downloaded file
 ```console
-$ sudo yum install shopify-cli-x.y.x.rpm
+$ sudo yum install /path/to/downloaded/shopify-cli-x.y.x.rpm
 ```
 
-### Ruby gem
+**RubyGems**
+
+See the [RubyGems]({{ site.baseurl }}/getting-started/install/#rubygems-all-platforms) section for further details.
+
+---
+
+### Windows 10
+
+On Windows 10 systems, Shopify App CLI is available through [RubyGems]({{ site.baseurl }}/getting-started/install/#rubygem-all-platforms).
+
+---
+
+### RubyGems (all platforms)
+
+Shopify App CLI is available on all platforms as a RubyGem through [RubyGems.org](https://rubygems.org/).
 
 ```console
 $ gem install shopify-cli
 ```
 
+---
+
 ### To check that Shopify App CLI is installed correctly:
 
 ```console

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

@@ -25,7 +25,7 @@ $ sudo apt remove shopify-cli
 $ sudo yum remove shopify-cli
 ```
 
-### Ruby gem
+### RubyGems (macOS, Linux, Windows 10)
 
 ```console
 $ gem uninstall shopify-cli

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

@@ -5,7 +5,7 @@ toc: false
 redirect_from: "/upgrade/"
 ---
 
-You can manage upgrades to Shopify App CLI with the package manager for your platform.
+You can manage upgrades to Shopify App CLI with the package manager for your platform.  **Note** that it's important to use the same package manager to upgrade that you originally used to install Shopify App CLI.
 
 ### Homebrew (macOS)
 
@@ -18,19 +18,23 @@ $ brew upgrade shopify-cli
 
 On Debian-based Linux distributions, download the latest `.deb` file for Shopify App CLI from the [releases page](https://github.com/Shopify/shopify-app-cli/releases) and install it to update.
 
+1. Download the `.deb` file from the [releases page](https://github.com/Shopify/shopify-app-cli/releases)
+1. Install the downloaded file
 ```console
-$ sudo apt install shopify-cli-x.y.z.deb
+$ sudo apt install /path/to/downloaded/shopify-cli-x.y.z.deb
 ```
 
 ### yum (CentOS 8+, Fedora, Red Hat, SUSE)
 
 On Red Hat–based Linux distributions, download the latest `.rpm` file for Shopify App CLI from the [releases page](https://github.com/Shopify/shopify-app-cli/releases) and install it to update.
 
+1. Download the `.rpm` file from the [releases page](https://github.com/Shopify/shopify-app-cli/releases)
+1. Install the downloaded file
 ```console
-$ sudo yum install shopify-cli-x.y.z.rpm
+$ sudo yum install /path/to/downloaded/shopify-cli-x.y.x.rpm
 ```
 
-### Ruby gem
+### RubyGems (macOS, Linux, Windows 10)
 
 ```console
 $ gem update shopify-cli

data/lib/project_types/node/commands/generate/billing.rb

@@ -19,6 +19,7 @@ module Node
           end
           billing_type_name = BILLING_TYPES.key(selected_type)
           selected_type[0] = File.join(ShopifyCli::Project.current.directory, selected_type[0])
+          selected_type[0] = "\"#{selected_type[0]}\""
           selected_type = selected_type.join(' ')
 
           spin_group = CLI::UI::SpinGroup.new

data/lib/project_types/node/commands/generate/page.rb

@@ -39,6 +39,7 @@ module Node
           end
           page_type_name = PAGE_TYPES.key(selected_type)
           selected_type[0] = File.join(ShopifyCli::Project.current.directory, selected_type[0])
+          selected_type[0] = "\"#{selected_type[0]}\""
           selected_type = selected_type.join(' ')
 
           spin_group = CLI::UI::SpinGroup.new

data/lib/project_types/node/commands/generate/webhook.rb

@@ -17,6 +17,7 @@ module Node
           end
 
           generate_path = File.join(ShopifyCli::Project.current.directory, "node_modules/.bin/generate-node-app")
+          generate_path = "\"#{generate_path}\""
 
           spin_group = CLI::UI::SpinGroup.new
           spin_group.add(@ctx.message('node.generate.webhook.generating', selected_type)) do |spinner|

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

@@ -1,24 +1,24 @@
 discount:
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    version: "^0.2.6"
+    version: "^0.2.10"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 unit_limit_per_order:
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
-    version: "^0.1.8"
+    version: "^0.1.12"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    version: "^0.2.4"
+    version: "^0.2.8"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 shipping_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-shipping-filter"
-    version: "^0.2.6"
+    version: "^0.2.10"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"

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

@@ -49,7 +49,7 @@ module Script
           resp_hash = script_service_request(
             query_name: query_name,
             api_key: api_key,
-            shop_domain: shop_domain,
+            shop_domain: format_shop_domain(shop_domain),
             variables: variables,
           )
           user_errors = resp_hash["data"]["shopScriptUpdateOrCreate"]["userErrors"]
@@ -76,7 +76,7 @@ module Script
           resp_hash = script_service_request(
             query_name: query_name,
             api_key: api_key,
-            shop_domain: shop_domain,
+            shop_domain: format_shop_domain(shop_domain),
             variables: variables,
           )
           user_errors = resp_hash["data"]["shopScriptDelete"]["userErrors"]
@@ -91,6 +91,10 @@ module Script
 
         private
 
+        def format_shop_domain(shop_domain)
+          shop_domain.delete_suffix("/")
+        end
+
         class ScriptServiceAPI < ShopifyCli::API
           property(:api_key, accepts: String)
           property(:shop_id, accepts: Integer)

data/lib/shopify-cli/heroku.rb

@@ -45,7 +45,7 @@ module ShopifyCli
       return if installed?
 
       result = if @ctx.windows?
-        @ctx.system(download_path)
+        @ctx.system("\"#{download_path}\"")
       else
         @ctx.system('tar', '-xf', download_path, chdir: ShopifyCli.cache_dir)
       end

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

@@ -289,6 +289,8 @@ module ShopifyCli
           error: {
             stop: "ngrok tunnel could not be stopped. Try running {{command:killall -9 ngrok}}",
             url_fetch_failure: "Unable to fetch external url",
+            prereq_command_required: "%1$s is required for installing ngrok. Please install %1$s using the appropriate"\
+              " package manager for your system.",
           },
 
           not_running: "{{green:x}} ngrok tunnel not running",
@@ -302,6 +304,7 @@ module ShopifyCli
           stopped: "{{green:x}} ngrok tunnel stopped",
           timed_out: "{{x}} ngrok tunnel has timed out, restarting ...",
           will_timeout: "{{*}} This tunnel will timeout in {{red:%s}}",
+          prereq_command_location: "%s @ %s",
         },
 
         version: {

data/lib/shopify-cli/tunnel.rb

@@ -124,6 +124,8 @@ module ShopifyCli
 
     def install(ctx)
       return if File.exist?(File.join(ShopifyCli.cache_dir, ctx.windows? ? 'ngrok.exe' : 'ngrok'))
+      check_prereq_command(ctx, 'curl')
+      check_prereq_command(ctx, ctx.linux? ? 'unzip' : 'tar')
       spinner = CLI::UI::SpinGroup.new
       spinner.add('Installing ngrok...') do
         zip_dest = File.join(ShopifyCli.cache_dir, 'ngrok.zip')
@@ -149,7 +151,7 @@ module ShopifyCli
     end
 
     def ngrok_command(port)
-      "#{File.join(ShopifyCli.cache_dir, 'ngrok')} http -inspect=false -log=stdout -log-level=debug #{port}"
+      "\"#{File.join(ShopifyCli.cache_dir, 'ngrok')}\" http -inspect=false -log=stdout -log-level=debug #{port}"
     end
 
     def seconds_to_hm(seconds)
@@ -169,6 +171,13 @@ module ShopifyCli
       end
       start_ngrok(ctx, port)
     end
+
+    def check_prereq_command(ctx, command)
+      cmd_path = ctx.which(command)
+      ctx.abort(ctx.message('core.tunnel.error.prereq_command_required', command)) if cmd_path.nil?
+      ctx.done(ctx.message('core.tunnel.prereq_command_location', command, cmd_path))
+    end
+
     class LogParser # :nodoc:
       TIMEOUT = 10
 

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler