autobuild 1.10.0.rc7 → 1.10.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fbb603adc50a250a3af4e6c09679336d8e6d837
-  data.tar.gz: 0a4c27bc5ec8eb7bcb9da652da1f15ac440345c4
+  metadata.gz: 66eb9435988ecd0bf116690efcca5943b996d2fa
+  data.tar.gz: 33c3da76765caf1ab4ac5b5001523fef0d30bbe7
 SHA512:
-  metadata.gz: a9a0ce610e7005ffe361018076c205281b11ce9db4f851a56ed4466d1e4fee88d1d03ee6c9ae12eaa68ac6edc06f4f2f2ce72192395b766c6b0dcb949dbf6c3d
-  data.tar.gz: 145c9eae1cb51b9d26712c601fb28c239e488bf812736c130dc601797b5109b50e86f57376ab6eaebe911eac79294761849f756e3bde401c8b4529386d27e02d
+  metadata.gz: c42f5a0c818d221bde6524617512d161919e22820ca880cf8f9b7bcc8e204723de9790e0ab643797c8a50fd7a50cfae26559eeab7b9d8935d2db743a21ca720a
+  data.tar.gz: 54f6c80e82710be6a64bd402ce22a4a551707d5e75ef98ec5867c1fe9785e7deff7ab46eaf9d2992f3cd356ec69f852333d60c0d9cbf9df84e0c2d862f848c47

data/lib/autobuild/environment.rb

@@ -95,10 +95,15 @@ class Environment
 
         attr_reader :inherited_variables
 
-        attr_reader :resolved_env
         attr_reader :system_env
         attr_reader :original_env
 
+        # The set of environment variables that are known to hold paths on the
+        # filesystem
+        #
+        # @see declare_path_variable
+        attr_reader :path_variables
+
         def initialize
             @inherited_environment = Hash.new
             @environment = Hash.new
@@ -106,13 +111,26 @@ def initialize
             @source_after = Set.new
             @inherit = true
             @inherited_variables = Set.new
+            @path_variables = Set.new
 
             @system_env = Hash.new
             @original_env = ORIGINAL_ENV.dup
-            @resolved_env = Hash.new
-            ENV.each do |k, v|
-                resolved_env[k] = v
-            end
+        end
+
+        # Declares that the given environment variable holds a path
+        #
+        # Non-existent paths in these variables are filtered out. It is called
+        # automatically if one of the 'path' methods are called ({#set_path},
+        # {#push_path}, ...)
+        #
+        # @param [String] name
+        def declare_path_variable(name)
+            path_variables << name
+        end
+
+        # Whether the given environment variable contains path(s)
+        def path_variable?(name)
+            path_variables.include?(name)
         end
 
         def initialize_copy(old)
@@ -129,8 +147,6 @@ def initialize_copy(old)
                 map_value { |k, v| v.dup if v }
             @original_env = @original_env.
                 map_value { |k, v| v.dup if v }
-            @resolved_env = @resolved_env.
-                map_value { |k, v| v.dup if v }
         end
 
         def [](name)
@@ -162,7 +178,6 @@ def clear(name = nil)
             if name
                 environment[name] = nil
                 inherited_environment[name] = nil
-                update_var(name)
             else
                 environment.keys.each do |env_key|
                     clear(env_key)
@@ -258,7 +273,6 @@ def init_from_env(name)
             else
                 inherited_environment[name] = Array.new
             end
-            update_var(name)
         end
 
         def push(name, *values)
@@ -291,7 +305,6 @@ def add(name, *values)
 
             values.concat(set)
             @environment[name] = values
-            update_var(name)
         end
 
         # Returns an environment variable value
@@ -351,24 +364,29 @@ def include?(name)
             environment.has_key?(name)
         end
 
-        def update_var(name)
-            if include?(name)
+        def resolved_env
+            resolved_env = Hash.new
+            environment.each_key do |name|
                 if value = value(name)
+                    if path_variable?(name)
+                        value = value.find_all { |p| File.exist?(p) }
+                    end
                     resolved_env[name] = value.join(File::PATH_SEPARATOR)
                 else
                     resolved_env[name] = nil
                 end
-            else
-                resolved_env.delete(name)
             end
+            resolved_env
         end
 
         def set_path(name, *paths)
+            declare_path_variable(name)
             clear(name)
             add_path(name, *paths)
         end
 
         def add_path(name, *paths)
+            declare_path_variable(name)
             paths = paths.map { |p| expand(p) }
 
             oldpath = (environment[name] ||= Array.new)
@@ -385,13 +403,14 @@ def add_path(name, *paths)
         end
 
         def remove_path(name, *paths)
+            declare_path_variable(name)
             paths.each do |p|
                 environment[name].delete(p)
             end
-            update_var(name)
         end
 
         def push_path(name, *values)
+            declare_path_variable(name)
             if current = environment.delete(name)
                 current = current.dup
                 add_path(name, *values)
@@ -443,10 +462,15 @@ def export_env_sh(io)
 
             unset_variables = Set.new
             variables = []
-            environment.each do |name, _|
+            environment.each_key do |name|
                 variables << name
-                value_with_inheritance = value(name, inheritance_mode: :keep)
+                value_with_inheritance    = value(name, inheritance_mode: :keep)
                 value_without_inheritance = value(name, inheritance_mode: :ignore)
+                if path_variable?(name)
+                    [value_with_inheritance, value_without_inheritance].each do |paths|
+                        paths.delete_if { |p| !File.exist?(p) }
+                    end
+                end
 
                 if !value_with_inheritance
                     unset_variables << name
@@ -515,7 +539,9 @@ def arch_size
                 if target_arch
                     cmdline << "-T" << target_arch
                 end
-                arch = `#{cmdline.join(" ")}`.split.grep(/DEB_TARGET_ARCH_BITS/).first
+                out = `#{cmdline.join(" ")}`.split
+                arch = out.grep(/DEB_TARGET_ARCH_BITS/).first ||
+		       out.grep(/DEB_BUILD_ARCH_BITS/).first
                 if arch
                     @arch_size = Integer(arch.chomp.split('=').last)
                 end
@@ -551,7 +577,9 @@ def arch_names
                 if target_arch
                     cmdline << "-T" << target_arch
                 end
-                arch = `#{cmdline.join(" ")}`.split.grep(/DEB_TARGET_MULTIARCH/).first
+                out = `#{cmdline.join(" ")}`.split
+                arch = out.grep(/DEB_TARGET_MULTIARCH/).first ||
+		       out.grep(/DEB_BUILD_MULTIARCH/).first
                 if arch
                     result << arch.chomp.split('=').last
                 end
@@ -598,7 +626,9 @@ def add_prefix(newprefix, includes = nil)
             if !includes || includes.include?(LIBRARY_PATH)
                 ld_library_search = ['lib', 'lib/ARCH', 'libARCHSIZE']
                 each_env_search_path(newprefix, ld_library_search) do |path|
-                    if !Dir.glob(File.join(path, "lib*.#{LIBRARY_SUFFIX}")).empty?
+                    has_sofile = Dir.enum_for(:glob, File.join(path, "lib*.#{LIBRARY_SUFFIX}")).
+                        find { true }
+                    if has_sofile
                         add_path(LIBRARY_PATH, path)
                     end
                 end
@@ -639,7 +669,7 @@ def isolate
         def prepare
             # Set up some important autobuild parameters
             inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', \
-                'LD_LIBRARY_PATH', 'CMAKE_PREFIX_PATH', 'PYTHONPATH'
+                LIBRARY_PATH, 'CMAKE_PREFIX_PATH', 'PYTHONPATH'
         end
 
         # Method called to filter the environment variables before they are set,
@@ -701,9 +731,8 @@ def self.env_add(name, *values)
     def self.env_value(name, options = Hash.new)
         env.value(name, options)
     end
-    # @deprecated, use the API on {env} instead
+    # @deprecated, there is no corresponding API on the {Environment}
     def self.env_update_var(name)
-        env.update_var(name)
     end
     # @deprecated, use the API on {env} instead
     def self.env_add_path(name, *paths)

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.10.0.rc7" unless defined? Autobuild::VERSION
+    VERSION = "1.10.0.rc8" 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.rc7
+  version: 1.10.0.rc8
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake