skylight 0.3.7 → 0.3.8

data/lib/skylight/util/conversions.rb

@@ -0,0 +1,9 @@
+module Skylight
+  module Util
+    module Conversions
+      def secs_to_nanos(secs)
+        secs * 1_000_000_000
+      end
+    end
+  end
+end

data/lib/skylight/util/http.rb

@@ -20,6 +20,7 @@ module Skylight
       include Logging
 
       attr_accessor :authentication, :config
+      attr_reader :host, :port
 
       def initialize(config, service = :report)
         @config = config
@@ -93,7 +94,8 @@ module Skylight
 
         http = Net::HTTP.new(@host, @port, @proxy_addr, @proxy_port, @proxy_user, @proxy_pass)
 
-        # Default is 60, but that's also the Heroku boot timeout and we don't want to slow boot
+        # Default is 60, but we don't want to wait that long.
+        # This path is also used on app boot and Heroku will timeout at 60
         http.read_timeout = 15
 
         if @ssl
@@ -113,9 +115,9 @@ module Skylight
           Response.new(res.code.to_i, res, res.body)
         end
       rescue Exception => e
-        error "http %s failed; error=%s; msg=%s", req.method, e.class, e.message
+        error "http %s %s failed; error=%s; msg=%s", req.method, req.path, e.class, e.message
         t { e.backtrace.join("\n") }
-        ErrorResponse.new(req.method, e)
+        ErrorResponse.new(req, e)
       end
 
       class Response
@@ -167,7 +169,7 @@ module Skylight
         end
       end
 
-      class ErrorResponse < Struct.new(:request_method, :exception)
+      class ErrorResponse < Struct.new(:request, :exception)
         def status
           nil
         end

data/lib/skylight/util/native_ext_fetcher.rb

@@ -169,7 +169,7 @@ module Skylight
       end
 
       def source_uri
-        "#{@source}/#{@version}/libskylight.#{@arch}.a.gz"
+        "#{@source}/#{@version}/libskylight.#{@version}.#{@arch}.a.gz"
       end
 
       def deconstruct_uri(uri)

data/lib/skylight/util/task.rb

@@ -7,13 +7,17 @@ module Skylight
 
       include Util::Logging
 
+      attr_reader :queue_depth_metric
+
       def initialize(size, timeout = 0.1, &blk)
-        @pid     = Process.pid
-        @thread  = nil
-        @size    = size
-        @lock    = Mutex.new
+        @pid = Process.pid
+        @thread = nil
+        @size = size
+        @lock = Mutex.new
         @timeout = timeout
-        @blk     = blk
+        @blk = blk
+
+        @queue_depth_metric = build_queue_depth_metric
       end
 
       def submit(msg, pid = Process.pid)
@@ -84,6 +88,8 @@ module Skylight
           @queue  = Util::Queue.new(@size)
           @thread = Thread.new do
             begin
+              prepare
+
               unless work
                 @queue = nil
               end
@@ -147,9 +153,19 @@ module Skylight
         @blk.call(msg)
       end
 
+      def prepare
+      end
+
       def finish
       end
 
+      def build_queue_depth_metric
+        lambda do
+          q = @queue
+          q ? @queue.length : 0
+        end
+      end
+
     end
   end
 end

data/lib/skylight/vendor/cli/highline.rb

@@ -28,7 +28,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.18".freeze
+  VERSION = "1.6.21".freeze
 
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError
@@ -255,6 +255,7 @@ class HighLine
     # Also, JRuby-1.7's ConsoleReader.readLine() needs to be passed the prompt
     # to handle line editing properly.
     say(@question) unless ((JRUBY or @question.readline) and @question.echo == true)
+
     begin
       @answer = @question.answer_or_default(get_response)
       unless @question.valid_answer?(@answer)
@@ -613,22 +614,10 @@ class HighLine
   # and the HighLine.color() method.
   #
   def say( statement )
-    statement = statement.to_str
+    statement = format_statement(statement)
     return unless statement.length > 0
 
-    # Allow non-ascii menu prompts in ruby > 1.9.2. ERB eval the menu statement
-    # with the environment's default encoding(usually utf8)
-    statement.force_encoding(Encoding.default_external) if defined?(Encoding) && Encoding.default_external
-
-    template  = ERB.new(statement, nil, "%")
-    statement = template.result(binding)
-
-    statement = wrap(statement) unless @wrap_at.nil?
-    statement = page_print(statement) unless @page_at.nil?
-
-    statement = statement.gsub(/\n(?!$)/,"\n#{indentation}") if @multi_indent
-
-    # Don't add a newline if statement ends with whitespace, OR
+      # Don't add a newline if statement ends with whitespace, OR
     # if statement ends with whitespace before a color escape code.
     if /[ \t](\e\[\d+(;\d+)*m)?\Z/ =~ statement
       @output.print(indentation+statement)
@@ -672,10 +661,16 @@ class HighLine
     @indent_level += increase
     multi = @multi_indent
     @multi_indent = multiline unless multiline.nil?
-    if block_given?
-        yield self
-    else
-        say(statement)
+    begin
+        if block_given?
+            yield self
+        else
+            say(statement)
+        end
+    rescue
+        @multi_indent = multi
+        @indent_level -= increase
+        raise
     end
     @multi_indent = multi
     @indent_level -= increase
@@ -712,6 +707,25 @@ class HighLine
 
   private
 
+  def format_statement statement
+    statement = statement.dup.to_str
+    return statement unless statement.length > 0
+
+  # Allow non-ascii menu prompts in ruby > 1.9.2. ERB eval the menu statement
+    # with the environment's default encoding(usually utf8)
+    statement.force_encoding(Encoding.default_external) if defined?(Encoding) && Encoding.default_external
+
+    template  = ERB.new(statement, nil, "%")
+    statement = template.result(binding)
+
+    statement = wrap(statement) unless @wrap_at.nil?
+    statement = page_print(statement) unless @page_at.nil?
+
+    statement = statement.gsub(/\n(?!$)/,"\n#{indentation}") if @multi_indent
+
+    statement
+  end
+
   #
   # A helper method for sending the output stream and error and repeat
   # of the question.
@@ -839,7 +853,11 @@ class HighLine
       answer
     else
       if JRUBY
-        raw_answer = @java_console.readLine(@question.question, nil)
+        statement = format_statement(@question)
+        raw_answer = @java_console.readLine(statement, nil)
+
+        raise EOFError, "The input stream is exhausted." if raw_answer.nil? and
+                                                            @@track_eof
       else
         raise EOFError, "The input stream is exhausted." if @@track_eof and
                                                             @input.eof?
@@ -917,6 +935,10 @@ class HighLine
         @question.change_case(@question.remove_whitespace(line))
       end
     else
+      if JRUBY #prompt has not been shown
+        say @question
+      end
+
       raw_no_echo_mode
       begin
         if @question.character == :getc

data/lib/skylight/vendor/cli/highline/menu.rb

@@ -368,31 +368,14 @@ class HighLine
 
     #
     # This method will update the intelligent responses to account for
-    # Menu specific differences.  This overrides the work done by
-    # Question.build_responses().
+    # Menu specific differences.  Calls the superclass' (Question's)
+    # build_responses method, overriding its default arguments to specify
+    # 'options' will be used to populate choice lists, and that
+    # the newly built hash will predominate over the preexisting hash
+    # for any keys that are the same.
     #
     def update_responses(  )
-      append_default unless default.nil?
-      @responses = @responses.merge(
-                     :ambiguous_completion =>
-                       "Ambiguous choice.  " +
-                       "Please choose one of #{options.inspect}.",
-                     :ask_on_error         =>
-                       "?  ",
-                     :invalid_type         =>
-                       "You must enter a valid #{options}.",
-                     :no_completion        =>
-                       "You must choose one of " +
-                       "#{options.inspect}.",
-                     :not_in_range         =>
-                       "Your answer isn't within the expected range " +
-                       "(#{expected_range}).",
-                     :mismatch             =>
-                       "Your entries didn't match.",
-                     :not_valid            =>
-                       "Your answer isn't valid (must match " +
-                       "#{@validate.inspect})."
-                   )
+      build_responses(options, true)
     end
   end
 end

data/lib/skylight/vendor/cli/highline/question.rb

@@ -225,22 +225,29 @@ class HighLine
     #
     # Called late in the initialization process to build intelligent
     # responses based on the details of this Question object.
+    # Also used by Menu#update_responses.
     #
-    def build_responses(  )
-      ### WARNING:  This code is quasi-duplicated in     ###
-      ### Menu.update_responses().  Check there too when ###
-      ### making changes!                                ###
+    def build_responses(message_source = answer_type, new_hash_wins = false)
+
       append_default unless default.nil?
-      @responses = { :ambiguous_completion =>
-                       "Ambiguous choice.  " +
-                       "Please choose one of #{@answer_type.inspect}.",
+
+      choice_error_str_func = lambda do
+        message_source.is_a?(Array) \
+            ? '[' +  message_source.map { |s| "#{s}" }.join(', ') + ']' \
+            : message_source.inspect
+      end
+
+      old_hash = @responses
+
+      new_hash = { :ambiguous_completion =>
+                       "Ambiguous choice.  Please choose one of " +
+                       choice_error_str_func.call + '.',
                      :ask_on_error         =>
                        "?  ",
                      :invalid_type         =>
-                       "You must enter a valid #{@answer_type}.",
+                       "You must enter a valid #{message_source}.",
                      :no_completion        =>
-                       "You must choose one of " +
-                       "#{@answer_type.inspect}.",
+                       "You must choose one of " + choice_error_str_func.call + '.',
                      :not_in_range         =>
                        "Your answer isn't within the expected range " +
                        "(#{expected_range}).",
@@ -248,10 +255,9 @@ class HighLine
                        "Your entries didn't match.",
                      :not_valid            =>
                        "Your answer isn't valid (must match " +
-                       "#{@validate.inspect})." }.merge(@responses)
-      ### WARNING:  This code is quasi-duplicated in     ###
-      ### Menu.update_responses().  Check there too when ###
-      ### making changes!                                ###
+                       "#{@validate.inspect})." }
+
+      @responses = new_hash_wins ? old_hash.merge(new_hash) : new_hash.merge(old_hash)
     end
 
     #

data/lib/skylight/vendor/cli/highline/string_extensions.rb

@@ -31,85 +31,65 @@ class HighLine
   module StringExtensions
     def self.included(base)
       HighLine::COLORS.each do |color|
+        color = color.downcase
         base.class_eval <<-END
-          if public_instance_methods.map { |m| m.to_s }.
-                                     include? "#{color.downcase}"
-            undef :#{color.downcase}
-          end
-          def #{color.downcase}
-            color(:#{color.downcase})
+          undef :#{color} if method_defined? :#{color}
+          def #{color}
+            color(:#{color})
           end
         END
+
         base.class_eval <<-END
-          if public_instance_methods.map { |m| m.to_s }.
-                                     include? "on_#{color.downcase}"
-            undef :on_#{color.downcase}
-          end
-          def on_#{color.downcase}
-            on(:#{color.downcase})
+          undef :on_#{color} if method_defined? :on_#{color}
+          def on_#{color}
+            on(:#{color})
           end
         END
         HighLine::STYLES.each do |style|
+          style = style.downcase
           base.class_eval <<-END
-            if public_instance_methods.map { |m| m.to_s }.
-                                       include? "#{style.downcase}"
-              undef :#{style.downcase}
-            end
-            def #{style.downcase}
-              color(:#{style.downcase})
+            undef :#{style} if method_defined? :#{style}
+            def #{style}
+              color(:#{style})
             end
           END
         end
       end
 
       base.class_eval do
-        if public_instance_methods.map { |m| m.to_s }.include? "color"
-          undef :color
-        end
-        if public_instance_methods.map { |m| m.to_s }.include? "foreground"
-          undef :foreground
-        end
+        undef :color if method_defined? :color
+        undef :foreground if method_defined? :foreground
         def color(*args)
           self.class.new(HighLine.color(self, *args))
         end
         alias_method :foreground, :color
 
-        if public_instance_methods.map { |m| m.to_s }.include? "on"
-          undef :on
-        end
+        undef :on if method_defined? :on
         def on(arg)
           color(('on_' + arg.to_s).to_sym)
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "uncolor"
-          undef :uncolor
-        end
+        undef :uncolor if method_defined? :uncolor
         def uncolor
           self.class.new(HighLine.uncolor(self))
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "rgb"
-          undef :rgb
-        end
+        undef :rgb if method_defined? :rgb
         def rgb(*colors)
           color_code = colors.map{|color| color.is_a?(Numeric) ? '%02x'%color : color.to_s}.join
           raise "Bad RGB color #{colors.inspect}" unless color_code =~ /^[a-fA-F0-9]{6}/
           color("rgb_#{color_code}".to_sym)
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "on_rgb"
-          undef :on_rgb
-        end
+        undef :on_rgb if method_defined? :on_rgb
         def on_rgb(*colors)
           color_code = colors.map{|color| color.is_a?(Numeric) ? '%02x'%color : color.to_s}.join
           raise "Bad RGB color #{colors.inspect}" unless color_code =~ /^[a-fA-F0-9]{6}/
           color("on_rgb_#{color_code}".to_sym)
         end
 
-        if public_instance_methods.map { |m| m.to_s }.include? "method_missing"
-          undef :method_missing
-        end
         # TODO Chain existing method_missing
+        undef :method_missing if method_defined? :method_missing
         def method_missing(method, *args, &blk)
           if method.to_s =~ /^(on_)?rgb_([0-9a-fA-F]{6})$/
             color(method)

data/lib/skylight/vendor/cli/highline/system_extensions.rb

@@ -14,10 +14,14 @@ class HighLine
     if JRUBY
       def initialize_system_extensions
         require 'java'
+        require 'readline'
         if JRUBY_VERSION =~ /^1.7/
           java_import 'jline.console.ConsoleReader'
 
-          @java_console = ConsoleReader.new(@input.to_inputstream, @output.to_outputstream)
+          input = @input && @input.to_inputstream
+          output = @output && @output.to_outputstream
+
+          @java_console = ConsoleReader.new(input, output)
           @java_console.set_history_enabled(false)
           @java_console.set_bell_enabled(true)
           @java_console.set_pagination_enabled(false)
@@ -76,7 +80,13 @@ class HighLine
         require "dl/import"
 
         module WinAPI
-          extend DL::Importer rescue DL::Importable
+          if defined?(DL::Importer)
+            # Ruby 1.9
+            extend DL::Importer
+          else
+            # Ruby 1.8
+            extend DL::Importable
+          end
           begin
             dlload "msvcrt", "kernel32"
           rescue DL::DLError
@@ -85,6 +95,16 @@ class HighLine
           extern "unsigned long _getch()"
           extern "unsigned long GetConsoleScreenBufferInfo(unsigned long, void*)"
           extern "unsigned long GetStdHandle(unsigned long)"
+
+          # Ruby 1.8 DL::Importable.import does mname[0,1].downcase so FooBar becomes fooBar
+          if defined?(getConsoleScreenBufferInfo)
+            alias_method :GetConsoleScreenBufferInfo, :getConsoleScreenBufferInfo
+            module_function :GetConsoleScreenBufferInfo
+          end
+          if defined?(getStdHandle)
+            alias_method :GetStdHandle, :getStdHandle
+            module_function :GetStdHandle
+          end
         end
       end
 
@@ -140,7 +160,11 @@ class HighLine
           CHARACTER_MODE = "jline"    # For Debugging purposes only.
 
           def terminal_size
-            [ @java_terminal.getTerminalWidth, @java_terminal.getTerminalHeight ]
+            if JRUBY_VERSION =~ /^1.7/
+              [ @java_terminal.get_width, @java_terminal.get_height ]
+            else
+              [ @java_terminal.getTerminalWidth, @java_terminal.getTerminalHeight ]
+            end
           end
 
           def raw_no_echo_mode
@@ -172,7 +196,7 @@ class HighLine
               size = [80, 40]
               FFI::NCurses.initscr
               begin
-                size = FFI::NCurses.getmaxyx(stdscr).reverse
+                size = FFI::NCurses.getmaxyx(FFI::NCurses.stdscr).reverse
               ensure
                 FFI::NCurses.endwin
               end