ruco 0.2.0.beta6 → 0.2.0.beta7

data/Readme.md

@@ -23,7 +23,7 @@ Features:
  - (optional) line numbers
 
 ![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/))
+[Colors in Ruby 1.8](#colors)
 
 Install
 =======
@@ -89,6 +89,19 @@ TIPS
  - [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
 
+<a name="colors"/>
+### Colors in Ruby 1.8
+
+    # OSX via brew OR port
+    brew install oniguruma
+    port install oniguruma5
+
+    # Ubuntu
+    sudo apt-get -y install libonig-dev
+
+    gem install oniguruma
+
+
 TODO
 =====
  - only do syntax parsing for changed lines + selected lines <-> will not be redrawn anyhow

data/VERSION

@@ -1 +1 @@
-0.2.0.beta6
+0.2.0.beta7

data/bin/ruco

@@ -45,17 +45,23 @@ def log(stuff)
   File.open('ruco.log','ab'){|f| f.puts stuff }
 end
 
-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 # no windows
-  ENV['TERM'] != 'rxvt' and
-  (ENV['TERM'] != 'xterm' or ENV['COLORTERM']) and # xterm can be converted into xterm-256colors if COLORTERM is given
-  ENV['TERM'] !~ /-color$/ # would only support 16 colors
-)
+# so far the only terminal that supports it is xterm-256color
+# but just setting ENV['TERM'] to it will crash un-rescue-able
+def activate_256_colors
+  (
+    RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ and # and not windows
+    # and its possible to open xterm-256color
+    Ruco::FileStore.new('~/.ruco/cache').cache('color_possible'){
+      system(%{TERM=xterm-256color ruby -r curses -e 'Curses.noecho' > /dev/null 2>&1})
+    }
+  ) and ENV['TERM'] = 'xterm-256color' # finally switch terminal
+end
+
+options = parse_options
 
+require 'ruco/file_store'
+$ruco_colors = activate_256_colors unless options[:no_colors]
 require 'ruco'
 
 # draw app and redraw after each keystroke (or paste)

data/lib/ruco/editor/colors.rb

@@ -80,7 +80,7 @@ module Ruco
       end
 
       def download_into_file(url)
-        theme_store = FileStore.new(File.expand_path('~/.ruco/themes'), :keep => 5, :string => true)
+        theme_store = FileStore.new('~/.ruco/cache', :string => true)
         theme_store.cache(url) do
           require 'open-uri'
           require 'openssl'

data/lib/ruco/file_store.rb

@@ -1,9 +1,10 @@
 require "digest/md5"
 require "fileutils"
+require "ruco/core_ext/file"
 
 module Ruco
   class FileStore
-    def initialize(folder, options)
+    def initialize(folder, options={})
       @folder = folder
       @options = options
     end
@@ -11,7 +12,7 @@ module Ruco
     def set(key, value)
       FileUtils.mkdir_p @folder unless File.exist? @folder
       File.write(file(key), serialize(value))
-      cleanup
+      cleanup if @options[:keep]
     end
 
     def get(key)

data/lib/ruco/screen.rb

@@ -12,9 +12,6 @@ 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

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.2.0.beta6"
+  s.version = "0.2.0.beta7"
 
   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-27}
+  s.date = %q{2011-09-28}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 62196367
+  hash: 62196365
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 6
-  version: 0.2.0.beta6
+  - 7
+  version: 0.2.0.beta7
 platform: ruby
 authors: 
 - Michael Grosser
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +02:00
+date: 2011-09-28 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency