sawaal 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e155b3e80dc6a2669e19cafc05cfb7368ff5022
-  data.tar.gz: 33caa694f2463eadc5182ea1a14760af2d5954c0
+  metadata.gz: f83a00ac10ede43f129020b8d41fbacd18293e36
+  data.tar.gz: d1fc746b0afac374c12d231e08f21fe790cd68da
 SHA512:
-  metadata.gz: bbf490442fe0ac0963513b61b6cea744e58b60b9ea58027c7f08b855daabe4d676a39571d3f89b707e9e1ff8e790768c9bc225c29f989495884d2931ad72ebce
-  data.tar.gz: 1d4535e9a8ee338d81e57c35bd9df9e34da0eab582b0a2eecbe9019b4f1595d398dfa2e6cd38056f0576acd457aadcb9477068aa6b8e8844501d7267ca37c519
+  metadata.gz: 20c2be2726ea28a67b78a3952b3173af2532a8da54c4cffdabab806deedde0e69783c7443e2c8178c7558e759e530438c959c9aa8551cc0fc4d0226275fe002b
+  data.tar.gz: 6d8c445b93ea703b7f20c09570d06986ad5e34a55489c0fb59a40d12d941a7b29b8d5c582f0c10cbfb6fb648a4b6691f3447b334edcb1d6764639500ed22447f

data/CHANGELOG.md

@@ -16,6 +16,17 @@ List of changes so far that have been released to ruby gems.
 
 <!-- markdown-toc end -->
 
+1.1.0 / 2015-07-29
+==================
+
+## Minor improvements
+
+### Hide help on keypress
+
+## Bugfixes
+
+### Read C-c properly
+
 1.0.2 / 2015-07-29
 ==================
 

data/lib/sawaal.rb

@@ -3,12 +3,12 @@
 require 'io/console'
 require 'timeout'
 
-require 'sawaal/color'
-require 'sawaal/cursor'
-require 'sawaal/selections'
-require 'sawaal/selector'
-require 'sawaal/tty'
-require 'sawaal/version'
+require_relative './sawaal/color'
+require_relative './sawaal/cursor'
+require_relative './sawaal/selections'
+require_relative './sawaal/selector'
+require_relative './sawaal/tty'
+require_relative './sawaal/version'
 
 # Helps a command line application by allowing it to ask
 # multiple choice questions

data/lib/sawaal/cursor.rb

@@ -12,6 +12,7 @@ module Sawaal
     def initialize
       @text = []
       @current_line_index = -1
+      @help_hidden = false
     end
 
     def save_excursion(&block)
@@ -45,6 +46,15 @@ module Sawaal
       TTY.print '(use arrow keys, press <enter> when finished)'
     end
 
+    def hide_help
+      return if @help_hidden
+      restore_position
+      clear_line
+      move_down
+      move_to_beginning
+      @help_hidden = true
+    end
+
     def write_item(item)
       line = "#{bold TTY::ARROW} #{item}"
       move_down

data/lib/sawaal/selections.rb

@@ -15,17 +15,15 @@ module Sawaal
     def select
       loop do
         ch = read_char
-        case ch
-        when TTY::RETURN
-          break
-        when TTY::MOVE_UP
-          @cursor.highlight(@cursor.current_line_index - 1)
-        when TTY::MOVE_DOWN
-          @cursor.highlight(@cursor.current_line_index + 1)
-        when TTY::CONTROL_C
-          @cursor.write_selection(red('terminated'))
-          exit 33
-        end
+
+        # hide help after any keypress
+        @cursor.hide_help
+
+        # selection has been made
+        break if ch == TTY::RETURN
+
+        # move selection
+        handle_input(ch)
       end
 
       selected = @cursor.current_line_index
@@ -33,6 +31,18 @@ module Sawaal
       @keys[@cursor.current_line_index]
     end
 
+    def handle_input(ch)
+      case ch
+      when TTY::MOVE_UP
+        @cursor.highlight(@cursor.current_line_index - 1)
+      when TTY::MOVE_DOWN
+        @cursor.highlight(@cursor.current_line_index + 1)
+      when TTY::CONTROL_C
+        @cursor.write_selection(red('<terminated>'))
+        exit 33
+      end
+    end
+
     def write
       @items.each do |item|
         @cursor.write_item(item)

data/lib/sawaal/selector.rb

@@ -10,7 +10,7 @@ module Sawaal
       selections = Selections.new(cursor, options)
 
       cursor.save_excursion do
-        cursor.write_question question
+        cursor.write_question(question)
         selections.write
         selections.select
       end

data/lib/sawaal/tty.rb

@@ -33,7 +33,7 @@ module Sawaal
     RESTORE_POSITION = ansii_escape('u')
 
     RETURN = "\r"
-    CONTROL_C = '\\u0003'
+    CONTROL_C = "\u0003"
 
     ARROW = '‣'
   end

data/lib/sawaal/version.rb

@@ -2,5 +2,5 @@
 
 # Track version of the module
 module Sawaal
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/spec/version_spec.rb

@@ -2,6 +2,6 @@
 
 describe Sawaal do
   it 'has a valid version tag' do
-    expect(Sawaal::VERSION).to(eq('1.0.2'))
+    expect(Sawaal::VERSION).to(eq('1.1.0'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawaal
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Anshul Verma