madCLIbs 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b225b7b9de1d2f71e550c51ad2fa87e16578fc9d
-  data.tar.gz: a05c025b597fbbea9527606c8a0a99e97898284a
+  metadata.gz: a88d8d8ab13aa4123b03d4b45323be937e8ecc57
+  data.tar.gz: c6bdafb4a0f1e89b461395778358a886e7f65b7f
 SHA512:
-  metadata.gz: 8be43d5a80282fc39e5585378c3736c6969c60da9566ffa6d29c9b3d3b87529ca0c3023ceb1183a3c5492b9e64d98452588a5127a3cc1f574866f988c91797c3
-  data.tar.gz: 504a39a88e488a0551eb9f1831364d2211eb103cc43e1f403a68f6b1f94c482d02236cc6a08dac10059303df3b3800cdcfb4a5978071f034cbe0c591fe513d23
+  metadata.gz: 6b99b9dd7c248b257bd8ce285545fb61c72576c1e55c15b8300763f614ddcedfe519c604f3bd144a56545e42f6c80f9387c16164b11d68aa36c8962ff4fd9a57
+  data.tar.gz: 1c2a2ee54468a35c3f19608fc486ac2d9c34c1efcb3690b472b08b70ca9219088ebe5c23c75812588d2e4e5b394bc79141000bb26e7714474f16e0fc793f6cbc

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+## Change Log
+
+### v0.0.5 (2015/02/17 19:51 +00:00)
+- [b1a4fcb](https://github.com/donaldguy/madCLIbs/commit/b1a4fcb3fcaba985b536076c6f8b5ba9c9b68ee0) Handle zero blanks; Add to_s -> value for blanks (@donaldguy)
+- [1aa811d](https://github.com/donaldguy/madCLIbs/commit/1aa811dc97fe749cb8e80166bc43e720dc5a0421) User-configurable token seperation logic (@donaldguy)
+
+### v0.0.4 (2015/02/16 04:23 +00:00)
+- [f16e304](https://github.com/donaldguy/madCLIbs/commit/f16e30444401af79db9b6f20e46eaddfc766e71e) Add Support for Custom Interrupt Handlers (@donaldguy)
+
+### v0.0.3 (2015/02/15 18:54 +00:00)
+- [2c3fea7](https://github.com/donaldguy/madCLIbs/commit/2c3fea7a0ffc4a261be30e114fc86608024ebae3) Add Shift-Tab support; Add demo GIF to README (@donaldguy)
+- [9f2a8ef](https://github.com/donaldguy/madCLIbs/commit/9f2a8efce6ebfeb2007eb60a63f0d303f25f885b) Nestable outer-styles; Loosen single-char constraint (@donaldguy)
+- [d044964](https://github.com/donaldguy/madCLIbs/commit/d04496425bbe772627b548f75d0625c9b9d8ce18) Badges (@donaldguy)
+
+### v0.0.2 (2015/02/15 17:58 +00:00)
+- [58803fc](https://github.com/donaldguy/madCLIbs/commit/58803fcb09d5ff29707d049c5381e135b34026e1) Remove dependency on activesupport (@donaldguy)
+
+### v0.0.1 (2015/02/15 17:55 +00:00)
+- [4ccbf56](https://github.com/donaldguy/madCLIbs/commit/4ccbf5621f0b54a6f4846fd7756b869e9c41baac) Tweak docs for initial release (@donaldguy)
+- [37c6ab9](https://github.com/donaldguy/madCLIbs/commit/37c6ab938c840b64aa81d67e0fe75597ab90c418) Color support; Move a lot of Blank::Base to mixins (@donaldguy)
+- [8d3dfc8](https://github.com/donaldguy/madCLIbs/commit/8d3dfc80059f85af98a074ca6f8106988718dbfa) Make cursor and arrow keys work (@donaldguy)
+- [954c4b4](https://github.com/donaldguy/madCLIbs/commit/954c4b4151285e289da6f3426da7568d0f10962e) Proof of concept /w placeholders & tabbing between fields (@donaldguy)
+- [b753175](https://github.com/donaldguy/madCLIbs/commit/b753175e9a9a03c83ca2345e8072ae889d4a8d29) Establish copyright provenance for iohelper.rb (@donaldguy)
+- [0106789](https://github.com/donaldguy/madCLIbs/commit/0106789a6144c095912fb7fd34c9232c9ee0fc27) Initial commit establishing intention (@donaldguy)

data/lib/mad_clibs.rb

@@ -4,11 +4,13 @@ class MadClibs
   autoload :Prompter, 'mad_clibs/prompter'
 
   attr_accessor :interrupt_handler
+  attr_accessor :token_separator
 
   def initialize(config = {})
     @prompter = Prompter.new(self)
     @interrupt_handler = config[:interrupt_handler]
     @interrupt_handler ||= ->() { raise Interrupt }
+    @token_separator = config[:separator] || " "
   end
 
   def prompt(*args)

data/lib/mad_clibs/blanks/base.rb

@@ -35,6 +35,10 @@ class MadClibs
         end
       end
 
+      def to_s
+        value
+      end
+
       protected
         include Mixins::ColorHandling
         include Mixins::DefaultKeyHandling

data/lib/mad_clibs/prompter.rb

@@ -16,10 +16,15 @@ class MadClibs
       @blanks = line.instance_variable_get(:@blanks)
       @current_blank_index = 0
 
-      until done?
+      if @blanks.empty?
         render
-        place_cursor
-        getc
+        @io.read_key(false) #pause to allow Ctrl-C; continue on any other key
+      else
+        until done?
+          render
+          place_cursor
+          getc
+        end
       end
 
       post_render
@@ -40,19 +45,29 @@ private
     def render
       buffer = StringIO.new
 
-      @tokens.each do |token|
+      @tokens.length.times do |i|
+        token = @tokens[i]
         if token.respond_to? :render
           buffer.print token.render
         elsif token.respond_to? :to_s
           buffer.print token
         end
 
-        buffer.print " "
+
+        buffer.print seperator_between(token, @tokens.fetch(i+1, nil))
       end
 
       @io.rerender buffer.string
     end
 
+    def seperator_between(a,b)
+      if @controller.token_separator.respond_to? :call
+        @controller.token_separator.call(a, b)
+      else
+        @controller.token_separator
+      end
+    end
+
     def getc
       @last_char = @io.read_key(false)
       case @last_char
@@ -75,12 +90,17 @@ private
     def place_cursor
       print @io.carriage_return
 
-      @tokens.each do |t|
+      @tokens.length.times do |i|
+        t = @tokens[i]
         if t == active_blank
           print @io.char_right*t.position
           break
         end
-        print @io.char_right*(Term::ANSIColor.uncolored(t).length+1) # + 1 for space
+
+        token_width = Term::ANSIColor.uncolored(t).length
+        seperator_width = seperator_between(t, @tokens.fetch(i+1,nil)).size
+
+        print @io.char_right*(token_width + seperator_width)
       end
     end
 

data/lib/mad_clibs/version.rb

@@ -1,3 +1,3 @@
 class MadClibs
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madCLIbs
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Donald Guy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,3 +101,4 @@ signing_key:
 specification_version: 4
 summary: User-friendly fill-in-the-blank CLI forms (think HTML5 with placeholders)
 test_files: []
+has_rdoc: