ruco 0.0.14 → 0.0.15

data/Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+gem 'clipboard'
+
 group :dev do # not development <-> would add unneeded development dependencies in gemspec
   gem 'rake'
   gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,6 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    clipboard (0.9.3)
+      zucker (>= 8)
     diff-lcs (1.1.2)
     git (1.2.5)
     jeweler (1.5.2)
@@ -18,11 +20,13 @@ GEM
     rspec-mocks (2.0.1)
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
+    zucker (8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  clipboard
   jeweler
   rake
   rspec (~> 2)

data/Readme.md

@@ -13,6 +13,8 @@ Finished:
  - find / go to line
  - delete line
  - configuration via `~/.ruco.rb`
+ - keeps indentation
+ - paste from clipboard (default: Ctrl+v)
 
 Install
 =======
@@ -58,9 +60,9 @@ TIPS
 
 TODO
 =====
+ - selecting -> delete / overwrite / copy / cut
  - support typing unicode like äöß etc (rework size / make strings utf8-aware)
  - smart staying at end of line/column when changing line
- - indentation + paste support
  - warnings / messages
  - syntax highlighting
  - support more key-combos/codes in keyboard.rb

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/ruco.rb

@@ -15,6 +15,8 @@ require 'ruco/text_area'
 require 'ruco/text_field'
 
 module Ruco
+  autoload :Clipboard, 'clipboard' # can crash when loaded -> load if needed
+
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
   TAB_SIZE = 2
 

data/lib/ruco/application.rb

@@ -84,6 +84,10 @@ module Ruco
     def setup_actions
       @actions = {}
 
+      action :paste do
+        editor.insert(Clipboard.paste('clipboard'))
+      end
+
       action :save do
         editor.save
       end
@@ -119,6 +123,7 @@ module Ruco
       bind :"Ctrl+g", :go_to_line
       bind :"Ctrl+f", :find
       bind :"Ctrl+d", :delete_line
+      bind :"Ctrl+v", :paste
     end
 
     def load_user_config

data/lib/ruco/text_area.rb

@@ -49,6 +49,9 @@ module Ruco
 
     def insert(text)
       text = tabs_to_spaces(text)
+      if text == "\n"
+        text = text + lines[@line].match(/^\s*/)[0]
+      end
       insert_into_content cursor_index, text
       move_according_to_insert(text)
     end

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -65,9 +65,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<clipboard>, [">= 0"])
     else
+      s.add_dependency(%q<clipboard>, [">= 0"])
     end
   else
+    s.add_dependency(%q<clipboard>, [">= 0"])
   end
 end
 

data/spec/ruco/application_spec.rb

@@ -9,6 +9,10 @@ describe Ruco::Application do
     File.open(@file,'w'){|f| f.write(content) }
   end
 
+  def editor_part(view)
+    view.naive_split("\n")[1..-2].join("\n")
+  end
+
   let(:app){ Ruco::Application.new(@file, :lines => 5, :columns => 10) }
   let(:status){ "Ruco #{Ruco::VERSION} -- spec/temp.txt  \n" }
   let(:command){ "^W Exit" }
@@ -101,6 +105,26 @@ describe Ruco::Application do
     end
   end
 
+  describe 'indentation' do
+    it "does not extra-indent when pasting" do
+      write('')
+      Ruco.class_eval "Clipboard.copy('ab\n  cd\n  ef')"
+      app.key(:tab)
+      app.key(:tab)
+      app.key(:'Ctrl+v') # paste
+      editor_part(app.view).should == "    ab\n  cd\n  ef"
+    end
+
+    it "indents when typing" do
+      write('')
+      app.key(:tab)
+      app.key(:tab)
+      app.key(:enter)
+      app.key('a')
+      editor_part(app.view).should == "    \n    a\n"
+    end
+  end
+
   describe '.ruco.rb' do
     it "loads it and can use the bound keys" do
       Tempfile.string_as_file("Ruco.configure{ bind(:'Ctrl+e'){ @editor.insert('TEST') } }") do |file|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Michael Grosser
@@ -17,8 +17,21 @@ cert_chain: []
 
 date: 2011-01-16 00:00:00 +01:00
 default_executable: ruco
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  version_requirements: *id001
+  type: :runtime
+  name: clipboard
 description: 
 email: michael@grosser.it
 executables: