ruco 0.2.0.beta7 → 0.2.0.beta8

data/VERSION

@@ -1 +1 @@
-0.2.0.beta7
+0.2.0.beta8

data/bin/ruco

@@ -22,6 +22,7 @@ BANNER
     opts.on("-c", "--convert-tabs","Convert tabs to spaces") { options[:convert_tabs] = true }
     opts.on("-u", "--undo-stack-size SIZE","Maximum size of the undo stack.  0 allows for a complete undo stack.") {|size| options[:undo_stack_size] = size.to_i }
     opts.on("-n", "--no-colors","No colors -- helps performance / broken terminals") { options[:no_colors] = true }
+    opts.on("--colors","Force colors -- everything could be black") { options[:colors] = true }
     opts.on("--debug-cache","Show caching in action") { options[:debug_cache] = true }
     opts.on("--debug-keys", "Show pressed keys") { options[:debug_keys] = true }
     opts.on("-v", "--version","Show Version"){
@@ -45,23 +46,37 @@ def log(stuff)
   File.open('ruco.log','ab'){|f| f.puts stuff }
 end
 
-# do not use colors if told so or the terminal does not support colors
-# so far the only terminal that supports it is xterm-256color
-# but just setting ENV['TERM'] to it will crash un-rescue-able
+# 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)
+# (setting ENV['TERM'] will sometimes crash un-rescue-able -> test if it works)
 def activate_256_colors
+  require 'ruco/file_store'
   (
-    RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ and # and not windows
-    # and its possible to open xterm-256color
+    # 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})
     }
-  ) and ENV['TERM'] = 'xterm-256color' # finally switch terminal
+
+    # finally switch terminal, so curses knows we want colors
+  ) and ENV['TERM'] = 'xterm-256color'
 end
 
 options = parse_options
 
-require 'ruco/file_store'
-$ruco_colors = activate_256_colors unless options[:no_colors]
+$ruco_colors = if options[:no_colors]
+  false
+elsif options[:colors]
+  true
+else
+  activate_256_colors
+end
+
 require 'ruco'
 
 # draw app and redraw after each keystroke (or paste)

data/lib/ruco/file_store.rb

@@ -5,7 +5,7 @@ require "ruco/core_ext/file"
 module Ruco
   class FileStore
     def initialize(folder, options={})
-      @folder = folder
+      @folder = File.expand_path(folder)
       @options = options
     end
 

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.2.0.beta7"
+  s.version = "0.2.0.beta8"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/spec/ruco/file_store_spec.rb

@@ -92,4 +92,10 @@ describe Ruco::FileStore do
     store.set('xxx','yyy')
     File.read(store.file('xxx')).should == 'yyy'
   end
+
+  it "works without colors" do
+    store = Ruco::FileStore.new(@folder)
+    store.set('xxx',1)
+    store.get('xxx').should == 1
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 62196365
+  hash: 62196371
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 7
-  version: 0.2.0.beta7
+  - 8
+  version: 0.2.0.beta8
 platform: ruby
 authors: 
 - Michael Grosser