vimdo 1.1.0 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data.tar.gz.sig +0 -0
- data/Rakefile +1 -1
- data/completion/zsh/_vimdo +21 -3
- data/lib/vimdo/cli.rb +5 -5
- data/lib/vimdo/version.rb +1 -1
- metadata +27 -5
- metadata.gz.sig +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 54c57797b210fc7705abee4ab93cfab9efb0fbe6
|
4
|
+
data.tar.gz: ac31e1655cd009ff500f98ef9363adfbb544378e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e3ff82d3491a22ddb330d41975047d17fcbd9b6e38e78ce06db8357c77023787bd51837f02acf547d829165a263d9ae68bc9b9780c8b1bd2d247ac423e775b28
|
7
|
+
data.tar.gz: 3aceeab606edcacada8d478bc0b4c077db704d7968c48180ab43eea3873067020c58bdbf7843b0619fe8f4657aaa1322e3d5d80427a6d8122c83dfa59ab09542
|
checksums.yaml.gz.sig
ADDED
Binary file
|
data.tar.gz.sig
ADDED
Binary file
|
data/Rakefile
CHANGED
@@ -28,7 +28,7 @@ end
|
|
28
28
|
%w{major minor patch}.each { |v|
|
29
29
|
desc "Bump #{v.capitalize} Version"
|
30
30
|
task "bump:#{v}", [:message] => ["version:bump:#{v}"] do |t, args|
|
31
|
-
m = args[:message] ? args[:message] : "
|
31
|
+
m = args[:message] ? args[:message] : "[release] bump version to #{ENV["VERSION"]}"
|
32
32
|
sh "git commit -am '#{m}'"
|
33
33
|
end
|
34
34
|
}
|
data/completion/zsh/_vimdo
CHANGED
@@ -11,12 +11,30 @@
|
|
11
11
|
# Copyright : © 2013 by Zhao Cai,
|
12
12
|
# Released under current GPL license.
|
13
13
|
# --------------- ------------------------------------------------------------
|
14
|
-
local ret
|
15
14
|
|
15
|
+
local curcontext state line ret expl
|
16
|
+
|
17
|
+
curcontext="$curcontext"
|
16
18
|
ret=1
|
17
19
|
|
18
|
-
|
19
|
-
|
20
|
+
_arguments -C \
|
21
|
+
'1: :->tasks' \
|
22
|
+
'*: :->args' && ret=0
|
23
|
+
|
24
|
+
case $state in
|
25
|
+
tasks)
|
26
|
+
tasks=( ${(z)"$(_call_program vimdo vimdo autocomplete $words[2,-1])"} )
|
27
|
+
_describe -t commands 'vimdo tasks' tasks && ret=0
|
28
|
+
;;
|
29
|
+
|
30
|
+
args)
|
31
|
+
tasks=( ${(z)"$(_call_program vimdo vimdo autocomplete $words[2,-1])"} )
|
32
|
+
if [[ -z "$tasks" ]] ; then
|
33
|
+
_path_files
|
34
|
+
else
|
35
|
+
_describe -t commands 'vimdo tasks' tasks && ret=0
|
36
|
+
fi
|
37
|
+
esac
|
20
38
|
|
21
39
|
return ret
|
22
40
|
|
data/lib/vimdo/cli.rb
CHANGED
@@ -71,7 +71,7 @@ module VimDo
|
|
71
71
|
to = File.expand_path(to)
|
72
72
|
from, to = [from, to].map {|f| File.expand_path(f) }
|
73
73
|
|
74
|
-
commands('tabnew', 'edit '+vim.
|
74
|
+
commands('tabnew', 'edit '+vim.escape_filename(from), 'diffsplit '+vim.escape_filename(to))
|
75
75
|
end
|
76
76
|
|
77
77
|
desc "merge", "LOCAL(= mine), MERGED(= yours), REMOTE(= merged output), [BASE(= common parent)]"
|
@@ -90,13 +90,13 @@ module VimDo
|
|
90
90
|
local, merge, remote = [local, merge, remote].map {|f| File.expand_path(f) }
|
91
91
|
|
92
92
|
merge_command =
|
93
|
-
'tabnew<Bar>edit ' + vim.
|
94
|
-
'<Bar>diffsplit ' + vim.
|
95
|
-
'<Bar>diffsplit ' + vim.
|
93
|
+
'tabnew<Bar>edit ' + vim.escape_filename(local) +
|
94
|
+
'<Bar>diffsplit ' + vim.escape_filename(merge) +
|
95
|
+
'<Bar>diffsplit ' + vim.escape_filename(remote)
|
96
96
|
|
97
97
|
if base
|
98
98
|
base_split_command =
|
99
|
-
"<Bar>diffsplit #{vim.
|
99
|
+
"<Bar>diffsplit #{vim.escape_filename(File.expand_path(base))}<Bar>wincmd J"
|
100
100
|
else
|
101
101
|
base_split_command = ''
|
102
102
|
end
|
data/lib/vimdo/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,36 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vimdo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Zhao Cai
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
|
-
cert_chain:
|
11
|
-
|
10
|
+
cert_chain:
|
11
|
+
- |
|
12
|
+
-----BEGIN CERTIFICATE-----
|
13
|
+
MIIDdDCCAlygAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMRIwEAYDVQQDDAljYWl6
|
14
|
+
aGFvZmYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
|
15
|
+
bTAeFw0xMzA0MTYxMzAxMzlaFw0xNDA0MTYxMzAxMzlaMEAxEjAQBgNVBAMMCWNh
|
16
|
+
aXpoYW9mZjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYD
|
17
|
+
Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu2zqh0u+TbhY5kNf
|
18
|
+
Z4OI5AZnXyIE6xVjO7mpp5t5qS+6m8iPIwWYhVTzFm/TDHX1jJ1Dauy7/iXA5m+i
|
19
|
+
xAKAOmCiL2j1VudVz+qBKPwiPAG3O0gtLWsxX5J5BwMimakOmDTGmXAEJCCYNjs8
|
20
|
+
9hdJzcGLydTpQU3RuAn2RE+Y7Rzwm3RAW/hMs5PDdx/3XtksHlQ54is4zob0aCOs
|
21
|
+
hJ9TYLpaKvtZCixX0YyiIuAl07BI4sYyXNNWzk+tHf5RlJ3d/oXR/XxLI6xH2v+h
|
22
|
+
RMsQVqF9UKGANhc8yhrcL7YnG6G8v8fkdJFKa2ZuBSIqYKCLl4ATcXD6tTF+THTf
|
23
|
+
oVxAGQIDAQABo3kwdzAJBgNVHRMEAjAAMB0GA1UdDgQWBBSCk5kEqlkwgrdYCHRk
|
24
|
+
wy0ZQt1eeTAeBgNVHREEFzAVgRNjYWl6aGFvZmZAZ21haWwuY29tMAsGA1UdDwQE
|
25
|
+
AwIEsDAeBgNVHRIEFzAVgRNjYWl6aGFvZmZAZ21haWwuY29tMA0GCSqGSIb3DQEB
|
26
|
+
BQUAA4IBAQCle3HlwCgKX19WNYY2EcJYilQCZJPtl/Gj1EbefaX3paMym6yO4FB9
|
27
|
+
i2yP1WTVB4N8OrS0z24b6mo5jKgplyTU6w9D+yI5WKbN4C7XCbBLeNGVlD9yK8CA
|
28
|
+
zc+igDfc63grzUR5Xj7PPxef4owUdz+XDG+mmmv6wNyXSzQUtFyZ8ucVL1vk5ihP
|
29
|
+
vZU7EDLfcHe3xiTYkarBtblwtSj6PHtYn/1v8ztYHhGKvW3wTTiplNwnW4Sx2Wfa
|
30
|
+
eIuFwYbmfyt5/ObUtmp3BlaIStTiX9TBWeuTx6Zq6q6wDzcudbDRd+jLa2XG2AGB
|
31
|
+
S6w/KYMnbhUxfyEU1MX10sJv87WIrtgF
|
32
|
+
-----END CERTIFICATE-----
|
33
|
+
date: 2013-04-19 00:00:00.000000000 Z
|
12
34
|
dependencies:
|
13
35
|
- !ruby/object:Gem::Dependency
|
14
36
|
name: vimrunner
|
@@ -58,14 +80,14 @@ dependencies:
|
|
58
80
|
requirements:
|
59
81
|
- - ~>
|
60
82
|
- !ruby/object:Gem::Version
|
61
|
-
version: '
|
83
|
+
version: '4.0'
|
62
84
|
type: :development
|
63
85
|
prerelease: false
|
64
86
|
version_requirements: !ruby/object:Gem::Requirement
|
65
87
|
requirements:
|
66
88
|
- - ~>
|
67
89
|
- !ruby/object:Gem::Version
|
68
|
-
version: '
|
90
|
+
version: '4.0'
|
69
91
|
- !ruby/object:Gem::Dependency
|
70
92
|
name: rake
|
71
93
|
requirement: !ruby/object:Gem::Requirement
|
metadata.gz.sig
ADDED
Binary file
|