ast-merge-git 7.1.16 → 7.1.17

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/lib/ast/merge/git/rust_host_provider.rb +20 -9
  4. data/lib/ast/merge/git/version.rb +1 -1
  5. data.tar.gz.sig +0 -0
  6. metadata +14 -14
  7. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8bc1c22dd4659be0a39bf74762a421ed48df8bfef3d940953dcc6f5f026e1ee5
4
- data.tar.gz: 54fb12921be60151977cc4d64be495de58d2921854bc9505173b00f7775ce118
3
+ metadata.gz: 8b612480c00c4d39bbf57d8d2b3e8c6763b28d0242e8481188dc44f4dd99c8b8
4
+ data.tar.gz: 7b49589021f17b4d39d0361f5a3442744a7cf8389ea593e0e081dfd1a69d5bc7
5
5
  SHA512:
6
- metadata.gz: 470e7aa0f5b0ef7ac327a9cd470c0e21e056c534197569ad755bed41690d4f688c35407ef5d7fe664f2f317827804ee2ecc06ff5321102fe93e00f6cacb86034
7
- data.tar.gz: 6a33315f6cfa2fd6e641451b61281271fe15fad3b475061bb647c5d135e31fe8cf458876a0fd7bcf46d4e08f6e00a627512ce8c8f8c6c5b88a2aac21db3bd1ea
6
+ metadata.gz: 9763b82c9445de5a13a45207c3236adc38387353567be7d7214b187ae4be2e2952752fc6a92f537c96390d6809ef0e7bab15f4a2b06ee0b77d718815a7124c59
7
+ data.tar.gz: d1000e31cff39793e2b274ac8c5955aa9dc6d0d5e5b216ea2e9e2a7415d4ce7030655e9d797018f6604f85d45151b98ae853db9ca0cc6dc3cf8370dbb1223294
checksums.yaml.gz.sig CHANGED
Binary file
data/lib/ast/merge/git/rust_host_provider.rb CHANGED
@@ -23,22 +23,33 @@ module Ast
23
23
  def additional_fields = %i[path_name labels conflict_marker_size]
24
24
 
25
25
  def policy(_operation, request)
26
+ core::OperationPolicyMerge3.new(value: git_merge3_policy(request))
27
+ end
28
+
29
+ def git_merge3_policy(request)
30
+ labels = git_labels(request)
31
+ width = git_marker_width(request)
32
+ core::ThreeWayMergePolicy.new(
33
+ render_policy: 'source-preserving', fallback_policy: 'none',
34
+ labels: labels.transform_keys(&:to_s), conflict_marker_size: width, extra: {}
35
+ )
36
+ end
37
+
38
+ def git_labels(request)
26
39
  labels = request.fetch(:labels, {})
27
- unless labels.is_a?(Hash) && labels.values.all? do |label|
28
- label.is_a?(String)
29
- end
30
- raise ArgumentError,
31
- 'Git labels must be a Hash of text values'
40
+ unless labels.is_a?(Hash) && labels.values.all? { |label| label.is_a?(String) }
41
+ raise ArgumentError, 'Git labels must be a Hash of text values'
32
42
  end
33
43
 
44
+ labels
45
+ end
46
+
47
+ def git_marker_width(request)
34
48
  width = request[:conflict_marker_size]
35
49
  width = Integer(width, 10) if width.is_a?(String) # Git argv is textual.
36
50
  raise ArgumentError, 'Git marker width must be an Integer' unless width.nil? || width.is_a?(Integer)
37
51
 
38
- core::OperationPolicy.from_merge3(core::ThreeWayMergePolicy.new(
39
- render_policy: 'source-preserving', fallback_policy: 'none',
40
- labels: labels.transform_keys(&:to_s), conflict_marker_size: width, extra: {}
41
- ))
52
+ width
42
53
  end
43
54
  end
44
55
  end
data/lib/ast/merge/git/version.rb CHANGED
@@ -6,7 +6,7 @@ module Ast
6
6
  # Version namespace for this gem.
7
7
  module Version
8
8
  # Current gem version.
9
- VERSION = '7.1.16'
9
+ VERSION = '7.1.17'
10
10
  end
11
11
  # Current gem version exposed at the traditional constant location.
12
12
  VERSION = Version::VERSION # Traditional Constant Location
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ast-merge-git
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.16
4
+ version: 7.1.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
43
43
  requirements:
44
44
  - - '='
45
45
  - !ruby/object:Gem::Version
46
- version: 7.1.16
46
+ version: 7.1.17
47
47
  type: :runtime
48
48
  prerelease: false
49
49
  version_requirements: !ruby/object:Gem::Requirement
50
50
  requirements:
51
51
  - - '='
52
52
  - !ruby/object:Gem::Version
53
- version: 7.1.16
53
+ version: 7.1.17
54
54
  - !ruby/object:Gem::Dependency
55
55
  name: tree_haver
56
56
  requirement: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - '='
59
59
  - !ruby/object:Gem::Version
60
- version: 7.1.16
60
+ version: 7.1.17
61
61
  type: :runtime
62
62
  prerelease: false
63
63
  version_requirements: !ruby/object:Gem::Requirement
64
64
  requirements:
65
65
  - - '='
66
66
  - !ruby/object:Gem::Version
67
- version: 7.1.16
67
+ version: 7.1.17
68
68
  - !ruby/object:Gem::Dependency
69
69
  name: version_gem
70
70
  requirement: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  version: '1.1'
75
75
  - - ">="
76
76
  - !ruby/object:Gem::Version
77
- version: 1.1.15
77
+ version: 1.1.16
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
84
84
  version: '1.1'
85
85
  - - ">="
86
86
  - !ruby/object:Gem::Version
87
- version: 1.1.15
87
+ version: 1.1.16
88
88
  - !ruby/object:Gem::Dependency
89
89
  name: kettle-dev
90
90
  requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
94
94
  version: '3.1'
95
95
  - - ">="
96
96
  - !ruby/object:Gem::Version
97
- version: 3.1.21
97
+ version: 3.1.24
98
98
  type: :development
99
99
  prerelease: false
100
100
  version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
104
104
  version: '3.1'
105
105
  - - ">="
106
106
  - !ruby/object:Gem::Version
107
- version: 3.1.21
107
+ version: 3.1.24
108
108
  - !ruby/object:Gem::Dependency
109
109
  name: bundler-audit
110
110
  requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
162
162
  version: '0.1'
163
163
  - - ">="
164
164
  - !ruby/object:Gem::Version
165
- version: 0.1.3
165
+ version: 0.1.4
166
166
  type: :development
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ dependencies:
172
172
  version: '0.1'
173
173
  - - ">="
174
174
  - !ruby/object:Gem::Version
175
- version: 0.1.3
175
+ version: 0.1.4
176
176
  - !ruby/object:Gem::Dependency
177
177
  name: appraisal2
178
178
  requirement: !ruby/object:Gem::Requirement
@@ -313,10 +313,10 @@ licenses:
313
313
  - PolyForm-Small-Business-1.0.0
314
314
  metadata:
315
315
  homepage_uri: https://structuredmerge.org
316
- source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.16
317
- changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.16/CHANGELOG.md
316
+ source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.17
317
+ changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.17/CHANGELOG.md
318
318
  bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
319
- documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.16
319
+ documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.17
320
320
  funding_uri: https://github.com/sponsors/pboling
321
321
  wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
322
322
  news_uri: https://www.railsbling.com/tags/ast-merge-git
metadata.gz.sig CHANGED
Binary file