ruco 0.1.14 → 0.2.0.beta

data/lib/ruco/editor_area.rb

@@ -2,6 +2,7 @@ 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,6 +19,28 @@ 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
@@ -32,12 +54,8 @@ module Ruco
       delete.each{|f| File.delete(f) }
     end
 
-    def file(key)
-      "#{@folder}/#{Digest::MD5.hexdigest(key)}.yml"
-    end
-
     def serialize(value)
-      Marshal.dump(value)
+      @options[:string] ? value : Marshal.dump(value)
     end
 
     def deserialize(value)

data/lib/ruco/screen.rb

@@ -1,5 +1,7 @@
 module Ruco
   class Screen
+    @@styles = {}
+
     def initialize(options)
       @options = options
       @cache = []
@@ -10,12 +12,16 @@ 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
@@ -88,14 +94,62 @@ module Ruco
       yield # render the line
     end
 
-    STYLES = {
-      :normal => 0,
-      :reverse => Curses::A_REVERSE
-    }
-
     def self.curses_style(style)
-      return 0 unless style
-      STYLES[style] or raise("Unknown style #{style.inspect}")
+      @@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
+
+    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
     end
   end
 end

data/lib/ruco/style_map.rb

@@ -1,6 +1,6 @@
 module Ruco
   class StyleMap
-    attr_accessor :lines
+    attr_accessor :lines, :foreground, :background
 
     def initialize(lines)
       @lines = Array.new(lines)
@@ -20,20 +20,19 @@ module Ruco
       @lines.map do |styles|
         next unless styles
 
-        # start and one after end of every column-range changes styles
-        points_of_change = styles.map{|s,c| [c.first, c.last+1] }.flatten.uniq
+        # change to style at start and recalculate one after the end
+        points_of_change = styles.map{|s,c| [c.first, c.last_element+1] }.flatten.uniq
 
         flat = []
 
-        styles.each do |style, columns|
-          points_of_change.each do |point|
+        points_of_change.each do |point|
+          flat[point] = :normal # set default
+          styles.each do |style, columns|
             next unless columns.include?(point)
             flat[point] = style
           end
         end
 
-        max = styles.map{|_,columns| columns.last }.max
-        flat[max+1] = :normal
         flat
       end
     end

data/lib/ruco/syntax_parser.rb

@@ -0,0 +1,33 @@
+module Ruco
+  module SyntaxParser
+    # uv only offers certain syntax
+    UV_CONVERT = {
+      'scss' => 'sass',
+      'html+erb' => 'html_rails',
+    }
+
+    def self.syntax_for_lines(lines, languages)
+      if syntax = syntax_node(languages)
+        processor = syntax.parse(lines.join("\n"),  Ruco::ArrayProcessor.new)
+        processor.lines
+      else
+        []
+      end
+    end
+
+    def self.syntax_node(languages)
+      @@syntax_node ||= {}
+      @@syntax_node[languages] ||= begin
+        found = nil
+        fallbacks = languages.map{|l| UV_CONVERT[l] }.compact
+
+        (languages + fallbacks).detect do |language|
+          syntax = File.join(Uv.syntax_path, "#{language}.syntax")
+          found = Textpow::SyntaxNode.load(syntax) if File.exist?(syntax)
+        end
+
+        found
+      end
+    end
+  end
+end

data/lib/ruco/tm_theme.rb

@@ -0,0 +1,45 @@
+require 'plist'
+
+module Ruco
+  class TMTheme
+    attr_accessor :background, :foreground, :styles
+
+    # TODO maybe later...
+    #attr_accessor :name, :uuid, :comment, :line_highlight
+
+    # not supported in Curses ...
+    #attr_accessor :invisibles, :caret, :selection
+
+    def initialize(file)
+      raw = Plist.parse_xml(file)
+      rules = raw['settings']
+      @styles = {}
+
+      # set global styles
+      global = rules.shift['settings']
+      self.background = global['background']
+      self.foreground = global['foreground']
+
+      # set scope styles
+      rules.each do |rules|
+        style = [
+          rules['settings']['foreground'],
+          rules['settings']['background'],
+        ]
+
+        next if style == [nil, nil] # some weird themes have rules without colors...
+        next unless scope = rules['scope'] # some weird themes have rules without scopes...
+
+        scope.split(/, ?/).map(&:strip).each do |scope|
+          @styles[scope] = style unless nested_scope?(scope)
+        end
+      end
+    end
+
+    private
+
+    def nested_scope?(scope)
+      scope.include?(' ')
+    end
+  end
+end

data/lib/ruco/window.rb

@@ -50,9 +50,15 @@ module Ruco
     end
 
     def style_map(selection)
-      mask = StyleMap.new(lines)
-      return mask unless selection
+      map = StyleMap.new(lines)
+      if selection
+        add_selection_styles(map, selection)
+      else
+        map
+      end
+    end
 
+    def add_selection_styles(map, selection)
       lines.times do |line|
         visible = visible_area(line)
         next unless selection.overlap?(visible)
@@ -62,10 +68,9 @@ module Ruco
         last = [selection.last, visible.last].min
         last = last[1] - left
 
-        mask.add(:reverse, line, first...last)
+        map.add(:reverse, line, first...last)
       end
-
-      mask
+      map
     end
 
     def left=(x)
@@ -77,6 +82,14 @@ module Ruco
       @top = [[line, max_top].min, 0].max
     end
 
+    def visible_lines
+      @top..(@top+@lines-1)
+    end
+
+    def visible_columns
+      @left..(@left+@columns-1)
+    end
+
     private
 
     def adjustment(current, allowed, threshold, offset)
@@ -95,13 +108,5 @@ module Ruco
       end_of_line = [line, last_visible_column]
       start_of_line..end_of_line
     end
-
-    def visible_lines
-      @top..(@top+@lines-1)
-    end
-
-    def visible_columns
-      @left..(@left+@columns-1)
-    end
   end
-end
+end

data/playground/benchmark_syntax_parser.rb

@@ -0,0 +1,23 @@
+$LOAD_PATH << 'lib'
+require 'oniguruma' if RUBY_VERSION < '1.9.0'
+require 'language_sniffer'
+gem 'plist'
+require 'plist'
+gem 'textpow1x'
+require 'textpow'
+gem 'ultraviolet1x'
+require 'uv'
+
+file = ARGV[0]
+text = File.read(file)
+language = LanguageSniffer.detect(file).language
+
+require 'ruco/syntax_parser'
+require 'ruco/array_processor'
+t = Time.now.to_f
+Ruco::SyntaxParser.syntax_for_lines(text.split("\n"), [language.name.downcase, language.lexer])
+Ruco::SyntaxParser.syntax_for_lines(text.split("\n"), [language.name.downcase, language.lexer])
+Ruco::SyntaxParser.syntax_for_lines(text.split("\n"), [language.name.downcase, language.lexer])
+Ruco::SyntaxParser.syntax_for_lines(text.split("\n"), [language.name.downcase, language.lexer])
+Ruco::SyntaxParser.syntax_for_lines(text.split("\n"), [language.name.downcase, language.lexer])
+puts (Time.now.to_f - t)

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.1.14"
+  s.version = "0.2.0.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-09-02}
+  s.date = %q{2011-09-23}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     "bin/ruco",
     "lib/ruco.rb",
     "lib/ruco/application.rb",
+    "lib/ruco/array_processor.rb",
     "lib/ruco/command_bar.rb",
     "lib/ruco/core_ext/array.rb",
     "lib/ruco/core_ext/file.rb",
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/ruco/core_ext/range.rb",
     "lib/ruco/core_ext/string.rb",
     "lib/ruco/editor.rb",
+    "lib/ruco/editor/colors.rb",
     "lib/ruco/editor/history.rb",
     "lib/ruco/editor/line_numbers.rb",
     "lib/ruco/editor_area.rb",
@@ -42,14 +44,22 @@ Gem::Specification.new do |s|
     "lib/ruco/screen.rb",
     "lib/ruco/status_bar.rb",
     "lib/ruco/style_map.rb",
+    "lib/ruco/syntax_parser.rb",
     "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
+    "lib/ruco/tm_theme.rb",
     "lib/ruco/version.rb",
     "lib/ruco/window.rb",
+    "playground/benchmark_syntax_parser.rb",
     "ruco.gemspec",
+    "spec/fixtures/railscasts.tmTheme",
+    "spec/fixtures/slow.js",
+    "spec/fixtures/test.tmTheme",
     "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",
@@ -60,7 +70,9 @@ Gem::Specification.new do |s|
     "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"
@@ -74,36 +86,23 @@ 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/command_bar_spec.rb",
-    "spec/ruco/core_ext/array_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/text_area_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
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<clipboard>, [">= 0.9.8"])
+      s.add_runtime_dependency(%q<ultraviolet1x>, [">= 0"])
+      s.add_runtime_dependency(%q<language_sniffer>, [">= 0"])
     else
       s.add_dependency(%q<clipboard>, [">= 0.9.8"])
+      s.add_dependency(%q<ultraviolet1x>, [">= 0"])
+      s.add_dependency(%q<language_sniffer>, [">= 0"])
     end
   else
     s.add_dependency(%q<clipboard>, [">= 0.9.8"])
+    s.add_dependency(%q<ultraviolet1x>, [">= 0"])
+    s.add_dependency(%q<language_sniffer>, [">= 0"])
   end
 end