ruco 0.2.18 → 0.2.19

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c4b7d7e0b73027d1ef874c0f3494581976e973a5
+  data.tar.gz: 247ba8d64c6c7eab0592790dce749d6a79813a77
+SHA512:
+  metadata.gz: 7f096d447626e9462030116c3b0604a8360f2b9c9e75c45a4c22148517c0c3fe82609809cfa6908216d98371a45d85bb83a528493e0bbc586bb5e7dc2f3829e8
+  data.tar.gz: 94746342db307fda720f6c7a726d84f98b452fdacada82186b984708e7bab32fa69e6c8967c657cf402b0a2f76b58d43caf00e31c247528873f14915ccff92c8

data/MIT-LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (C) 2013 Michael Grosser <michael@grosser.it>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/ruco

@@ -48,41 +48,40 @@ def log(stuff)
   File.open('ruco.log','ab'){|f| f.puts stuff }
 end
 
-# do not use colors if the terminal does not support colors
-# so far the only terminal that supports it:
-# - 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'
-  (
-    # not windows
-    RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ and
-
-    # possible to open xterm-256color
-    ['xterm', 'xterm-256color'].include?(ENV['TERM']) and
-    Ruco::FileStore.new('~/.ruco/cache').cache('color_possible'){
-      system(%{TERM=xterm-256color ruby -r curses -e 'Curses.noecho' > /dev/null 2>&1})
-    }
-
-    # finally switch terminal, so curses knows we want colors
-  ) and ENV['TERM'] = 'xterm-256color'
-end
-
 options = parse_options
 
-$ruco_colors = if options[:no_colors]
+options[:colors] = if options[:no_colors]
   false
 elsif options[:colors]
   true
 else
-  activate_256_colors
+  # so far the only terminal that supports it:
+  # - xterm-256color on osx
+  # - xterm on ubuntu 10.04+
+  if RbConfig::CONFIG['host_os'] !~ /mswin|mingw/
+    if ENV["TERM"] == 'xterm-256color'
+      true
+    else
+      require 'ruco/file_store'
+      if ENV['TERM'] == 'xterm'
+        # switch terminal, so curses knows we want colors
+        # setting ENV['TERM'] will sometimes crash un-rescue-able -> test if it works
+        possible = Ruco::FileStore.new('~/.ruco/cache').cache('color_possible') do
+          system(%{TERM=xterm-256color ruby -r curses -e 'Curses.noecho' > /dev/null 2>&1})
+        end
+        ENV['TERM'] = 'xterm-256color' if possible
+      end
+    end
+  end
 end
+$ruco_colors = options[:colors]
 
 require 'ruco'
 
 # draw app and redraw after each keystroke (or paste)
-Ruco::Screen.open(options) do |screen|
+Dispel::Screen.open(options) do |screen|
+  $ruco_screen = screen
+
   app = Ruco::Application.new(ARGV[0],
     :convert_tabs => options[:convert_tabs],
     :undo_stack_size => options[:undo_stack_size],
@@ -91,15 +90,10 @@ Ruco::Screen.open(options) do |screen|
 
   screen.draw *app.display_info
 
-  Keyboard.input do
-    Curses.getch
-  end
-
-  Keyboard.output do |key|
+  Dispel::Keyboard.output do |key|
     screen.debug_key(key) if options[:debug_keys]
     if key == :resize
       app.resize(screen.lines, screen.columns)
-      screen.clear_cache
     else
       result = app.key key
       break if result == :quit

data/lib/ruco.rb

@@ -1,3 +1,4 @@
+require 'dispel'
 require 'language_sniffer'
 
 require 'ruco/version'
@@ -9,14 +10,11 @@ require 'ruco/core_ext/hash'
 require 'ruco/core_ext/range'
 require 'ruco/core_ext/file'
 
-require 'ruco/keyboard'
 require 'ruco/position'
 require 'ruco/history'
 require 'ruco/option_accessor'
 require 'ruco/file_store'
 require 'ruco/window'
-require 'ruco/screen'
-require 'ruco/style_map'
 require 'ruco/syntax_parser'
 
 require 'ruco/editor'

data/lib/ruco/command_bar.rb

@@ -34,7 +34,7 @@ module Ruco
         map.prepend(:reverse, 0, 0..@options[:columns])
         map
       else
-        StyleMap.single_line_reversed(@options[:columns])
+        Dispel::StyleMap.single_line_reversed(@options[:columns])
       end
     end
 

data/lib/ruco/core_ext/range.rb

@@ -7,7 +7,7 @@ class Range
   # (1..2).last_element == 2
   # (1...3).last_element == 2
   def last_element
-    exclude_end? ? last.pred : last
+    Dispel::Tools.last_element(self)
   end unless defined? last_element
 
   # (1..2).move(2) == (3..4)

data/lib/ruco/core_ext/string.rb

@@ -1,13 +1,6 @@
 class String
-  # http://grosser.it/2011/08/28/ruby-string-naive-split-because-split-is-to-clever/
-  # "    ".split(' ') == []
-  # "    ".naive_split(' ') == ['','','','']
-  # "".split(' ') == []
-  # "".naive_split(' ') == ['']
   def naive_split(pattern)
-    pattern = /#{Regexp.escape(pattern)}/ unless pattern.is_a?(Regexp)
-    result = split(pattern, -1)
-    result.empty? ? [''] : result
+    Dispel::Tools.naive_split(self, pattern)
   end
 
   def tabs_to_spaces!
@@ -53,14 +46,8 @@ class String
   end unless defined? ellipsize
 end
 
-# http://grosser.it/2010/12/31/ruby-string-indexes-indices-find-all-indexes-in-a-string
 class String
   def indexes(needle)
-    found = []
-    current_index = -1
-    while current_index = index(needle, current_index+1)
-      found << current_index
-    end
-    found
+    Dispel::Tools.indexes(self, needle)
   end
 end

data/lib/ruco/editor/colors.rb

@@ -7,8 +7,8 @@ module Ruco
       STYLING_TIMEOUT = 4
 
       def style_map
-        $ruco_foreground = theme.foreground
-        $ruco_background = theme.background
+        $ruco_screen && $ruco_screen.options[:foreground] = theme.foreground
+        $ruco_screen && $ruco_screen.options[:background] = theme.background
         map = super
 
         return map if @colors_took_too_long or not @options[:language]

data/lib/ruco/status_bar.rb

@@ -23,7 +23,7 @@ module Ruco
     end
 
     def style_map
-      StyleMap.single_line_reversed(@options[:columns])
+      Dispel::StyleMap.single_line_reversed(@options[:columns])
     end
 
     def change_indicator

data/lib/ruco/syntax_parser.rb

@@ -16,7 +16,7 @@ module Ruco
         begin
           processor = syntax.parse(lines.join("\n"),  Ruco::ArrayProcessor.new)
           processor.lines
-        rescue RegexpError
+        rescue RegexpError, ArgumentError
           $stderr.puts $!
           []
         end

data/lib/ruco/version.rb

@@ -1,3 +1,3 @@
 module Ruco
-  VERSION = Version = "0.2.18"
+  VERSION = Version = "0.2.19"
 end

data/lib/ruco/window.rb

@@ -50,7 +50,7 @@ module Ruco
     end
 
     def style_map(selection)
-      map = StyleMap.new(lines)
+      map = Dispel::StyleMap.new(lines)
       if selection
         add_selection_styles(map, selection)
       else

metadata

@@ -1,62 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ruco
 version: !ruby/object:Gem::Version
-  version: 0.2.18
-  prerelease: 
+  version: 0.2.19
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: textpow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: language_sniffer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dispel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -66,12 +73,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- Gemfile
-- Gemfile.lock
-- Rakefile
-- Readme.md
+- MIT-LICENSE.txt
 - bin/ruco
 - lib/ruco.rb
 - lib/ruco/application.rb
@@ -91,74 +93,42 @@ files:
 - lib/ruco/file_store.rb
 - lib/ruco/form.rb
 - lib/ruco/history.rb
-- lib/ruco/keyboard.rb
 - lib/ruco/option_accessor.rb
 - lib/ruco/position.rb
-- 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
-- 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/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
-homepage: http://github.com/grosser/ruco
+homepage: https://github.com/grosser/ruco
 licenses:
 - MIT
-post_install_message: ! "\n    Mac: shift/ctrl + arrow-keys only work in iterm (not
-  Terminal.app)\n    Ubuntu: sudo apt-get install xclip # to use the clipboard\n\n"
+metadata: {}
+post_install_message: |2+
+
+      Mac: shift/ctrl + arrow-keys only work in iterm (not Terminal.app)
+      Ubuntu: sudo apt-get install xclip # to use the clipboard
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 169951991926027466
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 169951991926027466
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Commandline editor written in ruby
 test_files: []

data/.gitignore

@@ -1,2 +0,0 @@
-spec/temp.txt
-ruco.log

data/.travis.yml

@@ -1,7 +0,0 @@
-before_install:
-  - sudo apt-get install -y libonig-dev && bundle install
-script: "bundle exec rake"
-rvm:
-  - ree
-  - 1.9.2
-  - 1.9.3

data/Gemfile

@@ -1,8 +0,0 @@
-source :rubygems
-gemspec
-
-gem 'bump'
-gem 'oniguruma', :platform => :ruby_18
-gem 'ffi', :platform => [:mingw]
-gem 'rake'
-gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,39 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ruco (0.2.18)
-      clipboard (>= 0.9.8)
-      language_sniffer
-      textpow (>= 1.3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bump (0.3.9)
-    clipboard (1.0.1)
-    diff-lcs (1.1.3)
-    language_sniffer (1.0.2)
-    oniguruma (1.1.0)
-    plist (3.1.0)
-    rake (0.9.2.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    textpow (1.3.1)
-      plist (>= 3.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  ffi
-  oniguruma
-  rake
-  rspec (~> 2)
-  ruco!