ruco 0.2.0.beta → 0.2.0.beta2

data/Gemfile

@@ -1,11 +1,8 @@
 source :rubygems
 
 gem 'clipboard', '>=0.9.8'
-gem 'ultraviolet1x'
-gem 'language_sniffer'
 
 group :dev do # not development <-> would add unneeded development dependencies in gemspec
-  gem 'oniguruma', :platform => :ruby_18
   gem 'ffi', :platform => [:mingw]
   gem 'rake'
   gem 'rspec', '~>2'

data/Gemfile.lock

@@ -8,9 +8,6 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    language_sniffer (1.0.0)
-    oniguruma (1.1.0)
-    plist (3.1.0)
     rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -20,10 +17,6 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    textpow1x (0.11.0)
-      plist (>= 3.0.1)
-    ultraviolet1x (0.12.1)
-      textpow1x (>= 0.11.0)
 
 PLATFORMS
   ruby
@@ -32,8 +25,5 @@ DEPENDENCIES
   clipboard (>= 0.9.8)
   ffi
   jeweler
-  language_sniffer
-  oniguruma
   rake
   rspec (~> 2)
-  ultraviolet1x

data/Rakefile

@@ -21,23 +21,19 @@ end
 
 task :try_color do
   require 'curses'
-  # fix colors for xterm...
-  #if Curses::has_colors?
-  ENV['TERM'] += '-256color' if ENV['TERM'] == 'xterm'
-  Curses::start_color
-  # initialize every color we want to use
-  # id, foreground, background
-  #Curses.use_default_colors if defined? Curses.use_default_colors # 1.9 only, maybe helps to get real white...
-  Curses::init_pair( 32, 253, 39 )
-  #Curses::init_pair( 32, -1, -1 )
-  #Curses::init_pair( Curses::COLOR_RED, Curses::COLOR_RED, Curses::COLOR_BLACK )
-  #Curses::init_pair( Curses::COLOR_GREEN, Curses::COLOR_GREEN, Curses::COLOR_BLACK )
-  #end
+  if Curses::has_colors?
+    Curses::start_color
+    # initialize every color we want to use
+    # id, foreground, background
+    Curses::init_pair( Curses::COLOR_BLACK, Curses::COLOR_BLACK, Curses::COLOR_BLACK )
+    Curses::init_pair( Curses::COLOR_RED, Curses::COLOR_RED, Curses::COLOR_BLACK )
+    Curses::init_pair( Curses::COLOR_GREEN, Curses::COLOR_GREEN, Curses::COLOR_BLACK )
+  end
 
   Curses.setpos(0,0)
-  Curses.attrset(Curses::color_pair( 32 )) # fetch color pair with the id xxx
+  Curses.attrset(Curses.color_pair(Curses::COLOR_RED)) # fetch color pair with the id xxx
   Curses.addstr("xxxxxxxx\nyyyyyyy");
-  Curses.attrset(Curses::color_pair( 32 ))
+  Curses.attrset(Curses.color_pair(Curses::COLOR_GREEN))
   Curses.addstr("xxxxxxxx\nyyyyyyy");
   Curses.getch
 end
@@ -65,19 +61,6 @@ task :key do
   end
 end
 
-task :parse_syntax do
-  require 'ruco/array_processor'
-  require 'ultra_pow_list'
-  UltraPowList.make_loadable
-  require 'textpow'
-  require 'uv'
-  puts ruby = File.join(Uv.path.first,'uv', 'syntax','ruby.syntax')
-  syntax = Textpow::SyntaxNode.load(ruby)
-  processor = Ruco::ArrayProcessor.new
-  result = syntax.parse( "class Foo\n  def xxx;end\nend",  processor )
-  puts result.inspect
-end
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|

data/Readme.md

@@ -1,29 +1,41 @@
 Simple, extendable, test-driven commandline editor written in ruby, for Linux/Mac/Windows.
 
-Features:
+### Features
 
- - **Intuitive interface**
- - TextMate Syntax and Theme support
+ - **Desktop-like / intuitive interface**
  - selecting via Shift + arrow-keys (only Linux or iTerm) or 'select mode' Ctrl+b + arrow-keys
  - move line up/down (Alt+Ctrl+up/down)
  - Tab -> indent / Shift+Tab -> unindent
  - 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
  - (optional) blank line before eof on save
  - (optional) line numbers
 
-![ruco with railscasts theme](http://dl.dropbox.com/u/2670385/Web/ruco-with-railscasts-theme.png)<br/>
-(to get colors on ruby 1.8, install oniguruma [OsX](http://blog.pastie.org/2010/01/oniguruma-on-snow-leopard.html) / [Ubuntu](http://blog.loftninjas.org/2008/09/25/installing-the-oniguruma-gem-on-debianubuntu/))
+### 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
 
 Install
 =======
@@ -44,10 +56,6 @@ Customize
       options.editor_remove_trailing_whitespace_on_save = true  # default false
       options.editor_blank_line_before_eof_on_save = true       # default false
       options.editor_line_numbers = true                        # default false
-
-      # Use any Textmate theme e.g. from http://wiki.macromates.com/Themes/UserSubmittedThemes
-      # use a url that points directly to the theme, e.g. github 'raw' urls
-      options.color_theme = "https://raw.github.com/deplorableword/textmate-solarized/master/Solarized%20%28dark%29.tmTheme"
       ...
 
       # bind a key
@@ -83,20 +91,16 @@ Customize
 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
 
+
+
 TODO
 =====
- - only do syntax parsing for changed lines + selected lines <-> will not be redrawn anyhow
- - try to use complete file coloring as removed in 26d6da4
- - javascript syntax parsing is slow and often causes syntax-timeouts
- - some languages are still not mapped correctly to their syntax file
-   [languages](https://github.com/grosser/language_sniffer/blob/master/lib/language_sniffer/languages.yml) <->
-   [syntaxes](https://github.com/grosser/ultraviolet/tree/master/syntax)
  - do not fall back to 0:0 after undoing the first change
  - check writable status every x seconds (e.g. in background) -> faster while typing
  - search help e.g. 'Nothing found' '#4 of 6 hits' 'no more hits, start from beginning ?'

data/VERSION

@@ -1 +1 @@
-0.2.0.beta
+0.1.14

data/bin/ruco

@@ -21,7 +21,6 @@ Options:
 BANNER
     opts.on("-c", "--convert-tabs","Convert tabs to spaces") { options[:convert_tabs] = true }
     opts.on("-u", "--undo-stack-size SIZE","Maximum size of the undo stack.  0 allows for a complete undo stack.") {|size| options[:undo_stack_size] = size.to_i }
-    opts.on("-n", "--no-colors","No colors -- helps performance / broken terminals") { options[:no_colors] = true }
     opts.on("--debug-cache","Show caching in action") { options[:debug_cache] = true }
     opts.on("--debug-keys", "Show pressed keys") { options[:debug_keys] = true }
     opts.on("-v", "--version","Show Version"){
@@ -45,23 +44,15 @@ def log(stuff)
   File.open('ruco.log','ab'){|f| f.puts stuff }
 end
 
-options = parse_options
-
-# do not use colors if told so or the terminal does not support colors
-$ruco_colors = (
-  not options[:no_colors] and
-  RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ and # windows
-  ENV['TERM'] != 'rxvt' and
-  ENV['TERM'] !~ /-color$/
-)
+@options = parse_options
 
 require 'ruco'
 
 # draw app and redraw after each keystroke (or paste)
-Ruco::Screen.open(options) do |screen|
+Ruco::Screen.open(@options) do |screen|
   app = Ruco::Application.new(ARGV[0],
-    :convert_tabs => options[:convert_tabs],
-    :undo_stack_size => options[:undo_stack_size],
+    :convert_tabs => @options[:convert_tabs],
+    :undo_stack_size => @options[:undo_stack_size],
     :lines => screen.lines, :columns => screen.columns
   )
 
@@ -72,9 +63,9 @@ Ruco::Screen.open(options) do |screen|
   end
 
   Keyboard.output do |key|
-    screen.debug_key(key) if options[:debug_keys]
+    screen.debug_key(key) if @options[:debug_keys]
     if key == :resize
-      app.resize(screen.lines, screen.columns)
+      app.resize(lines, columns)
       screen.clear_cache
     else
       result = app.key key

data/lib/ruco.rb

@@ -1,5 +1,3 @@
-require 'language_sniffer'
-
 require 'ruco/version'
 
 require 'ruco/core_ext/object'
@@ -17,7 +15,6 @@ require 'ruco/file_store'
 require 'ruco/window'
 require 'ruco/screen'
 require 'ruco/style_map'
-require 'ruco/syntax_parser'
 
 require 'ruco/editor'
 require 'ruco/editor/line_numbers'
@@ -26,28 +23,6 @@ require 'ruco/status_bar'
 require 'ruco/command_bar'
 require 'ruco/application'
 
-if $ruco_colors
-  begin
-    # this can fail on ruby 1.8 <-> oniguruma is complicated to install
-    require 'oniguruma' if RUBY_VERSION < '1.9.0'
-
-    # there are some other gems out there like spox-textpow etc, so be picky
-    gem 'plist'
-    require 'plist'
-    gem 'textpow1x'
-    require 'textpow'
-    gem 'ultraviolet1x'
-    require 'uv'
-
-    # we do not need there if any other color li failed
-    require 'ruco/array_processor'
-    require 'ruco/tm_theme'
-    require 'ruco/editor/colors'
-  rescue LoadError
-    warn "Could not load color libs -- #{$!}"
-  end
-end
-
 require 'ruco/form'
 require 'ruco/text_area'
 require 'ruco/editor_area'

data/lib/ruco/application.rb

@@ -247,7 +247,7 @@ module Ruco
       @status_lines = 1
 
       editor_options = @options.slice(
-        :columns, :convert_tabs, :convert_newlines, :undo_stack_size, :color_theme
+        :columns, :convert_tabs, :convert_newlines, :undo_stack_size
       ).merge(
         :window => @options.nested(:window),
         :history => @options.nested(:history),

data/lib/ruco/core_ext/object.rb

@@ -50,29 +50,3 @@ class Object
     Marshal.load(Marshal.dump(self))
   end unless defined? deep_copy
 end
-
-class Object
-  # copy from active_support
-  def silence_warnings
-    with_warnings(nil) { yield }
-  end unless defined? silence_warnings
-
-  # copy from active_support
-  def with_warnings(flag)
-    old_verbose, $VERBOSE = $VERBOSE, flag
-    yield
-  ensure
-    $VERBOSE = old_verbose
-  end unless defined? with_warnings
-end
-
-# http://grosser.it/2010/07/23/open-uri-without-ssl-https-verification/
-module OpenURI
-  def self.without_ssl_verification
-    old = ::OpenSSL::SSL::VERIFY_PEER
-    silence_warnings{ ::OpenSSL::SSL.const_set :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE }
-    yield
-  ensure
-    silence_warnings{ ::OpenSSL::SSL.const_set :VERIFY_PEER, old }
-  end
-end

data/lib/ruco/core_ext/range.rb

@@ -9,13 +9,4 @@ class Range
   def last_element
     exclude_end? ? last.pred : last
   end unless defined? last_element
-
-  # (1..2).move(2) == (3..4)
-  def move(n)
-    if exclude_end?
-      (first + n)...(last + n)
-    else
-      (first + n)..(last + n)
-    end
-  end
 end

data/lib/ruco/editor.rb

@@ -21,7 +21,6 @@ module Ruco
       end
 
       content = (File.exist?(@file) ? File.binary_read(@file) : '')
-      @options[:language] ||= LanguageSniffer.detect(@file, :content => content).language
       content.tabs_to_spaces! if @options[:convert_tabs]
 
       # cleanup newline formats

data/lib/ruco/editor_area.rb

@@ -2,7 +2,6 @@ module Ruco
   # everything that does not belong to a text-area
   # but is needed for Ruco::Editor
   class EditorArea < TextArea
-    include Ruco::Editor::Colors if defined? Ruco::Editor::Colors # only colorize if all color libs are loaded
     include Ruco::Editor::LineNumbers
     include Ruco::Editor::History
 

data/lib/ruco/file_store.rb

@@ -19,28 +19,6 @@ module Ruco
       deserialize File.binary_read(file) if File.exist?(file)
     end
 
-    def cache(key, &block)
-      value = get(key)
-      if value.nil?
-        value = yield
-        set(key, value)
-      end
-      value
-    end
-
-    def delete(key)
-      FileUtils.rm(file(key))
-    rescue Errno::ENOENT
-    end
-
-    def clear
-      FileUtils.rm_rf(@folder)
-    end
-
-    def file(key)
-      "#{@folder}/#{Digest::MD5.hexdigest(key)}.yml"
-    end
-
     private
 
     def entries
@@ -54,8 +32,12 @@ module Ruco
       delete.each{|f| File.delete(f) }
     end
 
+    def file(key)
+      "#{@folder}/#{Digest::MD5.hexdigest(key)}.yml"
+    end
+
     def serialize(value)
-      @options[:string] ? value : Marshal.dump(value)
+      Marshal.dump(value)
     end
 
     def deserialize(value)

data/lib/ruco/screen.rb

@@ -1,7 +1,5 @@
 module Ruco
   class Screen
-    @@styles = {}
-
     def initialize(options)
       @options = options
       @cache = []
@@ -12,16 +10,12 @@ module Ruco
     end
 
     def open(&block)
-      if $ruco_colors and ENV['TERM'] == 'xterm'
-        ENV['TERM'] += '-256color' # activate 256 colors
-      end
       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
       Curses.stdscr.nodelay = 1 # do not block -> we can use timeouts
       Curses.init_screen
-      Curses.start_color if $ruco_colors and Curses.has_colors?
       yield self
     ensure
       Curses.clear # needed to clear the menu/status bar on windows
@@ -94,62 +88,14 @@ module Ruco
       yield # render the line
     end
 
-    def self.curses_style(style)
-      @@styles[style] ||= begin
-        if $ruco_colors
-          foreground = $ruco_foreground || '#ffffff'
-          background = $ruco_background || '#000000'
-
-          foreground, background = if style == :normal
-            [foreground, background]
-          elsif style == :reverse
-            ['#000000', '#ffffff']
-          else
-            # :red or [:red, :blue]
-            f,b = style
-            b ||= background
-            [f,b]
-          end
-
-          foreground = html_to_terminal_color(foreground)
-          background = html_to_terminal_color(background)
-          color_id(foreground, background)
-        else # no colors
-          if style == :reverse
-            Curses::A_REVERSE
-          else
-            Curses::A_NORMAL
-          end
-        end
-      end
-    end
-
-    # create a new color from foreground+background or reuse old
-    # and return color-id
-    def self.color_id(foreground, background)
-      @@color_ids ||= {}
-      @@color_ids[[foreground, background]] ||= begin
-        # make a new pair with a unique id
-        @@max_color_id ||= 0
-        id = (@@max_color_id += 1)
-        unless defined? RSpec # stops normal text-output, do not use in tests
-          Curses::init_pair(id, foreground, background)
-        end
-        Curses.color_pair(id)
-      end
-    end
+    STYLES = {
+      :normal => 0,
+      :reverse => Curses::A_REVERSE
+    }
 
-    COLOR_SOURCE_VALUES = 256
-    COLOR_TARGET_VALUES = 5
-    COLOR_DIVIDE = COLOR_SOURCE_VALUES / COLOR_TARGET_VALUES
-    TERM_COLOR_BASE = 16
-
-    def self.html_to_terminal_color(html_color)
-      return unless html_color
-      r = (html_color[1..2].to_i(16) / COLOR_DIVIDE) * 36
-      g = (html_color[3..4].to_i(16) / COLOR_DIVIDE) * 6
-      b = (html_color[5..6].to_i(16) / COLOR_DIVIDE) * 1
-      TERM_COLOR_BASE + r + g + b
+    def self.curses_style(style)
+      return 0 unless style
+      STYLES[style] or raise("Unknown style #{style.inspect}")
     end
   end
 end