autobuild 1.10.0.b3 → 1.10.0.b4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28218a1fe204bc6efd9ae8a5ca2635067dd1aa8f
-  data.tar.gz: dc5ea70ceb40b5798c5cbcfdbc53000dc1b0507d
+  metadata.gz: 337600547fed308e00ef0dbcfbedcdd02664d3d3
+  data.tar.gz: 5d051d09d63bcf0e82463b099d4a9e690893a516
 SHA512:
-  metadata.gz: a43bb95fbd578877a7559ea37323bdfaedc0a3197bf47a3b283667eb99b3c83d8079bdd4a2627c03ade5802a475e140c93bdf5aadcc075d8f42cb0fec3689c1d
-  data.tar.gz: b18e69dfe1aa5373a538d277ba30f455c94555b6de1c8a2335216545f0b37d8761920d1bd454bc9148f8ffed335aaf23e7e4225215ca2073fbbf2a24d770587c
+  metadata.gz: b996cbdfa5a35e5b23da4ded4e8da3258ebb9f06fadfd1ec0472b0958777d76771eebb7708c2959ca8d532b10485192d8f54de1071a205332a8d25fc964075d6
+  data.tar.gz: 54336977873b4150cea50d3356295b491ae154769c22cdf8660c2def2b9ca50a70709fa6291cf0898bbca475d450d47ad2843b6816476a2807868744150904d9

data/Rakefile

@@ -16,7 +16,8 @@ Utilrb::Rake.hoe do
         self.extra_deps <<
             ['rake', '>= 0.9.0'] <<
             ['utilrb', '>= 1.6.0'] <<
-            ['highline', '>= 0']
+            ['pastel', '>= 0.4.0'] <<
+            ['tty', '>= 0.2.0']
 
         self.test_globs = ['test/suite.rb']
     end

data/lib/autobuild.rb

@@ -18,6 +18,12 @@ require 'shellwords'
 require 'find'
 require 'rake/tasklib'
 require 'fileutils'
+require 'optparse'
+require 'rake'
+require 'singleton'
+require 'pastel'
+require 'tty'
+require 'autobuild/tools'
 
 require 'autobuild/version'
 require 'autobuild/environment'

data/lib/autobuild/config.rb

@@ -1,9 +1,3 @@
-require 'optparse'
-require 'rake'
-require 'singleton'
-require 'highline'
-require 'autobuild/tools'
-
 # Evaluates +script+ in autobuild context
 def Autobuild(&script)
     Autobuild.send(:module_eval, &script)
@@ -82,9 +76,6 @@ module Autobuild
 	# The directory in which logs are saved. Defaults to PREFIX/log.
         attr_writer :logdir
 
-        # A HighLine object that allows to colorize the output
-        attr_reader :console
-
         # True if we build and if the build is applied on all packages
         def full_build?
             do_build && !only_doc && packages.empty?
@@ -94,22 +85,19 @@ module Autobuild
     register_utility_class 'doc', Utility, disabled_by_default: false
     register_utility_class 'test', Utility, disabled_by_default: true
 
-    @console = HighLine.new
-
+    @colorizer = Pastel.new
     class << self
-        attr_writer :color
+        def color=(flag)
+            @colorizer = Pastel.new(enabled: flag)
+        end
+
         def color?
-            !!@color
+            @colorizer.enabled?
         end
     end
-    @color = true
 
-    def self.color(*args)
-        if color?
-            console.color(*args)
-        else
-            args.first
-        end
+    def self.color(message, *style)
+        @colorizer.decorate(message, *style)
     end
 
     DEFAULT_OPTIONS = { :nice => nil,

data/lib/autobuild/import/archive.rb

@@ -372,17 +372,14 @@ module Autobuild
                     package.progress_done
                     package.message "The archive #{@url.to_s} is different from the one currently checked out at #{package.srcdir}", :bold
                     package.message "I will have to delete the current folder to go on with the update"
-                    response = HighLine.new.ask "  Continue (yes or no) ? If no, this update will be ignored, which can lead to build problems.", String do |q|
-                        q.overwrite = true
-                        q.in = ['yes', 'no']
-                        q.default = 'yes'
-                        q.case = :downcase
-                    end
+                    response = TTY::Shell.new.ask "  Continue (yes or no) ? If no, this update will be ignored, which can lead to build problems." do
+                        modify :downcase
+                    end.read_string
                 else
                     raise Autobuild::InteractionRequired, "importing #{package.name} would have required user interaction and allow_interactive is false"
                 end
 
-                if response == "no"
+                if response == 'no' || response == 'n'
                     package.message "not updating #{package.srcdir}"
                     package.progress_done
                     return

data/lib/autobuild/import/git.rb

@@ -352,9 +352,21 @@ module Autobuild
             end
         end
 
+        # Enumerates the remotes that this importer would set up on the
+        # repository
+        #
+        # @yieldparam [String] remote_name the remote name
+        # @yieldparam [String] url the remote URL
+        # @yieldparam [String] push_to the remote push-to URL
+        def each_configured_remote
+            ([['autobuild', repository, push_to]] + additional_remotes).each do |args|
+                yield(args[0], args[1], args[2] || args[1])
+            end
+        end
+
         # Updates the git repository's configuration for the target remote
         def update_remotes_configuration(package)
-            ([['autobuild', repository, push_to]] + additional_remotes).each do |args|
+            each_configured_remote do |*args|
                 setup_remote(package, *args)
             end
 

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.10.0.b3" unless defined? Autobuild::VERSION
+    VERSION = "1.10.0.b4" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.10.0.b3
+  version: 1.10.0.b4
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: tty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement