shopify-cli 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa8d08ea4c9f452ea672ebe158f4e900eda442cc17aa46905d25aa53a7f3a673
-  data.tar.gz: 516ee988dee9309aa0e3319d576fe5fcd13065fa08b0b9a4d648fced6642d26e
+  metadata.gz: 3355ade46f06f8fad98098842f7b68bb0a154a53921a498ca4aba18379512ff6
+  data.tar.gz: 57617469febb8905d737a9991f4da4a578e0f87bc8cad17bfc3d674e28cd40c2
 SHA512:
-  metadata.gz: dc4c9b95106709203f6153310bdee08183b3bad45f1ff7f3512b408fabfa478391ca4e5adbfe6cc6b2aaaea655363067de9bacb39a8ff02016e5df03aa7366de
-  data.tar.gz: 503b6c26f1c57e65f5a22b5171faa8d9e5117c404ca02bec6a92af571cadf17f74918fd8bcf2b993100b0e09b3f20576dbeca401cbbb93c7f2355ac389bdf6ed
+  metadata.gz: a71cd8e3f4f9409f0c527ab6da9152e592d7cd1be173d9fe4e1499713998cf245541504151a1e63fa5901cf0c83b1d41302bc6628defff86042908b5e63d37af
+  data.tar.gz: 2d16c25b44bd21abbcd154abd0ff5d3b3e9e464b7c89377b523299855800cd65bf3357d89b3d92d8a66137e8316d64de755263a1bc21f30df1c5ad3b8e492492

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+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/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/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",

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…",

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

@@ -1,18 +1,18 @@
 discount:
   assemblyscript:
     package: "@shopify/extension-point-as-discount"
-    version: "^0.2.2"
+    version: "^0.2.3"
     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.2"
+    version: "^0.1.4"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    version: "^0.1.2"
+    version: "^0.2.1"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"

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

@@ -34,7 +34,7 @@ module Script
 
         def dependencies_installed?
           # Assuming if node_modules folder exist at root of script folder, all deps are installed
-          ctx.exist?("node_modules")
+          ctx.dir_exist?("node_modules")
         end
 
         private

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

@@ -22,7 +22,7 @@ module Script
         def get_push_package(script, compiled_type)
           build_file_path = file_path(script.name, compiled_type)
 
-          raise Domain::PushPackageNotFoundError unless File.exist?(build_file_path)
+          raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
           script_content = File.read(build_file_path)
 

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

@@ -9,7 +9,7 @@ module Script
 
         def get_script(language, extension_point_type, script_name)
           source_file_path = src_code_file(language)
-          unless File.exist?(source_file_path)
+          unless ctx.file_exist?(source_file_path)
             raise Domain::Errors::ScriptNotFoundError.new(extension_point_type, source_file_path)
           end
 

data/lib/project_types/script/script_project.rb

@@ -36,14 +36,14 @@ module Script
 
     class << self
       def create(ctx, dir)
-        raise Errors::ScriptProjectAlreadyExistsError, dir if ctx.exist?(dir)
+        raise Errors::ScriptProjectAlreadyExistsError, dir if ctx.dir_exist?(dir)
         ctx.mkdir_p(dir)
         ctx.chdir(dir)
       end
 
       def cleanup(ctx:, script_name:, root_dir:)
         ctx.chdir(root_dir)
-        ctx.rm_r("#{root_dir}/#{script_name}") if ctx.exist?("#{root_dir}/#{script_name}")
+        ctx.rm_r("#{root_dir}/#{script_name}") if ctx.dir_exist?("#{root_dir}/#{script_name}")
       end
     end
   end

data/lib/shopify-cli/admin_api/schema.rb

@@ -5,7 +5,8 @@ module ShopifyCli
     class Schema < Hash
       def self.get(ctx)
         unless ShopifyCli::DB.exists?(:shopify_admin_schema)
-          schema = AdminAPI.query(ctx, 'admin_introspection')
+          shop = Project.current.env.shop || get_shop(@ctx)
+          schema = AdminAPI.query(ctx, 'admin_introspection', shop: shop)
           ShopifyCli::DB.set(shopify_admin_schema: JSON.dump(schema))
         end
         # This is ruby magic for making a new hash with another hash.
@@ -27,6 +28,15 @@ module ShopifyCli
           object["name"]
         end
       end
+
+      private
+
+      def get_shop(ctx)
+        res = ShopifyCli::Tasks::SelectOrgAndShop.call(ctx)
+        domain = res[:shop_domain]
+        Project.current.env.update(ctx, :shop, domain)
+        domain
+      end
     end
   end
 end

data/lib/shopify-cli/context.rb

@@ -146,10 +146,19 @@ module ShopifyCli
     # #### Parameters
     # * `path` - the file path to a directory, relative to the context root to remove from the FS
     #
-    def exist?(path)
+    def dir_exist?(path)
       Dir.exist?(ctx_path(path))
     end
 
+    # checks if a file exists, the filepath is relative to the command root unless absolute
+    #
+    # #### Parameters
+    # * `path` - the file path to a file, relative to the context root to remove from the FS
+    #
+    def file_exist?(path)
+      File.exist?(ctx_path(path))
+    end
+
     # will recursively copy a directory from the FS, the filepath is relative to the command
     # root unless absolute
     #

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler