vimdo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee9475f465b154698dcc46377e814504166d0dba
-  data.tar.gz: 4342e14f9cb0f5b9be23ce6c890135531632a6e3
+  metadata.gz: 9fb783f65cc9b415f3295d3ab78355932deb7f7d
+  data.tar.gz: 8c3303d5184af091e03a1e34612e7ff69a1f05cd
 SHA512:
-  metadata.gz: 2c537f9e18e03e126a9ce07681d0880432cbfd3272f180953d1fca966e249b87b7c5f7d973bc383b04b6fec95ceca3de8c229c121f0a6d418b44def7789c94fc
-  data.tar.gz: 2a4529dfd4013e89115e575c7ff2996fd2317660c0ca534c2d1c6c1e93e0544a1cfee1e73e512fcb98703ce4dfca0d870c037bab5128ae41c0a5bd976703d892
+  metadata.gz: 5cffb90d164db6f824864eb6d1d3f74f5fa05643ba3f03dd70ad61af7c9047a0ed43b670b5141df9864ebad4164216fff3acb1acb01aa1d067be3055729007e2
+  data.tar.gz: 5395f1095dcf332c2fbbc1062c30f712929f053bf20b761ed2fd4ee1bf4ed19979d187281d443b807d10bc7421e386f2eb65e158e4248e4d30fd39616572ac60

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    vimdo (1.0.2.20130407152509)
+    vimdo (1.2.0.20130421112816)
       autocompletion (~> 0.0.3)
       thor (~> 0.18.0)
-      vimrunner (~> 0.2.2)
+      vimrunner (>= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -20,10 +20,10 @@ GEM
     hoe-version (1.2.0)
     json (1.7.7)
     rake (10.0.4)
-    rdoc (3.12.2)
+    rdoc (4.0.1)
       json (~> 1.4)
     thor (0.18.1)
-    vimrunner (0.2.2)
+    vimrunner (0.3.0)
 
 PLATFORMS
   ruby
@@ -35,5 +35,5 @@ DEPENDENCIES
   hoe-git
   hoe-version
   rake (>= 10.0.0)
-  rdoc (~> 3.10)
+  rdoc (~> 4.0)
   vimdo!

data/Rakefile

@@ -15,8 +15,8 @@ Hoe.spec 'vimdo' do
   license 'GPL-3'
 
   extra_deps << ['vimrunner', '>= 0.3.0']
-  extra_deps << ['thor', '~> 0.18.0']
-  extra_deps << ['autocompletion', '~> 0.0.3']
+  extra_deps << ['thor', '>= 0.18.0']
+  extra_deps << ['autocompletion', '>= 0.0.3']
 
   extra_dev_deps << ['rake', '>= 10.0.0']
   extra_dev_deps << ['hoe'] << ['hoe-gemspec'] << ['hoe-git'] << ['hoe-version']

data/lib/vimdo/cli.rb

@@ -1,5 +1,6 @@
 require 'thor'
 require "vimdo/ui"
+require "vimrunner/path"
 
 module VimDo
 
@@ -8,36 +9,36 @@ module VimDo
     package_name "VimDo"
 
     class_option :name,
-      :type    => :string,
-      :banner  => "servername to connect",
-      :default => 'VIM',
-      :aliases => ["--servername","-s" ]
+    :type    => :string,
+    :banner  => "servername to connect",
+    :default => 'VIM',
+    :aliases => ["--servername","-s" ]
     class_option :executable,
-      :type    => :string,
-      :banner  => "specifiy vim executable",
-      :aliases => "-e"
+    :type    => :string,
+    :banner  => "specifiy vim executable",
+    :aliases => "-e"
     class_option :foreground,
-      :type    => :boolean,
-      :banner  => "Foreground: Don't fork when starting GUI",
-      :default => false,
-      :aliases => "-f"
+    :type    => :boolean,
+    :banner  => "Foreground: Don't fork when starting GUI",
+    :default => false,
+    :aliases => "-f"
     class_option :vimrc,
-      :type    => :string,
-      :default => File.expand_path("~/.vimrc"),
-      :banner  => "path to vimrc",
-      :aliases => "-u"
+    :type    => :string,
+    :default => File.expand_path("~/.vimrc"),
+    :banner  => "path to vimrc",
+    :aliases => "-u"
     class_option :vimdorc,
-      :type    => :string,
-      :default => File.expand_path("~/.vimdorc"),
-      :banner  => "path to vimdo rc",
-      :aliases => "-c"
+    :type    => :string,
+    :default => File.expand_path("~/.vimdorc"),
+    :banner  => "path to vimdo rc",
+    :aliases => "-c"
     class_option "no-color",
-      :type   => :boolean,
-      :banner => "disable colorization in output"
+    :type   => :boolean,
+    :banner => "disable colorization in output"
     class_option :verbose,
-      :type    => :boolean,
-      :banner  => "enable verbose output mode",
-      :aliases => "-v"
+    :type    => :boolean,
+    :banner  => "enable verbose output mode",
+    :aliases => "-v"
 
     def initialize(*)
       super
@@ -57,9 +58,20 @@ module VimDo
     end
 
 
-    desc "edit",  "edit file +filename+ with Vim"
+    desc "edit",  "edit file +filename[:line]+ with Vim"
     def edit(filename)
-      vim.edit(File.expand_path(filename))
+      linenr = nil
+      if /(.*):(\d+):?/.match(filename)
+        f = File.expand_path($1)
+        linenr = $2
+      else
+        f = File.expand_path(filename)
+      end 
+
+      raise PathError "#{f} is not readable!" unless File.readable?(f)
+      vim.edit(f)
+      commands(linenr) if linenr
+      vim.foreground
     end
 
     desc "diff", "diff in vim"
@@ -67,13 +79,33 @@ module VimDo
       [from, to].each do |f|
         raise PathError "#{f} is not readable!" unless File.readable?(f)
       end
-      from = File.expand_path(from)
-      to = File.expand_path(to)
       from, to = [from, to].map {|f| File.expand_path(f) }
 
-      commands('tabnew', 'edit '+vim.escape_filename(from), 'diffsplit '+vim.escape_filename(to))
+      commands("tabedit #{path(from)}", "diffsplit #{path(to)}")
+      vim.foreground
+    end
+
+    desc "diffpatch", "diffpatch in vim"
+    method_option :patch, 
+      :aliases  => "-p"         ,
+      :required => true         ,
+      :type     => :string      ,
+      :desc     => "patch file"
+    def diffpatch(file)
+      patch = options[:patch]
+      [file, patch].each do |f|
+        unless File.readable?(f)
+          raise PathError "#{f} is not readable!"
+        end
+      end
+      file, patch = [file, patch].map {|f| File.expand_path(f) }
+
+      commands("edit #{path(file)}", "vertical diffpatch #{path(patch)}")
+      vim.foreground
     end
 
+
+
     desc "merge", "LOCAL(= mine), MERGED(= yours), REMOTE(= merged output), [BASE(= common parent)]"
     long_desc <<-LONGDESC
     LOCAL(= mine), MERGED(= yours), REMOTE(= merged output), [BASE(= common parent)]
@@ -90,13 +122,13 @@ module VimDo
       local, merge, remote = [local, merge, remote].map {|f| File.expand_path(f) }
 
       merge_command =
-        'tabnew<Bar>edit ' + vim.escape_filename(local) +
-        '<Bar>diffsplit '  + vim.escape_filename(merge) +
-        '<Bar>diffsplit '  + vim.escape_filename(remote)
+      "tabnew<Bar>edit #{path(local)}" +
+      "<Bar>diffsplit #{path(merge)}"  +
+      "<Bar>diffsplit #{path(remote)}"
 
       if base
         base_split_command =
-          "<Bar>diffsplit #{vim.escape_filename(File.expand_path(base))}<Bar>wincmd J"
+        "<Bar>diffsplit #{path(File.expand_path(base))}<Bar>wincmd J"
       else
         base_split_command = ''
       end
@@ -104,6 +136,7 @@ module VimDo
       switch_command = "<Bar>2wincmd w"
 
       commands(merge_command + base_split_command + switch_command)
+      vim.foreground
     end
 
     desc "autocomplete", "print subcommands for shell completion"
@@ -111,7 +144,10 @@ module VimDo
       raise UndefinedCommandError, "autocomplete should be intercepted."
     end
 
-  private
+    private
+    def path(p)
+      Vimrunner::Path.new(p)
+    end
     def vim
       @vim ||= VimDo.connect(options)
     end

data/lib/vimdo/version.rb

@@ -1,4 +1,4 @@
 module Vimremote
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end
 

data/vimdo.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "vimdo"
-  s.version = "1.2.0.20130421112816"
+  s.version = "1.2.0.20130421120240"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zhao Cai"]
@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<vimrunner>, [">= 0.3.0"])
-      s.add_runtime_dependency(%q<thor>, ["~> 0.18.0"])
-      s.add_runtime_dependency(%q<autocompletion>, ["~> 0.0.3"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.18.0"])
+      s.add_runtime_dependency(%q<autocompletion>, [">= 0.0.3"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<rake>, [">= 10.0.0"])
       s.add_development_dependency(%q<hoe>, [">= 0"])
@@ -38,8 +38,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
     else
       s.add_dependency(%q<vimrunner>, [">= 0.3.0"])
-      s.add_dependency(%q<thor>, ["~> 0.18.0"])
-      s.add_dependency(%q<autocompletion>, ["~> 0.0.3"])
+      s.add_dependency(%q<thor>, [">= 0.18.0"])
+      s.add_dependency(%q<autocompletion>, [">= 0.0.3"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<rake>, [">= 10.0.0"])
       s.add_dependency(%q<hoe>, [">= 0"])
@@ -50,8 +50,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<vimrunner>, [">= 0.3.0"])
-    s.add_dependency(%q<thor>, ["~> 0.18.0"])
-    s.add_dependency(%q<autocompletion>, ["~> 0.0.3"])
+    s.add_dependency(%q<thor>, [">= 0.18.0"])
+    s.add_dependency(%q<autocompletion>, [">= 0.0.3"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<rake>, [">= 10.0.0"])
     s.add_dependency(%q<hoe>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimdo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Zhao Cai
@@ -30,7 +30,7 @@ cert_chain:
   eIuFwYbmfyt5/ObUtmp3BlaIStTiX9TBWeuTx6Zq6q6wDzcudbDRd+jLa2XG2AGB
   S6w/KYMnbhUxfyEU1MX10sJv87WIrtgF
   -----END CERTIFICATE-----
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vimrunner
@@ -50,28 +50,28 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: autocompletion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
@@ -207,6 +207,7 @@ extensions: []
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
+- README.md
 files:
 - Gemfile
 - Gemfile.lock