shopify-cli 1.0.3 → 1.1.2

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

@@ -4,6 +4,7 @@ module CLI
     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'
@@ -131,8 +132,8 @@ module CLI
     # * +args+ - arguments for +Frame.open+
     # * +block+ - block for +Frame.open+
     #
-    def self.frame(*args, &block)
-      CLI::UI::Frame.open(*args, &block)
+    def self.frame(*args, **kwargs, &block)
+      CLI::UI::Frame.open(*args, **kwargs, &block)
     end
 
     # Convenience Method for +CLI::UI::Spinner.spin+
@@ -142,8 +143,8 @@ module CLI
     # * +args+ - arguments for +Spinner.open+
     # * +block+ - block for +Spinner.open+
     #
-    def self.spinner(*args, &block)
-      CLI::UI::Spinner.spin(*args, &block)
+    def self.spinner(*args, **kwargs, &block)
+      CLI::UI::Spinner.spin(*args, **kwargs, &block)
     end
 
     # Convenience Method to override frame color using +CLI::UI::Frame.with_frame_color+

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

@@ -106,7 +106,9 @@ module CLI
       # * +n+ - The column to move to
       #
       def self.cursor_horizontal_absolute(n = 1)
-        control(n.to_s, 'G')
+        cmd = control(n.to_s, 'G')
+        cmd += control('1', 'D') if CLI::UI::OS.current.shift_cursor_on_line_reset?
+        cmd
       end
 
       # Show the cursor
@@ -136,13 +138,17 @@ module CLI
       # Move to the next line
       #
       def self.next_line
-        cursor_down + control('1', 'G')
+        cmd = cursor_down + control('1', 'G')
+        cmd += control('1', 'D') if CLI::UI::OS.current.shift_cursor_on_line_reset?
+        cmd
       end
 
       # Move to the previous line
       #
       def self.previous_line
-        cursor_up + control('1', 'G')
+        cmd = cursor_up + control('1', 'G')
+        cmd += control('1', 'D') if CLI::UI::OS.current.shift_cursor_on_line_reset?
+        cmd
       end
 
       def self.clear_to_end_of_line

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

@@ -48,6 +48,7 @@ module CLI
 
       class InvalidColorName < ArgumentError
         def initialize(name)
+          super
           @name = name
         end
 

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

@@ -227,11 +227,12 @@ module CLI
         end
 
         # The width of a prefix given the number of Frames in the stack
-        # Does _not_ account for the space at the end of the final prefix
         def prefix_width
-          FrameStack.items.reduce(0) do |width, item|
+          w = FrameStack.items.reduce(0) do |width, item|
             width + item.frame_style.prefix_width
           end
+
+          w.zero? ? w : w + 1
         end
 
         # Override a color for a given thread.

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

@@ -32,6 +32,7 @@ module CLI
 
         class InvalidFrameStyleName < ArgumentError
           def initialize(name)
+            super
             @name = name
           end
 

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

@@ -20,10 +20,6 @@ module CLI
               VERTICAL
             end
 
-            def prefix_width
-              CLI::UI::ANSI.printing_width(prefix)
-            end
-
             # Draws the "Open" line for this frame style
             #
             # ==== Attributes
@@ -103,7 +99,10 @@ module CLI
 
               preamble_width = CLI::UI::ANSI.printing_width(preamble)
               preamble_start = Frame.prefix_width
-              preamble_end   = preamble_start + preamble_width
+              # If prefix_width is non-zero, we need to subtract the width of
+              # the final space, since we're going to write over it.
+              preamble_start -= 1 unless preamble_start.zero?
+              preamble_end = preamble_start + preamble_width
 
               suffix_width = CLI::UI::ANSI.printing_width(suffix)
               suffix_end   = termwidth - 2
@@ -139,6 +138,15 @@ module CLI
               # reset to column 1 so that things like ^C don't ruin formatting
               o << "\r"
 
+              # This code will print out a full line with the given preamble and
+              # suffix, as exemplified below.
+              #
+              # preamble_start                         suffix_start
+              # |                 preamble_end         |            suffix_end
+              # |                 |                    |            | termwidth
+              # |                 |                    |            | |
+              # V                 V                    V            V V
+              # --- Preamble text --------------------- suffix text --
               o << color.code
               o << print_at_x(preamble_start, HORIZONTAL * (termwidth - preamble_start)) # draw a full line
               o << print_at_x(preamble_start, preamble)

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

@@ -97,8 +97,35 @@ module CLI
 
               o = +''
 
-              o << color.code << preamble
-              o << color.code << suffix
+              # Shopify's CI system supports terminal emulation, but not some of
+              # the fancier features that we normally use to draw frames
+              # extra-reliably, so we fall back to a less foolproof strategy. This
+              # is probably better in general for cases with impoverished terminal
+              # emulators and no active user.
+              unless [0, '', nil].include?(ENV['CI'])
+                o << color.code << preamble
+                o << color.code << suffix
+                o << CLI::UI::Color::RESET.code
+                o << "\n"
+
+                return o
+              end
+
+              preamble_start = Frame.prefix_width
+
+              # If prefix_width is non-zero, we need to subtract the width of
+              # the final space, since we're going to write over it.
+              preamble_start -= 1 unless preamble_start.zero?
+
+              # Prefix_width includes the width of the terminal space, which we
+              # want to remove.  The clamping is done to avoid a negative
+              # preamble start which can occur for the first frame.
+              o << CLI::UI::ANSI.hide_cursor
+
+              # reset to column 1 so that things like ^C don't ruin formatting
+              o << "\r"
+              o << color.code
+              o << print_at_x(preamble_start, preamble + color.code + suffix)
               o << CLI::UI::Color::RESET.code
               o << "\n"
 

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

@@ -5,6 +5,7 @@ module CLI
     class Glyph
       class InvalidGlyphHandle < ArgumentError
         def initialize(handle)
+          super
           @handle = handle
         end
 
@@ -15,7 +16,7 @@ module CLI
         end
       end
 
-      attr_reader :handle, :codepoint, :color, :char, :to_s, :fmt
+      attr_reader :handle, :codepoint, :color, :to_s, :fmt
 
       # Creates a new glyph
       #
@@ -23,12 +24,14 @@ module CLI
       #
       # * +handle+ - The handle in the +MAP+ constant
       # * +codepoint+ - The codepoint used to create the glyph (e.g. +0x2717+ for a ballot X)
+      # * +plain+ - A fallback plain string to be used in case glyphs are disabled
       # * +color+ - What color to output the glyph. Check +CLI::UI::Color+ for options.
       #
-      def initialize(handle, codepoint, color)
+      def initialize(handle, codepoint, plain, color)
         @handle    = handle
         @codepoint = codepoint
         @color     = color
+        @plain     = plain
         @char      = Array(codepoint).pack('U*')
         @to_s      = color.code + char + Color::RESET.code
         @fmt       = "{{#{color.name}:#{char}}}"
@@ -36,16 +39,24 @@ module CLI
         MAP[handle] = self
       end
 
+      # Fetches the actual character(s) to be displayed for a glyph, based on the current OS support
+      #
+      # ==== Returns
+      # Returns the glyph string
+      def char
+        CLI::UI::OS.current.supports_emoji? ? @char : @plain
+      end
+
       # Mapping of glyphs to terminal output
       MAP = {}
