vcsdiff 0.1.0.alpha → 0.1.1.alpha
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.
- data/bin/vcsdiff +7 -5
- metadata +22 -41
data/bin/vcsdiff
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
################################################################################
|
|
4
4
|
# #
|
|
5
|
-
# File: vcsdiff
|
|
5
|
+
# File: vcsdiff #
|
|
6
6
|
# ++++++++++++++++++++++++++++++ #
|
|
7
7
|
# Copyright (C) 2012 + Author: Foivos S. Zakkak + #
|
|
8
8
|
# + Website: foivos.zakkak.net + #
|
|
@@ -28,7 +28,6 @@
|
|
|
28
28
|
################################################################################
|
|
29
29
|
|
|
30
30
|
require 'optparse'
|
|
31
|
-
require 'ftools'
|
|
32
31
|
|
|
33
32
|
options = {}
|
|
34
33
|
option_parser = OptionParser.new do |opts|
|
|
@@ -80,8 +79,8 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument
|
|
|
80
79
|
exit 1;
|
|
81
80
|
end
|
|
82
81
|
|
|
83
|
-
if options[:sys]
|
|
84
|
-
# TODO: implement auto detection
|
|
82
|
+
if not options[:sys]
|
|
83
|
+
# TODO: implement auto detection
|
|
85
84
|
options[:sys]="svn"
|
|
86
85
|
end
|
|
87
86
|
|
|
@@ -99,13 +98,16 @@ remote=""
|
|
|
99
98
|
|
|
100
99
|
options[:files].each do |f|
|
|
101
100
|
remote="/tmp/"+f
|
|
101
|
+
dir=File.dirname(remote)
|
|
102
|
+
Dir.mkdir(dir) unless File.exists?(dir)
|
|
102
103
|
%x[cp #{f} #{remote}]
|
|
103
104
|
%x[#{options[:sys]} diff #{ARGV.join(" ")} #{f} > #{patch}]
|
|
104
105
|
if !($?.success?)
|
|
106
|
+
puts %'Error: #{options[:sys]} diff #{ARGV.join(" ")} #{f} > #{patch} failed'
|
|
105
107
|
exit 1;
|
|
106
108
|
end
|
|
107
109
|
%x[patch -R -p0 #{remote} #{patch}]
|
|
108
|
-
%x[#{options[:diff]} #{remote} #{f}]
|
|
110
|
+
%x[#{options[:diff]} #{remote} #{f} < `tty` > `tty`]
|
|
109
111
|
File.delete(remote)
|
|
110
112
|
end
|
|
111
113
|
|
metadata
CHANGED
|
@@ -1,68 +1,49 @@
|
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
|
1
|
+
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: vcsdiff
|
|
3
|
-
version: !ruby/object:Gem::Version
|
|
4
|
-
|
|
3
|
+
version: !ruby/object:Gem::Version
|
|
4
|
+
version: 0.1.1.alpha
|
|
5
5
|
prerelease: 6
|
|
6
|
-
segments:
|
|
7
|
-
- 0
|
|
8
|
-
- 1
|
|
9
|
-
- 0
|
|
10
|
-
- alpha
|
|
11
|
-
version: 0.1.0.alpha
|
|
12
6
|
platform: ruby
|
|
13
|
-
authors:
|
|
7
|
+
authors:
|
|
14
8
|
- Foivos Zakkak
|
|
15
9
|
autorequire:
|
|
16
10
|
bindir: bin
|
|
17
11
|
cert_chain: []
|
|
18
|
-
|
|
19
|
-
date: 2012-10-15 00:00:00 Z
|
|
12
|
+
date: 2012-10-31 00:00:00.000000000 Z
|
|
20
13
|
dependencies: []
|
|
21
|
-
|
|
22
|
-
|
|
14
|
+
description: A ruby gem for inspecting diffs generated by git/svn/hg diff using vim
|
|
15
|
+
or Kompare
|
|
23
16
|
email: foivos@zakkak.net
|
|
24
|
-
executables:
|
|
17
|
+
executables:
|
|
25
18
|
- vcsdiff
|
|
26
19
|
extensions: []
|
|
27
|
-
|
|
28
20
|
extra_rdoc_files: []
|
|
29
|
-
|
|
30
|
-
files:
|
|
21
|
+
files:
|
|
31
22
|
- bin/vcsdiff
|
|
32
23
|
homepage: http://rubygems.org/gems/vcsdiff
|
|
33
|
-
licenses:
|
|
24
|
+
licenses:
|
|
34
25
|
- GPL-3
|
|
35
26
|
post_install_message:
|
|
36
27
|
rdoc_options: []
|
|
37
|
-
|
|
38
|
-
require_paths:
|
|
28
|
+
require_paths:
|
|
39
29
|
- lib
|
|
40
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
|
30
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
|
41
31
|
none: false
|
|
42
|
-
requirements:
|
|
43
|
-
- -
|
|
44
|
-
- !ruby/object:Gem::Version
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
- 0
|
|
48
|
-
version: "0"
|
|
49
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
32
|
+
requirements:
|
|
33
|
+
- - ! '>='
|
|
34
|
+
- !ruby/object:Gem::Version
|
|
35
|
+
version: '0'
|
|
36
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
50
37
|
none: false
|
|
51
|
-
requirements:
|
|
52
|
-
- -
|
|
53
|
-
- !ruby/object:Gem::Version
|
|
54
|
-
hash: 25
|
|
55
|
-
segments:
|
|
56
|
-
- 1
|
|
57
|
-
- 3
|
|
58
|
-
- 1
|
|
38
|
+
requirements:
|
|
39
|
+
- - ! '>'
|
|
40
|
+
- !ruby/object:Gem::Version
|
|
59
41
|
version: 1.3.1
|
|
60
|
-
requirements:
|
|
42
|
+
requirements:
|
|
61
43
|
- patch
|
|
62
44
|
rubyforge_project:
|
|
63
|
-
rubygems_version: 1.8.
|
|
45
|
+
rubygems_version: 1.8.24
|
|
64
46
|
signing_key:
|
|
65
47
|
specification_version: 3
|
|
66
48
|
summary: vcsdiff
|
|
67
49
|
test_files: []
|
|
68
|
-
|