dev-ui 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 209b2569ba461e867bbce33d15b701106477886a
-  data.tar.gz: 02d3b565537c45640763f25f30728df1fee6466e
+  metadata.gz: '0088aa409f65b6130d130f404bb71662a06a6f3d'
+  data.tar.gz: a1a7e7da5c2b8534882f67b22953d4fe886f4d4b
 SHA512:
-  metadata.gz: a23cb0cb24241e40f466889c16ddd8fe26fe7191e7d93151a51a9a696f7e6e26592a8f37a8eb2f9b6ca169d844ab9bd5b39116e14ae997c6afad5b328e48b76f
-  data.tar.gz: ecb5fb7a4a7e45b8d6648edab5c7f38d60b2c53730f145ab4002081d9396efd9cbff941d54fb02ea58a74ffab3834b9a5c95ee8df648df3b3a8f7776dfae663d
+  metadata.gz: d8dc9c83e8145df6ba606ad805b9c2fd1444c372ad00cbd34e534878ba1a3f0180d00488371cac76706f22bd4d8335e1dc51a3b144fc00e08496ecd07eac471e
+  data.tar.gz: b89f0a81a0840ed0ffde9b9f118ae4d9552b0ac4fde6505158a63ecd2bddcb4fdc8a1a74db78ffd9a7a0a27acc970cc68321905a1cfa89135299d1ad2883e2f0

data/README.md

@@ -1,6 +1,8 @@
 ```ruby
 require 'dev/ui'
 
+Dev::UI::StdoutRouter.enable
+
 Dev::UI::Frame.open('{{*}} {{bold:a}}', color: :green) do
   Dev::UI::Frame.open('{{i}} b', color: :magenta) do
     Dev::UI::Frame.open('{{?}} c', color: :cyan) do

data/lib/dev/ui.rb

@@ -67,9 +67,10 @@ module Dev
       Dev::UI::StdoutRouter.duplicate_output_to = File.open(path, 'w')
       yield
     ensure
-      f = Dev::UI::StdoutRouter.duplicate_output_to
-      f.close
-      Dev::UI::StdoutRouter.duplicate_output_to = nil
+      if file_descriptor = Dev::UI::StdoutRouter.duplicate_output_to
+        file_descriptor.close 
+        Dev::UI::StdoutRouter.duplicate_output_to = nil
+      end
     end
 
     def self.raw

data/lib/dev/ui/ansi.rb

@@ -7,8 +7,24 @@ module Dev
 
       # ANSI escape sequences (like \x1b[31m) have zero width.
       # when calculating the padding width, we must exclude them.
+      # This also implements a *reaaaallly* shitty version of utf8 character
+      # width calculation like we could get for real from something like
+      # utf8proc.
       def self.printing_width(str)
-        strip_codes(str).size
+        zwj = false
+        strip_codes(str).codepoints.reduce(0) do |acc, cp|
+          if zwj
+            zwj = false
+            next acc
+          end
+          case cp
+          when 0x200d # zero-width joiner
+            zwj = true
+            acc
+          else
+            acc + 1
+          end
+        end
       end
 
       def self.strip_codes(str)
@@ -46,6 +62,10 @@ module Dev
         control(n.to_s, 'D')
       end
 
+      def self.cursor_horizontal_absolute(n = 1)
+        control(n.to_s, 'G')
+      end
+
       # Cursor Visibility
 
       def self.show_cursor

data/lib/dev/ui/formatter.rb

@@ -8,14 +8,16 @@ module Dev
     class Formatter
       SGR_MAP = {
         # presentational
-        'red'     => '31',
-        'green'   => '32',
-        'yellow'  => '33',
-        'blue'    => '34',
-        'magenta' => '35',
-        'cyan'    => '36',
-        'bold'    => '1',
-        'reset'   => '0',
+        'red'       => '31',
+        'green'     => '32',
+        'yellow'    => '33',
+        'blue'      => '34',
+        'magenta'   => '35',
+        'cyan'      => '36',
+        'bold'      => '1',
+        'italic'    => '3',
+        'underline' => '4',
+        'reset'     => '0',
 
         # semantic
         'error'   => '31', # red

data/lib/dev/ui/frame.rb

@@ -130,24 +130,40 @@ module Dev
             prefix << ' ' << text << ' '
           end
 
+          termwidth = Dev::UI::Terminal.width
+
           suffix = String.new
           if right_text
-            suffix << ' ' << right_text << ' ' << color.code << (Dev::UI::Box::Heavy::HORZ * 2)
+            suffix << ' ' << right_text << ' '
           end
 
-          textwidth = Dev::UI::ANSI.printing_width(prefix + suffix)
-          termwidth = Dev::UI::Terminal.width
-          termwidth = 30 if termwidth < 30
+          suffix_width = Dev::UI::ANSI.printing_width(suffix)
+          suffix_end   = termwidth - 2
+          suffix_start = suffix_end - suffix_width
 
-          if textwidth > termwidth
+          prefix_width = Dev::UI::ANSI.printing_width(prefix)
+          prefix_start = 0
+          prefix_end   = prefix_start + prefix_width
+
+          if prefix_end > suffix_start
             suffix = ''
-            prefix = prefix[0...termwidth]
-            textwidth = termwidth
+            # if prefix_end > termwidth
+            # we *could* truncate it, but let's just let it overflow to the
+            # next line and call it poor usage of this API.
           end
-          padwidth = termwidth - textwidth
-          pad = Dev::UI::Box::Heavy::HORZ * padwidth
 
-          prefix + color.code + pad + suffix + Dev::UI::Color::RESET.code + "\n"
+          o = String.new
+
+          o << color.code
+          o << Dev::UI::Box::Heavy::HORZ * termwidth # draw a full line
+          o << Dev::UI::ANSI.cursor_horizontal_absolute(1 + prefix_start)
+          o << prefix
+          o << Dev::UI::ANSI.cursor_horizontal_absolute(1 + suffix_start)
+          o << suffix
+          o << Dev::UI::Color::RESET.code
+          o << "\n"
+
+          o
         end
 
         module FrameStack

data/lib/dev/ui/interactive_prompt.rb

@@ -85,17 +85,10 @@ module Dev
       end
 
       def raw_tty!
-        begin
-          $stdin.raw! unless ENV['TEST']
-        rescue Errno::ENOTTY
-          ''
-        end
-        yield
-      ensure
-        begin
-          $stdin.cooked!
-        rescue Errno::ENOTTY
-          ''
+        if ENV['TEST'] || !$stdin.tty?
+          yield
+        else
+          $stdin.raw { yield }
         end
       end
 

data/lib/dev/ui/spinner.rb

@@ -151,11 +151,11 @@ module Dev
                 end
 
                 Dev::UI::Frame.divider('STDOUT')
-                out = "(empty)" if out.strip.empty?
+                out = "(empty)" if out.nil? || out.strip.empty?
                 puts out
 
                 Dev::UI::Frame.divider('STDERR')
-                err = "(empty)" if err.strip.empty?
+                err = "(empty)" if err.nil? || err.strip.empty?
                 puts err
               end
             end

data/lib/dev/ui/version.rb

@@ -1,5 +1,5 @@
 module Dev
   module UI
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev-ui
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Burke Libbey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler