piston 2.0.9 → 2.0.10
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/Rakefile +1 -1
- data/VERSION.yml +1 -1
- data/piston.gemspec +5 -5
- metadata +12 -4
data/Rakefile
CHANGED
|
@@ -19,7 +19,7 @@ begin
|
|
|
19
19
|
|
|
20
20
|
s.add_runtime_dependency "main", ">= 2.8.3"
|
|
21
21
|
s.add_runtime_dependency "log4r", ">= 1.0.5"
|
|
22
|
-
s.add_runtime_dependency "activesupport", ">= 2.0.0"
|
|
22
|
+
s.add_runtime_dependency "activesupport", ">= 2.0.0", "< 3.0.0"
|
|
23
23
|
end
|
|
24
24
|
Jeweler::GemcutterTasks.new
|
|
25
25
|
rescue LoadError
|
data/VERSION.yml
CHANGED
data/piston.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{piston}
|
|
8
|
-
s.version = "2.0.
|
|
8
|
+
s.version = "2.0.10"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Francois Beausoleil"]
|
|
12
|
-
s.date = %q{2010-
|
|
12
|
+
s.date = %q{2010-09-14}
|
|
13
13
|
s.default_executable = %q{piston}
|
|
14
14
|
s.description = %q{Piston makes it easy to merge vendor branches into your own repository, without worrying about which revisions were grabbed or not. Piston will also keep your local changes in addition to the remote changes.}
|
|
15
15
|
s.email = %q{francois@teksol.info}
|
|
@@ -169,18 +169,18 @@ Gem::Specification.new do |s|
|
|
|
169
169
|
s.add_development_dependency(%q<cucumber>, [">= 0.1.16"])
|
|
170
170
|
s.add_runtime_dependency(%q<main>, [">= 2.8.3"])
|
|
171
171
|
s.add_runtime_dependency(%q<log4r>, [">= 1.0.5"])
|
|
172
|
-
s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
|
|
172
|
+
s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0", "< 3.0.0"])
|
|
173
173
|
else
|
|
174
174
|
s.add_dependency(%q<cucumber>, [">= 0.1.16"])
|
|
175
175
|
s.add_dependency(%q<main>, [">= 2.8.3"])
|
|
176
176
|
s.add_dependency(%q<log4r>, [">= 1.0.5"])
|
|
177
|
-
s.add_dependency(%q<activesupport>, [">= 2.0.0"])
|
|
177
|
+
s.add_dependency(%q<activesupport>, [">= 2.0.0", "< 3.0.0"])
|
|
178
178
|
end
|
|
179
179
|
else
|
|
180
180
|
s.add_dependency(%q<cucumber>, [">= 0.1.16"])
|
|
181
181
|
s.add_dependency(%q<main>, [">= 2.8.3"])
|
|
182
182
|
s.add_dependency(%q<log4r>, [">= 1.0.5"])
|
|
183
|
-
s.add_dependency(%q<activesupport>, [">= 2.0.0"])
|
|
183
|
+
s.add_dependency(%q<activesupport>, [">= 2.0.0", "< 3.0.0"])
|
|
184
184
|
end
|
|
185
185
|
end
|
|
186
186
|
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: piston
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 27
|
|
5
5
|
prerelease: false
|
|
6
6
|
segments:
|
|
7
7
|
- 2
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 2.0.
|
|
9
|
+
- 10
|
|
10
|
+
version: 2.0.10
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Francois Beausoleil
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2010-
|
|
18
|
+
date: 2010-09-14 00:00:00 -04:00
|
|
19
19
|
default_executable: piston
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|
|
@@ -80,6 +80,14 @@ dependencies:
|
|
|
80
80
|
- 0
|
|
81
81
|
- 0
|
|
82
82
|
version: 2.0.0
|
|
83
|
+
- - <
|
|
84
|
+
- !ruby/object:Gem::Version
|
|
85
|
+
hash: 7
|
|
86
|
+
segments:
|
|
87
|
+
- 3
|
|
88
|
+
- 0
|
|
89
|
+
- 0
|
|
90
|
+
version: 3.0.0
|
|
83
91
|
type: :runtime
|
|
84
92
|
version_requirements: *id004
|
|
85
93
|
description: Piston makes it easy to merge vendor branches into your own repository, without worrying about which revisions were grabbed or not. Piston will also keep your local changes in addition to the remote changes.
|