vedeu 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e5bec0b5de4844a5345d59ec1da5c8ad679f8d5
-  data.tar.gz: 1d4e0cfa8a8d21a8ad784467a9e0597218160f6f
+  metadata.gz: f601ff87eda4c07701dfc42940bbed9c30879fc3
+  data.tar.gz: cbf134f3d4aa31bacec4dbc26ac059e4cec15f1b
 SHA512:
-  metadata.gz: 4722efaa8c4a0cdd1ce6399d55d9f2103d3b9df478e8fa317c342d519f3537ec1d14d5f5f601b152b878a8429c4ca108ec54a2f9ef489d970e096c6638f3a9ec
-  data.tar.gz: 7ae465c0dd6f73cfbfcc6b6b2ef956894d19490c71631237111086c817ee3f2619d9d7684c5fca6821dd929d9f789d5311c5f47cf7b4e4f0f477326b4c102f57
+  metadata.gz: 3c4d5ef111d1f43f66c3fa1a4acc31a7066405fa5aed113b7b9fabed117290757d42d7972f847eeb2c009262b2c50a7504ca0f28e8741ec7f27c72ed1754b336
+  data.tar.gz: 1d663a4f0a1d69cca7abf7aa1f91346bc47be0578fdba37e7627e0df5a8e9109980fc5bc01bd31493f29f9e2ba20ecdbc8adfab4a7cf8581b1ad80060c4c6275

data/lib/vedeu/input/input.rb

@@ -1,26 +1,61 @@
 require_relative '../support/queue'
 require_relative '../support/terminal'
+require_relative '../repository/event_repository'
 
 module Vedeu
-  module Input
-    extend self
+  class Input
+    def self.capture
+      new.capture
+    end
 
     def capture
-      key = input
-
-      Trigger.event(:_mode_switch_) if is_escape?(key)
+      EventRepository.trigger(:_keypress_, keypress)
 
-      Queue.enqueue(key)
+      Queue.enqueue(keypress)
     end
 
     private
 
-    def is_escape?(key)
-      key.ord == 27
+    def keypress
+      key        = input
+      translated = case key
+      when "\r"      then :enter
+      when "\t"      then :tab
+      when "\e"      then :escape
+      when "\e[A"    then :up
+      when "\e[B"    then :down
+      when "\e[C"    then :right
+      when "\e[D"    then :left
+      when "\e[5~"   then :page_up
+      when "\e[6~"   then :page_down
+      when "\e[H"    then :home
+      when "\e[3~"   then :delete
+      when "\e[F"    then :end
+      when "\eOP"    then :f1
+      when "\eOQ"    then :f2
+      when "\eOR"    then :f3
+      when "\eOS"    then :f4
+      when "\e[15~"  then :f5
+      when "\e[17~"  then :f6
+      when "\e[18~"  then :f7
+      when "\e[19~"  then :f8
+      when "\e[20~"  then :f9
+      when "\e[21~"  then :f10
+      when "\e[23~"  then :f11
+      when "\e[24~"  then :f12
+      when "\e[1;2P" then :print_screen
+      when "\e[1;2Q" then :scroll_lock
+      when "\e[1;2R" then :pause_break
+      when "\u007F"  then :backspace
+      else
+        key
+      end
+
+      translated
     end
 
     def input
-      Terminal.input
+      @_input ||= Terminal.input
     end
   end
 end

data/lib/vedeu/repository/event_repository.rb

@@ -1,18 +1,6 @@
 require_relative '../support/terminal'
 
 module Vedeu
-  class Trigger
-    def self.event(event, *args)
-      EventRepository.trigger(event, *args)
-    end
-  end
-
-  class Register
-    def self.event(event, *args)
-      EventRepository.register(event, &block)
-    end
-  end
-
   module EventRepository
     extend self
 
@@ -35,8 +23,15 @@ module Vedeu
     def defaults
       {
         :_exit_         => [ proc { fail StopIteration } ],
-        :_mode_switch_  => [ proc { fail ModeSwitch } ]
+        :_keypress_     => [ proc { |key| keypress(key) } ],
+        :_mode_switch_  => [ proc { fail ModeSwitch } ],
       }
     end
+
+    def keypress(key)
+      trigger(:_mode_switch_) if key == :escape
+
+      trigger(:key, key)
+    end
   end
 end

data/lib/vedeu/support/exit.rb

@@ -3,7 +3,7 @@ require_relative '../repository/event_repository'
 module Vedeu
   class Exit
     def self.dispatch
-      Trigger.event(:_exit_)
+      EventRepository.trigger(:_exit_)
     end
   end
 end

data/lib/vedeu/support/queue.rb

@@ -16,6 +16,10 @@ module Vedeu
       store.size > 0
     end
 
+    def entries
+      store
+    end
+
     def size
       store.size
     end

data/lib/vedeu/support/terminal.rb

@@ -21,17 +21,22 @@ module Vedeu
     ensure
       restore_screen
     end
-    # :nocov:
 
     def input
       if raw_mode?
-        console.getc
+        keys = console.getch
+        if keys.ord == 27
+          keys << console.read_nonblock(3) rescue nil
+          keys << console.read_nonblock(2) rescue nil
+        end
+        keys
 
       else
         console.gets.chomp
 
       end
     end
+    # :nocov:
 
     def output(stream = '')
       console.print(stream)
@@ -39,6 +44,7 @@ module Vedeu
       stream
     end
 
+    # :nocov:
     def initialize_screen(&block)
       output Esc.string 'reset'
       output Esc.string 'clear'
@@ -70,6 +76,7 @@ module Vedeu
     def raw_mode?
       @mode == :raw
     end
+    # :nocov:
 
     def centre
       [(height / 2), (width / 2)]

data/test/example_app/lib/app.rb

@@ -64,15 +64,24 @@ module Example
                           }.merge(command_position)
     command 'time', {
                       entity:   ExampleCommand,
-                      keyword: 'time',
+                      keyword:  'time',
                       keypress: 't'
                     }
     command 'exit', {
                       entity:   Vedeu::Exit,
-                      keyword: 'exit',
+                      keyword:  'exit',
                       keypress: 'q'
                     }
 
+    event :key do |key|
+      case key
+      when 'v' then puts "v was pressed."
+      when :f1 then puts "F1 was pressed."
+      when :f2 then run(:some_event, [:args, :go, :here])
+      else
+      end
+    end
+
     def self.start
       Vedeu::Launcher.new([]).execute!
     end

data/test/lib/vedeu/input/input_test.rb

@@ -4,9 +4,52 @@ require_relative '../../../../lib/vedeu/input/input'
 module Vedeu
   describe Input do
     describe '.capture' do
-      it 'enqueues the captured input from the terminal' do
-        Terminal.stub :input, 'input' do
-          Input.capture.must_equal(Vedeu::Queue)
+      keypresses = {
+        "\r"      => :enter,
+        "\t"      => :tab,
+        # "\e"      => :escape, # handled below in separate test
+        "\e[A"    => :up,
+        "\e[B"    => :down,
+        "\e[C"    => :right,
+        "\e[D"    => :left,
+        "\e[5~"   => :page_up,
+        "\e[6~"   => :page_down,
+        "\e[H"    => :home,
+        "\e[3~"   => :delete,
+        "\e[F"    => :end,
+        "\eOP"    => :f1,
+        "\eOQ"    => :f2,
+        "\eOR"    => :f3,
+        "\eOS"    => :f4,
+        "\e[15~"  => :f5,
+        "\e[17~"  => :f6,
+        "\e[18~"  => :f7,
+        "\e[19~"  => :f8,
+        "\e[20~"  => :f9,
+        "\e[21~"  => :f10,
+        "\e[23~"  => :f11,
+        "\e[24~"  => :f12,
+        "\e[1;2P" => :print_screen,
+        "\e[1;2Q" => :scroll_lock,
+        "\e[1;2R" => :pause_break,
+        "\u007F"  => :backspace,
+        "k"       => "k"
+      }
+
+      keypresses.each do |keypress, value|
+        it 'enqueues the captured input from the terminal' do
+          Queue.reset
+          Terminal.stub :input, keypress do
+            Input.capture
+            Queue.entries.must_equal([value])
+          end
+        end
+      end
+
+      it 'switches the terminal mode when escape is pressed' do
+        Queue.reset
+        Terminal.stub :input, "\e" do
+          proc { Input.capture }.must_raise(ModeSwitch)
         end
       end
     end

data/test/lib/vedeu/support/queue_test.rb

@@ -36,6 +36,19 @@ module Vedeu
       end
     end
 
+    describe '.entries' do
+      it 'returns an empty collection when the queue is empty' do
+        Queue.reset
+        Queue.entries.must_equal([])
+      end
+
+      it 'returns all the enqueue items when the queue is not empty' do
+        Queue.reset
+        Queue.enqueue(:queued_entry)
+        Queue.entries.must_equal([:queued_entry])
+      end
+    end
+
     describe '.size' do
       it 'returns the size of the queue when the queue is empty' do
         Queue.reset

data/test/test_helper.rb

@@ -9,10 +9,6 @@ SimpleCov.start do
   add_filter   '/test/'
 end unless ENV['no_simplecov']
 
-Minitest.after_run do
-  print [27.chr, '[', '?25h'].join # show cursor
-end
-
 GC.disable
 
 # commented out by default (makes tests slower)

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.0.35'
+  spec.version       = '0.0.36'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler