shopify-cli 0.9.3 → 1.0.4

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

@@ -24,6 +24,15 @@ module ShopifyCli
           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: {
@@ -52,6 +61,19 @@ module ShopifyCli
           saved: "%s saved to project root",
         },
 
+        config: {
+          help: <<~HELP,
+          Change configuration of how the CLI operates
+            Usage: {{command:%s config [ feature ] [ feature_name ] }}
+          HELP
+          feature: {
+            enabled: "{{v}} feature {{green:%s}} was enabled",
+            disabled: "{{v}} feature {{green:%s}} was disabled",
+            is_enabled: "{{v}} feature {{green:%s}} is enabled",
+            is_disabled: "{{v}} feature {{green:%s}} is disabled",
+          },
+        },
+
         git: {
           error: {
             directory_exists: "Project directory already exists. Please create a project with a new name.",
@@ -251,6 +273,20 @@ module ShopifyCli
               "{{x}} error: For authentication issues, run {{command:%s logout}} to clear invalid credentials",
             update_prompt: "Do you want to update your application url?",
           },
+          select_org_and_shop: {
+            authentication_issue: "For authentication issues, run {{command:%s logout}} to clear invalid credentials",
+            create_store: "Visit {{underline:https://partners.shopify.com/%s/stores}} to create one",
+            development_store: "Using development store {{green:%s}}",
+            development_store_select: "Select a development store",
+            error: {
+              no_development_stores: "{{x}} No Development Stores available.",
+              no_organizations: "No partner organizations available.",
+              organization_not_found: "Cannot find a partner organization with that ID",
+              partners_notice: "Please visit https://partners.shopify.com/ to create a partners account",
+            },
+            organization: "Partner organization {{green:%s (%s)}}",
+            organization_select: "Select partner organization",
+          },
         },
 
         tunnel: {
@@ -259,10 +295,17 @@ module ShopifyCli
             url_fetch_failure: "Unable to fetch external url",
           },
 
-          stopped: "{{green:x}} ngrok tunnel stopped",
           not_running: "{{green:x}} ngrok tunnel not running",
