has_versions 0.4.4 → 0.4.5
Sign up to get free protection for your applications and to get access to all the features.
- data/has_versions.gemspec +1 -4
- data/lib/has_versions/diff/simple.rb +3 -3
- metadata +2 -2
data/has_versions.gemspec
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
# -*- encoding: utf-8 -*-
|
|
2
|
-
$:.push File.expand_path("../lib", __FILE__)
|
|
3
|
-
require "has_versions/version"
|
|
4
|
-
|
|
5
2
|
Gem::Specification.new do |s|
|
|
6
3
|
s.name = "has_versions"
|
|
7
|
-
s.version = '0.4.
|
|
4
|
+
s.version = '0.4.5'
|
|
8
5
|
|
|
9
6
|
s.platform = Gem::Platform::RUBY
|
|
10
7
|
s.authors = ["Grant Rodgers"]
|
|
@@ -15,9 +15,9 @@ module HasVersions
|
|
|
15
15
|
|
|
16
16
|
output = {}.with_indifferent_access
|
|
17
17
|
all_keys.each do |key|
|
|
18
|
-
next unless versioning_codable?(key)
|
|
19
|
-
our_value = versioning_decode_value(key, ours[key])
|
|
20
|
-
their_value = versioning_decode_value(key, theirs[key])
|
|
18
|
+
next unless target.versioning_codable?(key)
|
|
19
|
+
our_value = target.versioning_decode_value(key, ours[key])
|
|
20
|
+
their_value = target.versioning_decode_value(key, theirs[key])
|
|
21
21
|
output[key] = [our_value, their_value] if our_value != their_value
|
|
22
22
|
end
|
|
23
23
|
output
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: has_versions
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.5
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-04-
|
|
12
|
+
date: 2012-04-04 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: i18n
|