ruco 0.0.8 → 0.0.9

data/Rakefile

@@ -20,15 +20,19 @@ end
 task :key do
   require 'curses'
 
-  Curses.noecho
-  Curses.raw
-  Curses.stdscr.keypad(true)
+  Curses.cbreak # provide unbuffered input
+  Curses.noecho # turn off input echoing
+  Curses.nonl # turn off newline translation
+  Curses.stdscr.keypad(true) # turn on keypad mode
+#  Curses.stdscr.nodelay = 1
+
   
   count = 0
   loop do
-    count = (count + 1) % 20
     key = Curses.getch
+    next if key == 4294967295 # placeholder key when using nodelay mode
     break if key == ?\C-c
+    count = (count + 1) % 20
     Curses.setpos(count,0)
     Curses.addstr("#{key.inspect}     ");
   end

data/Readme.md

@@ -23,7 +23,8 @@ Usage
 
 TODO
 =====
- - backspace on mac ?
+ - support typing unicode like äöß etc (rework size / make strings utf8-aware)
+ - ask before quitting on changed file
  - bind/action must use instance_exec
  - read .rucorc.rb
  - write key binding guide

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bin/ruco

@@ -38,8 +38,9 @@ def write(line,row,text)
 end
 
 def init_screen
-  Curses.noecho # do not show typed chars
   Curses.init_screen
+  Curses.noecho # do not show typed chars
+  Curses.nonl # turn off newline translation
   Curses.stdscr.keypad(true) # enable arrow keys
   Curses.raw # give us all other keys
 

data/lib/ruco.rb

@@ -3,7 +3,6 @@ require 'ruco/core_ext/string'
 require 'ruco/core_ext/array'
 
 require 'ruco/cursor'
-require 'ruco/command'
 
 require 'ruco/editor'
 require 'ruco/status_bar'

data/lib/ruco/application.rb

@@ -50,11 +50,7 @@ module Ruco
       when :tab then @focused.insert("\t")
       when 32..126 then @focused.insert(key.chr) # printable
       when :enter then
-        result = @focused.insert("\n")
-        if result.is_a?(Ruco::Command)
-          result.send_to(@editor)
-          @focused = @editor
-        end
+        @focused.insert("\n")
       when :backspace then @focused.delete(-1)
       when :delete then @focused.delete(1)
 
@@ -65,6 +61,7 @@ module Ruco
     end
 
     def bind(key, action=nil, &block)
+      raise "Ctrl+m cannot be bound" if key == :"Ctrl+m" # would shadow enter -> bad
       raise if action and block
       @bindings[key] = action || block
     end
@@ -73,6 +70,14 @@ module Ruco
       @actions[name] = block
     end
 
+    def ask(question, options={}, &block)
+      @focused = @command
+      @command.ask(question, options) do |response|
+        @focused = @editor
+        block.call(response)
+      end
+    end
+
     private
 
     def setup_actions
@@ -85,8 +90,7 @@ module Ruco
       end
 
       action :go_to_line do
-        @focused = @command
-        @command.move_to_line
+        ask('Go to Line: '){|result| @editor.move(:to_line, result.to_i) }
       end
 
       action :delete_line do
@@ -94,8 +98,7 @@ module Ruco
       end
 
       action :find do
-        @focused = @command
-        @command.find
+        ask("Find: ", :cache => true){|result| @editor.find(result) }
       end
     end
 

data/lib/ruco/command_bar.rb

@@ -25,23 +25,17 @@ module Ruco
       end
     end
 
-    def find
-      @forms_cache[:find] ||= Form.new('Find: ', :columns => @options[:columns]) do |value|
-        @form = nil
-        Command.new(:find, value)
-      end
-      @form = @forms_cache[:find]
-    end
-
-    def move_to_line
-      @form = Form.new('Go to Line: ', :columns => @options[:columns], :type => :integer) do |value|
-        @form = nil
-        Command.new(:move, :to_line, value.to_i)
+    def ask(question, options={}, &block)
+      @form = cached_form_if(options[:cache], question) do
+        Form.new(question, :columns => @options[:columns]) do |result|
+          @form = nil
+          block.call(result)
+        end
       end
     end
 
     def reset
-      @forms_cache[:find] = nil if @form == @forms_cache[:find]
+      @forms_cache[@forms_cache.index(@form)] = nil
       @form = nil
     end
 
@@ -55,6 +49,14 @@ module Ruco
 
     private
 
+    def cached_form_if(cache, question)
+      if cache
+        @forms_cache[question] ||= yield
+      else
+        yield
+      end
+    end
+
     def available_shortcuts
       used_columns = 0
       spacer = '    '

data/lib/ruco/form.rb

@@ -15,11 +15,7 @@ module Ruco
 
     def insert(text)
       @text_field.insert(text.gsub("\n",''))
-      if text.include?("\n")
-        result = @text_field.value
-        result = result.to_i if @options[:type] == :integer
-        @submit.call(result)
-      end
+      @submit.call(@text_field.value) if text.include?("\n")
     end
 
     def cursor

data/lib/ruco/keyboard.rb

@@ -1,4 +1,6 @@
 class Keyboard
+  A_TO_Z = ('a'..'z').to_a
+
   def self.listen
     loop do
       key = Curses.getch
@@ -17,19 +19,15 @@ class Keyboard
 
       # modify
       when 9 then :tab
+      when 13 then :enter # shadows Ctrl+m
       when 32..126 then key # printable
-      when 10 then :enter
-      when 263 then :backspace
+      when 263, 127 then :backspace # ubuntu / mac
       when Curses::KEY_DC then :delete
 
       # misc
-      when ?\C-d then :"Ctrl+d"
-      when ?\C-f then :"Ctrl+f"
-      when ?\C-g then :"Ctrl+g"
+      when 0 then :"Ctrl+space"
+      when 1..26 then :"Ctrl+#{A_TO_Z[key-1]}"
       when 27 then :escape
-      when ?\C-s then :"Ctrl+s"
-      when ?\C-w then :"Ctrl+w"
-      when ?\C-q then :"Ctrl+q"
       else
         key
       end

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
     "bin/ruco",
     "lib/ruco.rb",
     "lib/ruco/application.rb",
-    "lib/ruco/command.rb",
     "lib/ruco/command_bar.rb",
     "lib/ruco/core_ext/array.rb",
     "lib/ruco/core_ext/object.rb",
@@ -37,7 +36,6 @@ Gem::Specification.new do |s|
     "ruco.gemspec",
     "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",
-    "spec/ruco/command_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
@@ -53,7 +51,6 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",
-    "spec/ruco/command_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",

data/spec/ruco/command_bar_spec.rb

@@ -15,91 +15,69 @@ describe Ruco::CommandBar do
     bar.view.should == "^W Exit    ^S Save"
   end
 
-  describe :find do
-    it "sets command bar into search mode" do
-      bar.find
+  describe :ask do
+    it "sets command bar into question mode" do
+      bar.ask('Find: '){}
       bar.view.should == "Find: "
       bar.cursor.column.should == 6
     end
 
-    it "can enter stuff" do
-      bar.find
+    it "can enter answer" do
+      bar.ask('Find: '){}
       bar.insert('abc')
       bar.view.should == "Find: abc"
       bar.cursor.column.should == 9
     end
 
-    it "keeps entered stuff" do
-      bar.find
+    it "gets reset when submitting" do
+      bar.ask('Find: '){}
+      bar.insert("123\n")
+      bar.view.should == default_view
+    end
+
+    it "keeps entered answer when cached" do
+      bar.ask('Find: ', :cache => true){}
       bar.insert('abc')
       bar.insert("\n")
-      bar.find
+      bar.ask('Find: ', :cache => true){}
       bar.view.should == "Find: abc"
       bar.cursor.column.should == 9
     end
 
-    it "can reset the search" do
-      bar.find
+    it "reset the question when cached" do
+      bar.ask('Find: ', :cache => true){}
       bar.insert('abc')
       bar.reset
 
       bar.view.should == default_view
-      bar.find
+      bar.ask('Find: ', :cache => true){}
       bar.view.should == "Find: " # term removed
     end
 
-    it "can execute a search" do
-      bar.find
-      bar.insert('abc')
-      result = bar.insert("d\n")
-      result.should == Ruco::Command.new(:find, 'abcd')
-    end
+    it "does not reset all cached questions" do
+      bar.ask('Find: ', :cache => true){}
+      bar.insert("abc\n")
 