-      STAR      = new('*', 0x2b51,           Color::YELLOW) # YELLOW SMALL STAR (⭑)
-      INFO      = new('i', 0x1d4be,          Color::BLUE)   # BLUE MATHEMATICAL SCRIPT SMALL i (𝒾)
-      QUESTION  = new('?', 0x003f,           Color::BLUE)   # BLUE QUESTION MARK (?)
-      CHECK     = new('v', 0x2713,           Color::GREEN)  # GREEN CHECK MARK (✓)
-      X         = new('x', 0x2717,           Color::RED)    # RED BALLOT X (✗)
-      BUG       = new('b', 0x1f41b,          Color::WHITE)  # Bug emoji (🐛)
-      CHEVRON   = new('>', 0xbb,             Color::YELLOW) # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK (»)
-      HOURGLASS = new('H', [0x231b, 0xfe0e], Color::BLUE)   # HOURGLASS + VARIATION SELECTOR 15 (⌛︎)
+      STAR      = new('*', 0x2b51,           '*', Color::YELLOW) # YELLOW SMALL STAR (⭑)
+      INFO      = new('i', 0x1d4be,          'i', Color::BLUE)   # BLUE MATHEMATICAL SCRIPT SMALL i (𝒾)
+      QUESTION  = new('?', 0x003f,           '?', Color::BLUE)   # BLUE QUESTION MARK (?)
+      CHECK     = new('v', 0x2713,           '√', Color::GREEN)  # GREEN CHECK MARK (✓)
+      X         = new('x', 0x2717,           'X', Color::RED)    # RED BALLOT X (✗)
+      BUG       = new('b', 0x1f41b,          '!', Color::WHITE)  # Bug emoji (🐛)
+      CHEVRON   = new('>', 0xbb,             '»', Color::YELLOW) # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK (»)
+      HOURGLASS = new('H', [0x231b, 0xfe0e], 'H', Color::BLUE)   # HOURGLASS + VARIATION SELECTOR 15 (⌛︎)
 
       # Looks up a glyph by name
       #

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

@@ -0,0 +1,63 @@
+module CLI
+  module UI
+    module OS
+      # Determines which OS is currently running the UI, to make it easier to
+      # adapt its behaviour to the features of the OS.
+      def self.current
+        @current_os ||= case RUBY_PLATFORM
+        when /darwin/
+          Mac
+        when /linux/
+          Linux
+        when /mingw32/
+          Windows
+        else
+          raise "Could not determine OS from platform #{RUBY_PLATFORM}"
+        end
+      end
+
+      class Mac
+        class << self
+          def supports_emoji?
+            true
+          end
+
+          def supports_color_prompt?
+            true
+          end
+
+          def supports_arrow_keys?
+            true
+          end
+
+          def shift_cursor_on_line_reset?
+            false
+          end
+        end
+      end
+
+      class Linux < Mac
+      end
+
+      class Windows
+        class << self
+          def supports_emoji?
+            false
+          end
+
+          def supports_color_prompt?
+            false
+          end
+
+          def supports_arrow_keys?
+            false
+          end
+
+          def shift_cursor_on_line_reset?
+            true
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -190,7 +190,13 @@ module CLI
           end
 
           raise(ArgumentError, 'insufficient options') if options.nil? || options.empty?
-          instructions = (multiple ? "Toggle options. " : "") + "Choose with ↑ ↓ ⏎"
+          navigate_text = if CLI::UI::OS.current.supports_arrow_keys?
+            "Choose with ↑ ↓ ⏎"
+          else
+            "Navigate up with 'k' and down with 'j', press Enter to select"
+          end
+
+          instructions = (multiple ? "Toggle options. " : "") + navigate_text
           instructions += ", filter with 'f'" if filter_ui
           instructions += ", enter option with 'e'" if select_ui && (options.size > 9)
           puts_question("#{question} {{yellow:(#{instructions})}}")
@@ -256,7 +262,10 @@ module CLI
           # thread to manage output, but the current strategy feels like a
           # better tradeoff.
           prefix = CLI::UI.with_frame_color(:blue) { CLI::UI::Frame.prefix }
-          prompt = prefix + CLI::UI.fmt('{{blue:> }}') + CLI::UI::Color::YELLOW.code
+          # If a prompt is interrupted on Windows it locks the colour of the terminal from that point on, so we should
+          # not change the colour here.
+          prompt = prefix + CLI::UI.fmt('{{blue:> }}')
+          prompt += CLI::UI::Color::YELLOW.code if CLI::UI::OS.current.supports_color_prompt?
 
           begin
             line = Readline.readline(prompt, true)

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

@@ -273,6 +273,7 @@ module CLI
             case char
             when ESC        ; @state = :esc
             when "\r", "\n" ; select_current
+            when "\b"       ; update_search(BACKSPACE) # Happens on Windows
             else            ; update_search(char)
             end
           when :line_select

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

@@ -10,11 +10,11 @@ module CLI
       PERIOD = 0.1 # seconds
       TASK_FAILED = :task_failed
 
-      RUNES = %w(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏).freeze
+      RUNES = CLI::UI::OS.current.supports_emoji? ? %w(⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏).freeze : %w(\\ | / - \\ | / -).freeze
 
       begin
-        colors = [CLI::UI::Color::CYAN.code] * 5 + [CLI::UI::Color::MAGENTA.code] * 5
-        raise unless RUNES.size == colors.size
+        colors = [CLI::UI::Color::CYAN.code] * (RUNES.size / 2).ceil +
+          [CLI::UI::Color::MAGENTA.code] * (RUNES.size / 2).to_i
         GLYPHS = colors.zip(RUNES).map(&:join)
       end
 

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

@@ -98,15 +98,13 @@ module CLI
           #
           def render(index, force = true, width: CLI::UI::Terminal.width)
             @m.synchronize do
-              begin
-                if force || @always_full_render || @force_full_render
-                  full_render(index, width)
-                else
-                  partial_render(index)
-                end
-              ensure
-                @force_full_render = false
+              if force || @always_full_render || @force_full_render
+                full_render(index, width)
+              else
+                partial_render(index)
               end
+            ensure
+              @force_full_render = false
             end
           end
 

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

@@ -49,6 +49,7 @@ module CLI
 
       class InvalidWidgetHandle < ArgumentError
         def initialize(handle)
+          super
           @handle = handle
         end
 
@@ -61,6 +62,7 @@ module CLI
 
       class InvalidWidgetArguments < ArgumentError
         def initialize(argstring, pattern)
+          super
           @argstring = argstring
           @pattern   = pattern
         end

data/vendor/gen/lib/gen.rb

@@ -0,0 +1,39 @@
+require 'cli/ui'
+require 'cli/kit'
+
+CLI::UI::StdoutRouter.enable
+
+module Gen
+  extend CLI::Kit::Autocall
+
+  TOOL_NAME = 'cli-kit'
+  ROOT      = File.expand_path('../../..', __FILE__)
+
+  TOOL_CONFIG_PATH = File.expand_path(File.join('~', '.config', TOOL_NAME))
+  LOG_FILE = File.join(TOOL_CONFIG_PATH, 'logs', 'log.log')
+  DEBUG_LOG_FILE = File.join(TOOL_CONFIG_PATH, 'logs', 'debug.log')
+
+  autoload(:Generator, 'gen/generator')
+
+  autoload(:EntryPoint, 'gen/entry_point')
+  autoload(:Commands,   'gen/commands')
+
+  autocall(:Config)  { CLI::Kit::Config.new(tool_name: TOOL_NAME) }
+  autocall(:Command) { CLI::Kit::BaseCommand }
+  autocall(:Logger)  { CLI::Kit::Logger.new(debug_log_file: DEBUG_LOG_FILE) }
+
+  autocall(:Executor) { CLI::Kit::Executor.new(log_file: LOG_FILE) }
+  autocall(:Resolver) do
+    CLI::Kit::Resolver.new(
+      tool_name: TOOL_NAME,
+      command_registry: Gen::Commands::Registry
+    )
+  end
+
+  autocall(:ErrorHandler) do
+    CLI::Kit::ErrorHandler.new(
+      log_file: LOG_FILE,
+      exception_reporter: nil
+    )
+  end
+end

data/vendor/gen/lib/gen/commands.rb

@@ -0,0 +1,18 @@
+require 'gen'
+
+module Gen
+  module Commands
+    Registry = CLI::Kit::CommandRegistry.new(
+      default: 'help',
+      contextual_resolver: nil
+    )
+
+    def self.register(const, cmd, path)
+      autoload(const, path)
+      Registry.add(->() { const_get(const) }, cmd)
+    end
+
+    register :Help, 'help', 'gen/commands/help'
+    register :New,  'new',  'gen/commands/new'
+  end
+end