vimdo 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413d520ac752991279d4a5b9844e6560a4aaa076
-  data.tar.gz: 2e74dd8a044fdeb4d25ee2c8cff4506313e0e051
+  metadata.gz: 6bba073beab14c842aceec4434adbca77591fbb7
+  data.tar.gz: a6da018fda191b5b42088051deb802a83e6c01ff
 SHA512:
-  metadata.gz: 19000317c50f47480f30a9fb3dd806dd0932c7170bdfe1ea6e9b590e7c15a0526fc62cef31580402ae9a8f62e9aa9c4fe4d7d32c0a0c931120de904a0a5b97ac
-  data.tar.gz: f7bb539fa87c633ecb10da4f7b18e13df9f8d5b50c63b0e36cb1680c9bda7ce2a2858f9b01f9289700a1b61e0ca34b5bfa32fcd17fc519aa9f527904180f9a6f
+  metadata.gz: c843a33d44a3504625e6540336eeecb20a43699de964c602c3ce90fb1801969588010dbf5a6b5ec735793bbf85ef94ad3514eec189a15a82f38e8d77b8d2f4af
+  data.tar.gz: 9bf0812c75177c7e03a27e6939259728971ac4a2cafe24ff0558c04706be7dfbfe8f7fbce728c10db60dba935bf6c6b30a0931ded4c91cb39558a353d5606411

data/Gemfile

@@ -1,23 +1,10 @@
 # -*- ruby -*-
 
-# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
-
 source "https://rubygems.org/"
 
-gem "vimrunner", "~>0.2.2"
-gem "thor", "~>0.18.0"
+gemspec
+
+
 
-gem "rdoc", "~>3.10", :group => [:development, :test]
-gem "rspec", ">=2.13", :group => [:development, :test]
-gem "rake", ">=10.0.0", :group => [:development, :test]
-gem "hoe", ">=0", :group => [:development, :test]
-gem "hoe-gemspec", ">=0", :group => [:development, :test]
-gem "hoe-git", ">=0", :group => [:development, :test]
-gem "hoe-version", ">=0", :group => [:development, :test]
-gem "hoe-bundler", ">=0", :group => [:development, :test]
-gem "guard", ">=0", :group => [:development, :test]
-gem "guard-rspec", ">=0", :group => [:development, :test]
-gem "terminal-notifier-guard", ">=0", :group => [:development, :test]
-gem "growl", ">=0", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Gemfile.lock

@@ -1,49 +1,27 @@
+PATH
+  remote: .
+  specs:
+    vimdo (1.0.2.20130407152509)
+      autocompletion (~> 0.0.3)
+      thor (~> 0.18.0)
+      vimrunner (~> 0.2.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.0.9)
-    diff-lcs (1.2.2)
-    formatador (0.2.4)
-    growl (1.0.3)
-    guard (1.7.0)
-      formatador (>= 0.2.4)
-      listen (>= 0.6.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (2.5.2)
-      guard (>= 1.1)
-      rspec (~> 2.11)
+    autocompletion (0.0.3)
+    awesome_print (1.1.0)
     hoe (3.5.2)
       rake (>= 0.8, < 11.0)
-    hoe-bundler (1.2.0)
-      hoe (>= 2.2.0)
     hoe-gemspec (1.0.0)
       hoe (>= 2.2.0)
     hoe-git (1.5.0)
       hoe (>= 2.2.0)
     hoe-version (1.2.0)
     json (1.7.7)
-    listen (0.7.3)
-    lumberjack (1.0.3)
-    method_source (0.8.1)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    slop (3.4.4)
-    terminal-notifier-guard (1.5.3)
     thor (0.18.1)
     vimrunner (0.2.2)
 
@@ -51,17 +29,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  growl
-  guard
-  guard-rspec
+  awesome_print
   hoe
-  hoe-bundler
   hoe-gemspec
   hoe-git
   hoe-version
   rake (>= 10.0.0)
   rdoc (~> 3.10)
-  rspec (>= 2.13)
-  terminal-notifier-guard
-  thor (~> 0.18.0)
-  vimrunner (~> 0.2.2)
+  vimdo!

data/Manifest.txt

@@ -5,8 +5,12 @@ Manifest.txt
 README.md
 Rakefile
 bin/vimdo
+completion/bash/vimdo
+completion/zsh/_vimdo
 lib/vimdo.rb
+lib/vimdo/autocomplete.rb
 lib/vimdo/cli.rb
 lib/vimdo/friendly_error.rb
 lib/vimdo/ui.rb
 lib/vimdo/version.rb
+vimdo.gemspec

data/Rakefile

@@ -3,8 +3,8 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.plugin :gemspec
 Hoe.plugin :bundler
+Hoe.plugin :gemspec
 Hoe.plugin :git
 Hoe.plugin :test
 Hoe.plugin :version
@@ -16,11 +16,13 @@ Hoe.spec 'vimdo' do
 
   extra_deps << ['vimrunner', '~> 0.2.2']
   extra_deps << ['thor', '~> 0.18.0']
+  extra_deps << ['autocompletion', '~> 0.0.3']
 
-  extra_dev_deps << ['rspec', '>= 2.13']
   extra_dev_deps << ['rake', '>= 10.0.0']
-  extra_dev_deps << ['hoe'] << ['hoe-gemspec'] << ['hoe-git'] << ['hoe-version'] << ['hoe-bundler']
-  extra_dev_deps << ['guard'] << ['guard-rspec'] << ['terminal-notifier-guard'] << ['growl']
+  extra_dev_deps << ['hoe'] << ['hoe-gemspec'] << ['hoe-git'] << ['hoe-version']
+  extra_dev_deps << ['awesome_print']
+  # extra_dev_deps << ['rspec', '>= 2.13']
+  # extra_dev_deps << ['guard'] << ['guard-rspec'] << ['terminal-notifier-guard'] << ['growl']
 end
 
 %w{major minor patch}.each { |v|

data/bin/vimdo

@@ -2,21 +2,26 @@
 
 # Trap interrupts to quit cleanly. See
 # https://twitter.com/mitchellh/status/283014103189053442
-# Signal.trap("INT") { exit 1 }
+Signal.trap("INT") { exit 1 }
 
 ($LOAD_PATH << File.expand_path("../../lib", __FILE__)).uniq!
 require 'rubygems' unless defined? Gem # rubygems is only needed in 1.8
 
 require 'vimdo'
 require 'vimdo/cli'
+require 'vimdo/autocomplete'
 require 'vimdo/friendly_error'
 
 
-VimDo.with_friendly_errors { VimDo.load_recipes ; VimDo::CLI.start }
+VimDo.with_friendly_errors {
+  VimDo.load_recipes
+  if ARGV[0] == 'autocomplete'
+    ARGV.shift
+    VimDo.autocomplete(ARGV)
+  else
+    VimDo::CLI.start
+  end
+}
 
 
 
-# ~~ modeline  ~~ [[[1 -------------------------------------------------------
-# vim: set ft=ruby ts=2 sw=2 tw=78 fdm=syntax fmr=[[[,]]] fdl=1 :
-
-

data/completion/bash/vimdo

@@ -0,0 +1,15 @@
+_vimdo_command()
+{
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+
+    SAVE_IFS=$IFS
+    IFS=" "
+    args="${COMP_WORDS[*]:1}"
+    IFS=$SAVE_IFS
+
+    COMPREPLY=( $(compgen -W "`vimdo autocomplete ${args}`" -- ${cur}) )
+
+    return 0
+}
+complete -F _vimdo_command vimdo

data/completion/zsh/_vimdo

@@ -0,0 +1,25 @@
+#compdef vimdo
+# --------------- ------------------------------------------------------------
+#           Name : _vimdo
+#       Synopsis : zsh completion for vimdo
+#         Author : Zhao Cai <caizhaoff@gmail.com>
+#       HomePage : https://github.com/zhaocai/vimdo
+#        Version : 0.1
+#   Date Created : Sun 07 Apr 2013 03:05:47 PM EDT
+#  Last Modified : Sun 07 Apr 2013 03:05:47 PM EDT
+#            Tag : [ shell, zsh, completion, vim ]
+#      Copyright : © 2013 by Zhao Cai,
+#                  Released under current GPL license.
+# --------------- ------------------------------------------------------------
+local ret
+
+ret=1
+
+vimdo_comp=( ${(z)"$(_call_program vimdo vimdo autocomplete $words[2,-1])"} )
+_describe 'vimdo' vimdo_comp && ret=0
+
+return ret
+
+
+
+

data/lib/vimdo.rb

@@ -12,7 +12,8 @@ module VimDo
     end
   end
 
-  class PathError           < VimDoError; status_code(14) ; end
+  class PathError                  < VimDoError; status_code(14) ; end
+  class UndefinedCommandError      < VimDoError; status_code(15) ; end
 
   class << self
     attr_writer :ui, :rc
@@ -26,8 +27,10 @@ module VimDo
     end
 
     def connect(options= {})
-      options[:name] = options[:servername]
-      Vimrunner::Server.new(options).connect
+      Vimrunner::Server.new(
+        # symbolize keys
+        options.inject({}){ |h, (n,v)| h[n.to_sym] = v; h }
+      ).connect(:spawn => true)
     end
 
     def load_recipes

data/lib/vimdo/autocomplete.rb

@@ -0,0 +1,30 @@
+require "vimdo/cli"
+require "autocompletion"
+
+module VimDo
+
+  def self.autocomplete(words)
+    subcommands = VimDo::CLI.tasks.keys
+    global_options = VimDo::CLI.class_options.values.map { |v| v.switch_name }
+
+    if words.empty?
+      puts (subcommands + global_options).flatten
+    elsif words.length == 1 && ! subcommands.include?(words[0])
+      puts AutoCompletion.words(subcommands).complete(words[0])
+    else
+      options = global_options
+      current_task = VimDo::CLI.tasks[words.shift] 
+      if current_task && ! current_task.options.empty?
+        options << current_task.options.values.map { |v| v.switch_name }
+      end
+      options = options.flatten.delete_if { |o| words.include? o }
+
+      if words[-1]
+        puts AutoCompletion.words(options.flatten).complete(words[-1])
+      else 
+        puts options.flatten
+      end
+    end
+  end
+end
+

data/lib/vimdo/cli.rb

@@ -7,24 +7,34 @@ module VimDo
     include Thor::Actions
     package_name "VimDo"
 
-    class_option "servername",
+    class_option :name,
       :type    => :string,
       :banner  => "servername to connect",
       :default => 'VIM',
-      :aliases => "-s"
-    class_option "executable",
+      :aliases => ["--servername","-s" ]
+    class_option :executable,
       :type    => :string,
       :banner  => "specifiy vim executable",
       :aliases => "-e"
-    class_option "vimrc",
+    class_option :foreground,
+      :type    => :boolean,
+      :banner  => "Foreground: Don't fork when starting GUI",
+      :default => false,
+      :aliases => "-f"
+    class_option :vimrc,
       :type    => :string,
-      :default => "~/.vimdorc",
-      :banner  => "specifiy vimrc",
+      :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"
     class_option "no-color",
       :type   => :boolean,
       :banner => "disable colorization in output"
-    class_option "verbose",
+    class_option :verbose,
       :type    => :boolean,
       :banner  => "enable verbose output mode",
       :aliases => "-v"
@@ -33,6 +43,7 @@ module VimDo
       super
       VimDo.ui = UI::Shell.new(options)
       VimDo.ui.level = "debug" if options["verbose"]
+
     end
 
     desc "commands", "execute commands in vim"
@@ -95,6 +106,10 @@ module VimDo
       commands(merge_command + base_split_command + switch_command)
     end
 
+    desc "autocomplete", "print subcommands for shell completion"
+    def autocomplete()
+      raise UndefinedCommandError, "autocomplete should be intercepted."
+    end
 
   private
     def vim

data/lib/vimdo/version.rb

@@ -1,4 +1,4 @@
 module Vimremote
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end
 

data/vimdo.gemspec

@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "vimdo"
+  s.version = "1.0.2.20130407152509"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Zhao Cai"]
+  s.date = "2013-04-07"
+  s.description = "Vimdo is a ruby gem to automate tasks with vim remote servers.\nPredefined tasks include diff, merge, etc.  You can define your own recipes\nto run tasks with Vim. For example, you can define `DirDiff` recipe:\n\n```ruby\nmodule VimDo\n  class CLI < Thor\n\n    desc \"dirdiff\", \"directory diff in vim\"\n    def dirdiff(from, to)\n      [from, to].each do |f|\n        unless File.directory?(f)\n          raise PathError \"\#{f} is not directory!\"\n        end\n      end\n\n      from, to = [from, to].map {|f| File.expand_path(f) }\n      commands(%Q{exec 'DirDiff ' fnameescape(\"\#{from}\") fnameescape(\"\#{to}\")})\n    end\n\n  end\nend\n\n```\n\nThen run `vimdo dirdiff path/to/a path/to/b` from the command line or other tools"
+  s.email = ["caizhaoff@gmail.com"]
+  s.executables = ["vimdo"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
+  s.files = ["Gemfile", "Gemfile.lock", "History.txt", "Manifest.txt", "README.md", "Rakefile", "bin/vimdo", "completion/bash/vimdo", "completion/zsh/_vimdo", "lib/vimdo.rb", "lib/vimdo/autocomplete.rb", "lib/vimdo/cli.rb", "lib/vimdo/friendly_error.rb", "lib/vimdo/ui.rb", "lib/vimdo/version.rb", "vimdo.gemspec"]
+  s.homepage = "http://zhaocai.github.com/vimdo"
+  s.licenses = ["GPL-3"]
+  s.rdoc_options = ["--main", "README.md"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "vimdo"
+  s.rubygems_version = "2.0.3"
+  s.summary = "Vimdo is a ruby gem to automate tasks with vim remote servers"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<vimrunner>, ["~> 0.2.2"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.18.0"])
+      s.add_runtime_dependency(%q<autocompletion>, ["~> 0.0.3"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<rake>, [">= 10.0.0"])
+      s.add_development_dependency(%q<hoe>, [">= 0"])
+      s.add_development_dependency(%q<hoe-gemspec>, [">= 0"])
+      s.add_development_dependency(%q<hoe-git>, [">= 0"])
+      s.add_development_dependency(%q<hoe-version>, [">= 0"])
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
+    else
+      s.add_dependency(%q<vimrunner>, ["~> 0.2.2"])
+      s.add_dependency(%q<thor>, ["~> 0.18.0"])
+      s.add_dependency(%q<autocompletion>, ["~> 0.0.3"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<rake>, [">= 10.0.0"])
+      s.add_dependency(%q<hoe>, [">= 0"])
+      s.add_dependency(%q<hoe-gemspec>, [">= 0"])
+      s.add_dependency(%q<hoe-git>, [">= 0"])
+      s.add_dependency(%q<hoe-version>, [">= 0"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<vimrunner>, ["~> 0.2.2"])
+    s.add_dependency(%q<thor>, ["~> 0.18.0"])
+    s.add_dependency(%q<autocompletion>, ["~> 0.0.3"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<rake>, [">= 10.0.0"])
+    s.add_dependency(%q<hoe>, [">= 0"])
+    s.add_dependency(%q<hoe-gemspec>, [">= 0"])
+    s.add_dependency(%q<hoe-git>, [">= 0"])
+    s.add_dependency(%q<hoe-version>, [">= 0"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimdo
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Zhao Cai
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.18.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: autocompletion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
+        version: 0.0.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,63 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: growl
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -249,11 +193,15 @@ files:
 - README.md
 - Rakefile
 - bin/vimdo
+- completion/bash/vimdo
+- completion/zsh/_vimdo
 - lib/vimdo.rb
+- lib/vimdo/autocomplete.rb
 - lib/vimdo/cli.rb
 - lib/vimdo/friendly_error.rb
 - lib/vimdo/ui.rb
 - lib/vimdo/version.rb
+- vimdo.gemspec
 homepage: http://zhaocai.github.com/vimdo
 licenses:
 - GPL-3