shopify-cli 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa8d08ea4c9f452ea672ebe158f4e900eda442cc17aa46905d25aa53a7f3a673
-  data.tar.gz: 516ee988dee9309aa0e3319d576fe5fcd13065fa08b0b9a4d648fced6642d26e
+  metadata.gz: 9f47a49090da5b25b266e4186c08b377e91e6fe240620076f24bb0174accc854
+  data.tar.gz: 68be2a02c00aa4e0c67295024d0997c453eb40b9d92f4cec9ae06dc5c0b3d0fa
 SHA512:
-  metadata.gz: dc4c9b95106709203f6153310bdee08183b3bad45f1ff7f3512b408fabfa478391ca4e5adbfe6cc6b2aaaea655363067de9bacb39a8ff02016e5df03aa7366de
-  data.tar.gz: 503b6c26f1c57e65f5a22b5171faa8d9e5117c404ca02bec6a92af571cadf17f74918fd8bcf2b993100b0e09b3f20576dbeca401cbbb93c7f2355ac389bdf6ed
+  metadata.gz: f0cd5e1c1e79ec89fcba9834eb1c1ea98d53a98ad46f2fcc45e5fefebfabcd9b1655cb73c1431c503b9c1a26f2d684d6a1c330813423733601670839c7e82efc
+  data.tar.gz: a3f83e966247aee450f3a73615dce3d324f82ab944304be131dec81973d1984c405d060844601047ceb259163faaa79524d859bbe9a874479ea4a26c21530152

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.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)
+
 Version 1.0.1
 ------
 * Fixed an issue with RVM taking over the shell shim fd when it was not in use

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/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/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)

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/extension/models/type.rb

@@ -12,6 +12,7 @@ module Extension
         end
 
         def inherited(klass)
+          super
           @all_extension_types ||= []
           @all_extension_types << klass
         end

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

@@ -20,7 +20,7 @@ module Extension
           extension_context: extension_context,
         }
 
-        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, input).dig(*RESPONSE_FIELD)
+        response = ShopifyCli::PartnersAPI.query(context, GRAPHQL_FILE, **input).dig(*RESPONSE_FIELD)
         context.abort(context.message('tasks.errors.parse_error')) if response.nil?
 
         abort_if_user_errors(context, response)