ruco 0.1.9 → 0.1.10

data/Readme.md

@@ -16,6 +16,7 @@ Features:
  - opens file at line with `ruco foo/bar.rb:32` syntax
  - keeps whatever newline format you use (\r \n \r\n)
  - surrounds selection with quotes/braces (select abc + " --> "abc")
+ - shortens long file names in the middle
  - (optional) remove trailing whitespace on save
  - (optional) blank line before eof on save
  - (optional) line numbers
@@ -98,7 +99,6 @@ TODO
  - search options regex + case-sensitive
  - add auto-confirm to 'replace?' dialog -> type s == skip, no enter needed
  - 1.8: unicode support <-> already finished but unusable due to Curses (see encoding branch)
- - shorten long file names in the middle/start, not at the end
  - add double quotes/braces when typing one + skip over quote/brace when its already typed at current position
 
 Authors

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/ruco/core_ext/string.rb

@@ -42,6 +42,17 @@ class String
     last = words.last
     slice(0,first.size) == first and slice(-last.size,last.size) == last
   end
+
+  # https://gist.github.com/20844
+  # remove middle from strings exceeding max length.
+  def ellipsize(options={})
+    max = options[:max] || 40
+    delimiter = options[:delimiter] || "..."
+    return self if self.size <= max
+    remainder = max - delimiter.size
+    offset = remainder / 2
+    (self[0,offset + (remainder.odd? ? 1 : 0)].to_s + delimiter + self[-offset,offset].to_s)[0,max].to_s
+  end unless defined? ellipsize
 end
 
 # http://grosser.it/2010/12/31/ruby-string-indexes-indices-find-all-indexes-in-a-string

data/lib/ruco/status_bar.rb

@@ -6,8 +6,20 @@ module Ruco
     end
 
     def view
-      position = @editor.position
-      spread "Ruco #{Ruco::VERSION} -- #{@editor.file}#{change_indicator}#{writable_indicator}", "#{position.line + 1}:#{position.column + 1}"
+      columns = @options[:columns]
+
+      version = "Ruco #{Ruco::VERSION} -- "
+      position = " #{@editor.position.line + 1}:#{@editor.position.column + 1}"
+      indicators = "#{change_indicator}#{writable_indicator}"
+      essential = version + position + indicators
+      space_left = [columns - essential.size, 0].max
+
+      # fit file name into remaining space
+      file = @editor.file
+      file = file.ellipsize(:max => space_left)
+      space_left -= file.size
+
+      "#{version}#{file}#{indicators}#{' ' * space_left}#{position}"[0, columns]
     end
 
     def change_indicator

data/ruco.gemspec

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

data/spec/ruco/application_spec.rb

@@ -69,7 +69,7 @@ describe Ruco::Application do
   it "can resize" do
     write("01234567\n1\n2\n3\n4\n5678910111213\n6\n7\n8")
     app.resize(8, 7)
-    app.view.should == "Ruc 1:1\n0123456\n1\n2\n3\n4\n5678910\n^W Exit"
+    app.view.should == "Ruco 0.\n0123456\n1\n2\n3\n4\n5678910\n^W Exit"
   end
 
   describe 'opening with line' do
@@ -138,7 +138,7 @@ describe Ruco::Application do
       editor_part(reopened.view).should == "x\n\n"
     end
   end
-  
+
   it "can select all" do
     write("1\n2\n3\n4\n5\n")
     app.key(:down)

data/spec/ruco/status_bar_spec.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Michael Grosser