console_utils 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b8ff5ade51bb1eeb010dd6c9bb40afcbd54ac9d
-  data.tar.gz: d94d2684a740245b6d3e541c812ab03785cdc23c
+  metadata.gz: cf9d61e130700afa5abe8e93c11b6fada2eb6cb4
+  data.tar.gz: e406176372e604f376c6806cc5d48c0141b46241
 SHA512:
-  metadata.gz: 59bee05607a89edf2b91ec1730f2b25ca544f61cb9cccc3253eadd93ffe76e01fba31012a13076fbea7ed721934ecff9cd31bb9c6a02474fe92346faf3ece8cf
-  data.tar.gz: 33b2f85d32e419a10707081436867634d5c87edb8f177a3c9206cfe15c5ecea447049f6da5ad05801033e4ee18e4758e7f4af246ffd8fbc62dcde4017f9695bb
+  metadata.gz: ab3c2fd6ebbed1a16715e688e28ca54179fd091e3ca49a93031b3cf6b612f7e59771c8ff9dcd01fe8be898677328d4af1b839fc871f554773b4be2390149ffa9
+  data.tar.gz: 21b6aa7cc8c3bf5fe6aa5a5d1952256ee7153915ad595b80170639d909617fea473f05fa27252bcda6903d5d9cbfdcf3d3926c5fefc0edaefd625527d0cda211

data/README.md

@@ -184,7 +184,7 @@ Also provides shorthand to find any user by id: `usr(id)`
 ## OtherUtils
 
 #### clr()
