tty-draft 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bc16e9e8a441a309f86dffb97b2df5c83d8ad6763e189475166686b28c51f9a
-  data.tar.gz: 4d96ceedb0865ccec8cee75c5dfb7cadcf51e7ce06536e9f1c97c636c52c40e2
+  metadata.gz: 96bf89073a5a4f36eaf4f201aea23179363d51e71634f19b3606920081ac10b9
+  data.tar.gz: 552c765b4e9ef313810cd612dcd36361ca258514aa02218575961bd229e75917
 SHA512:
-  metadata.gz: 9e7c8536ab82c89bdb9a13b2c0d568e09c0d6bbe53834ad7a8931ce3c781905ed1b869c7423273707c907160cac19fcc1d10da910d9d1d7bc0da971529bef663
-  data.tar.gz: 04c73838ea97e15219c3508f1f9d038aeac23e0ac101f918b1b13c3963f74895bfeb7510d8df80738b306560794cf6497dfe82238c6ee20b8ee8373a94551725
+  metadata.gz: 0a34cdf25cdadb7e9439af8d2fc671fe88bb7d39d2fcc60572019dba79c6d7a7459813c16476649bbb25430d8e1b69aba8b08f4ea91acac609b9cfcbb846eb7d
+  data.tar.gz: 6ae19fe5ad236885fc4483cdced1c8d6ccbe503c0d67dba14a344cd46892e133ea46690b3678ec32cdc7ce9f73abbb14d9d1f145c4920b72c5dc7ea6acb4de4b

data/README.md

@@ -19,15 +19,19 @@ gem install tty-draft
 ```ruby
 require 'tty-draft'
 
+draft = TTY::Draft.new(
+  prompt: ->(n){n==0 ? "\033[32m> \033[0m" : '  '}
+)
+
 loop do
-  puts TTY::Draft.gets
+  draft.gets
   puts "I see"
 end
 ```
 
-- `enter`: submit
-- `shift+enter`: new line
-- arrow keys: move cursor around
+- `enter`: new line
+- arrow keys: move cursor around and retrieve history
+- `ctrl-d`/`ctrl-z`: submit
 
 ## License
 

data/lib/tty-draft.rb

@@ -3,40 +3,40 @@ require 'tty-live'
 
 module TTY
   class Draft
-    VERSION = '0.1.0'
-
-    class << self
-      def gets
-        draft = new
-        reader = Reader.new
-        reader.subscribe(draft)
-        live = Live.new
-
-        loop do
-          reader.read_char
-          if draft.done
-            live.update('')
-            reader.unsubscribe(draft)
-            print live.show
-            return draft.edited
-          end
-          live.update(draft.editing)
-          print live.hide
-        end
-      end
-    end
+    VERSION = '0.1.2'
 
     attr_reader :done
 
-    def initialize
-      @chars = [[]]
-      @row = 0
-      @col = 0
+    def initialize(prompt: ->(n){''})
+      @prompt = prompt
+      new_draft
+    end
+
+    def gets
+      reader = Reader.new
+      reader.subscribe(self)
+      live = Live.new
+
+      live.update(edited)
+      loop do
+        reader.read_char
+        if done
+          live.update(edited)
+          reader.unsubscribe(self)
+          puts live.show
+          return to_string(@chars).tap{new_draft}
+        end
+        live.update(editing)
+        print live.hide
+      end
     end
 
     def keypress(event)
       @done = false
       case event.key.name
+      when :ctrl_d, :ctrl_z
+        history << @chars
+        @done = true
       when :backspace
         if @col > 0
           @col -= 1
@@ -61,14 +61,27 @@ module TTY
         @row += 1
         @col = 0
       when :up
-        @row -= 1 if @row > 0
-        fix_col
+        if @row > 0
+          @row -= 1
+          return fix_col
+        end
+        if @work > 0
+          return load_history(@work -= 1)
+        end
       when :down
-        @row += 1 if (@row + 1) < @chars.size
-        fix_col
+        if (@row + 1) < @chars.size
+          @row += 1
+          return fix_col
+        end
+        if @work + 1 < @workspaces.size
+          return load_history(@work += 1)
+        end
+      when :home, :ctrl_a
+        @col = 0
+      when :end, :ctrl_e
+        @col = current_row.size
       when :return
-        return insert_row if event.key.shift
-        @done = true
+        insert_row
       else
         return insert_row if event.value == "\n"
         current_row.insert(@col, event.value)
@@ -76,19 +89,19 @@ module TTY
       end
     end
 
+    private
+
     def edited
-      to_string(@chars)
+      render to_string(@chars)
     end
 
     def editing
       copy = @chars.dup
       copy[@row] = current_row.dup
       copy[@row][@col] = "\e[7m#{copy[@row][@col] || ' '}\e[27m"
-      to_string(copy)
+      render to_string(copy)
     end
 
-    private
-
     def delete_char
       current_row.delete_at(@col)
     end
@@ -108,12 +121,36 @@ module TTY
       @col = 0
     end
 
+    def new_draft
+      @chars = [[]]
+      @row = 0
+      @col = 0
+      (@workspaces = [])[(@work = history.size)] = @chars
+    end
+
+    def history
+      @history ||= []
+    end
+
+    def load_history(i)
+      @chars = (@workspaces[i] ||= @history[i].map(&:dup))
+      @row = @chars.size - 1
+      @col = current_row.size
+    end
+
     def fix_col
       @col = [@col, current_row.size].min
     end
 
     def to_string(chars)
-      chars.map{|r| r.empty? ? ' ' : r.join }.join("\n")
+      chars.map(&:join).join("\n")
+    end
+
+    def render(str)
+      lines = str.empty? ? [''] : str.each_line
+      lines.each_with_index.map do |line, i|
+        @prompt[i] + line
+      end.join
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tty-draft
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - c