ruco 0.2.0.beta2 → 0.2.0.beta3

data/Gemfile

@@ -1,8 +1,11 @@
 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,6 +8,9 @@ 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)
@@ -17,6 +20,10 @@ 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
@@ -25,5 +32,8 @@ DEPENDENCIES
   clipboard (>= 0.9.8)
   ffi
   jeweler
+  language_sniffer
+  oniguruma
   rake
   rspec (~> 2)
+  ultraviolet1x

data/Rakefile

@@ -21,19 +21,23 @@ end
 
 task :try_color do
   require 'curses'
-  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
+  # 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
 
   Curses.setpos(0,0)
-  Curses.attrset(Curses.color_pair(Curses::COLOR_RED)) # fetch color pair with the id xxx
+  Curses.attrset(Curses::color_pair( 32 )) # fetch color pair with the id xxx
   Curses.addstr("xxxxxxxx\nyyyyyyy");
-  Curses.attrset(Curses.color_pair(Curses::COLOR_GREEN))
+  Curses.attrset(Curses::color_pair( 32 ))
   Curses.addstr("xxxxxxxx\nyyyyyyy");
   Curses.getch
 end
@@ -61,6 +65,19 @@ 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,41 +1,29 @@
 Simple, extendable, test-driven commandline editor written in ruby, for Linux/Mac/Windows.
 
-### Features
+Features:
 
- - **Desktop-like / intuitive interface**
+ - **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)
  - 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` in Ruby
- - Full clipboard support -> Ctrl+x/c/v
- - undo / redo -> Ctrl+z/y
+ - configuration via `~/.ruco.rb`
+ - cut, copy and paste -> Ctrl+x/c/v
+ - undo / redo
  - stays at last position when reopening a file
- - opens file at line e.g. `ruco foo/bar.rb:32`
- - supports all newline formats
+ - opens file at line with `ruco foo/bar.rb:32` syntax
+ - keeps whatever newline format you use (\r \n \r\n)
  - 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
 
-### 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
+![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/))
 
 Install
 =======
@@ -56,6 +44,10 @@ 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
@@ -91,16 +83,20 @@ 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 single space and pressing tab inserts 2*space
+ - [Tabs] Ruco does not like tabs. Existing tabs are displayed as ' ' 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
+ - [Ruby1.9] Unicode support -> install libncursesw5-dev before installing ruby (does not work for 1.8)
  - [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.1.14
+0.2.0.beta3

data/bin/ruco

@@ -21,6 +21,7 @@ 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"){
@@ -44,15 +45,23 @@ def log(stuff)
   File.open('ruco.log','ab'){|f| f.puts stuff }
 end
 
-@options = parse_options
+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$/ # it seems many lion users set xterm-color to fix bugs ...
+)
 
 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
   )
 
@@ -63,9 +72,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(lines, columns)
+      app.resize(screen.lines, screen.columns)
       screen.clear_cache
     else
       result = app.key key

data/lib/ruco.rb

@@ -1,3 +1,5 @@
+require 'language_sniffer'
+
 require 'ruco/version'
 
 require 'ruco/core_ext/object'
@@ -15,6 +17,7 @@ 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'
@@ -23,6 +26,28 @@ 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
+        :columns, :convert_tabs, :convert_newlines, :undo_stack_size, :color_theme
       ).merge(
         :window => @options.nested(:window),
         :history => @options.nested(:history),

data/lib/ruco/array_processor.rb

@@ -0,0 +1,53 @@
+module Ruco
+  class ArrayProcessor
+    attr_accessor :lines
+
+    def initialize
+      @line_number = -1
+      @lines = []
+      @open_elements = []
+      @still_open_elements = []
+    end
+
+    def open_tag(name, position)
+      #puts "Open #{name}  #{@line_number}:#{position}"
+      @open_elements << [name, position]
+    end
+
+    def close_tag(name, position)
+      #puts "Close #{name} #{@line_number}:#{position}"
+      open_element = @open_elements.pop || @still_open_elements.pop
+      @lines[@line_number] << [name, open_element.last...position]
+    end
+
+    def new_line(line)
+      #puts "Line #{line}"
+      # close elements only opened in last line
+      @open_elements.each do |name, position|
+        @lines[@line_number] << [name, position...@line.size]
+      end
+
+      # surround last line in still open elements from previouse lines
+      @still_open_elements.each do |name,_|
+        @lines[@line_number] << [name, 0...@line.size]
+      end
+
+      # mark open as 'still open'
+      # and let them start on column 0 -> if closed in this line its 0...position
+      @still_open_elements += @open_elements.map{|name,_| [name,0]}
+      @open_elements = []
+
+      # proceed with next line
+      @line = line
+      @line_number += 1
+      @lines[@line_number] = []
+    end
+
+    def start_parsing(name);end
+    def end_parsing(name);end
+
+    def inspect
+      @lines
+    end
+  end
+end

data/lib/ruco/core_ext/object.rb

@@ -50,3 +50,29 @@ 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,4 +9,13 @@ 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,6 +21,7 @@ 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/colors.rb

@@ -0,0 +1,97 @@
+require 'timeout'
+
+module Ruco
+  class Editor
+    module Colors
+      DEFAULT_THEME = File.expand_path('../../../../spec/fixtures/railscasts.tmTheme',__FILE__)
+      STYLING_TIMEOUT = 4
+
+      def style_map
+        map = super
+        return map if @colors_took_too_long
+
+        # disable colors if syntax-parsing takes too long
+        begin
+          syntax = Timeout.timeout(STYLING_TIMEOUT) do
+            syntax_info[@window.visible_lines]
+          end
+        rescue Timeout::Error
+          # this takes too long, just go on without styles
+          STDERR.puts "Styling takes too long, go on without me!"
+          @colors_took_too_long = true
+          return map
+        end
+
+        add_syntax_highlighting_to_style_map(map, syntax)
+
+        if @selection
+          # add selection a second time so it stays on top
+          @window.add_selection_styles(map, @selection)
+        end
+        map
+      end
+
+      private
+
+      def syntax_info
+        if language = @options[:language]
+          @syntax_info ||= {}
+          language = [language.name.downcase, language.lexer]
+          lines.map do |line|
+            @syntax_info[line] ||= SyntaxParser.syntax_for_lines([line], language).first
+          end
+        else
+          []
+        end
+      end
+
+      def add_syntax_highlighting_to_style_map(map, syntax_info)
+        return unless syntax_info
+
+        $ruco_foreground = theme.foreground
+        $ruco_background = theme.background
+
+        syntax_info.each_with_index do |syntax_positions, line|
+          next unless syntax_positions
+          syntax_positions.each do |syntax_element, columns|
+            columns = columns.move(-@window.left)
+            style = style_for_syntax_element(syntax_element)
+            if style and columns.first >= 0
+              map.add(style, line, columns)
+            end
+          end
+        end
+      end
+
+      def style_for_syntax_element(syntax_element)
+        @style_for_element ||= {}
+        @style_for_element[syntax_element] ||= begin
+          _, style = theme.styles.detect{|name,style| syntax_element.start_with?(name) }
+          style
+        end
+      end
+
+      def theme
+        @theme ||= begin
+          file = download_into_file(@options[:color_theme]) if @options[:color_theme]
+          file ||= DEFAULT_THEME
+          Ruco::TMTheme.new(file)
+        end
+      end
+
+      def download_into_file(url)
+        theme_store = FileStore.new(File.expand_path('~/.ruco/themes'), :keep => 5, :pure => true)
+        theme_store.cache(url) do
+          require 'open-uri'
+          require 'openssl'
+          OpenURI.without_ssl_verification do
+            open(url).read
+          end
+        end
+        File.expand_path(theme_store.file(url))
+      rescue => e
+        STDERR.puts "Could not download #{url} -- #{e}"
+      end
+    end
+  end
+end