shopify-cli 1.0.0 → 1.0.5

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
 
     ##
@@ -83,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
 
     ##
@@ -117,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
@@ -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 = '1.0.0'
+  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
@@ -105,6 +101,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'
@@ -126,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.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-08-13 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