shopify-cli 1.3.0 → 1.6.0

data/lib/shopify-cli/shopifolk.rb

@@ -0,0 +1,87 @@
+module ShopifyCli
+  ##
+  # ShopifyCli::Shopifolk contains the logic to determine if the user appears to be a Shopify staff
+  #
+  # The Shopifolk Feature flag will persist between runs so if the flag is enabled or disabled,
+  # it will still be in that same state until the next class invocation.
+  class Shopifolk
+    GCLOUD_CONFIG_FILE = File.expand_path('~/.config/gcloud/configurations/config_default')
+    DEV_PATH = '/opt/dev'
+    SECTION = 'core'
+    FEATURE_NAME = 'shopifolk'
+
+    class << self
+      attr_writer :acting_as_shopify_organization
+
+      ##
+      # will return if the user appears to be a Shopify employee, based on several heuristics
+      #
+      # #### Returns
+      #
+      # * `is_shopifolk` - returns true if the user is a Shopify Employee
+      #
+      # #### Example
+      #
+      #     ShopifyCli::Shopifolk.check
+      #
+      def check
+        return false unless ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
+
+        ShopifyCli::Shopifolk.new.shopifolk?
+      end
+
+      def act_as_shopify_organization
+        @acting_as_shopify_organization = true
+      end
+
+      def acting_as_shopify_organization?
+        !!@acting_as_shopify_organization || (Project.has_current? && Project.current.config['shopify_organization'])
+      end
+
+      def reset
+        @acting_as_shopify_organization = nil
+      end
+    end
+
+    ##
+    # will return if the user is a Shopify employee
+    #
+    # #### Returns
+    #
+    # * `is_shopifolk` - returns true if the user has `dev` installed and
+    # a valid google cloud config file with email ending in "@shopify.com"
+    #
+    def shopifolk?
+      return false unless ShopifyCli::Config.get_bool('shopifolk-beta', 'enabled')
+      return true if Feature.enabled?(FEATURE_NAME)
+
+      if shopifolk_by_gcloud? && shopifolk_by_dev?
+        ShopifyCli::Feature.enable(FEATURE_NAME)
+        true
+      else
+        ShopifyCli::Feature.disable(FEATURE_NAME)
+        false
+      end
+    end
+
+    private
+
+    def shopifolk_by_gcloud?
+      ini&.dig("[#{SECTION}]", 'account')&.match?(/@shopify.com\z/)
+    end
+
+    def shopifolk_by_dev?
+      File.exist?("#{DEV_PATH}/bin/dev") && File.exist?("#{DEV_PATH}/.shopify-build")
+    end
+
+    def ini
+      @ini ||= begin
+        if File.exist?(GCLOUD_CONFIG_FILE)
+          CLI::Kit::Ini
+            .new(GCLOUD_CONFIG_FILE, default_section: "[#{SECTION}]", convert_types: false)
+            .tap(&:parse).ini
+        end
+      end
+    end
+  end
+end

data/lib/shopify-cli/task.rb

@@ -6,5 +6,13 @@ module ShopifyCli
       task = new
       task.call(*args, **kwargs)
     end
+
+    private
+
+    def wants_to_run_against_shopify_org?
+      @ctx.puts(@ctx.message('core.tasks.select_org_and_shop.identified_as_shopify'))
+      message = @ctx.message('core.tasks.select_org_and_shop.first_party')
+      CLI::UI::Prompt.confirm(message, default: false)
+    end
   end
 end

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

@@ -17,12 +17,23 @@ module ShopifyCli
           redir: [OAuth::REDIRECT_HOST]
         )
 
-        user_errors = resp["data"]["appCreate"]["userErrors"]
+        unless resp
+          ctx.abort("Error - empty response")
+        end
+
+        errors = resp.dig("errors")
+        if !errors.nil? && errors.any?
+          ctx.abort(errors.map { |err| "#{err['field']} #{err['message']}" }.join(", "))
+        end
+
+        user_errors = resp.dig("data", "appCreate", "userErrors")
         if !user_errors.nil? && user_errors.any?
           ctx.abort(user_errors.map { |err| "#{err['field']} #{err['message']}" }.join(", "))
         end
 
-        resp["data"]["appCreate"]["app"]
+        ShopifyCli::Core::Monorail.metadata[:api_key] = resp.dig("data", "appCreate", "app", "apiKey")
+
+        resp.dig("data", "appCreate", "app")
       end
     end
   end

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

@@ -22,6 +22,9 @@ module ShopifyCli
       private
 
       def fetch_org
+        if Shopifolk.check && wants_to_run_against_shopify_org?
+          Shopifolk.act_as_shopify_organization
+        end
         orgs = PartnersAPI::Organizations.fetch_with_app(@ctx)
         org_id = if orgs.count == 1
           orgs.first["id"]

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

@@ -8,18 +8,23 @@ module ShopifyCli
       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?
+        if Shopifolk.check && wants_to_run_against_shopify_org?
+          Shopifolk.act_as_shopify_organization
+        end
         org = get_organization(organization_id)
-        shop_domain ||= get_shop_domain(org)
+        unless Shopifolk.acting_as_shopify_organization?
+          shop_domain ||= get_shop_domain(org)
+        end
+        ShopifyCli::Core::Monorail.metadata[:organization_id] = org["id"].to_i
         response(org["id"].to_i, shop_domain)
       end
 
       private
 
       def response(organization_id, shop_domain)
-        {
-          organization_id: organization_id,
-          shop_domain: shop_domain,
-        }
+        result = { organization_id: organization_id }
+        result[:shop_domain] = shop_domain if shop_domain
+        result
       end
 
       def organizations

data/lib/shopify-cli/tunnel.rb

@@ -123,7 +123,8 @@ module ShopifyCli
     private
 
     def install(ctx)
-      return if File.exist?(File.join(ShopifyCli.cache_dir, ctx.windows? ? 'ngrok.exe' : 'ngrok'))
+      ngrok = "ngrok#{ctx.executable_file_extension}"
+      return if File.exist?(File.join(ShopifyCli.cache_dir, ngrok))
       check_prereq_command(ctx, 'curl')
       check_prereq_command(ctx, ctx.linux? ? 'unzip' : 'tar')
       spinner = CLI::UI::SpinGroup.new
@@ -141,6 +142,11 @@ module ShopifyCli
         ctx.rm(zip_dest)
       end
       spinner.wait
+
+      # final check to see if ngrok is accessible
+      unless File.exist?(File.join(ShopifyCli.cache_dir, ngrok))
+        ctx.abort(ctx.message('core.tunnel.error.ngrok', ngrok, ShopifyCli.cache_dir))
+      end
     end
 
     def fetch_url(ctx, log_path)
@@ -210,7 +216,7 @@ module ShopifyCli
       end
 
       def parse_account
-        account, timeout, _ = @log.match(/AccountName:([\w\s\d@._\-]*) SessionDuration:([\d]+) PlanName/)&.captures
+        account, timeout, _ = @log.match(/AccountName:(.*)\s+SessionDuration:([\d]+) PlanName/)&.captures
         @account = account&.empty? ? nil : account
         @timeout = timeout&.empty? ? 0 : timeout.to_i
       end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = '1.3.0'
+  VERSION = '1.6.0'
 end

data/lib/shopify_cli.rb

@@ -15,7 +15,7 @@ ENV['PATH'] = ENV['PATH'].split(':').select { |p| p.start_with?('/', '~') }.join
 vendor_path = File.expand_path("../../vendor/lib", __FILE__)
 $LOAD_PATH.unshift(vendor_path) unless $LOAD_PATH.include?(vendor_path)
 
-deps = %w(cli-ui cli-kit smart_properties)
+deps = %w(cli-ui cli-kit smart_properties webrick)
 deps.each do |dep|
   vendor_path = File.expand_path("../../vendor/deps/#{dep}/lib", __FILE__)
   $LOAD_PATH.unshift(vendor_path) unless $LOAD_PATH.include?(vendor_path)
@@ -108,6 +108,7 @@ module ShopifyCli
   autoload :Heroku, 'shopify-cli/heroku'
   autoload :JsDeps, 'shopify-cli/js_deps'
   autoload :JsSystem, 'shopify-cli/js_system'
+  autoload :MethodObject, 'shopify-cli/method_object'
   autoload :Log, 'shopify-cli/log'
   autoload :OAuth, 'shopify-cli/oauth'
   autoload :Options, 'shopify-cli/options'
@@ -115,7 +116,10 @@ module ShopifyCli
   autoload :ProcessSupervision, 'shopify-cli/process_supervision'
   autoload :Project, 'shopify-cli/project'
   autoload :ProjectType, 'shopify-cli/project_type'
+  autoload :ResolveConstant, 'shopify-cli/resolve_constant'
   autoload :Resources, 'shopify-cli/resources'
+  autoload :Result, 'shopify-cli/result'
+  autoload :Shopifolk, 'shopify-cli/shopifolk'
   autoload :SubCommand, 'shopify-cli/sub_command'
   autoload :Task, 'shopify-cli/task'
   autoload :Tasks, 'shopify-cli/tasks'

data/shopify.fish

@@ -7,6 +7,6 @@ if [ $status != "0" ]
   echo "This version of Shopify App CLI is no longer supported. You’ll need to migrate to the new CLI version to continue.
 
 Please visit this page for complete instructions:
-  https://shopify.github.io/shopify-app-cli/migrate/
+  https://shopify.dev/tools/cli/troubleshooting#migrate-from-a-legacy-version
 "
 end

data/shopify.sh

@@ -6,6 +6,6 @@ if [ "$?" != "0" ]; then
   echo "This version of Shopify App CLI is no longer supported. You’ll need to migrate to the new CLI version to continue.
 
 Please visit this page for complete instructions:
-  https://shopify.github.io/shopify-app-cli/migrate/
+  https://shopify.dev/tools/cli/troubleshooting#migrate-from-a-legacy-version
 "
 fi

data/vendor/deps/cli-kit/REVISION

@@ -1 +1 @@
-1013aa5c5664e7034ca3f02fd2e0513361b07e95 (dirty)
+6eadd6c7f7fc9217008c2cfb0bc3101cb6cf3b41

data/vendor/deps/cli-kit/lib/cli/kit/logger.rb

@@ -61,7 +61,7 @@ module CLI
       #
       # @param msg [String] the message to log
       def debug(msg)
-        $stdout.puts CLI::UI.fmt(msg) if is_debug?
+        $stdout.puts CLI::UI.fmt(msg) if debug?
         @debug_logger.debug(format_debug(msg))
       end
 
@@ -73,7 +73,7 @@ module CLI
         "[#{CLI::UI::StdoutRouter.current_id[:id]}] #{msg}"
       end
 
-      def is_debug?
+      def debug?
         val = ENV[@env_debug_name]
         val && val != '0' && val != ''
       end

data/vendor/deps/cli-kit/lib/cli/kit/system.rb

@@ -94,11 +94,11 @@ module CLI
           delegate_open3(*a, sudo: sudo, env: env, method: :popen2, **kwargs, &block)
         end
 
-        def popen2e(*a, sudo: false, env: ENV, **kwargs)
+        def popen2e(*a, sudo: false, env: ENV, **kwargs, &block)
           delegate_open3(*a, sudo: sudo, env: env, method: :popen2e, **kwargs, &block)
         end
 
-        def popen3(*a, sudo: false, env: ENV, **kwargs)
+        def popen3(*a, sudo: false, env: ENV, **kwargs, &block)
           delegate_open3(*a, sudo: sudo, env: env, method: :popen3, **kwargs, &block)
         end
 
@@ -112,7 +112,7 @@ module CLI
         # - `**kwargs`: additional keyword arguments to pass to Process.spawn
         #
         # #### Returns
-        # - `status`: boolean success status of the command execution
+        # - `status`: The `Process:Status` result for the command execution
         #
         # #### Usage
         # `stat = CLI::Kit::System.system('ls', 'a_folder')`

data/vendor/deps/cli-ui/REVISION

@@ -1 +1 @@
-5ea578d3110af35c73837a8008147ce53a4b56ed (dirty)
+168ce68b31d8436b2b222d6f063e5c7225785bd4

data/vendor/deps/cli-ui/lib/cli/ui.rb

@@ -1,18 +1,19 @@
 module CLI
   module UI
-    autoload :ANSI,               'cli/ui/ansi'
-    autoload :Glyph,              'cli/ui/glyph'
-    autoload :Color,              'cli/ui/color'
-    autoload :Frame,              'cli/ui/frame'
-    autoload :OS,                 'cli/ui/os'
-    autoload :Printer,            'cli/ui/printer'
-    autoload :Progress,           'cli/ui/progress'
-    autoload :Prompt,             'cli/ui/prompt'
-    autoload :Terminal,           'cli/ui/terminal'
-    autoload :Truncater,          'cli/ui/truncater'
-    autoload :Formatter,          'cli/ui/formatter'
-    autoload :Spinner,            'cli/ui/spinner'
-    autoload :Widgets,            'cli/ui/widgets'
+    autoload :ANSI,      'cli/ui/ansi'
+    autoload :Glyph,     'cli/ui/glyph'
+    autoload :Color,     'cli/ui/color'
+    autoload :Frame,     'cli/ui/frame'
+    autoload :OS,        'cli/ui/os'
+    autoload :Printer,   'cli/ui/printer'
+    autoload :Progress,  'cli/ui/progress'
+    autoload :Prompt,    'cli/ui/prompt'
+    autoload :Terminal,  'cli/ui/terminal'
+    autoload :Truncater, 'cli/ui/truncater'
+    autoload :Formatter, 'cli/ui/formatter'
+    autoload :Spinner,   'cli/ui/spinner'
+    autoload :Widgets,   'cli/ui/widgets'
+    autoload :Wrap,      'cli/ui/wrap'
 
     # Convenience accessor to +CLI::UI::Spinner::SpinGroup+
     SpinGroup = Spinner::SpinGroup
@@ -29,7 +30,7 @@ module CLI
     end
 
     # Color resolution using +CLI::UI::Color.lookup+
-    # Will lookup using +Color.lookup+ if a symbol, otherwise we assume it is a valid color and return it
+    # Will lookup using +Color.lookup+ unless it's already a CLI::UI::Color (or nil)
     #
     # ==== Attributes
     #
@@ -37,26 +38,25 @@ module CLI
     #
     def self.resolve_color(input)
       case input
-      when Symbol
-        CLI::UI::Color.lookup(input)
-      else
+      when CLI::UI::Color, nil
         input
+      else
+        CLI::UI::Color.lookup(input)
       end
     end
 
     # Frame style resolution using +CLI::UI::Frame::FrameStyle.lookup+.
-    # Will lookup using +FrameStyle.lookup+ if the input is a symbol.  Otherwise,
-    # we assume it's a valid FrameStyle
+    # Will lookup using +FrameStyle.lookup+ unless it's already a CLI::UI::Frame::FrameStyle(or nil)
     #
     # ==== Attributes
     #
     # * +input+ - frame style to resolve
     def self.resolve_style(input)
       case input
-      when Symbol
-        CLI::UI::Frame::FrameStyle.lookup(input)
-      else
+      when CLI::UI::Frame::FrameStyle, nil
         input
+      else
+        CLI::UI::Frame::FrameStyle.lookup(input)
       end
     end
 
@@ -114,6 +114,10 @@ module CLI
       CLI::UI::Formatter.new(input).format(enable_color: enable_color)
     end
 
+    def self.wrap(input)
+      CLI::UI::Wrap.new(input).wrap
+    end
+
     # Convenience Method for +CLI::UI::Printer.puts+
     #
     # ==== Attributes

data/vendor/deps/cli-ui/lib/cli/ui/ansi.rb

@@ -21,6 +21,8 @@ module CLI
           when 0x200d # zero-width joiner
             zwj = true
             acc
+          when "\n"
+            acc
           else
             acc + 1
           end
@@ -138,17 +140,13 @@ module CLI
       # Move to the next line
       #
       def self.next_line
-        cmd = cursor_down + control('1', 'G')
-        cmd += control('1', 'D') if CLI::UI::OS.current.shift_cursor_on_line_reset?
-        cmd
+        cursor_down + cursor_horizontal_absolute
       end
 
       # Move to the previous line
       #
       def self.previous_line
-        cmd = cursor_up + control('1', 'G')
-        cmd += control('1', 'D') if CLI::UI::OS.current.shift_cursor_on_line_reset?
-        cmd
+        cursor_up + cursor_horizontal_absolute
       end
 
       def self.clear_to_end_of_line

data/vendor/deps/cli-ui/lib/cli/ui/frame.rb

@@ -90,7 +90,7 @@ module CLI
 
           t_start = Time.now
           CLI::UI.raw do
-            print prefix.chop
+            print(prefix.chop)
             puts frame_style.open(text, color: color)
           end
           FrameStack.push(color: color, style: frame_style)
@@ -153,7 +153,7 @@ module CLI
           frame_style = CLI::UI.resolve_style(frame_style) || fs_item.frame_style
 
           CLI::UI.raw do
-            print prefix.chop
+            print(prefix.chop)
             puts frame_style.divider(text, color: color)
           end
 
@@ -197,7 +197,7 @@ module CLI
           end
 
           CLI::UI.raw do
-            print prefix.chop
+            print(prefix.chop)
             puts frame_style.close(text, color: color, **kwargs)
           end
         end