autobuild 1.10.0.rc4 → 1.10.0.rc5

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: f1f39b2297d4736d60828fa77e676d89de569c07
4
- data.tar.gz: 53d2121fc0311cbb65300300e0189bc5c68454bd
3
+ metadata.gz: b1c06167f06497b4020c6ffce89ee69dd72e4750
4
+ data.tar.gz: b718b386c30704197b1b9ae6a3b3fcb22460da2c
5
5
  SHA512:
6
- metadata.gz: 92d0e2f85b18705b6110a357c300c0f660432a773ae914149fcc99ea96193754e4dd2f7152954375b1d2e0d92211e8d651aac5ac27ccb9afe7ac5fc538502096
7
- data.tar.gz: 0aa3efd0d3e06853355ef9b979419ba0f1b5927dba08ba26f4b6295449d83569f9fe925eb909a20bb7be8751124f9a9e7873bd2236f3d331314b981202cf5286
6
+ metadata.gz: 2580aff6b12ffb0ab7398ecf6cc2af1064f088dfc32cfe7bac301773a85c217064ae38bdc483baf8257eb43588e79e72bfd56915947d017ac1c16744267561cd
7
+ data.tar.gz: cfcbe1c31e7f417e94c9aaeb6a05152abf0788adb7d6a5abd4d4f06d5f16476b585c805d371101eaea855546a3e4a640f655a0f114d9e516672e1e914570254d
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
21
21
  s.add_runtime_dependency "rake", ">= 0.9.0"
22
22
  s.add_runtime_dependency "utilrb", ">= 2.0"
23
23
  s.add_runtime_dependency "tty", '>= 0.2.1'
24
+ s.add_runtime_dependency 'tty-prompt', '>= 0.2.0'
24
25
  s.add_runtime_dependency 'pastel', '>= 0.5.0'
25
26
  s.add_development_dependency "flexmock", ">= 2.0.0"
26
27
  s.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
@@ -23,6 +23,7 @@ module Autobuild
23
23
  require 'singleton'
24
24
  require 'pastel'
25
25
  require 'tty'
26
+ require 'tty-prompt'
26
27
  require 'autobuild/tools'
27
28
 
28
29
  require 'autobuild/version'
@@ -368,14 +368,12 @@ def checkout(package, options = Hash.new) # :nodoc:
368
368
  package.progress_done
369
369
  package.message "The archive #{@url.to_s} is different from the one currently checked out at #{package.srcdir}", :bold
370
370
  package.message "I will have to delete the current folder to go on with the update"
371
- response = TTY::Shell.new.ask " Continue (yes or no) ? If no, this update will be ignored, which can lead to build problems." do
372
- modify :downcase
373
- end.read_string
371
+ response = TTY::Prompt.new.ask " Continue (yes or no) ? If no, this update will be ignored, which can lead to build problems.", type: :bool
374
372
  else
375
373
  raise Autobuild::InteractionRequired, "importing #{package.name} would have required user interaction and allow_interactive is false"
376
374
  end
377
375
 
378
- if response == 'no' || response == 'n'
376
+ if !response
379
377
  package.message "not updating #{package.srcdir}"
380
378
  package.progress_done
381
379
  return
@@ -348,6 +348,8 @@ def isolate_errors(options = Hash.new)
348
348
  toplevel = !Thread.current[:isolate_errors]
349
349
  Thread.current[:isolate_errors] = true
350
350
  yield
351
+ rescue InteractionRequired
352
+ raise
351
353
  rescue Interrupt
352
354
  raise
353
355
  rescue ::Exception => e
@@ -1,5 +1,5 @@
1
1
  module Autobuild
2
- VERSION = "1.10.0.rc4" unless defined? Autobuild::VERSION
2
+ VERSION = "1.10.0.rc5" 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.rc4
4
+ version: 1.10.0.rc5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sylvain Joyeux
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-20 00:00:00.000000000 Z
11
+ date: 2016-02-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -52,6 +52,20 @@ dependencies:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: 0.2.1
55
+ - !ruby/object:Gem::Dependency
56
+ name: tty-prompt
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ">="
60
+ - !ruby/object:Gem::Version
61
+ version: 0.2.0
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ">="
67
+ - !ruby/object:Gem::Version
68
+ version: 0.2.0
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: pastel
57
71
  requirement: !ruby/object:Gem::Requirement