shopify-cli 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3355ade46f06f8fad98098842f7b68bb0a154a53921a498ca4aba18379512ff6
-  data.tar.gz: 57617469febb8905d737a9991f4da4a578e0f87bc8cad17bfc3d674e28cd40c2
+  metadata.gz: 8765adff2578420b0bbaaf7aa30e7e3f6b28b20363671f9e64a419f8b97fe647
+  data.tar.gz: 17e00973e6c881c58c1e0ade838a98e93a17a39f7d960261a36f9cdc74a87940
 SHA512:
-  metadata.gz: a71cd8e3f4f9409f0c527ab6da9152e592d7cd1be173d9fe4e1499713998cf245541504151a1e63fa5901cf0c83b1d41302bc6628defff86042908b5e63d37af
-  data.tar.gz: 2d16c25b44bd21abbcd154abd0ff5d3b3e9e464b7c89377b523299855800cd65bf3357d89b3d92d8a66137e8316d64de755263a1bc21f30df1c5ad3b8e492492
+  metadata.gz: '08b07fe290962b6ba6416214165dde7d9c78d01c7eade8662917ec530af18af1a773b08957c58be5b6c10c733bd4be8e2c40a24c2241153d575a158d3988bb84'
+  data.tar.gz: 171f11dd5a4e740cb91345ed51e10485f9499e328bc6dec0ab3027c415b35fd312b616c451137639c224c07862d8651836074ef5bbb85563229ca93d85aa944a

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
- - 2.4.7
- - 2.5.1
+ - 2.5.8
+ - 2.6.6
+ - 2.7.1
 before_install:
 - gem install bundler -v '1.17.3'
 cache:

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+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.
+
+Version 1.0.5
+------
+* Fix a bug in out opt-in metrics
+
+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)

data/Gemfile

@@ -16,7 +16,7 @@ group :test do
   gem 'mocha', require: false
   gem 'minitest', '>= 5.0.0', require: false
   gem 'minitest-reporters', require: false
-  gem 'fakefs', require: false
+  gem 'fakefs', '>= 1.0', require: false
   gem 'webmock', require: false
   gem 'timecop', require: false
 end

data/Gemfile.lock

@@ -4,13 +4,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
-    ast (2.4.0)
+    ast (2.4.1)
     builder (3.2.3)
-    byebug (8.2.2)
+    byebug (8.2.5)
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    fakefs (0.20.0)
+    fakefs (1.2.2)
     hashdiff (0.3.2)
     metaclass (0.0.4)
     method_source (0.9.2)
@@ -22,9 +22,9 @@ GEM
       ruby-progressbar
     mocha (1.7.0)
       metaclass (~> 0.0.1)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -34,19 +34,19 @@ GEM
     public_suffix (3.0.3)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.0)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
-    rubocop (0.85.0)
+    rubocop (0.89.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.4)
     session (3.2.0)
@@ -62,7 +62,7 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
-  fakefs
+  fakefs (>= 1.0)
   minitest (>= 5.0.0)
   minitest-reporters
   mocha

data/bin/load_shopify.rb

@@ -9,7 +9,9 @@ ENV['USER_PWD'] ||= Dir.pwd
 # Prune non-absolute paths from PATH to prevent non-deterministic behavior
 # i.e. If user has "." or "./bin" in their PATH
 # Note that this logic is duplicated in lib/shopify.rb
-ENV['PATH'] = ENV['PATH'].split(':').select { |p| p.start_with?('/', '~') }.join(':')
+ENV['PATH'] = ENV['PATH'].split(File::PATH_SEPARATOR).select do |p|
+  p.start_with?('/', '~', /[A-Z]:\\/)
+end.join(File::PATH_SEPARATOR)
 
 $original_env = ENV.to_hash
 

data/bin/shopify

@@ -8,6 +8,8 @@ module Kernel
   def require(name)
     original_require(name)
   rescue LoadError => e
