ruco 0.2.0.beta → 0.2.0.beta2

data/spec/ruco/screen_spec.rb

@@ -3,7 +3,7 @@ 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).should == Curses::A_NORMAL
     end
 
     it "is red for red" do
@@ -12,7 +12,7 @@ describe Ruco::Screen do
     end
 
     it "is reverse for reverse" do
-      Ruco::Screen.curses_style(:reverse).should == 512
+      Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
     end
 
     it "raises on unknown style" do
@@ -20,42 +20,5 @@ describe Ruco::Screen do
         Ruco::Screen.curses_style(:foo)
       }.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
-      end
-
-      it "is reverse for reverse" do
-        Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
-      end
-
-      it "is normal for unknown style" do
-        Ruco::Screen.curses_style(:foo).should == Curses::A_NORMAL
-      end
-    end
-  end
-
-  describe :html_to_terminal_color do
-    # http://www.mudpedia.org/wiki/Xterm_256_colors
-    [
-      ['#ff0000', 196],
-      ['#00ff00', 46],
-      ['#0000ff', 21],
-      ['#ffffff', 231]
-    ].each do |html,term|
-      it "converts #{html} to #{term}" do
-        Ruco::Screen.html_to_terminal_color(html).should == term
-      end
-    end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,8 @@
 $LOAD_PATH.unshift 'lib'
-$ruco_colors = true
-
 require 'ruco'
 require 'timeout'
-require 'tempfile'
-
-silence_warnings{ Ruco::Editor::Colors::DEFAULT_THEME = 'spec/fixtures/test.tmTheme' }
 
+require 'tempfile'
 class Tempfile
   def self.string_as_file(data)
     result = nil
@@ -25,4 +21,4 @@ class Time
     yield
     Time.now.to_f - t
   end
-end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 31098193
+  hash: 62196359
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  version: 0.2.0.beta
+  - 2
+  version: 0.2.0.beta2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -16,11 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 +02:00
+date: 2011-09-24 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: 
     - - ">="
@@ -31,12 +32,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: 
     - - ">="
@@ -45,12 +46,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :runtime
   name: ultraviolet1x
+  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: 
     - - ">="
@@ -59,9 +60,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :runtime
   name: language_sniffer
+  version_requirements: *id003
   prerelease: false
 description: 
 email: michael@grosser.it
@@ -80,7 +81,6 @@ files:
 - 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
@@ -89,7 +89,6 @@ files:
 - 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
@@ -102,19 +101,12 @@ files:
 - 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
@@ -128,9 +120,7 @@ files:
 - 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
@@ -174,5 +164,22 @@ 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/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/text_area_spec.rb
+- spec/ruco/window_spec.rb
+- spec/ruco_spec.rb
+- spec/spec_helper.rb

data/lib/ruco/array_processor.rb

@@ -1,53 +0,0 @@
-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/editor/colors.rb

@@ -1,97 +0,0 @@
-require 'timeout'
-
-module Ruco
-  class Editor
-    module Colors
-      DEFAULT_THEME = 'spec/fixtures/railscasts.tmTheme'
-      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

data/lib/ruco/syntax_parser.rb

@@ -1,33 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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