autobuild 1.12.3 → 1.13.0.pre1

data/lib/autobuild/packages/pkgconfig.rb

@@ -2,25 +2,25 @@
 
 module Autobuild
     class InstalledPkgConfig < Package
-	attr_reader :pkgconfig
-	attr_reader :prefix
+        attr_reader :pkgconfig
+        attr_reader :prefix
 
-	def initialize(name)
-	    @pkgconfig = PkgConfig.new(name)
-	    @prefix    = @pkgconfig.prefix
-	    super
-	end
+        def initialize(name)
+            @pkgconfig = PkgConfig.new(name)
+            @prefix    = @pkgconfig.prefix
+            super
+        end
 
-	def installstamp
-	    std_stamp = super
-	    return std_stamp if File.file?(std_stamp)
+        def installstamp
+            std_stamp = super
+            return std_stamp if File.file?(std_stamp)
 
-	    pcfile = File.join(pkgconfig.prefix, "lib", "pkgconfig", "#{name}.pc")
-	    if !File.file?(pcfile)
-		raise "cannot find the .pc file for #{name}, tried #{pcfile}"
-	    end
-	    pcfile
-	end
+            pcfile = File.join(pkgconfig.prefix, "lib", "pkgconfig", "#{name}.pc")
+            if !File.file?(pcfile)
+                raise "cannot find the .pc file for #{name}, tried #{pcfile}"
+            end
+            pcfile
+        end
     end
     def self.installed_pkgconfig(name, &block)
         InstalledPkgConfig.new(name, &block)

data/lib/autobuild/pkgconfig.rb

@@ -1,9 +1,9 @@
 # Access to information from pkg-config(1)
 class PkgConfig
     class NotFound < RuntimeError
-	attr_reader :name
-	def initialize(name); @name = name end
-	def to_s; "#{name} is not available to pkg-config" end
+        attr_reader :name
+        def initialize(name); @name = name end
+        def to_s; "#{name} is not available to pkg-config" end
     end
     
     # The module name
@@ -14,30 +14,30 @@ def to_s; "#{name} is not available to pkg-config" end
     # Create a PkgConfig object for the package +name+
     # Raises PkgConfig::NotFound if the module does not exist
     def initialize(name)
-	if !system("pkg-config --exists #{name}")
-	    raise NotFound.new(name)
-	end
-	
-	@name    = name
-	@version = `pkg-config --modversion #{name}`.chomp.strip
-	@actions = Hash.new
-	@variables = Hash.new
+        if !system("pkg-config --exists #{name}")
+            raise NotFound.new(name)
+        end
+        
+        @name    = name
+        @version = `pkg-config --modversion #{name}`.chomp.strip
+        @actions = Hash.new
+        @variables = Hash.new
     end
 
     ACTIONS = %w{cflags cflags-only-I cflags-only-other 
-		libs libs-only-L libs-only-l libs-only-other static}
+                libs libs-only-L libs-only-l libs-only-other static}
     ACTIONS.each do |action|
-	define_method(action.gsub(/-/, '_')) do 
-	    @actions[action] ||= `pkg-config --#{action} #{name}`.chomp.strip
-	end
+        define_method(action.gsub(/-/, '_')) do 
+            @actions[action] ||= `pkg-config --#{action} #{name}`.chomp.strip
+        end
     end
 
     def method_missing(varname, *args, &proc)
-	if args.empty?
-	    @variables[varname] ||= `pkg-config --variable=#{varname} #{name}`.chomp.strip
-	else
-	    super(varname, *args, &proc)
-	end
+        if args.empty?
+            @variables[varname] ||= `pkg-config --variable=#{varname} #{name}`.chomp.strip
+        else
+            super(varname, *args, &proc)
+        end
     end
 end
 

data/lib/autobuild/reporting.rb

@@ -250,28 +250,6 @@ def self.display_progress
         end
     end
 
-    # The exception type that is used to report multiple errors that occured
-    # when ignore_errors is set
-    class CompositeException < Autobuild::Exception
-        # The array of exception objects representing all the errors that
-        # occured during the build
-        attr_reader :original_errors
-
-        def initialize(original_errors)
-            @original_errors = original_errors
-        end
-
-        def mail?; true end
-
-        def to_s
-            result = ["#{original_errors.size} errors occured"]
-            original_errors.each_with_index do |e, i|
-                result << "(#{i}) #{e.to_s}"
-            end
-            result.join("\n")
-        end
-    end
-
     ## The reporting module provides the framework # to run commands in
     # autobuild and report errors # to the user
     #

data/lib/autobuild/subcommand.rb

@@ -81,7 +81,7 @@ def self.autodetect_processor_count
         if @processor_count
             return @processor_count
         end
-		
+                
         if File.file?('/proc/cpuinfo')
             cpuinfo = File.readlines('/proc/cpuinfo')
             physical_ids, core_count, processor_ids = [], [], []
@@ -252,9 +252,9 @@ def self.run(target, phase, *command)
             FileUtils.mkdir_p File.dirname(logname)
         end
 
-	if Autobuild.verbose
-	    Autobuild.message "#{target_name}: running #{command.join(" ")}\n    (output goes to #{logname})"
-	end
+        if Autobuild.verbose
+            Autobuild.message "#{target_name}: running #{command.join(" ")}\n    (output goes to #{logname})"
+        end
 
         open_flag = if Autobuild.keep_oldlogs then 'a'
                     elsif Autobuild.registered_logfile?(logname) then 'a'
@@ -281,7 +281,7 @@ def self.run(target, phase, *command)
             logfile.puts
             logfile.puts "#{Time.now}: running"
             logfile.puts "    #{command.join(" ")}"
-	    logfile.puts "with environment:"
+            logfile.puts "with environment:"
             env.keys.sort.each do |key|
                 if value = env[key]
                     logfile.puts "  '#{key}'='#{value}'"
@@ -290,7 +290,7 @@ def self.run(target, phase, *command)
             logfile.puts
             logfile.puts "#{Time.now}: running"
             logfile.puts "    #{command.join(" ")}"
-	    logfile.flush
+            logfile.flush
             logfile.sync = true
 
             if !input_streams.empty?

data/lib/autobuild/timestamps.rb

@@ -58,11 +58,11 @@ class SourceTreeTask < Rake::Task
         attr_reader :newest_file
         attr_reader :newest_time
 
-	def initialize(*args, &block)
-	    @exclude = Autobuild.ignored_files.dup
-	    super
-	end
-	    
+        def initialize(*args, &block)
+            @exclude = Autobuild.ignored_files.dup
+            super
+        end
+            
         def timestamp
             if @newest_time
                 return @newest_time

data/lib/autobuild/tools.rb

@@ -1,8 +1,8 @@
 module Autobuild
     class << self
-	# Configure the programs used by different packages
+        # Configure the programs used by different packages
         attr_reader :programs
-	# A cache of entries in programs to their resolved full path 
+        # A cache of entries in programs to their resolved full path 
         #
         # @return [{String=>[String,String,String]}] the triplet (full path,
         #   tool name, value of ENV['PATH']). The last two values are used to
@@ -12,11 +12,11 @@ class << self
         attr_reader :programs_in_path
 
         # Get a given program, using its name as default value. For
-	# instance
-	#   tool('automake') 
-	# will return 'automake' unless the autobuild script defined
-	# another automake program in Autobuild.programs by doing
-	#   Autobuild.programs['automake'] = 'automake1.9'
+        # instance
+        #   tool('automake') 
+        # will return 'automake' unless the autobuild script defined
+        # another automake program in Autobuild.programs by doing
+        #   Autobuild.programs['automake'] = 'automake1.9'
         def tool(name)
             programs[name.to_sym] || programs[name.to_s] || name.to_s
         end

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.12.3" unless defined? Autobuild::VERSION
+    VERSION = "1.13.0.pre1" unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.13.0.pre1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -19,10 +19,7 @@ dependencies:
         version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 12.1.0
+        version: 12.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,10 +29,7 @@ dependencies:
         version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 12.1.0
+        version: 12.3.0
 - !ruby/object:Gem::Dependency
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
@@ -62,20 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
@@ -237,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1