-    it "finds with offset when same search is entered again" do
-      bar.find
-      bar.insert('abcd')
-      bar.insert("\n")
-      bar.find
-      result = bar.insert("\n")
-      result.should == Ruco::Command.new(:find, 'abcd')
-    end
-  end
-
-  describe :move_to_line do
-    it "displays a form" do
-      bar.move_to_line
-      bar.view.should == "Go to Line: "
-    end
+      bar.ask('Foo: ', :cache => true){}
+      bar.reset # clears Foo not Find
+      bar.view.should == default_view
 
-    it "gets output" do
-      bar.move_to_line
-      bar.insert('123')
-      result = bar.insert("\n")
-      result.should == Ruco::Command.new(:move, :to_line, 123)
+      bar.ask('Find: ', :cache => true){}
+      bar.view.should == "Find: abc"
     end
 
-    it "gets reset when starting a new go to line" do
-      bar.move_to_line
+    it "gets reset when starting a new question" do
+      bar.ask('Find: '){}
       bar.insert('123')
-      bar.move_to_line
-      bar.view.should == "Go to Line: "
-    end
-
-    it "gets reset when submitting" do
-      bar.move_to_line
-      bar.insert("123\n")
-      bar.view.should == default_view
+      bar.ask('Find: '){}
+      bar.view.should == "Find: "
     end
 
-    it "does not reset search when resetting" do
-      bar.find
+    it "can execute" do
+      bar.ask('Find: ', :cache => true){|r| @result = r }
       bar.insert('abc')
-      bar.move_to_line
-      bar.reset
-
-      bar.view.should == default_view
-      bar.find
-      bar.view.should == "Find: abc"
+      bar.insert("d\n")
+      @result.should == 'abcd'
     end
   end
 end

data/spec/ruco/form_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('spec/spec_helper')
 
 describe Ruco::Form do
-  let(:form){ Ruco::Form.new('Test', :columns => 30){|value| Ruco::Command.new(:find, value) } }
+  let(:form){ Ruco::Form.new('Test', :columns => 30){|value| @result = value } }
 
   it "positions cursor in text field" do
     form.cursor.should == [0, 5]
@@ -13,13 +13,15 @@ describe Ruco::Form do
       form.cursor.should == [0, 8]
     end
 
-    it "returns nil on any insert" do
-      form.insert('abc').should == nil
+    it "does not return result on normal insert" do
+      form.insert('abc')
+      @result.should == nil
     end
 
-    it "returns value on enter" do
+    it "returns result on enter" do
       form.insert('abc')
-      form.insert("d\n").should == Ruco::Command.new(:find, 'abcd')
+      form.insert("d\n")
+      @result.should == "abcd"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Michael Grosser
@@ -36,7 +36,6 @@ files:
 - bin/ruco
 - lib/ruco.rb
 - lib/ruco/application.rb
-- lib/ruco/command.rb
 - lib/ruco/command_bar.rb
 - lib/ruco/core_ext/array.rb
 - lib/ruco/core_ext/object.rb
@@ -51,7 +50,6 @@ files:
 - ruco.gemspec
 - spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb
-- spec/ruco/command_spec.rb
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
@@ -96,7 +94,6 @@ summary: Commandline editor written in ruby
 test_files: 
 - spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb
-- spec/ruco/command_spec.rb
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb

data/lib/ruco/command.rb

@@ -1,19 +0,0 @@
-module Ruco
-  # Used to pass around commands
-  class Command
-    attr_reader :method, :args
-
-    def initialize(method, *args)
-      @method = method
-      @args = args
-    end
-
-    def send_to(object)
-      object.send(@method, *@args)
-    end
-
-    def ==(other)
-      other.method == method and other.args == args
-    end
-  end
-end

data/spec/ruco/command_spec.rb

@@ -1,11 +0,0 @@
-require File.expand_path('spec/spec_helper')
-
-describe Ruco::Command do
-  it "can invoke a recorded command" do
-    Ruco::Command.new(:slice, 0,1).send_to("ab1").should == 'a'
-  end
-
-  it "can invoke a recorded command without arguments" do
-    Ruco::Command.new(:strip).send_to(" a ").should == 'a'
-  end
-end