-Term::ANSIColor shorthand
+[Pastel](https://github.com/piotrmurach/pastel) shorthand
 
 #### shutting(:engine_key[, to: logger_level]) {}
 Shuts up the logger of a specified Rails engine for a given key (`:rails`, `:record`, `:controller` or `:view`).

data/console_utils.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.1"
 
   spec.add_dependency "activesupport", ">= 4.1", "< 6"
-  spec.add_dependency "term-ansicolor"
+  spec.add_dependency "pastel"
   spec.add_dependency "awesome_print"
   spec.add_dependency "benchmark-ips"
   spec.add_dependency "pry-rails"

data/lib/console_utils/other_utils.rb

@@ -1,8 +1,8 @@
 module ConsoleUtils #:nodoc:
   module OtherUtils
-    # <tt>Term::ANSIColor</tt> shorthand
+    # <tt>Pastel</tt> shorthand
     def clr
-      Term::ANSIColor
+      ConsoleUtils.pastel
     end
 
     # :call-seq:

data/lib/console_utils/request_utils/auth_automators.rb

@@ -1,7 +1,6 @@
 module ConsoleUtils::RequestUtils
   class DefaultAuthAutomator
     def self.call(rq)
-      p rq
       if rq.can_auto_auth?
         rq.params[ConsoleUtils.token_param] ||= ConsoleUtils.default_token.presence || ConsoleUtils.auto_token_for(rq.uid)
       end

data/lib/console_utils/request_utils/exap.rb

@@ -4,12 +4,15 @@ module ConsoleUtils::RequestUtils #:nodoc:
   class Exap < Requester
     INSPECT_FORMAT = "<Local: %s (%s)>".freeze
 
-    ConsoleUtils.request_methods.each do |reqm|
-      define_method(reqm) do |*args|
-        @url, *@_args = args
-        app.public_send(reqm, @url, *normalize_args)
-        self
-      end
+    ConsoleUtils.request_methods.each do |request_method|
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1
+        def #{request_method}(url, *args)
+          @url = url
+          @_args = args
+          app.#{request_method}(@url, *normalize_args)
+          self
+        end
+      RUBY
     end
 
     def to_s

data/lib/console_utils/request_utils/remo.rb

@@ -1,21 +1,24 @@
 require 'uri'
-require "console_utils/request_utils/requester"
+require 'open3'
+require 'shellwords'
+require 'console_utils/request_utils/requester'
 
 module ConsoleUtils::RequestUtils #:nodoc:
   class Remo < Requester
-    OUT_FORMAT      = "\n%{size_download}\n%{time_total}".freeze
     INSPECT_FORMAT  = "<Remote: %s in %s ms>".freeze
     INSPECT_NOTHING = "<Remote: nothing>".freeze
 
     attr_reader :request_method
 
-    ConsoleUtils.request_methods.each do |reqm|
-      define_method(reqm) do |url, *args|
-        @_args = args
-        @url   = urlify(url, *normalize_args)
-        @request_method = reqm.to_s.upcase
-        perform
-      end
+    ConsoleUtils.request_methods.each do |request_method|
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1
+        def #{request_method}(url, *args)
+          @_args = args
+          @url = urlify(url, *normalize_args)
+          @request_method = "#{request_method.to_s.upcase}"
+          perform
+        end
+      RUBY
     end
 
     def inspect
@@ -30,30 +33,103 @@ module ConsoleUtils::RequestUtils #:nodoc:
       @_body
     end
 
+    attr_reader :_result
+
     protected
 
     def perform
-      IO.popen(curl_command, "r+") { |io| set_payload!(io.readlines) }
+      Curl.(request_method, url) do |result, payload|
+        @_result = result
+        set_payload!(payload)
+      end
     end
 
     private
 
-    def set_payload!((*body_lines, size, time))
+    def set_payload!((*body_lines, code, time, size))
       @_body = body_lines.join
+      @_code = code.to_i
       @_size = size.to_f
       @_time = time.tr(?,, ?.).to_f
       self
     end
 
-    def curl_command
-      %W(#{ConsoleUtils.curl_bin} --silent --write-out #{OUT_FORMAT} -X #{request_method} #{url}).
-        tap { |cmd| puts "# #{cmd.shelljoin.inspect}" unless ConsoleUtils.curl_silence }
-    end
-
     def urlify(*args)
       options = args.extract_options!
       URI.join(ConsoleUtils.remote_endpoint, *args).
         tap { |uri| uri.query = options.to_query }.to_s
     end
+
+    class Curl
+      OUT_FORMAT = "\n%{http_code}\n%{time_total}\n%{size_download}".freeze
+
+      def self.call(*args)
+        result = new(*args)
+        yield(result.to_h, result.payload)
+      end
+
+      attr_reader :request, :response, :payload
+
+      def initialize(request_method, url)
+        cmd = %W(#{ConsoleUtils.curl_bin} --silent -v --write-out #{OUT_FORMAT} -X #{request_method} #{url})
+        puts "# #{cmd.shelljoin.inspect}" unless ConsoleUtils.curl_silence
+
+        @response = {}
+        @request  = {}
+        @payload  = []
+
+        Open3.popen3(Shellwords.join(cmd)) do |stdin, stdout, stderr, thr|
+          # stdin.close
+          { stderr: stderr, stdin: stdout }.each do |key, io|
+            Thread.new do
+              while line = io.gets
+                key == :stderr ? process_stderr(line) : @payload << line
+              end
+            end
+          end
+          thr.join
+        end
+      end
+
+      KEY_MAP = { ">" => :request, "<" => :response }
+
+      def process_stderr(line)
+        # warn(line)
+        if type = KEY_MAP[line.chr]
+          line = line[2, line.size-1].strip
+
+          return if line.size == 0
+
+          case type
+          when :request; set_request(line)
+          when :response; set_response(line)
+          end
+        end
+      end
+
+      def set_request(line)
+        # warn("Request: #{line}")
+        if !@request.key?(:http_version) && line =~ /^(GET|POST|PUT|PATCH|HEAD|OPTION|DELETE) (.+?) HTTP\/(.+)$/
+          @request.merge!(method: $1, url: $2, http_version: $3)
+        else
+          header, value = line.split(": ", 2)
+          @request[header] = value
+        end
+      end
+
+      def set_response(line)
+        # warn("Response: #{line}")
+        if !@response.key?(:http_version) && line =~ /^HTTP\/(.+) (\d+?) (.+)$/
+          @response.merge!(http_version: $1, http_code: $2, http_status: $3)
+        else
+          header, value = line.split(": ", 2)
+          @response[header] = value
+        end
+      end
+
+      def to_h
+        { response: @response, request: @request }
+      end
+    end
   end
 end

data/lib/console_utils/request_utils/requester.rb

@@ -5,10 +5,8 @@ module ConsoleUtils::RequestUtils #:nodoc:
   class Requester < SimpleDelegator
     INFO_HASH_FIELDS = %i(url size time human_size human_time).freeze
     INFO_FORMAT      = "%#-.50{url} | %#10{human_size} | %#10{human_time}\n".freeze
-    NO_RESPONSE      = Term::ANSIColor.red(" \u27A7 Empty response's body.").freeze
-    PBCOPY_MESSAGE   = Term::ANSIColor.green(" \u27A4 Response body copied to pasteboard\n").freeze
-    COMPLETE_IN      = Term::ANSIColor.green("Complete in %s").freeze
-    TRANSFERED       = Term::ANSIColor.cyan("Transfered: %s").freeze
+    NO_RESPONSE      = ConsoleUtils.pastel.red(" \u27A7 Empty response's body.").freeze
+    PBCOPY_MESSAGE   = ConsoleUtils.pastel.green(" \u27A4 Response body copied to pasteboard\n").freeze
 
     class_attribute :default_params, instance_writer: false
     attr_reader :url
@@ -54,7 +52,9 @@ module ConsoleUtils::RequestUtils #:nodoc:
     end
 
     def to_info_hash
-      INFO_HASH_FIELDS.zip(INFO_HASH_FIELDS.map(&method(:public_send))).to_h
+      hsh = {}
+      INFO_HASH_FIELDS.each { |field| hsh[field] = public_send(field) }
+      hsh
     end
 
     protected
@@ -69,18 +69,38 @@ module ConsoleUtils::RequestUtils #:nodoc:
 
     def show_complete_in!(reset = true)
       return if @_time.nil?
-      puts "=> #{COMPLETE_IN % [time_ms]}"
+      if @_code && status_code = Rack::Utils::HTTP_STATUS_CODES[@_code]
+        print "=> ", pastel.public_send(status_color(@_code), "Completed ", pastel.bold("#{@_code} #{status_code}"), " in #{time_ms}"), "\n"
+      else
+        puts "=> #{pastel.green("Completed in #{time_ms}")}"
+      end
+    ensure
+      @_code = nil
       @_time = nil
     end
 
+    def pastel
+      ConsoleUtils.pastel
+    end
+
     def show_transfered!(reset = true)
       return if @_size.nil?
-      puts "=> #{TRANSFERED % [size_downloaded]}"
+      print "=> ", pastel.cyan("Transferred: #{size_downloaded}"), "\n"
+    ensure
       @_size = nil
     end
 
+    def status_color(code)
+      case code
+      when 200...400; :green
+      when 400...500; :red
+      when 500...600; :intense_red
+      else            :yellow
+      end
+    end
+
     private_constant :PBCOPY_MESSAGE,
-                     :NO_RESPONSE, :COMPLETE_IN, :TRANSFERED,
+                     :NO_RESPONSE,
                      :INFO_FORMAT
   end
 end

data/lib/console_utils/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

data/lib/console_utils.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/tagged_logging'
-require 'term/ansicolor'
+require 'pastel'
 require 'console_utils/core_ext/array_to_proc'
 require 'console_utils/core_ext/local_values'
 require 'console_utils/version'
@@ -201,6 +201,10 @@ module ConsoleUtils
     def setup_modules_to(context = nil)
       ReplState.setup(context)
     end
+
+    def pastel
+      @pastel ||= Pastel.new
+    end
   end
 
   ActiveSupport.run_load_hooks(:console_utils, self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="