ruco 0.2.0.beta12 → 0.2.0

data/.travis.yml

@@ -0,0 +1,7 @@
+before_script:
+  - sudo apt-get install -y libonig-dev && bundle install
+script: "bundle exec rake"
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/Readme.md

@@ -1,8 +1,8 @@
 Simple, extendable, test-driven commandline editor written in ruby, for Linux/Mac/Windows.
 
-Features:
+### Features
 
- - **Intuitive interface**
+ - **Desktop-like / intuitive interface**
  - TextMate Syntax and Theme support
  - selecting via Shift + arrow-keys (only Linux or iTerm) or 'select mode' Ctrl+b + arrow-keys
  - move line up/down (Alt+Ctrl+up/down)
@@ -10,12 +10,12 @@ Features:
  - keeps indentation (+ paste-detection e.g. via Cmd+v)
  - change (*) + writable (!) indicators
  - find / go to line / delete line / search & replace
- - configuration via `~/.ruco.rb`
- - cut, copy and paste -> Ctrl+x/c/v
- - undo / redo
+ - configuration via `~/.ruco.rb` in Ruby
+ - Full clipboard support -> Ctrl+x/c/v
+ - undo / redo -> Ctrl+z/y
  - stays at last position when reopening a file
- - opens file at line with `ruco foo/bar.rb:32` syntax
- - keeps whatever newline format you use (\r \n \r\n)
+ - opens file at line e.g. `ruco foo/bar.rb:32`
+ - supports all newline formats
  - surrounds selection with quotes/braces (select abc + " --> "abc")
  - shortens long file names in the middle
  - (optional) remove trailing whitespace on save
@@ -25,14 +25,17 @@ Features:
 ![ruco with railscasts theme](http://dl.dropbox.com/u/2670385/Web/ruco-with-railscasts-theme.png)<br/>
 [Colors in Ruby 1.8](#colors)
 
+
 Install
 =======
     sudo gem install ruco
 
+
 Usage
 =====
     ruco file.rb
 
+
 Customize
 =========
 
@@ -80,12 +83,13 @@ Customize
       bind :"Ctrl+u", :first_line
     end
 
+
 TIPS
 ====
  - [Mac] arow-keys + Shift/Alt does not work in default terminal (use iTerm)
- - [Tabs] Ruco does not like tabs. Existing tabs are displayed as ' ' and pressing tab inserts 2*space
+ - [Tabs] Ruco does not like tabs. Existing tabs are displayed as single space and pressing tab inserts 2*space
  - [RVM] `alias r="rvm 1.9.2 exec ruco"` and you only have to install ruco once
- - [Ruby1.9] Unicode support -> install libncursesw5-dev before installing ruby (does not work for 1.8)
+ - [Ruby1.9] Unicode support -> install libncursesw5-dev before installing ruby
  - [ssh vs clipboard] access your desktops clipboard by installing `xauth` on the server and then using `ssh -X`
  - [Alt key] if Alt does not work try your Meta/Win/Cmd key
 
@@ -102,6 +106,24 @@ TIPS
     gem install oniguruma
 
 
+Architecture
+============
+Ruco is basically a lot of String manipulation separated in HTML style elements.
+The only component dealing with the commandline interface are Screen and Keyboard. Therefore
+everything is very simple to build and test since it returns a string or a e.g. cursor position.
+
+Writing/reading is done in a TextArea or a TextField (a TextArea with 1 line)
+which are placed in Form`s.
+
+The Application consists of a StatusBar, Editor, CommandBar and delegates actions to the currently active element.
+
+To build the commandline output Editor/CommandBar return:
+
+ - view -- text that should be displayed on the screen (complete content cropped via Window)
+ - style_map -- a big Array with style infos, e.g. 'on line 1 chars 5 to 7 are red'
+ - cursor -- where to draw the cursor
+
+
 TODO
 =====
  - only do syntax parsing for changed lines + selected lines <-> will not be redrawn anyhow
@@ -125,6 +147,7 @@ TODO
  - 1.8: unicode support <-> already finished but unusable due to Curses (see encoding branch)
  - add double quotes/braces when typing one + skip over quote/brace when its already typed at current position
 
+
 Authors
 =======
 

data/VERSION

@@ -1 +1 @@
-0.2.0.beta12
+0.2.0

data/lib/ruco/editor/colors.rb

@@ -7,9 +7,12 @@ module Ruco
       STYLING_TIMEOUT = 4
 
       def style_map
-        return super if @colors_took_too_long or not @options[:language]
+        $ruco_foreground = theme.foreground
+        $ruco_background = theme.background
         map = super
 
+        return map if @colors_took_too_long or not @options[:language]
+
         # disable colors if syntax-parsing takes too long
         begin
           syntax = Timeout.timeout(STYLING_TIMEOUT) do
@@ -22,9 +25,6 @@ module Ruco
           return map
         end
 
-        $ruco_foreground = theme.foreground
-        $ruco_background = theme.background
-
         if syntax
           add_syntax_highlighting_to_style_map(map, syntax)
 

data/lib/ruco/screen.rb

@@ -74,7 +74,7 @@ module Ruco
           # position at start of line and draw
           Curses.setpos(line_number,0)
           Ruco::StyleMap.styled(line, styles).each do |style, part|
-            Curses.attrset self.class.curses_style(style)
+            Curses.attrset self.class.curses_style(style, $ruco_colors)
             Curses.addstr part
           end
 
@@ -91,8 +91,8 @@ module Ruco
       yield # render the line
     end
 
-    def self.curses_style(style)
-      if $ruco_colors
+    def self.curses_style(style, colors)
+      if colors
         foreground = $ruco_foreground || '#ffffff'
         background = $ruco_background || '#000000'
 

data/lib/ruco/syntax_parser.rb

@@ -3,7 +3,8 @@ module Ruco
     # textpow only offers certain syntax
     TEXTPOW_CONVERT = {
       'scss' => 'sass',
-      'html+erb' => 'html_rails',
+      'html+erb' => 'html',
+      'rhtml' => 'html',
     }
 
     def self.syntax_for_line(line, languages)

data/ruco.gemspec

@@ -5,15 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.2.0.beta12"
+  s.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-10-04}
+  s.date = %q{2011-10-06}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
   s.files = [
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "Rakefile",
@@ -86,6 +87,29 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Commandline editor written in ruby}
+  s.test_files = [
+    "spec/ruco/application_spec.rb",
+    "spec/ruco/array_processor_spec.rb",
+    "spec/ruco/command_bar_spec.rb",
+    "spec/ruco/core_ext/array_spec.rb",
+    "spec/ruco/core_ext/range_spec.rb",
+    "spec/ruco/core_ext/string_spec.rb",
+    "spec/ruco/editor_spec.rb",
+    "spec/ruco/file_store_spec.rb",
+    "spec/ruco/form_spec.rb",
+    "spec/ruco/history_spec.rb",
+    "spec/ruco/keyboard_spec.rb",
+    "spec/ruco/option_accessor_spec.rb",
+    "spec/ruco/screen_spec.rb",
+    "spec/ruco/status_bar_spec.rb",
+    "spec/ruco/style_map_spec.rb",
+    "spec/ruco/syntax_parser_spec.rb",
+    "spec/ruco/text_area_spec.rb",
+    "spec/ruco/tm_theme_spec.rb",
+    "spec/ruco/window_spec.rb",
+    "spec/ruco_spec.rb",
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/ruco/editor_spec.rb

@@ -722,15 +722,10 @@ describe Ruco::Editor do
     end
 
     it "times out when styling takes too long" do
-      begin
-        STDERR.should_receive(:puts)
-        old = Ruco::Editor::Colors::STYLING_TIMEOUT
-        silence_warnings{ Ruco::Editor::Colors::STYLING_TIMEOUT = 0.001 }
-        write(File.read('lib/ruco.rb'))
-        editor.style_map.flatten.should == [nil,nil,nil]
-      ensure
-        silence_warnings{ Ruco::Editor::Colors::STYLING_TIMEOUT = old }
-      end
+      STDERR.should_receive(:puts)
+      Timeout.should_receive(:timeout).and_raise Timeout::Error
+      write(File.read('lib/ruco.rb'))
+      editor.style_map.flatten.should == [nil,nil,nil]
     end
 
     describe 'with theme' do

data/spec/ruco/screen_spec.rb

@@ -3,44 +3,35 @@ require File.expand_path('spec/spec_helper')
 describe Ruco::Screen do
   describe :curses_style do
     it "is 'normal' for nothing" do
-      Ruco::Screen.curses_style(:normal).should == 256
+      Ruco::Screen.curses_style(:normal, true).should == 256
     end
 
     it "is red for red" do
       pending
-      Ruco::Screen.curses_style(:red).should == Curses::color_pair( Curses::COLOR_RED )
+      Ruco::Screen.curses_style(:red, true).should == Curses::color_pair( Curses::COLOR_RED )
     end
 
     it "is reverse for reverse" do
-      Ruco::Screen.curses_style(:reverse).should == 512
+      Ruco::Screen.curses_style(:reverse, true).should == 512
     end
 
     it "raises on unknown style" do
       lambda{
-        Ruco::Screen.curses_style(:foo)
+        Ruco::Screen.curses_style(:foo, true)
       }.should raise_error
     end
 
     describe 'without colors' do
-      before do
-        Ruco::Screen.class_eval '@@styles = {}' # clear cache
-        $ruco_colors = false
-      end
-
-      after do
-        $ruco_colors = true
-      end
-
       it "is 'normal' for normal" do
-        Ruco::Screen.curses_style(:normal).should == Curses::A_NORMAL
+        Ruco::Screen.curses_style(:normal, false).should == Curses::A_NORMAL
       end
 
       it "is reverse for reverse" do
-        Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
+        Ruco::Screen.curses_style(:reverse, false).should == Curses::A_REVERSE
       end
 
       it "is normal for unknown style" do
-        Ruco::Screen.curses_style(:foo).should == Curses::A_NORMAL
+        Ruco::Screen.curses_style(:foo, false).should == Curses::A_NORMAL
       end
     end
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 62196379
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 2
   - 0
-  - beta
-  - 12
-  version: 0.2.0.beta12
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -17,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 +02:00
+date: 2011-10-06 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +30,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id001
   type: :runtime
   name: clipboard
+  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,12 +44,12 @@ dependencies:
         segments: 
         - 1
         version: "1"
-  requirement: *id002
   type: :runtime
   name: textpow1x
+  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,9 +58,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :runtime
   name: language_sniffer
+  version_requirements: *id003
   prerelease: false
 description: 
 email: michael@grosser.it
@@ -73,6 +71,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -160,14 +159,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -175,5 +172,25 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby
-test_files: []
-
+test_files: 
+- spec/ruco/application_spec.rb
+- spec/ruco/array_processor_spec.rb
+- spec/ruco/command_bar_spec.rb
+- spec/ruco/core_ext/array_spec.rb
+- spec/ruco/core_ext/range_spec.rb
+- spec/ruco/core_ext/string_spec.rb
+- spec/ruco/editor_spec.rb
+- spec/ruco/file_store_spec.rb
+- spec/ruco/form_spec.rb
+- spec/ruco/history_spec.rb
+- spec/ruco/keyboard_spec.rb
+- spec/ruco/option_accessor_spec.rb
+- spec/ruco/screen_spec.rb
+- spec/ruco/status_bar_spec.rb
+- spec/ruco/style_map_spec.rb
+- spec/ruco/syntax_parser_spec.rb
+- spec/ruco/text_area_spec.rb
+- spec/ruco/tm_theme_spec.rb
+- spec/ruco/window_spec.rb
+- spec/ruco_spec.rb
+- spec/spec_helper.rb