autobuild 1.10.1 → 1.11.0.rc1

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6def4ec61d33b39f6ba2e362dc2e270058f781eb
4
- data.tar.gz: 34de65f94cbd2e135f096617028cee2aed60954f
3
+ metadata.gz: 5abb3c21cd7451fd077c26272e062ee8cee4de51
4
+ data.tar.gz: 6d10760392b3106e23f3b24a4bf338dcd9194974
5
5
  SHA512:
6
- metadata.gz: b0fc25e4c12d1fcb224f4cfc2e74cab62810a4be013841a723b41b3a200d7cd7c2931407eb1eba671e646094a0a6aaf6bc3b14d73c0e3352c7d3f19607de5f51
7
- data.tar.gz: 9807abd7fe4c1373065dc1157221274d4b305aa192c2ab9323f8a9113f365ab84823fd52eed6cf2554cdc0c47fedf092939fb4990117972b5e0de4a4e3785ba1
6
+ metadata.gz: a600aca31f49d9336974cbf53b2ae81f9eae74966abee18093ada14a8e04c25da6302b7f990830ed32535ea41252b376b551bfe8b58aa3f7b401d045fe25eb41
7
+ data.tar.gz: f319f3b540cd9939a0dff6c8bc69f1f356b7fc0fd8c23dfedd3833250bb3b7741c953e15227ff8cca5bc85e045dc1babea7c3a96776675c478b6133862b145cc
@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
18
18
  s.extensions = []
19
19
  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
20
20
 
21
- s.add_runtime_dependency "rake", ">= 11.1.0", '~> 11.1'
22
- s.add_runtime_dependency "utilrb", ">= 3.0"
23
- s.add_runtime_dependency 'tty-prompt', '>= 0.6.0', '~> 0.6.0'
24
- s.add_runtime_dependency 'pastel', '>= 0.6.0', '~> 0.6.0'
25
- s.add_development_dependency "flexmock", ">= 2.0.0"
26
- s.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
21
+ s.add_runtime_dependency "rake", "~> 12.0", ">= 12.0.0"
22
+ s.add_runtime_dependency "utilrb", "~> 3.0", ">= 3.0"
23
+ s.add_runtime_dependency 'tty-prompt', '~> 0.12.0', '>= 0.12.0'
24
+ s.add_runtime_dependency 'pastel', '~> 0.7.0', '>= 0.7.0'
25
+ s.add_development_dependency "flexmock", '~> 2.0', ">= 2.0.0"
26
+ s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
27
27
  s.add_development_dependency "fakefs"
28
28
  s.add_development_dependency "simplecov"
29
29
  end
@@ -374,7 +374,7 @@ def delta_between_tags(package, from_tag, to_tag)
374
374
  # @return [Hash<String,String>] a mapping from a tag name to its commit
375
375
  # ID
376
376
  def tags(package, options = Hash.new)
377
- if !options.fetch(only_local: false)
377
+ if !options.fetch(:only_local, false)
378
378
  run_git_bare(package, 'fetch', '--tags')
379
379
  end
380
380
  tag_list = run_git_bare(package, 'show-ref', '--tags').map(&:strip)
@@ -612,8 +612,9 @@ def status(package, options = Hash.new)
612
612
  end
613
613
 
614
614
  validate_importdir(package)
615
- remote_commit = current_remote_commit(package, only_local)
616
- status = merge_status(package, remote_commit)
615
+ pinned_state, target_commit, _ = determine_target_state(package, only_local: only_local)
616
+
617
+ status = merge_status(package, target_commit)
617
618
  status.uncommitted_code = self.class.has_uncommitted_changes?(package)
618
619
  if current_branch = self.current_branch(package)
619
620
  if current_branch != "refs/heads/#{local_branch}"
@@ -957,18 +958,7 @@ def reset_head_to_commit(package, target_commit, fetch_commit, options = Hash.ne
957
958
  end
958
959
  end
959
960
 
960
- # @option (see Package#update)
961
- def update(package, options = Hash.new)
962
- validate_importdir(package)
963
- only_local = options.fetch(:only_local, false)
964
- reset = options.fetch(:reset, false)
965
-
966
- # This is really really a hack to workaround how broken the
967
- # importdir thing is
968
- if package.importdir == package.srcdir
969
- update_alternates(package)
970
- end
971
-
961
+ def determine_target_state(package, only_local: false)
972
962
  pinned_state =
973
963
  if commit then commit
974
964
  elsif tag then "refs/tags/#{tag}"
@@ -987,6 +977,25 @@ def update(package, options = Hash.new)
987
977
  current_remote_commit(package, only_local: only_local)
988
978
  end
989
979
 
980
+ return pinned_state, target_commit, fetch_commit
981
+ end
982
+
983
+
984
+ # @option (see Package#update)
985
+ def update(package, options = Hash.new)
986
+ validate_importdir(package)
987
+ only_local = options.fetch(:only_local, false)
988
+ reset = options.fetch(:reset, false)
989
+
990
+ # This is really really a hack to workaround how broken the
991
+ # importdir thing is
992
+ if package.importdir == package.srcdir
993
+ update_alternates(package)
994
+ end
995
+
996
+ pinned_state, target_commit, fetch_commit =
997
+ determine_target_state(package, only_local: only_local)
998
+
990
999
  # If we are tracking a commit/tag, just check it out and return
991
1000
  if !has_local_branch?(package)
992
1001
  package.message "%%s: checking out branch %s" % [local_branch]
@@ -275,7 +275,7 @@ def apply_env(env, set = Hash.new, ops = Array.new)
275
275
  if last = set[env_op.name]
276
276
  last_pkg, last_values = *last
277
277
  if last_values != env_op.values
278
- raise IncompatibleEnvironment, "trying to reset #{env_op.name} to #{env_op.values} which conflicts with #{last_pkg.name} already setting it to #{last_values}"
278
+ raise IncompatibleEnvironment, "trying to reset #{env_op.name} to #{env_op.values} in #{self.name} but this conflicts with #{last_pkg.name} already setting it to #{last_values}"
279
279
  end
280
280
  else
281
281
  set[env_op.name] = [self, env_op.values]
@@ -1,5 +1,5 @@
1
1
  module Autobuild
2
- VERSION = "1.10.1" unless defined? Autobuild::VERSION
2
+ VERSION = "1.11.0.rc1" unless defined? Autobuild::VERSION
3
3
  end
4
4
 
5
5
 
metadata CHANGED
@@ -1,39 +1,42 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autobuild
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.1
4
+ version: 1.11.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sylvain Joyeux
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-06 00:00:00.000000000 Z
11
+ date: 2017-07-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
18
- - !ruby/object:Gem::Version
19
- version: 11.1.0
20
17
  - - "~>"
21
18
  - !ruby/object:Gem::Version
22
- version: '11.1'
19
+ version: '12.0'
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 12.0.0
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- version: 11.1.0
30
27
  - - "~>"
31
28
  - !ruby/object:Gem::Version
32
- version: '11.1'
29
+ version: '12.0'
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: 12.0.0
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: utilrb
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
+ - - "~>"
38
+ - !ruby/object:Gem::Version
39
+ version: '3.0'
37
40
  - - ">="
38
41
  - !ruby/object:Gem::Version
39
42
  version: '3.0'
@@ -41,6 +44,9 @@ dependencies:
41
44
  prerelease: false
42
45
  version_requirements: !ruby/object:Gem::Requirement
43
46
  requirements:
47
+ - - "~>"
48
+ - !ruby/object:Gem::Version
49
+ version: '3.0'
44
50
  - - ">="
45
51
  - !ruby/object:Gem::Version
46
52
  version: '3.0'
@@ -48,46 +54,49 @@ dependencies:
48
54
  name: tty-prompt
49
55
  requirement: !ruby/object:Gem::Requirement
50
56
  requirements:
51
- - - ">="
52
- - !ruby/object:Gem::Version
53
- version: 0.6.0
54
57
  - - "~>"
55
58
  - !ruby/object:Gem::Version
56
- version: 0.6.0
59
+ version: 0.12.0
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: 0.12.0
57
63
  type: :runtime
58
64
  prerelease: false
59
65
  version_requirements: !ruby/object:Gem::Requirement
60
66
  requirements:
61
- - - ">="
62
- - !ruby/object:Gem::Version
63
- version: 0.6.0
64
67
  - - "~>"
65
68
  - !ruby/object:Gem::Version
66
- version: 0.6.0
69
+ version: 0.12.0
70
+ - - ">="
71
+ - !ruby/object:Gem::Version
72
+ version: 0.12.0
67
73
  - !ruby/object:Gem::Dependency
68
74
  name: pastel
69
75
  requirement: !ruby/object:Gem::Requirement
70
76
  requirements:
71
- - - ">="
72
- - !ruby/object:Gem::Version
73
- version: 0.6.0
74
77
  - - "~>"
75
78
  - !ruby/object:Gem::Version
76
- version: 0.6.0
79
+ version: 0.7.0
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: 0.7.0
77
83
  type: :runtime
78
84
  prerelease: false
79
85
  version_requirements: !ruby/object:Gem::Requirement
80
86
  requirements:
81
- - - ">="
82
- - !ruby/object:Gem::Version
83
- version: 0.6.0
84
87
  - - "~>"
85
88
  - !ruby/object:Gem::Version
86
- version: 0.6.0
89
+ version: 0.7.0
90
+ - - ">="
91
+ - !ruby/object:Gem::Version
92
+ version: 0.7.0
87
93
  - !ruby/object:Gem::Dependency
88
94
  name: flexmock
89
95
  requirement: !ruby/object:Gem::Requirement
90
96
  requirements:
97
+ - - "~>"
98
+ - !ruby/object:Gem::Version
99
+ version: '2.0'
91
100
  - - ">="
92
101
  - !ruby/object:Gem::Version
93
102
  version: 2.0.0
@@ -95,6 +104,9 @@ dependencies:
95
104
  prerelease: false
96
105
  version_requirements: !ruby/object:Gem::Requirement
97
106
  requirements:
107
+ - - "~>"
108
+ - !ruby/object:Gem::Version
109
+ version: '2.0'
98
110
  - - ">="
99
111
  - !ruby/object:Gem::Version
100
112
  version: 2.0.0
@@ -102,20 +114,20 @@ dependencies:
102
114
  name: minitest
103
115
  requirement: !ruby/object:Gem::Requirement
104
116
  requirements:
105
- - - ">="
117
+ - - "~>"
106
118
  - !ruby/object:Gem::Version
107
119
  version: '5.0'
108
- - - "~>"
120
+ - - ">="
109
121
  - !ruby/object:Gem::Version
110
122
  version: '5.0'
111
123
  type: :development
112
124
  prerelease: false
113
125
  version_requirements: !ruby/object:Gem::Requirement
114
126
  requirements:
115
- - - ">="
127
+ - - "~>"
116
128
  - !ruby/object:Gem::Version
117
129
  version: '5.0'
118
- - - "~>"
130
+ - - ">="
119
131
  - !ruby/object:Gem::Version
120
132
  version: '5.0'
121
133
  - !ruby/object:Gem::Dependency
@@ -219,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
219
231
  version: 1.9.3
220
232
  required_rubygems_version: !ruby/object:Gem::Requirement
221
233
  requirements:
222
- - - ">="
234
+ - - ">"
223
235
  - !ruby/object:Gem::Version
224
- version: '0'
236
+ version: 1.3.1
225
237
  requirements: []
226
238
  rubyforge_project:
227
239
  rubygems_version: 2.5.1
@@ -229,3 +241,4 @@ signing_key:
229
241
  specification_version: 4
230
242
  summary: Library to handle build systems and import mechanisms
231
243
  test_files: []
244
+ has_rdoc: