autobuild 1.7.11.rc2 → 1.7.11.rc3

data/Manifest.txt

@@ -33,6 +33,7 @@ lib/autobuild/parallel.rb
 lib/autobuild/pkgconfig.rb
 lib/autobuild/reporting.rb
 lib/autobuild/subcommand.rb
+lib/autobuild/tools.rb
 lib/autobuild/timestamps.rb
 lib/autobuild/version.rb
 lib/autobuild/rake_task_extension.rb

data/lib/autobuild.rb

@@ -5,6 +5,7 @@ if defined? Rake::DSL
 end
 
 module Autobuild
+    LIB_DIR = File.expand_path(File.dirname(__FILE__))
 end
 
 begin

data/lib/autobuild/config.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'rake'
 require 'singleton'
 require 'highline'
+require 'autobuild/tools'
 
 # Evaluates +script+ in autobuild context
 def Autobuild(&script)
@@ -63,17 +64,6 @@ module Autobuild
             else raise ArgumentError, "there is no utility called #{utility_name}, available utilities are #{utilities.keys.sort.join(", ")}"
             end
         end
-
-	# Configure the programs used by different packages
-        attr_reader :programs
-	# 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
-        #   invalidate the cache when needed
-        #
-        # @see tool_in_path
-        attr_reader :programs_in_path
 	# The directory in which logs are saved. Defaults to PREFIX/log.
         attr_writer :logdir
 
@@ -112,8 +102,6 @@ module Autobuild
         :verbose => false, :debug => false, :do_build => true, :do_forced_build => false, :do_rebuild => false, :do_update => true, 
         :daemonize => false, :packages => [], :default_packages => [], :keep_oldlogs => false }
 
-    @programs = Hash.new
-    @programs_in_path = Hash.new
     DEFAULT_OPTIONS.each do |name, value|
         send("#{name}=", value)
     end
@@ -192,50 +180,6 @@ module Autobuild
             end
         end
 
-        # 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'
-        def tool(name)
-            programs[name.to_sym] || programs[name.to_s] || name.to_s
-        end
-
-        # Resolves the absolute path to a given tool
-        def tool_in_path(name)
-            path, path_name, path_env = programs_in_path[name]
-            current = tool(name)
-            if path_env != ENV['PATH'] || path_name != current
-                # Delete the current entry given that it is invalid
-                programs_in_path.delete(name)
-                if current[0, 1] == "/"
-                    # This is already a full path
-                    path = current
-                else
-                    path = ENV['PATH'].split(':').
-                        find { |dir| File.exists?(File.join(dir, current)) }
-                    if path
-                        path = File.join(path, current)
-                    end
-                end
-
-                if !path
-                    raise ArgumentError, "tool #{name}, set to #{current}, can not be found in PATH=#{path_env}"
-                end
-
-                # Verify that the new value is a file and is executable
-                if !File.file?(path)
-                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not a file"
-                elsif !File.executable?(path)
-                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not executable"
-                end
-                programs_in_path[name] = [path, current, ENV['PATH']]
-            end
-
-            return path
-        end
-
 	# Gets autobuild options from the command line and returns the
 	# remaining elements
         def commandline(args)

data/lib/autobuild/tools.rb

@@ -0,0 +1,62 @@
+module Autobuild
+    class << self
+	# Configure the programs used by different packages
+        attr_reader :programs
+	# 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
+        #   invalidate the cache when needed
+        #
+        # @see tool_in_path
+        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'
+        def tool(name)
+            programs[name.to_sym] || programs[name.to_s] || name.to_s
+        end
+
+        # Resolves the absolute path to a given tool
+        def tool_in_path(name)
+            path, path_name, path_env = programs_in_path[name]
+            current = tool(name)
+            if path_env != ENV['PATH'] || path_name != current
+                # Delete the current entry given that it is invalid
+                programs_in_path.delete(name)
+                if current[0, 1] == "/"
+                    # This is already a full path
+                    path = current
+                else
+                    path = ENV['PATH'].split(':').
+                        find { |dir| File.exists?(File.join(dir, current)) }
+                    if path
+                        path = File.join(path, current)
+                    end
+                end
+
+                if !path
+                    raise ArgumentError, "tool #{name}, set to #{current}, can not be found in PATH=#{path_env}"
+                end
+
+                # Verify that the new value is a file and is executable
+                if !File.file?(path)
+                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not a file"
+                elsif !File.executable?(path)
+                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not executable"
+                end
+                programs_in_path[name] = [path, current, ENV['PATH']]
+            end
+
+            return path
+        end
+    end
+
+    @programs = Hash.new
+    @programs_in_path = Hash.new
+end
+

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.11.rc2" unless defined? Autobuild::VERSION
+    VERSION = "1.7.11.rc3" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.11.rc2
+  version: 1.7.11.rc3
   prerelease: 7
 platform: ruby
 authors:
@@ -139,6 +139,7 @@ files:
 - lib/autobuild/pkgconfig.rb
 - lib/autobuild/reporting.rb
 - lib/autobuild/subcommand.rb
+- lib/autobuild/tools.rb
 - lib/autobuild/timestamps.rb
 - lib/autobuild/version.rb
 - lib/autobuild/rake_task_extension.rb