ruco 0.0.41 → 0.0.42

data/Readme.md

@@ -11,6 +11,7 @@ Features:
  - configuration via `~/.ruco.rb`
  - cut, copy and paste -> Ctrl+x/c/v
  - undo / redo
+ - stays at last position when reopening a file
 
 Install
 =======
@@ -70,7 +71,6 @@ TODO
  - big warning when editing a not-writable file
  - find next (Alt+n)
  - add selection colors to forms in command_bar
- - session storage (stay at same line/column when reopening)
  - smart staying at column when changing line
  - warnings / messages
  - syntax highlighting

data/VERSION

@@ -1 +1 @@
-0.0.41
+0.0.42

data/lib/ruco.rb

@@ -5,10 +5,12 @@ require 'ruco/core_ext/string'
 require 'ruco/core_ext/array'
 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/file_store'
 require 'ruco/window'
 
 require 'ruco/editor'

data/lib/ruco/application.rb

@@ -150,9 +150,11 @@ module Ruco
       action :quit do
         if editor.modified?
           ask("Loose changes? Enter=Yes Esc=Cancel") do
+            editor.store_session
             :quit
           end
         else
+          editor.store_session
           :quit
         end
       end

data/lib/ruco/core_ext/file.rb

@@ -0,0 +1,5 @@
+class File
+  def self.write(to, content)
+    File.open(to, 'w'){|f| f.write(content) }
+  end
+end

data/lib/ruco/core_ext/hash.rb

@@ -1,4 +1,16 @@
 class Hash
   # 1.9 does not want index and 1.8 does not have key
   alias_method(:key, :index) unless method_defined?(:key)
+
+  # http://www.ruby-forum.com/topic/149449
+  def slice(*keys, &block)
+    if block
+      each do |key, val|
+        boolean = block.call(key, val)
+        keys << key if boolean
+      end
+    end
+    hash = self
+    keys.inject({}){|returned, key| returned.update key => hash[key]}
+  end
 end

data/lib/ruco/editor.rb

@@ -29,6 +29,7 @@ module Ruco
 
       @saved_content = content
       @text_area = EditorArea.new(content, options)
+      restore_session
     end
 
     def find(text)
@@ -52,5 +53,21 @@ module Ruco
     rescue Object => e
       e.message
     end
+
+    def store_session
+      session_store.set(@file, text_area.state.slice(:position, :screen_position))
+    end
+
+    private
+
+    def restore_session
+      if state = session_store.get(@file)
+        text_area.state = state
+      end
+    end
+
+    def session_store
+      FileStore.new(File.expand_path('~/.ruco/sessions'), :keep => 20)
+    end
   end
 end

data/lib/ruco/editor_area.rb

@@ -45,8 +45,6 @@ module Ruco
       adjust_to_indentation -removed.first, -removed.last
     end
 
-    private
-
     def state
       {
         :content => content,
@@ -57,11 +55,13 @@ module Ruco
 
     def state=(data)
       @selection = nil
-      @lines = data[:content].naive_split("\n")
+      @lines = data[:content].naive_split("\n") if data[:content]
       self.position = data[:position]
       self.screen_position = data[:screen_position]
     end
 
+    private
+
     # TODO use this instead of instance variables
     def screen_position
       Position.new(@window.top, @window.left)

data/lib/ruco/file_store.rb

@@ -0,0 +1,40 @@
+require "digest/md5"
+
+module Ruco
+  class FileStore
+    def initialize(folder, options)
+      @folder = folder
+      @options = options
+    end
+
+    def set(key, value)
+      `mkdir -p #{@folder}` unless File.exist? @folder
+      File.write(file(key), serialize(value))
+      cleanup
+    end
+
+    def get(key)
+      file = file(key)
+      deserialize File.read(file) if File.exist?(file)
+    end
+
+    private
+
+    def cleanup
+      delete = `ls -t #{@folder}`.split("\n")[@options[:keep]..-1] || []
+      delete.each{|f| File.delete("#{@folder}/#{f}") }
+    end
+
+    def file(key)
+      "#{@folder}/#{Digest::MD5.hexdigest(key)}.yml"
+    end
+
+    def serialize(value)
+      Marshal.dump(value)
+    end
+
+    def deserialize(value)
+      Marshal.load(value)
+    end
+  end
+end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.41"
+  s.version = "0.0.42"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-05}
+  s.date = %q{2011-02-06}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -24,12 +24,14 @@ Gem::Specification.new do |s|
     "lib/ruco/application.rb",
     "lib/ruco/command_bar.rb",
     "lib/ruco/core_ext/array.rb",
+    "lib/ruco/core_ext/file.rb",
     "lib/ruco/core_ext/hash.rb",
     "lib/ruco/core_ext/object.rb",
     "lib/ruco/core_ext/range.rb",
     "lib/ruco/core_ext/string.rb",
     "lib/ruco/editor.rb",
     "lib/ruco/editor_area.rb",
+    "lib/ruco/file_store.rb",
     "lib/ruco/form.rb",
     "lib/ruco/history.rb",
     "lib/ruco/keyboard.rb",
@@ -45,6 +47,7 @@ Gem::Specification.new do |s|
     "spec/ruco/core_ext/array_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",
@@ -64,6 +67,7 @@ Gem::Specification.new do |s|
     "spec/ruco/core_ext/array_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",

data/spec/ruco/application_spec.rb

@@ -3,6 +3,7 @@ require File.expand_path('spec/spec_helper')
 
 describe Ruco::Application do
   before do
+    `rm -rf ~/.ruco/sessions`
     @file = 'spec/temp.txt'
     write('')
   end
@@ -15,7 +16,6 @@ describe Ruco::Application do
     File.read(@file)
   end
 
-
   def editor_part(view)
     view.naive_split("\n")[1..-2].join("\n")
   end
@@ -83,6 +83,22 @@ describe Ruco::Application do
       app.key(:enter).should == :quit
     end
   end
+
+  describe 'session' do
+    it "stores the session so I can reopen at the same position" do
+      write("0\n1\n2\n")
+      type :right, :down, :"Ctrl+q"
+      reopened = Ruco::Application.new(@file, :lines => 5, :columns => 10)
+      reopened.cursor.should == [2,1]
+    end
+
+    it "does not store or restore content" do
+      write('')
+      type 'x', :"Ctrl+s", :enter, :enter, 'a', :"Ctrl+q"
+      reopened = Ruco::Application.new(@file, :lines => 5, :columns => 10)
+      editor_part(reopened.view).should == "x\n\n"
+    end
+  end
   
   it "can select all" do
     write("1\n2\n3\n4\n5\n")
@@ -246,14 +262,18 @@ describe Ruco::Application do
   end
 
   describe '.ruco.rb' do
+    around do |block|
+      rucorc = File.expand_path('~/.ruco.rb')
+      `mv #{rucorc} #{rucorc}.backup  2>&1`
+      File.write(rucorc, "Ruco.configure{ bind(:'Ctrl+e'){ @editor.insert('TEST') } }")
+      block.call
+      `rm #{rucorc} && mv #{rucorc}.backup #{rucorc} 2>&1`
+    end
+
     it "loads it and can use the bound keys" do
-      Tempfile.string_as_file("Ruco.configure{ bind(:'Ctrl+e'){ @editor.insert('TEST') } }") do |file|
-        File.stub!(:exist?).and_return true
-        File.should_receive(:expand_path).with("~/.ruco.rb").and_return file
-        app.view.should_not include('TEST')
-        app.key(:"Ctrl+e")
-        app.view.should include("TEST")
-      end
+      app.view.should_not include('TEST')
+      app.key(:"Ctrl+e")
+      app.view.should include("TEST")
     end
   end
 

data/spec/ruco/editor_spec.rb

@@ -20,6 +20,7 @@ describe Ruco::Editor do
   }
 
   before do
+    `rm -rf ~/.ruco/sessions`
     @file = 'spec/temp.txt'
   end
 

data/spec/ruco/file_store_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::FileStore do
+  before do
+    @folder = 'spec/sessions'
+    `rm -rf #{@folder}`
+  end
+
+  after do
+    `rm -rf #{@folder}`
+  end
+
+  let(:store){ Ruco::FileStore.new(@folder, :keep => 3) }
+
+  it "can store stuff" do
+    store.set('xxx', 1)
+    store.get('xxx').should == 1
+  end
+
+  it "can store :keep keys" do
+    store.set('xxx', 1)
+    store.set('yyy', 1)
+    store.set('zzz', 1)
+    store.set('aaa', 1)
+    store.get('xxx').should == nil
+  end
+
+  it "drops least recently used key" do
+    store.set('xxx', 1)
+    store.set('yyy', 1)
+    store.set('xxx', 1)
+    store.set('zzz', 1)
+    store.set('aaa', 1)
+    store.get('xxx').should == 1
+    store.get('yyy').should == nil
+  end
+
+  it "does not drop if used multiple times" do
+    store.set('xxx', 1)
+    store.set('yyy', 1)
+    store.set('zzz', 1)
+    store.set('zzz', 1)
+    store.set('zzz', 1)
+    store.set('zzz', 1)
+    store.get('xxx').should == 1
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 41
-  version: 0.0.41
+  - 42
+  version: 0.0.42
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +01:00
+date: 2011-02-06 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,12 +51,14 @@ files:
 - lib/ruco/application.rb
 - lib/ruco/command_bar.rb
 - lib/ruco/core_ext/array.rb
+- lib/ruco/core_ext/file.rb
 - lib/ruco/core_ext/hash.rb
 - lib/ruco/core_ext/object.rb
 - lib/ruco/core_ext/range.rb
 - lib/ruco/core_ext/string.rb
 - lib/ruco/editor.rb
 - lib/ruco/editor_area.rb
+- lib/ruco/file_store.rb
 - lib/ruco/form.rb
 - lib/ruco/history.rb
 - lib/ruco/keyboard.rb
@@ -72,6 +74,7 @@ files:
 - spec/ruco/core_ext/array_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
@@ -94,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 282935183
+      hash: 916252531
       segments: 
       - 0
       version: "0"
@@ -119,6 +122,7 @@ test_files:
 - spec/ruco/core_ext/array_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