ruco 0.2.0.beta8 → 0.2.0.beta9

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 gem 'clipboard', '>=0.9.8'
-gem 'ultraviolet1x'
+gem 'textpow1x', '>=1'
 gem 'language_sniffer'
 
 group :dev do # not development <-> would add unneeded development dependencies in gemspec

data/Gemfile.lock

@@ -20,10 +20,8 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    textpow1x (0.11.0)
+    textpow1x (1.0.0)
       plist (>= 3.0.1)
-    ultraviolet1x (0.12.1)
-      textpow1x (>= 0.11.0)
 
 PLATFORMS
   ruby
@@ -36,4 +34,4 @@ DEPENDENCIES
   oniguruma
   rake
   rspec (~> 2)
-  ultraviolet1x
+  textpow1x (>= 1)

data/VERSION

@@ -1 +1 @@
-0.2.0.beta8
+0.2.0.beta9

data/bin/ruco

@@ -48,8 +48,8 @@ end
 
 # do not use colors if the terminal does not support colors
 # so far the only terminal that supports it:
-# - xterm-256color on osx (not ssh)
-# - xterm on ubuntu (not ssh)
+# - xterm-256color on osx
+# - xterm and xterm-256color on ubuntu 10.04+
 # (setting ENV['TERM'] will sometimes crash un-rescue-able -> test if it works)
 def activate_256_colors
   require 'ruco/file_store'

data/lib/ruco/editor/colors.rb

@@ -7,8 +7,8 @@ module Ruco
       STYLING_TIMEOUT = 4
 
       def style_map
+        return super if @colors_took_too_long or not @options[:language]
         map = super
-        return map if @colors_took_too_long
 
         # disable colors if syntax-parsing takes too long
         begin
@@ -22,39 +22,37 @@ module Ruco
           return map
         end
 
-        add_syntax_highlighting_to_style_map(map, syntax)
+        $ruco_foreground = theme.foreground
+        $ruco_background = theme.background
+
+        if syntax
+          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)
+          @window.add_selection_styles(map, @selection) if @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
-          []
+        language = @options[:language]
+        possible_languages = [language.name.downcase, language.lexer]
+
+        @syntax_info ||= {}
+        lines.map do |line|
+          @syntax_info[line] ||= SyntaxParser.syntax_for_lines([line], possible_languages).first
         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)
+            columns = 0...columns.last if columns.first < 0 and columns.last > 0
             style = style_for_syntax_element(syntax_element)
             if style and columns.first >= 0
               map.add(style, line, columns)

data/lib/ruco/file_store.rb

@@ -60,7 +60,7 @@ module Ruco
     end
 
     def deserialize(value)
-      Marshal.load(value)
+      @options[:string] ? value : Marshal.load(value)
     end
   end
 end

data/lib/ruco/screen.rb

@@ -104,8 +104,7 @@ module Ruco
           else
             # :red or [:red, :blue]
             f,b = style
-            b ||= background
-            [f,b]
+            [f || foreground, b || background]
           end
 
           foreground = html_to_terminal_color(foreground)

data/lib/ruco/syntax_parser.rb

@@ -1,7 +1,7 @@
 module Ruco
   module SyntaxParser
-    # uv only offers certain syntax
-    UV_CONVERT = {
+    # textpow only offers certain syntax
+    TEXTPOW_CONVERT = {
       'scss' => 'sass',
       'html+erb' => 'html_rails',
     }
@@ -19,10 +19,10 @@ module Ruco
       @@syntax_node ||= {}
       @@syntax_node[languages] ||= begin
         found = nil
-        fallbacks = languages.map{|l| UV_CONVERT[l] }.compact
+        fallbacks = languages.map{|l| TEXTPOW_CONVERT[l] }.compact
 
         (languages + fallbacks).detect do |language|
-          syntax = File.join(Uv.syntax_path, "#{language}.syntax")
+          syntax = File.join(Textpow.syntax_path, "#{language}.syntax")
           found = Textpow::SyntaxNode.load(syntax) if File.exist?(syntax)
         end
 

data/lib/ruco.rb

@@ -36,8 +36,6 @@ if $ruco_colors
     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'

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.2.0.beta8"
+  s.version = "0.2.0.beta9"
 
   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-28}
+  s.date = %q{2011-10-02}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -92,16 +92,16 @@ Gem::Specification.new do |s|
 
     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<textpow1x>, [">= 1"])
       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<textpow1x>, [">= 1"])
       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<textpow1x>, [">= 1"])
     s.add_dependency(%q<language_sniffer>, [">= 0"])
   end
 end

data/spec/ruco/application_spec.rb

@@ -31,7 +31,7 @@ describe Ruco::Application do
   end
 
   def status(line=1)
-    "Ruco #{Ruco::VERSION} -- spec/temp.txt                   #{line}:1\n"
+    "Ruco #{Ruco::VERSION} -- spec/temp.txt                    #{line}:1\n"
   end
 
   let(:rucorc){ 'spec/.ruco.rb' }

data/spec/ruco/editor_spec.rb

@@ -631,14 +631,14 @@ describe Ruco::Editor do
     end
 
     it "shows multi-line selection in scrolled space" do
-      write("\n\n\n\n\n0123456789\n0123456789\n0123456789\n\n")
+      write("\n\n\n\n\nacdefghijk\nacdefghijk\nacdefghijk\n\n")
       ta = editor.send(:text_area)
       ta.send(:position=, [5,8])
       ta.send(:screen_position=, [5,7])
       editor.selecting do
         move(:relative, 2, 1)
       end
-      editor.view.should == "789\n789\n789"
+      editor.view.should == "ijk\nijk\nijk"
       editor.cursor.should == [2,2]
       editor.style_map.flatten.should == [
         [nil, :reverse, nil, nil, nil, :normal], # start to end of screen
@@ -668,6 +668,18 @@ describe Ruco::Editor do
       ]
     end
 
+    it "shows mid-keywords for moved window" do
+      write("\n\n\n\n\nclass ")
+      editor.move(:to, 5, 6)
+      editor.cursor.should == [1,3]
+      editor.view.should == "\nss \n"
+      editor.style_map.flatten.should == [
+        nil,
+        [color(:keyword), nil, :normal],
+        nil
+      ]
+    end
+
     it "shows multiple syntax elements" do
       write("if @x")
       editor.style_map.flatten.should == [

data/spec/ruco/file_store_spec.rb

@@ -91,6 +91,7 @@ describe Ruco::FileStore do
     store = Ruco::FileStore.new(@folder, :keep => 3, :string => true)
     store.set('xxx','yyy')
     File.read(store.file('xxx')).should == 'yyy'
+    store.get('xxx').should == 'yyy'
   end
 
   it "works without colors" do

data/spec/ruco/status_bar_spec.rb

@@ -16,7 +16,7 @@ describe Ruco::StatusBar do
   it "can show to long files" do
     editor = Ruco::Editor.new('123456789abcdefghijklmnop', :lines => 5, :columns => 20)
     bar = Ruco::StatusBar.new(editor, :columns => 30)
-    bar.view.should == "Ruco #{Ruco::VERSION} -- 123...nop   1:1"
+    bar.view.should == "Ruco #{Ruco::VERSION} -- 1234...nop   1:1"
     bar.view.size.should == 30
   end
 

data/spec/ruco_spec.rb

@@ -2,6 +2,6 @@ require File.expand_path('spec/spec_helper')
 
 describe Ruco do
   it "has a VERSION" do
-    Ruco::VERSION.should =~ /^\d+\.\d+\.\d+$/
+    Ruco::OLD_VERSION.should =~ /^\d+\.\d+\.\d+(\.[a-z\d]+)?$/
   end
-end
+end

data/spec/spec_helper.rb

@@ -5,7 +5,11 @@ require 'ruco'
 require 'timeout'
 require 'tempfile'
 
-silence_warnings{ Ruco::Editor::Colors::DEFAULT_THEME = 'spec/fixtures/test.tmTheme' }
+silence_warnings do
+  Ruco::Editor::Colors::DEFAULT_THEME = 'spec/fixtures/test.tmTheme'
+  Ruco::OLD_VERSION = Ruco::VERSION
+  Ruco::VERSION = '0.0.0' # so tests dont fail if version gets longer
+end
 
 class Tempfile
   def self.string_as_file(data)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 62196371
+  hash: 62196369
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 8
-  version: 0.2.0.beta8
+  - 9
+  version: 0.2.0.beta9
 platform: ruby
 authors: 
 - Michael Grosser
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +02:00
+date: 2011-10-02 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,13 +42,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
-        - 0
-        version: "0"
+        - 1
+        version: "1"
   requirement: *id002
   type: :runtime
-  name: ultraviolet1x
+  name: textpow1x
   prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement