autobuild 1.10.0.rc11 → 1.10.0.rc12

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: 386d081be3487411185b3889e428dcc69f8e8757
4
- data.tar.gz: 650d79aae07958ff7c3fc12533cfdf26e0d2cfef
3
+ metadata.gz: 93d2b10bf766be5eff2ff289bee403db33bdf8bc
4
+ data.tar.gz: d7ec8fc8421d2bad68820e9d00b09d06f2361edd
5
5
  SHA512:
6
- metadata.gz: ae9c065dd08369928d0afcd393b55a76d7393c5e16f83e9b8e47fd17dd9aac363123a46644b8d41c2c83fbb5f72f1655dcdf03c43fd039a4336bff2de6b39a0e
7
- data.tar.gz: 9f42be295cb1c9bd29c4606fa4f0262f86af699bf0b1c5323817d1cc985f8494f732979550e90d9e0c38026e7bd83b1b9dc6aca02ac1ac0671114069b9cc74ac
6
+ metadata.gz: ab309ce13fbf4933bf84c657bf8b5153379353cbb1419be9ec972de7142d95ace0ebf0a10e81fec5bfa4314d8f80b8eeec6f73bcb025d9836cbb5f777b750cde
7
+ data.tar.gz: be06d3591c000d8d0c29c17332114da77b05f5c7e7291fa98682eea45383a05126021f9999eb4dc137c73c5b5872e3a7cf0f7c41a9e1ddd54b4e963fb2c4e582
data/.travis.yml CHANGED
@@ -1,5 +1,11 @@
1
+ sudo: false
1
2
  language: ruby
2
3
  rvm:
3
- - 2.0.0
4
- - 2.1.6
5
- - 2.2.2
4
+ - '2.0'
5
+ - '2.1'
6
+ - '2.2'
7
+ - '2.3.1'
8
+ - 'jruby-9.1.2.0'
9
+ matrix:
10
+ allow_failures:
11
+ - rvm: 'jruby-9.1.2.0'
@@ -124,5 +124,7 @@ def to_s
124
124
  # This is for instance used during package import if the importer has to ask
125
125
  # the user a question and allow_interactive is false
126
126
  class InteractionRequired < RuntimeError; end
127
+
128
+ class AlreadyFailedError < RuntimeError; end
127
129
  end
128
130
 
@@ -33,6 +33,8 @@ def default_alternates
33
33
  end
34
34
  end
35
35
 
36
+ self.default_alternates = nil
37
+
36
38
  # Returns the git version as a string
37
39
  #
38
40
  # @return [String]
@@ -102,6 +104,10 @@ def self.at_least_version(*version)
102
104
  def initialize(repository, branch = nil, options = {})
103
105
  @alternates = Git.default_alternates.dup
104
106
  @git_dir_cache = Array.new
107
+ @local_branch = @remote_branch = nil
108
+ @tag = @commit = nil
109
+
110
+ @merge = false
105
111
 
106
112
  if branch.respond_to?(:to_hash)
107
113
  branch, options = nil, branch.to_hash
@@ -132,6 +138,7 @@ def initialize(repository, branch = nil, options = {})
132
138
 
133
139
  @with_submodules = gitopts.delete(:with_submodules)
134
140
  @remote_name = 'autobuild'
141
+ @push_to = nil
135
142
  relocate(repository, gitopts)
136
143
  @additional_remotes = Array.new
137
144
  end
@@ -334,9 +334,6 @@ def failed?
334
334
  # will subsequently be a noop. I.e. if +build+ fails, +install+ will do
335
335
  # nothing.
336
336
  def isolate_errors(options = Hash.new)
337
- # Don't do anything if we already have failed
338
- return if failed?
339
-
340
337
  if !options.kind_of?(Hash)
341
338
  options = Hash[mark_as_failed: true]
342
339
  end
@@ -344,6 +341,14 @@ def isolate_errors(options = Hash.new)
344
341
  mark_as_failed: true,
345
342
  ignore_errors: Autobuild.ignore_errors
346
343
 
344
+ # Don't do anything if we already have failed
345
+ if failed?
346
+ if !options[:ignore_errors]
347
+ raise AlreadyFailedError, "attempting to do an operation on a failed package"
348
+ end
349
+ return
350
+ end
351
+
347
352
  begin
348
353
  toplevel = !Thread.current[:isolate_errors]
349
354
  Thread.current[:isolate_errors] = true
@@ -26,6 +26,7 @@ def self.progress_display_enabled=(value)
26
26
  end
27
27
 
28
28
  @progress_display_enabled = true
29
+ @last_progress_msg = nil
29
30
 
30
31
  def self.message(*args)
31
32
  return if silent?
@@ -1,5 +1,5 @@
1
1
  module Autobuild
2
- VERSION = "1.10.0.rc11" unless defined? Autobuild::VERSION
2
+ VERSION = "1.10.0.rc12" unless defined? Autobuild::VERSION
3
3
  end
4
4
 
5
5
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autobuild
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.0.rc11
4
+ version: 1.10.0.rc12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sylvain Joyeux
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-01 00:00:00.000000000 Z
11
+ date: 2016-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -227,4 +227,3 @@ signing_key:
227
227
  specification_version: 4
228
228
  summary: Library to handle build systems and import mechanisms
229
229
  test_files: []
230
- has_rdoc: