shopify-cli 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d17f3e09b5ecfa047387eb3786b187bbb4e03068a28b71815c62a338e4d3b3a0
-  data.tar.gz: e7ae1f805df2f928ae5b1c043d9b864fc8151750f1869d4d23d8a73757ecbba0
+  metadata.gz: b05da9533ccffc11607217b455d2a23590668a445a0af58c67c168fe5a5dfe96
+  data.tar.gz: e10408bf78ac963dd50953edbf438bc4dbf247d0001db8a1b1013b0f981189f1
 SHA512:
-  metadata.gz: 609ad36002ecb5b13d41cb4c6a0cfb397e18087878372acc59e3f3520fad32eb59d661f122307ac95b0d456c216327da317f9c30a26bfdd360370cc5f0aede1d
-  data.tar.gz: '094c183b361bd503a15d87e89b37c065361b78b3cfa69902a8176644c4f1d67c3890902889a069dc4049bd5a22ec4e6b9af258f19e12a0fc9a4e10aa72bab7e3'
+  metadata.gz: 7626a67bc6ba0fe13b6223b4239927e4f4e39c74a2536e7fe0a38b4403d9c115771a913c4921d28a81175de84c1cc9e7fc9b84e046042a5957ba9f3aa1d56d7d
+  data.tar.gz: 630008b941f6c034f51fcdb370f6dd09dba5bcb18a44b5bd1035367443bdc28d679adf69ee9e0f3a9417ddfcbef473411d99934a9a14fc777310edf67677711c

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,6 +1,10 @@
+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 
+* Fix a bug when running the `connect` command with an account with multiple organizations
 
 Version 1.0.3
 ------

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

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

@@ -12,7 +12,7 @@ module Extension
       def call(context:, api_key:)
         input = { api_key: api_key }
 
-        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?
 
         Converters::AppConverter.from_hash(response.dig(APP_FIELD))

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

@@ -18,7 +18,7 @@ module Extension
           config: JSON.generate(config),
           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)

data/lib/project_types/script/commands/create.rb

@@ -34,12 +34,8 @@ module Script
       end
 
       def self.help
-        ShopifyCli::Context.message('script.create.help', ShopifyCli::TOOL_NAME)
-      end
-
-      def self.extended_help
         allowed_values = Script::Layers::Application::ExtensionPoints.types.map { |type| "{{cyan:#{type}}}" }
-        ShopifyCli::Context.message('script.create.extended_help', ShopifyCli::TOOL_NAME, allowed_values.join(', '))
+        ShopifyCli::Context.message('script.create.help', ShopifyCli::TOOL_NAME, allowed_values.join(', '))
       end
     end
   end

data/lib/project_types/script/commands/disable.rb

@@ -3,9 +3,8 @@
 module Script
   module Commands
     class Disable < ShopifyCli::Command
-      prerequisite_task :ensure_env
-
       def call(_args, _name)
+        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
         project = ScriptProject.current
         Layers::Application::DisableScript.call(
           ctx: @ctx,

data/lib/project_types/script/commands/enable.rb

@@ -3,7 +3,6 @@
 module Script
   module Commands
     class Enable < ShopifyCli::Command
-      prerequisite_task :ensure_env
       options do |parser, flags|
         parser.on('--config_props=KEYVALUEPAIRS', Array) do |t|
           flags[:config_props] = Hash[t.map { |s| s.split(':') }]
@@ -12,6 +11,7 @@ module Script
       end
 
       def call(_args, _name)
+        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
         project = ScriptProject.current
         api_key = project.env[:api_key]
         shop_domain = project.env[:shop]
@@ -32,6 +32,8 @@ module Script
           title: project.script_name
         ))
         @ctx.puts(@ctx.message('script.enable.info'))
+      rescue Errors::InvalidConfigYAMLError => e
+        UI::ErrorHandler.pretty_print_and_raise(e)
       rescue StandardError => e
         UI::ErrorHandler.pretty_print_and_raise(e, failed_op: @ctx.message('script.enable.error.operation_failed'))
       end
@@ -40,10 +42,6 @@ module Script
         ShopifyCli::Context.message('script.enable.help', ShopifyCli::TOOL_NAME)
       end
 
-      def self.extended_help
-        ShopifyCli::Context.message('script.enable.extended_help', ShopifyCli::TOOL_NAME)
-      end
-
       private
 
       def acquire_configuration(config_file: nil, config_props: nil)
@@ -59,6 +57,8 @@ module Script
           })
         end
         configuration
+      rescue Errno::ENOENT, Psych::SyntaxError
+        raise Errors::InvalidConfigYAMLError, options.flags[:config_file]
       end
 
       # No slice pre Ruby 2.5 so roll our own

data/lib/project_types/script/commands/push.rb

@@ -3,13 +3,12 @@
 module Script
   module Commands
     class Push < ShopifyCli::Command
-      prerequisite_task :ensure_env
-
       options do |parser, flags|
         parser.on('--force') { |t| flags[:force] = t }
       end
 
       def call(_args, _name)
+        ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
         project = ScriptProject.current
         api_key = project.env[:api_key]
         return @ctx.puts(self.class.help) unless api_key &&
@@ -31,10 +30,6 @@ module Script
       def self.help
         ShopifyCli::Context.message('script.push.help', ShopifyCli::TOOL_NAME)
       end
-
-      def self.extended_help
-        ShopifyCli::Context.message('script.push.extended_help', ShopifyCli::TOOL_NAME)
-      end
     end
   end
 end

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

@@ -7,13 +7,13 @@ discount:
 unit_limit_per_order:
   assemblyscript:
     package: "@shopify/extension-point-as-unit-limit-per-order"
-    version: "^0.1.6"
+    version: "^0.1.8"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 payment_filter:
   assemblyscript:
     package: "@shopify/extension-point-as-payment-filter"
-    version: "^0.2.2"
+    version: "^0.2.3"
     sdk-version: "^6.0.0"
     toolchain-version: "^1.1.0"
 shipping_filter:

data/lib/project_types/script/errors.rb

@@ -9,9 +9,17 @@ module Script
     class NoExistingStoresError < ScriptProjectError
       attr_reader :organization_id
       def initialize(organization_id)
+        super()
         @organization_id = organization_id
       end
     end
     class ScriptProjectAlreadyExistsError < ScriptProjectError; end
+    class InvalidConfigYAMLError < ScriptProjectError
+      attr_reader :config_file
+      def initialize(config_file)
+        super()
+        @config_file = config_file
+      end
+    end
   end
 end

data/lib/project_types/script/layers/domain/errors.rb

@@ -8,12 +8,14 @@ module Script
         class InvalidExtensionPointError < ScriptProjectError
           attr_reader :type
           def initialize(type)
+            super()
             @type = type
           end
         end
         class ScriptNotFoundError < ScriptProjectError
           attr_reader :script_name, :extension_point_type
           def initialize(extension_point_type, script_name)
+            super()
             @script_name = script_name
             @extension_point_type = extension_point_type
           end

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

@@ -21,6 +21,7 @@ module Script
         class ScriptRepushError < ScriptProjectError
           attr_reader :api_key
           def initialize(api_key)
+            super()
             @api_key = api_key
           end
         end

data/lib/project_types/script/messages/messages.rb

@@ -38,6 +38,9 @@ module Script
           invalid_extension_cause: "Invalid extension point %s",
           invalid_extension_help: "Allowed values: %s.",
 
+          invalid_config: "Can't change the configuration values because %1$s is missing or "\
+                          "it is not formatted properly.",
+
           script_not_found_cause: "Couldn't find script %s for extension point %s",
 
           app_not_installed_cause: "App not installed on development store.",
@@ -74,11 +77,9 @@ module Script
           help: <<~HELP,
           {{command:%1$s create script}}: Creates a script project.
             Usage: {{command:%1$s create script}}
-          HELP
-          extended_help: <<~HELP,
-            \s\sOptions:
-              \s\s{{command:--name=NAME}} Script project name. Use any string.
-              \s\s{{command:--extension_point=TYPE}} Extension point name. Allowed values: %2$s.
+            Options:
+              {{command:--name=NAME}} Script project name. Use any string.
+              {{command:--extension_point=TYPE}} Extension point name. Allowed values: %2$s.
           HELP
 
           error: {
@@ -94,10 +95,8 @@ module Script
           help: <<~HELP,
           Build the script and put it into production. If you've already pushed a script with the same extension point, use --force to replace the current script with the newest one.
             Usage: {{command:%s push}}
-          HELP
-          extended_help: <<~HELP,
-            \s\sOptions:
-              \s\s{{command:[--force]}} Forces the script to be overwritten if an instance of it already exists.
+            Options:
+              {{command:[--force]}} Forces the script to be overwritten if an instance of it already exists.
           HELP
 
           error: {
@@ -125,11 +124,9 @@ module Script
           help: <<~HELP,
           Turn on script in development store.
             Usage: {{command:%s enable}}
-          HELP
-          extended_help: <<~HELP,
-            \s\sOptions:
-              \s\s{{command:--config_props='name1:value1, name2:value2'}} Optional. Define the configuration of your script by passing individual name and value pairs. If used with --config_file, then matching values in --config_props will override those set in the file.
-              \s\s{{command:--config_file=<path/to/YAMLFilename>}} Optional. Define the configuration of your script using a YAML formatted file. --config_props values override properties in this file.
+            Options:
+              {{command:--config_props='name1:value1, name2:value2'}} Optional. Define the configuration of your script by passing individual name and value pairs. If used with --config_file, then matching values in --config_props will override those set in the file.
+              {{command:--config_file=<path/to/YAMLFilename>}} Optional. Define the configuration of your script using a YAML formatted file. --config_props values override properties in this file.
           HELP
 
           info: "{{*}} A script always remains enabled until you disable it - even after pushing "\

data/lib/project_types/script/ui/error_handler.rb

@@ -44,6 +44,10 @@ module Script
             cause_of_error: ShopifyCli::Context.message('script.error.invalid_context_cause'),
             help_suggestion: ShopifyCli::Context.message('script.error.invalid_context_help'),
           }
+        when Errors::InvalidConfigYAMLError
+          {
+            cause_of_error: ShopifyCli::Context.message('script.error.invalid_config', e.config_file),
+          }
         when Errors::InvalidScriptNameError
           {
             cause_of_error: ShopifyCli::Context.message('script.error.invalid_script_name_cause'),

data/lib/shopify-cli/command.rb

@@ -9,17 +9,19 @@ module ShopifyCli
     attr_accessor :options
 
     class << self
-      attr_writer :ctx
+      attr_writer :ctx, :task_registry
 
       def call(args, command_name)
         subcommand, resolved_name = subcommand_registry.lookup_command(args.first)
         if subcommand
           subcommand.ctx = @ctx
+          subcommand.task_registry = @task_registry
           subcommand.call(args, resolved_name, command_name)
         else
           cmd = new(@ctx)
           cmd.options.parse(@_options, args)
           return call_help(command_name) if cmd.options.help
+          run_prerequisites
           cmd.call(args, command_name)
         end
       end
@@ -41,13 +43,16 @@ module ShopifyCli
       end
 
       def prerequisite_task(*tasks)
-        tasks.each do |task|
-          prerequisite_tasks[task] = ShopifyCli::Tasks::Registry[task]
-        end
+        @prerequisite_tasks ||= []
+        @prerequisite_tasks += tasks
+      end
+
+      def run_prerequisites
+        (@prerequisite_tasks || []).each { |task| task_registry[task]&.call(@ctx) }
       end
 
-      def prerequisite_tasks
-        @prerequisite_tasks ||= {}
+      def task_registry
+        @task_registry || ShopifyCli::Tasks::Registry
       end
 
       def call_help(*cmds)
@@ -57,6 +62,7 @@ module ShopifyCli
     end
 
     def initialize(ctx = nil)
+      super()
       @ctx = ctx || ShopifyCli::Context.new
       self.options = Options.new
     end

data/lib/shopify-cli/commands/connect.rb

@@ -12,21 +12,14 @@ module ShopifyCli
           @ctx.puts prod_warning if [:rails, :node].include?(Project.current_project_type)
         end
 
-        env_data = begin
-          Resources::EnvFile.parse_external_env
-                   rescue Errno::ENOENT
-                     {}
-        end
-
-        org = fetch_org
-        id = org['id']
-        app = get_app(id, org['apps'])
-        shop = get_shop(org['stores'], id)
-
-        write_env(app, shop, env_data[:scopes], env_data[:extra])
-        write_cli_yml(project_type, id) unless Project.has_current?
+        org = ShopifyCli::Tasks::EnsureEnv.call(@ctx, regenerate: true)
+        api_key = Project.current.env['api_key']
+        write_cli_yml(project_type, org['id']) unless Project.has_current?
+        @ctx.puts(@ctx.message('core.connect.connected', get_app(org['apps'], api_key).first["title"]))
+      end
 
-        @ctx.puts(@ctx.message('core.connect.connected', app['title']))
+      def get_app(apps, api_key)
+        apps.select { |app| app["apiKey"] == api_key }
       end
 
       def ask_project_type
@@ -37,67 +30,6 @@ module ShopifyCli
         end
       end
 
-      def fetch_org
-        orgs = PartnersAPI::Organizations.fetch_with_app(@ctx)
-        org_id = if orgs.count == 1
-          orgs.first["id"]
-        else
-          CLI::UI::Prompt.ask(@ctx.message('core.connect.organization_select')) do |handler|
-            orgs.each do |org|
-              handler.option(
-                @ctx.message('core.partners_api.org_name_and_id', org['businessName'], org['id'])
-              ) { org["id"] }
-            end
-          end
-        end
-        org = orgs.find { |o| o["id"] == org_id }
-        org
-      end
-
-      def get_app(org_id, apps)
-        if apps.count == 1
-          apps.first
-        elsif apps.count == 0
-          @ctx.puts(@ctx.message('core.connect.no_apps'))
-          title = CLI::UI::Prompt.ask(@ctx.message('core.connect.app_name'))
-          type = CLI::UI::Prompt.ask(@ctx.message('core.connect.app_type.select')) do |handler|
-            handler.option(@ctx.message('core.connect.app_type.select_public')) { 'public' }
-            handler.option(@ctx.message('core.connect.app_type.select_custom')) { 'custom' }
-          end
-          ShopifyCli::Tasks::CreateApiClient.call(@ctx, org_id: org_id, title: title, type: type)
-        else
-          CLI::UI::Prompt.ask(@ctx.message('core.connect.app_select')) do |handler|
-            apps.each { |app| handler.option(app["title"]) { app } }
-          end
-        end
-      end
-
-      def get_shop(shops, id)
-        if shops.count == 1
-          shop = shops.first["shopDomain"]
-        elsif shops.count == 0
-          @ctx.puts(@ctx.message('core.connect.no_development_stores', id))
-        else
-          shop = CLI::UI::Prompt.ask(@ctx.message('core.connect.development_store_select')) do |handler|
-            shops.each { |s| handler.option(s["shopName"]) { s["shopDomain"] } }
-          end
-        end
-        shop
-      end
-
-      def write_env(app, shop, scopes, extra)
-        scopes = 'write_products,write_customers,write_draft_orders' if scopes.nil?
-        extra = {} if extra.nil?
-
-        Resources::EnvFile.new(
-          api_key: app["apiKey"],
-          secret: app["apiSecretKeys"].first["secret"],
-          shop: shop,
-          scopes: scopes,
-          extra: extra,
-        ).write(@ctx)
-      end
-
       def write_cli_yml(project_type, org_id)
         ShopifyCli::Project.write(
           @ctx,

data/lib/shopify-cli/commands/create.rb

@@ -32,7 +32,7 @@ module ShopifyCli
       end
 
       def self.help
-        project_types = all_visible_type.map(&:project_type).join(" | ")
+        project_types = all_visible_type.map(&:project_type).sort.join(" | ")
         ShopifyCli::Context.message('core.create.help', ShopifyCli::TOOL_NAME, project_types)
       end
 

data/lib/shopify-cli/commands/system.rb

@@ -36,11 +36,13 @@ module ShopifyCli
         cli_constants_extra = %w(
           PROJECT_TYPES_DIR
           TEMP_DIR
-          CACHE_DIR
-          TOOL_CONFIG_PATH
-          LOG_FILE
-          DEBUG_LOG_FILE
         )
+        cli_path_methods = [
+          :cache_dir,
+          :tool_config_path,
+          :log_file,
+          :debug_log_file,
+        ]
 
         cli_constants += cli_constants_extra if show_all_details
 
@@ -48,6 +50,12 @@ module ShopifyCli
         cli_constants.each do |s|
           @ctx.puts("  " + @ctx.message('core.system.const', s, ShopifyCli.const_get(s.to_sym)) + "\n")
         end
+
+        if show_all_details
+          cli_path_methods.each do |m|
+            @ctx.puts("  " + @ctx.message('core.system.const', m.upcase, ShopifyCli.send(m)) + "\n")
+          end
+        end
       end
 
       def display_cli_ruby(_show_all_details)
@@ -74,7 +82,7 @@ module ShopifyCli
       end
 
       def display_ngrok
-        ngrok_location = File.join(ShopifyCli::CACHE_DIR, 'ngrok')
+        ngrok_location = File.join(ShopifyCli.cache_dir, 'ngrok')
         if File.exist?(ngrok_location)
           @ctx.puts("  " + @ctx.message('core.system.ngrok_available', ngrok_location))
         else

data/lib/shopify-cli/core/entry_point.rb

@@ -35,7 +35,7 @@ module ShopifyCli
           task_registry = ShopifyCli::Tasks::Registry
 
           command, command_name, args = ShopifyCli::Resolver.call(args)
-          executor = ShopifyCli::Core::Executor.new(ctx, task_registry, log_file: ShopifyCli::LOG_FILE)
+          executor = ShopifyCli::Core::Executor.new(ctx, task_registry, log_file: ShopifyCli.log_file)
           ShopifyCli::Core::Monorail.log(command_name, args) do
             executor.call(command, command_name, args)
           end

data/lib/shopify-cli/core/executor.rb

@@ -3,16 +3,14 @@ require 'shopify_cli'
 module ShopifyCli
   module Core
     class Executor < CLI::Kit::Executor
-      def initialize(ctx, task_registry, *args)
+      def initialize(ctx, task_registry, *args, **kwargs)
         @ctx = ctx || ShopifyCli::Context.new
         @task_registry = task_registry || ShopifyCli::Tasks::TaskRegistry.new
-        super(*args)
+        super(*args, **kwargs)
       end
 
       def call(command, command_name, args)
-        command.prerequisite_tasks.each do |task, _|
-          @task_registry[task]&.call(@ctx)
-        end
+        command.task_registry = @task_registry
         command.ctx = @ctx
         super
       end

data/lib/shopify-cli/core/monorail.rb

@@ -99,7 +99,7 @@ module ShopifyCli
               success: err.nil?,
               error_message: err,
               uname: RbConfig::CONFIG["host"],
-              cli_version: ShopifyCli::Git.sha(dir: ShopifyCli::ROOT),
+              cli_version: ShopifyCli::VERSION,
               ruby_version: RUBY_VERSION,
             }.tap do |payload|
               payload[:metadata] = JSON.dump(metadata) unless metadata.empty?

data/lib/shopify-cli/db.rb

@@ -14,7 +14,7 @@ module ShopifyCli
 
     attr_reader :db # :nodoc:
 
-    def initialize(path: File.join(ShopifyCli::CACHE_DIR, ".db.pstore")) # :nodoc:
+    def initialize(path: File.join(ShopifyCli.cache_dir, ".db.pstore")) # :nodoc:
       @db = PStore.new(path)
     end
 

data/lib/shopify-cli/heroku.rb

@@ -36,7 +36,7 @@ module ShopifyCli
     def download
       return if installed?
 
-      result = @ctx.system('curl', '-o', download_path, DOWNLOAD_URLS[@ctx.os], chdir: ShopifyCli::CACHE_DIR)
+      result = @ctx.system('curl', '-o', download_path, DOWNLOAD_URLS[@ctx.os], chdir: ShopifyCli.cache_dir)
       @ctx.abort(@ctx.message('core.heroku.error.download')) unless result.success?
       @ctx.abort(@ctx.message('core.heroku.error.download')) unless File.exist?(download_path)
     end
@@ -44,7 +44,7 @@ module ShopifyCli
     def install
       return if installed?
 
-      result = @ctx.system('tar', '-xf', download_path, chdir: ShopifyCli::CACHE_DIR)
+      result = @ctx.system('tar', '-xf', download_path, chdir: ShopifyCli.cache_dir)
       @ctx.abort(@ctx.message('core.heroku.error.install')) unless result.success?
 
       @ctx.rm(download_path)
@@ -70,7 +70,7 @@ module ShopifyCli
     end
 
     def download_path
-      File.join(ShopifyCli::CACHE_DIR, download_filename)
+      File.join(ShopifyCli.cache_dir, download_filename)
     end
 
     def git_remote
@@ -79,7 +79,7 @@ module ShopifyCli
     end
 
     def heroku_command
-      local_path = File.join(ShopifyCli::CACHE_DIR, 'heroku', 'bin', 'heroku').to_s
+      local_path = File.join(ShopifyCli.cache_dir, 'heroku', 'bin', 'heroku').to_s
       if File.exist?(local_path)
         local_path
       else

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

@@ -16,23 +16,7 @@ module ShopifyCli
           already_connected_warning: "{{yellow:! This app appears to be already connected}}",
           connected: "{{v}} Project now connected to {{green:%s}}",
           project_type_select: "What type of project would you like to connect?",
-          organization_select: "To which partner organization does this project belong?",
-          app_select: "To which app does this project belong?",
-          no_development_stores: <<~MESSAGE,
-          No development stores available.
-          Visit {{underline:https://partners.shopify.com/%d/stores}} to create one
-          MESSAGE
-          development_store_select: "Which development store would you like to use?",
           cli_yml_saved: ".shopify-cli.yml saved to project root",
-
-          no_apps: 'You have no apps to connect to, creating a new app.',
-          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}}",
-          },
         },
 
         context: {
@@ -254,9 +238,21 @@ module ShopifyCli
 
         tasks: {
           ensure_env: {
-            api_key_question: "What is your Shopify API key?",
-            api_secret_key_question: "What is your Shopify API secret key?",
-            development_store_question: "What is your development store URL? (Example: my-dev-store.myshopify.com)",
+            organization_select: "To which partner organization does this project belong?",
+            no_development_stores: <<~MESSAGE,
+            No development stores available.
+            Visit {{underline:https://partners.shopify.com/%d/stores}} to create one
+            MESSAGE
+            development_store_select: "Which development store would you like to use?",
+            app_select: "To which app does this project belong?",
+            no_apps: 'You have no apps to connect to, creating a new app.',
+            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}}",
+            },
           },
           ensure_dev_store: {
             could_not_verify_store: "Couldn't verify your store %s",

data/lib/shopify-cli/process_supervision.rb

@@ -5,9 +5,6 @@ module ShopifyCli
   # ProcessSupervision wraps a running process spawned by `exec` and keeps track
   # if its `pid` and keeps a log file for it as well
   class ProcessSupervision
-    # is the directory where the pid and logfile are kept
-    RUN_DIR = File.join(ShopifyCli::CACHE_DIR, 'sv')
-
     # a string or a symbol to identify this process by
     attr_reader :identifier
     # process ID for the running process
@@ -20,6 +17,11 @@ module ShopifyCli
     attr_reader :log_path
 
     class << self
+      def run_dir
+        # is the directory where the pid and logfile are kept
+        File.join(ShopifyCli.cache_dir, 'sv')
+      end
+
       ##
       # Will find and create a new instance of ProcessSupervision for a running process
       # if it is currently running. It will return nil if the process is not running.
@@ -34,7 +36,7 @@ module ShopifyCli
       #   will be nil if the process is not running.
       #
       def for_ident(identifier)
-        pid, time = File.read(File.join(RUN_DIR, "#{identifier}.pid")).split(':')
+        pid, time = File.read(File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.pid")).split(':')
         new(identifier, pid: Integer(pid), time: time)
       rescue Errno::ENOENT
         nil
@@ -108,8 +110,8 @@ module ShopifyCli
       @identifier = identifier
       @pid = pid
       @time = time
-      @pid_path = File.join(RUN_DIR, "#{identifier}.pid")
-      @log_path = File.join(RUN_DIR, "#{identifier}.log")
+      @pid_path = File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.pid")
+      @log_path = File.join(ShopifyCli::ProcessSupervision.run_dir, "#{identifier}.log")
     end
 
     ##

data/lib/shopify-cli/project_type.rb

@@ -14,6 +14,7 @@ module ShopifyCli
       alias_method :all_loaded, :repository
 
       def inherited(klass)
+        super
         repository << klass
         klass.project_type = @current_type
         klass.project_load_shallow = @shallow_load
@@ -32,7 +33,7 @@ module ShopifyCli
 
       def load_all
         Dir.glob(File.join(ShopifyCli::ROOT, 'lib', 'project_types', '*', 'cli.rb')).map do |filepath|
-          load_type(filepath.split(File::Separator)[-2], true)
+          load_type(filepath.split(File::Separator)[-2].to_sym, true)
         end
       end
 
@@ -64,7 +65,7 @@ module ShopifyCli
 
       def register_task(task, name)
         return if project_load_shallow
-        Task::Registry.add(const_get(task), name)
+        ShopifyCli::Task.register(task, name)
       end
 
       def register_messages(messages)

data/lib/shopify-cli/sub_command.rb

@@ -8,6 +8,7 @@ module ShopifyCli
         cmd = new(@ctx)
         args = cmd.options.parse(@_options, args[1..-1] || [])
         return call_help(parent_command, command_name) if cmd.options.help
+        run_prerequisites
         cmd.call(args, command_name)
       end
     end

data/lib/shopify-cli/task.rb

@@ -2,9 +2,9 @@ require 'shopify_cli'
 
 module ShopifyCli
   class Task
-    def self.call(*args)
+    def self.call(*args, **kwargs)
       task = new
-      task.call(*args)
+      task.call(*args, **kwargs)
     end
   end
 end

data/lib/shopify-cli/tasks.rb

@@ -12,15 +12,22 @@ module ShopifyCli
       end
 
       def [](name)
-        @tasks[name]
+        class_or_proc = @tasks[name]
+        if class_or_proc.is_a?(Class)
+          class_or_proc
+        elsif class_or_proc.respond_to?(:call)
+          class_or_proc.call
+        else
+          class_or_proc
+        end
       end
     end
 
     Registry = TaskRegistry.new
 
-    def self.register(task, name, path)
-      autoload(task, path)
-      Registry.add(const_get(task), name)
+    def self.register(task, name, path = nil)
+      autoload(task, path) if path
+      Registry.add(-> () { const_get(task) }, name)
     end
 
     register :CreateApiClient, :create_api_client, 'shopify-cli/tasks/create_api_client'

data/lib/shopify-cli/tasks/ensure_env.rb

@@ -3,27 +3,84 @@ require 'shopify_cli'
 module ShopifyCli
   module Tasks
     class EnsureEnv < ShopifyCli::Task
-      def call(ctx)
+      def call(ctx, regenerate: false, required: [:api_key, :secret])
         @ctx = ctx
-        Resources::EnvFile.read(ctx.root)
-      rescue Errno::ENOENT
-        ask
+        env_data =
+          begin
+            Resources::EnvFile.parse_external_env
+          rescue Errno::ENOENT
+            {}
+          end
+
+        return {} if !regenerate && required.all? { |property| env_data[property] }
+
+        org = fetch_org
+        write_env(env_data, org)
+        org
+      end
+
+      private
+
+      def fetch_org
+        orgs = PartnersAPI::Organizations.fetch_with_app(@ctx)
+        org_id = if orgs.count == 1
+          orgs.first["id"]
+        else
+          CLI::UI::Prompt.ask(@ctx.message('core.tasks.ensure_env.organization_select')) do |handler|
+            orgs.each do |org|
+              handler.option(
+                @ctx.message('core.partners_api.org_name_and_id', org['businessName'], org['id'])
+              ) { org["id"] }
+            end
+          end
+        end
+        orgs.find { |o| o["id"] == org_id }
       end
 
-      def ask
-        api_key = CLI::UI.ask(@ctx.message('core.tasks.ensure_env.api_key_question'))
-        api_secret = CLI::UI.ask(@ctx.message('core.tasks.ensure_env.api_secret_key_question'))
-        shop = CLI::UI.ask(@ctx.message('core.tasks.ensure_env.development_store_question'))
-        shop.gsub!(/https?\:\/\//, '')
-
-        env = Resources::EnvFile.new(
-          api_key: api_key,
-          secret: api_secret,
-          shop: shop,
-          host: ShopifyCli::Tunnel.start(@ctx),
-          scopes: 'write_products,write_customers,write_draft_orders',
+      def get_app(org_id, apps)
+        if apps.count == 1
+          apps.first
+        elsif apps.count == 0
+          @ctx.puts(@ctx.message('core.tasks.ensure_env.no_apps'))
+          title = CLI::UI::Prompt.ask(@ctx.message('core.tasks.ensure_env.app_name'))
+          type = CLI::UI::Prompt.ask(@ctx.message('core.tasks.ensure_env.app_type.select')) do |handler|
+            handler.option(@ctx.message('core.tasks.ensure_env.app_type.select_public')) { 'public' }
+            handler.option(@ctx.message('core.tasks.ensure_env.app_type.select_custom')) { 'custom' }
+          end
+          ShopifyCli::Tasks::CreateApiClient.call(@ctx, org_id: org_id, title: title, type: type)
+        else
+          CLI::UI::Prompt.ask(@ctx.message('core.tasks.ensure_env.app_select')) do |handler|
+            apps.each { |app| handler.option(app["title"]) { app } }
+          end
+        end
+      end
+
+      def get_shop(shops, id)
+        if shops.count == 1
+          shop = shops.first["shopDomain"]
+        elsif shops.count == 0
+          @ctx.puts(@ctx.message('core.tasks.ensure_env.no_development_stores', id))
+        else
+          shop = CLI::UI::Prompt.ask(@ctx.message('core.tasks.ensure_env.development_store_select')) do |handler|
+            shops.each { |s| handler.option(s["shopName"]) { s["shopDomain"] } }
+          end
+        end
+        shop
+      end
+
+      def write_env(env_data, org)
+        id = org['id']
+        app = get_app(id, org['apps'])
+
+        env_data[:shop] = get_shop(org['stores'], id)
+        env_data[:api_key] = app["apiKey"]
+        env_data[:secret] = app["apiSecretKeys"].first["secret"]
+        env_data[:scopes] = 'write_products,write_customers,write_draft_orders' if env_data[:scopes].nil?
+        env_data[:extra] = {} if env_data[:extra].nil?
+
+        Resources::EnvFile.new(
+          env_data
         ).write(@ctx)
-        env
       end
     end
   end

data/lib/shopify-cli/tunnel.rb

@@ -88,7 +88,7 @@ module ShopifyCli
     #
     def auth(ctx, token)
       install(ctx)
-      ctx.system(File.join(ShopifyCli::CACHE_DIR, 'ngrok'), 'authtoken', token)
+      ctx.system(File.join(ShopifyCli.cache_dir, 'ngrok'), 'authtoken', token)
     end
 
     ##
@@ -122,14 +122,14 @@ module ShopifyCli
     private
 
     def install(ctx)
-      return if File.exist?(File.join(ShopifyCli::CACHE_DIR, 'ngrok'))
+      return if File.exist?(File.join(ShopifyCli.cache_dir, 'ngrok'))
       spinner = CLI::UI::SpinGroup.new
       spinner.add('Installing ngrok...') do
-        zip_dest = File.join(ShopifyCli::CACHE_DIR, 'ngrok.zip')
+        zip_dest = File.join(ShopifyCli.cache_dir, 'ngrok.zip')
         unless File.exist?(zip_dest)
-          ctx.system('curl', '-o', zip_dest, DOWNLOAD_URLS[ctx.os], chdir: ShopifyCli::CACHE_DIR)
+          ctx.system('curl', '-o', zip_dest, DOWNLOAD_URLS[ctx.os], chdir: ShopifyCli.cache_dir)
         end
-        ctx.system('unzip', '-u', zip_dest, chdir: ShopifyCli::CACHE_DIR)
+        ctx.system('unzip', '-u', zip_dest, chdir: ShopifyCli.cache_dir)
         ctx.rm(zip_dest)
       end
       spinner.wait
@@ -143,7 +143,7 @@ module ShopifyCli
     end
 
     def ngrok_command(port)
-      "exec #{File.join(ShopifyCli::CACHE_DIR, 'ngrok')} http -inspect=false -log=stdout -log-level=debug #{port}"
+      "exec #{File.join(ShopifyCli.cache_dir, 'ngrok')} http -inspect=false -log=stdout -log-level=debug #{port}"
     end
 
     def seconds_to_hm(seconds)

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/shopify_cli.rb

@@ -44,10 +44,6 @@ module ShopifyCli
   ROOT              = File.expand_path('../..', __FILE__)
   PROJECT_TYPES_DIR = File.join(ROOT, 'lib', 'project_types')
   TEMP_DIR          = File.join(ROOT, '.tmp')
-  CACHE_DIR         = File.join(File.expand_path(ENV.fetch('XDG_CACHE_HOME', '~/.cache')), TOOL_NAME)
-  TOOL_CONFIG_PATH  = File.join(File.expand_path(ENV.fetch('XDG_CONFIG_HOME', '~/.config')), TOOL_NAME)
-  LOG_FILE          = File.join(TOOL_CONFIG_PATH, 'logs', 'log.log')
-  DEBUG_LOG_FILE    = File.join(TOOL_CONFIG_PATH, 'logs', 'debug.log')
 
   # programmer emoji if default install location, else wrench emoji
   EMOJI    = ROOT == '/opt/shopify' ? "\u{1f469}\u{200d}\u{1f4bb}" : "\u{1f527}"
@@ -82,7 +78,7 @@ module ShopifyCli
   # ShopifyCli::Config
   autocall(:Config)   { CLI::Kit::Config.new(tool_name: TOOL_NAME) }
   # ShopifyCli::Logger
-  autocall(:Logger)   { CLI::Kit::Logger.new(debug_log_file: DEBUG_LOG_FILE) }
+  autocall(:Logger)   { CLI::Kit::Logger.new(debug_log_file: ShopifyCli.debug_log_file) }
   # ShopifyCli::Resolver
   autocall(:Resolver) do
     ShopifyCli::Core::HelpResolver.new(
@@ -93,7 +89,7 @@ module ShopifyCli
   # ShopifyCli::ErrorHandler
   autocall(:ErrorHandler) do
     CLI::Kit::ErrorHandler.new(
-      log_file: ShopifyCli::LOG_FILE,
+      log_file: ShopifyCli.log_file,
       exception_reporter: nil,
     )
   end
@@ -127,7 +123,33 @@ module ShopifyCli
 
   require 'shopify-cli/messages/messages'
   Context.load_messages(ShopifyCli::Messages::MESSAGES)
-end
 
-# Make sure the cache dir always exists
-FileUtils.mkdir_p(ShopifyCli::CACHE_DIR)
+  def self.cache_dir
+    cache_dir = if ENV.key?('RUNNING_SHOPIFY_CLI_TESTS')
+      TEMP_DIR
+    else
+      File.join(File.expand_path(ENV.fetch('XDG_CACHE_HOME', '~/.cache')), TOOL_NAME)
+    end
+
+    # Make sure the cache dir always exists
+    @cache_dir_exists ||= FileUtils.mkdir_p(cache_dir)
+
+    cache_dir
+  end
+
+  def self.tool_config_path
+    if ENV.key?('RUNNING_SHOPIFY_CLI_TESTS')
+      TEMP_DIR
+    else
+      File.join(File.expand_path(ENV.fetch('XDG_CONFIG_HOME', '~/.config')), TOOL_NAME)
+    end
+  end
+
+  def self.log_file
+    File.join(tool_config_path, 'logs', 'log.log')
+  end
+
+  def self.debug_log_file
+    File.join(tool_config_path, 'logs', 'debug.log')
+  end
+end

metadata

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