+    # Special case for readline.so, which fails harmlessly on Windows
+    raise if (name == "readline.so") && ShopifyCli::Context.new.windows?
     # Special case for psych (yaml), which rescues this itself
     raise if name == "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
     STDERR.puts "[Note] You cannot use gems with Shopify App CLI."

data/docs/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -16,9 +16,9 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.6)
-    dnsruby (1.61.3)
-      addressable (~> 2.5)
+    concurrent-ruby (1.1.7)
+    dnsruby (1.61.4)
+      simpleidn (~> 0.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -28,12 +28,12 @@ GEM
     execjs (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.13.0)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    github-pages (206)
+    github-pages (207)
       github-pages-health-check (= 1.16.1)
-      jekyll (= 3.8.7)
+      jekyll (= 3.9.0)
       jekyll-avatar (= 0.7.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.6)
@@ -67,7 +67,8 @@ GEM
       jekyll-theme-time-machine (= 0.1.1)
       jekyll-titles-from-headings (= 0.5.3)
       jemoji (= 0.11.1)
-      kramdown (= 1.17.0)
+      kramdown (= 2.3.0)
+      kramdown-parser-gfm (= 1.1.0)
       liquid (= 4.0.3)
       mercenary (~> 0.3)
       minima (= 2.5.1)
@@ -86,14 +87,14 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.7)
+    jekyll (3.9.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (>= 1.17, < 3)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
@@ -191,7 +192,10 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    kramdown (1.17.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -204,7 +208,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.14.1)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     octokit (4.18.0)
       faraday (>= 0.9)
@@ -215,6 +219,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rexml (3.2.4)
     rouge (3.19.0)
     ruby-enum (0.8.0)
       i18n
@@ -228,6 +233,8 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
+    simpleidn (0.1.1)
+      unf (~> 0.1.4)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
@@ -235,8 +242,11 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

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/ext/shopify-cli/extconf.rb

@@ -3,25 +3,45 @@ require 'fileutils'
 
 gem = File.expand_path('../../../', __FILE__)
 exe = File.join(gem, 'bin', 'shopify')
-script = exe + '.sh'
-symlink = '/usr/local/bin/shopify'
-
-script_content = <<~SCRIPT
-  #!/usr/bin/env bash
-  #{RbConfig.ruby} --disable=gems -I #{gem} #{exe} $@
-SCRIPT
-
-File.write(script, script_content)
-FileUtils.chmod("+x", script)
-
-makefile_content = <<~MAKEFILE
-  .PHONY: clean install
-  
-  clean:
-  \t@sudo rm -f #{symlink}
-  
-  install: clean
-  \t@sudo ln -s #{script} #{symlink}
-MAKEFILE
+
+if RUBY_PLATFORM.match(/mingw32/)
+  bat_path = File.dirname(RbConfig.ruby)
+  bat = "#{bat_path}\\shopify.bat"
+
+  script_content = "#{RbConfig.ruby} --disable=gems -I '#{gem}' '#{exe}' %*"
+
+  FileUtils.mkdir_p(bat_path)
+  makefile_content = <<~MAKEFILE
+    .PHONY: clean install
+
+    clean:
+    \t rm -f "#{bat}"
+
+    install: clean
+    \t echo "@ECHO OFF"> "#{bat}"
+    \t echo "#{script_content}">> "#{bat}"
+  MAKEFILE
+else
+  script = exe + '.sh'
+  symlink = '/usr/local/bin/shopify'
+
+  script_content = <<~SCRIPT
+    #!/usr/bin/env bash
+    #{RbConfig.ruby} --disable=gems -I #{gem} #{exe} $@
+  SCRIPT
+
+  File.write(script, script_content)
+  FileUtils.chmod("+x", script)
+
+  makefile_content = <<~MAKEFILE
+    .PHONY: clean install
+    
+    clean:
+    \t@sudo rm -f #{symlink}
+    
+    install: clean
+    \t@sudo ln -s #{script} #{symlink}
+  MAKEFILE
+end
 
 File.write('Makefile', makefile_content)