-          start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",
+          signup_suggestion: <<~MESSAGE,
+          {{*}} To avoid tunnels that timeout, it is recommended to signup for a free ngrok
+          account at {{underline:https://ngrok.com/signup}}. After you signup, install your
+          personalized authorization token using {{command:%s tunnel auth <token>}}.
+          MESSAGE
           start: "{{v}} ngrok tunnel running at {{underline:%s}}",
+          start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",
+          stopped: "{{green:x}} ngrok tunnel stopped",
+          timed_out: "{{x}} ngrok tunnel has timed out, restarting ...",
+          will_timeout: "{{*}} This tunnel will timeout in {{red:%s}}",
         },
 
         version: {

data/lib/shopify-cli/partners_api/organizations.rb

@@ -4,25 +4,25 @@ module ShopifyCli
       class << self
         def fetch_all(ctx)
           resp = PartnersAPI.query(ctx, 'all_organizations')
-          resp['data']['organizations']['nodes'].map do |org|
-            org['stores'] = org['stores']['nodes']
+          (resp.dig('data', 'organizations', 'nodes') || []).map do |org|
+            org['stores'] = (org.dig('stores', 'nodes') || [])
             org
           end
         end
 
         def fetch(ctx, id:)
           resp = PartnersAPI.query(ctx, 'find_organization', id: id)
-          org = resp['data']['organizations']['nodes'].first
+          org = resp.dig('data', 'organizations', 'nodes').first
           return nil if org.nil?
-          org['stores'] = org['stores']['nodes']
+          org['stores'] = (org.dig('stores', 'nodes') || [])
           org
         end
 
         def fetch_with_app(ctx)
           resp = PartnersAPI.query(ctx, 'all_orgs_with_apps')
-          resp['data']['organizations']['nodes'].map do |org|
-            org['stores'] = org['stores']['nodes']
-            org['apps'] = org['apps']['nodes']
+          (resp.dig('data', 'organizations', 'nodes') || []).map do |org|
+            org['stores'] = (org.dig('stores', 'nodes') || [])
+            org['apps'] = (org.dig('apps', 'nodes') || [])
             org
           end
         end

data/lib/shopify-cli/project_type.rb

@@ -1,11 +1,12 @@
 module ShopifyCli
   class ProjectType
+    extend Feature::Set
+
     class << self
       attr_accessor :project_type,
         :project_name,
         :project_creator_command_class,
         :project_load_shallow
-      attr_reader :hidden
 
       def repository
         @repository ||= []
@@ -53,10 +54,6 @@ module ShopifyCli
         const_get(@project_creator_command_class)
       end
 
-      def hidden_project_type
-        @hidden = true
-      end
-
       def register_command(const, cmd)
         return if project_load_shallow
         Context.new.abort(

data/lib/shopify-cli/tasks.rb

@@ -27,6 +27,7 @@ module ShopifyCli
     register :EnsureEnv, :ensure_env, 'shopify-cli/tasks/ensure_env'
     register :EnsureLoopbackURL, :ensure_loopback_url, 'shopify-cli/tasks/ensure_loopback_url'
     register :EnsureDevStore, :ensure_dev_store, 'shopify-cli/tasks/ensure_dev_store'
+    register :SelectOrgAndShop, :select_org_and_shop, 'shopify-cli/tasks/select_org_and_shop'
     register :UpdateDashboardURLS, :update_dashboard_urls, 'shopify-cli/tasks/update_dashboard_urls'
   end
 end

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

@@ -14,7 +14,6 @@ module ShopifyCli
         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(

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

@@ -0,0 +1,77 @@
+require 'shopify_cli'
+
+module ShopifyCli
+  module Tasks
+    class SelectOrgAndShop < ShopifyCli::Task
+      attr_reader :ctx
+
+      def call(ctx, organization_id: nil, shop_domain: nil)
+        @ctx = ctx
+        return response(organization_id.to_i, shop_domain) unless organization_id.nil? || shop_domain.nil?
+        org = get_organization(organization_id)
+        shop_domain ||= get_shop_domain(org)
+        response(org["id"].to_i, shop_domain)
+      end
+
+      private
+
+      def response(organization_id, shop_domain)
+        {
+          organization_id: organization_id,
+          shop_domain: shop_domain,
+        }
+      end
+
+      def organizations
+        @organizations ||= ShopifyCli::PartnersAPI::Organizations.fetch_all(ctx)
+      end
+
+      def get_organization(organization_id)
+        @organization ||= if !organization_id.nil?
+          org = ShopifyCli::PartnersAPI::Organizations.fetch(ctx, id: organization_id)
+          if org.nil?
+            ctx.puts(ctx.message('core.tasks.select_org_and_shop.error.authentication_issue', ShopifyCli::TOOL_NAME))
+            ctx.abort(ctx.message('core.tasks.select_org_and_shop.error.organization_not_found'))
+          end
+          org
+        elsif organizations.count == 0
+          ctx.puts(ctx.message('core.tasks.select_org_and_shop.error.partners_notice'))
+          ctx.puts(ctx.message('core.tasks.select_org_and_shop.authentication_issue', ShopifyCli::TOOL_NAME))
+          ctx.abort(ctx.message('core.tasks.select_org_and_shop.error.no_organizations'))
+        elsif organizations.count == 1
+          org = organizations.first
+          ctx.puts(ctx.message('core.tasks.select_org_and_shop.organization', org['businessName'], org['id']))
+          org
+        else
+          org_id = CLI::UI::Prompt.ask(ctx.message('core.tasks.select_org_and_shop.organization_select')) do |handler|
+            organizations.each do |o|
+              handler.option(ctx.message('core.partners_api.org_name_and_id', o['businessName'], o['id'])) { o['id'] }
+            end
+          end
+          organizations.find { |o| o['id'] == org_id }
+        end
+      end
+
+      def get_shop_domain(organization)
+        valid_stores = organization['stores'].select do |store|
+          store['transferDisabled'] == true || store['convertableToPartnerTest'] == true
+        end
+
+        if valid_stores.count == 0
+          ctx.puts(ctx.message('core.tasks.select_org_and_shop.error.no_development_stores'))
+          ctx.puts(ctx.message('core.tasks.select_org_and_shop.create_store', organization['id']))
+          ctx.puts(ctx.message('core.tasks.select_org_and_shop.authentication_issue', ShopifyCli::TOOL_NAME))
+        elsif valid_stores.count == 1
+          domain = valid_stores.first['shopDomain']
+          ctx.puts(ctx.message('core.tasks.select_org_and_shop.development_store', domain))
+          domain
+        else
+          CLI::UI::Prompt.ask(
+            ctx.message('core.tasks.select_org_and_shop.development_store_select'),
+            options: valid_stores.map { |s| s['shopDomain'] }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -28,16 +28,17 @@ module ShopifyCli
       end
 
       def construct_redirect_urls(urls, new_url, callback_url)
-        urls.map do |url|
+        new_urls = urls.map do |url|
           if (match = url.match(NGROK_REGEX))
             "#{new_url}#{match[2]}"
           else
             url
           end
         end
-        if urls.grep(/#{new_url}#{callback_url}/).empty?
-          urls.push("#{new_url}#{callback_url}")
+        if new_urls.grep(/#{new_url}#{callback_url}/).empty?
+          new_urls.push("#{new_url}#{callback_url}")
         end
+        new_urls.uniq
       end
     end
   end

data/lib/shopify-cli/tunnel.rb

@@ -62,14 +62,19 @@ module ShopifyCli
     #
     def start(ctx, port: PORT)
       install(ctx)
-      process = ShopifyCli::ProcessSupervision.start(:ngrok, ngrok_command(port))
-      log = fetch_url(ctx, process.log_path)
-      if log.account
-        ctx.puts(ctx.message('core.tunnel.start_with_account', log.url, log.account))
+      url, account, seconds_remaining = start_ngrok(ctx, port)
+      if account
+        ctx.puts(ctx.message('core.tunnel.start_with_account', url, account))
       else
-        ctx.puts(ctx.message('core.tunnel.start', log.url))
+        if seconds_remaining <= 0
+          ctx.puts(ctx.message('core.tunnel.timed_out'))
+          url, _account, seconds_remaining = restart_ngrok(ctx, port)
+        end
+        ctx.puts(ctx.message('core.tunnel.start', url))
+        ctx.puts(ctx.message('core.tunnel.will_timeout', seconds_to_hm(seconds_remaining)))
+        ctx.puts(ctx.message('core.tunnel.signup_suggestion', ShopifyCli::TOOL_NAME))
       end
-      log.url
+      url
     end
 
     ##
@@ -138,13 +143,30 @@ module ShopifyCli
     end
 
     def ngrok_command(port)
-      "exec #{File.join(ShopifyCli::CACHE_DIR, 'ngrok')} http -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)
+      format("%d hours %d minutes", seconds / 3600, seconds / 60 % 60)
+    end
+
+    def start_ngrok(ctx, port)
+      process = ShopifyCli::ProcessSupervision.start(:ngrok, ngrok_command(port))
+      log = fetch_url(ctx, process.log_path)
+      seconds_remaining = (process.time.to_i + log.timeout) - Time.now.to_i
+      [log.url, log.account, seconds_remaining]
+    end
+
+    def restart_ngrok(ctx, port)
+      unless ShopifyCli::ProcessSupervision.stop(:ngrok)
+        ctx.abort(ctx.message('core.tunnel.error.stop'))
+      end
+      start_ngrok(ctx, port)
+    end
     class LogParser # :nodoc:
       TIMEOUT = 10
 
-      attr_reader :url, :account
+      attr_reader :url, :account, :timeout
 
       def initialize(log_path)
         @log_path = log_path
@@ -173,7 +195,9 @@ module ShopifyCli
       end
 
       def parse_account
-        @account, _ = @log.match(/AccountName:([\w\s]+) SessionDuration/)&.captures
+        account, timeout, _ = @log.match(/AccountName:([\w\s]*) SessionDuration:([\d]+) PlanName/)&.captures
+        @account = account&.empty? ? nil : account
+        @timeout = timeout&.empty? ? 0 : timeout.to_i
       end
 
       def error

data/lib/shopify-cli/version.rb

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

data/lib/shopify_cli.rb

@@ -105,6 +105,7 @@ module ShopifyCli
   autoload :Context, 'shopify-cli/context'
   autoload :Core, 'shopify-cli/core'
   autoload :DB, 'shopify-cli/db'
+  autoload :Feature, 'shopify-cli/feature'
   autoload :Form, 'shopify-cli/form'
   autoload :Git, 'shopify-cli/git'
   autoload :Helpers, 'shopify-cli/helpers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -216,8 +216,6 @@ files:
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
-- lib/project_types/script/forms/enable.rb
-- lib/project_types/script/forms/push.rb
 - lib/project_types/script/forms/script_form.rb
 - lib/project_types/script/graphql/app_script_update_or_create.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
@@ -249,6 +247,7 @@ files:
 - lib/project_types/script/templates/ts/as-pect.config.js
 - lib/project_types/script/templates/ts/as-pect.d.ts
 - lib/project_types/script/ui/error_handler.rb
+- lib/project_types/script/ui/printing_spinner.rb
 - lib/project_types/script/ui/strict_spinner.rb
 - lib/rubygems_plugin.rb
 - lib/shopify-cli/admin_api.rb
@@ -257,6 +256,7 @@ files:
 - lib/shopify-cli/api.rb
 - lib/shopify-cli/command.rb
 - lib/shopify-cli/commands.rb
+- lib/shopify-cli/commands/config.rb
 - lib/shopify-cli/commands/connect.rb
 - lib/shopify-cli/commands/create.rb
 - lib/shopify-cli/commands/help.rb
@@ -267,9 +267,11 @@ files:
 - lib/shopify-cli/core.rb
 - lib/shopify-cli/core/entry_point.rb
 - lib/shopify-cli/core/executor.rb
+- lib/shopify-cli/core/finalize.rb
 - lib/shopify-cli/core/help_resolver.rb
 - lib/shopify-cli/core/monorail.rb
 - lib/shopify-cli/db.rb
+- lib/shopify-cli/feature.rb
 - lib/shopify-cli/form.rb
 - lib/shopify-cli/git.rb
 - lib/shopify-cli/helpers.rb
@@ -296,6 +298,7 @@ files:
 - lib/shopify-cli/tasks/ensure_dev_store.rb
 - lib/shopify-cli/tasks/ensure_env.rb
 - lib/shopify-cli/tasks/ensure_loopback_url.rb
+- lib/shopify-cli/tasks/select_org_and_shop.rb
 - lib/shopify-cli/tasks/update_dashboard_urls.rb
 - lib/shopify-cli/tunnel.rb
 - lib/shopify-cli/version.rb

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Forms
-    class Enable < ScriptForm
-      flag_arguments :api_key, :shop_domain
-
-      def ask
-        self.api_key ||= ask_api_key
-        self.shop_domain ||= ask_shop_domain
-      end
-
-      private
-
-      def ask_api_key
-        ask_app_api_key(organization['apps'], message: ctx.message('script.forms.enable.ask_app_api_key'))
-      end
-
-      def ask_shop_domain
-        super(organization, message: ctx.message('script.forms.enable.ask_shop_domain'))
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Forms
-    class Push < ScriptForm
-      flag_arguments :api_key, :force
-
-      def ask
-        self.api_key ||= ask_api_key
-      end
-
-      private
-
-      def ask_api_key
-        ask_app_api_key(organization['apps'])
-      end
-    end
-  end
-end