autoproj 2.0.0.rc26 → 2.0.0.rc27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 491dfe3641e05b794fe4ebca4b1bd3a48032cdfe
-  data.tar.gz: 726cec0a9378e474a9699b1269035ba0b6fcfb0a
+  metadata.gz: e43ece02cf158c387946061509fabaac433aaf36
+  data.tar.gz: 81dae227e65b0f8584bfb96f4ab7c0978b5979c3
 SHA512:
-  metadata.gz: b963b9f5dd9d599d692f8b47d58ee3f1c30d79a12078d3d409b88ae895cbe0b285549055bd154fceffc8488b4c24259f2c8f87e63543a9a1fe943941e5b58e36
-  data.tar.gz: 3b9ac577b4cfc306b5177573322f7bf823ccb00e4ce7a7eb9e26841feaa5b4706570badb43dce56163152ebb3ae5779d6a7527ad720fdb979f7a2f153b172dad
+  metadata.gz: 281464e3457065d796ffd7a6834ac47e107d12b2222cf08ea9c73486fd628699986dd7a577ca83da715b258d26e2648981347ed6282281d6b02f2bba268e47dc
+  data.tar.gz: 9ffa7fce1ebc1e0f38487efa4dad6c067f8b078aa1a69be0aee63a254f76db796e750def42fad371ba877b95b5ae72effa6f4ac5c2a0a3af4ca831043ad49cdf

data/.travis.yml

@@ -1,9 +1,14 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - '2.0'
+  - '2.1'
+  - '2.2'
+  - '2.3.1'
+  - 'jruby-9.1.2.0'
+matrix:
+    allow_failures:
+        - rvm: 'jruby-9.1.2.0'
 script:
     - bundler exec rake
     - bundler exec rake test

data/lib/autoproj/autobuild.rb

@@ -77,7 +77,7 @@ def remove_obsolete_installed_orogen_package(name)
                     FileUtils.rm_f pcfile
                 end
                 pcfile = File.join(path, "orogen-project-#{name}.pc")
-                if File.exists?(pcfile)
+                if File.exist?(pcfile)
                     Autoproj.message "  removing obsolete file #{pcfile}", :bold
                     FileUtils.rm_f pcfile
                 end
@@ -89,7 +89,7 @@ def remove_obsolete_installed_orogen_package(name)
         def remove_obsolete_installed_file(*path)
             post_install do
                 path = File.join(prefix, *path)
-                if File.exists?(path)
+                if File.exist?(path)
                     Autoproj.message "  removing obsolete file #{path}", :bold
                     FileUtils.rm_f path
                 end

data/lib/autoproj/cli/bootstrap.rb

@@ -11,7 +11,7 @@ class Bootstrap
             attr_reader :root_dir
 
             def initialize(root_dir = Dir.pwd)
-                if File.exists?(File.join(root_dir, 'autoproj', "manifest"))
+                if File.exist?(File.join(root_dir, 'autoproj', "manifest"))
                     raise ConfigError, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
                 end
                 @root_dir = root_dir

data/lib/autoproj/cli/inspection_tool.rb

@@ -17,6 +17,7 @@ def initialize_and_load(options = Hash.new)
                         end
                     end
                     ws.load_package_sets(mainline: mainline)
+                    ws.config.save
                     ws.setup_all_package_directories
                 end
             end

data/lib/autoproj/cli/snapshot.rb

@@ -29,7 +29,7 @@ def run(target_dir, options)
                 #
                 # This must be done first as the snapshot calls might copy stuff in
                 # there
-                if File.exists?(target_dir)
+                if File.exist?(target_dir)
                     raise ArgumentError, "#{target_dir} already exists"
                 end
                 FileUtils.cp_r Autoproj.config_dir, target_dir

data/lib/autoproj/cli/update.rb

@@ -77,6 +77,7 @@ def run(selected_packages, options)
                     reset: options[:reset],
                     ignore_errors: options[:keep_going],
                     retry_count: options[:retry_count])
+                ws.config.save
                 if !update_packages
                     return [], [], true
                 end

data/lib/autoproj/configuration.rb

@@ -157,7 +157,7 @@ def load(options = Hash.new)
 
         def reconfigure!
             new_config = Hash.new
-            config.each do |key, (value, user_validated)|
+            config.each do |key, (value, _user_validated)|
                 new_config[key] = [value, false]
             end
             @config = new_config

data/lib/autoproj/installation_manifest.rb

@@ -14,6 +14,9 @@ def exist?
             File.exist?(path)
         end
 
+        # Returns information about a given package
+        #
+        # @return [Package]
         def [](name)
             packages[name]
         end
@@ -67,13 +70,6 @@ def each(&block)
             packages.each_value(&block)
         end
 
-        # Returns information about a given package
-        #
-        # @return [Package]
-        def [](name)
-            packages[name]
-        end
-
         # Returns the default Autoproj installation manifest path for a given
         # autoproj workspace root
         #

data/lib/autoproj/manifest.rb

@@ -28,12 +28,12 @@ def self.load(file)
 
         # Load the manifest data contained in +file+
         def load(file)
-            if !File.exists?(file)
+            if !File.exist?(file)
                 raise ConfigError.new(File.dirname(file)), "expected an autoproj configuration in #{File.dirname(file)}, but #{file} does not exist"
             end
 
             data = Autoproj.in_file(file, Autoproj::YAML_LOAD_ERROR) do
-                YAML.load(File.read(file))
+                YAML.load(File.read(file)) || Hash.new
             end
 
             @file = file
@@ -677,7 +677,7 @@ def resolve_package_name_as_osdep(name)
                 (osdeps_availability == OSPackageResolver::IGNORE)
             osdeps_overrides = self.osdeps_overrides[name]
             if osdeps_overrides && (!osdeps_available || osdeps_overrides[:force])
-                source_packages = osdeps_overrides[:packages].inject([]) do |result, src_pkg_name|
+                return osdeps_overrides[:packages].inject([]) do |result, src_pkg_name|
                     result.concat(resolve_package_name_as_source_package(src_pkg_name))
                 end.uniq
             elsif !osdeps_available && (pkg = find_autobuild_package(name))
@@ -864,7 +864,7 @@ def all_selected_packages(validate = true)
         # Returns the set of packages that should be built if the user does not
         # specify any on the command line
         def default_packages(validate = true)
-            if layout = data['layout']
+            if data['layout']
                 return layout_packages(validate)
             else
                 result = PackageSelection.new

data/lib/autoproj/ops/configuration.rb

@@ -132,7 +132,7 @@ def update_remote_package_set(vcs, options = Hash.new)
             name = PackageSet.name_of(ws.manifest, vcs)
             raw_local_dir = PackageSet.raw_local_dir_of(vcs)
 
-            return if options[:checkout_only] && File.exists?(raw_local_dir)
+            return if options[:checkout_only] && File.exist?(raw_local_dir)
 
             # YUK. I am stopping there in the refactoring
             # TODO: figure out a better way
@@ -342,7 +342,7 @@ def sort_package_sets_by_import_order(package_sets, root_pkg_set)
                 queue = Array.new
                 while !pending.empty?
                     pkg_set = pending.shift
-                    if not_processed_yet = pkg_set.imports.find { |imported_set| !topological.include?(imported_set) }
+                    if pkg_set.imports.any? { |imported_set| !topological.include?(imported_set) }
                         queue.push(pkg_set)
                     else
                         topological << pkg_set

data/lib/autoproj/ops/import.rb

@@ -198,7 +198,7 @@ def import_selected_packages(selection, updated_packages, options = Hash.new)
                     end
 
                     # And wait one to finish
-                    pkg, time, result, reason = completion_queue.pop
+                    pkg, _time, _result, reason = completion_queue.pop
                     pending_packages.delete(pkg)
                     if reason
                         if reason.kind_of?(Autobuild::InteractionRequired)
@@ -229,8 +229,8 @@ def import_selected_packages(selection, updated_packages, options = Hash.new)
                     raise ImportFailed, "import of #{failures.size} packages failed: #{failures.keys.map(&:name).sort.join(", ")}"
                 end
 
-                all_processed_packages.delete_if do |pkg|
-                    ws.manifest.excluded?(pkg.name) || ws.manifest.ignored?(pkg.name)
+                all_processed_packages.delete_if do |processed_pkg|
+                    ws.manifest.excluded?(processed_pkg.name) || ws.manifest.ignored?(processed_pkg.name)
                 end
                 all_processed_packages
 
@@ -267,14 +267,14 @@ def finalize_package_load(processed_packages)
                     end
 
                     packages, osdeps = pkg.partition_optional_dependencies
-                    packages.each do |pkg_name|
-                        if !manifest.ignored?(pkg_name) && !manifest.excluded?(pkg_name)
-                            pkg.depends_on pkg_name
+                    packages.each do |dep_pkg_name|
+                        if !manifest.ignored?(dep_pkg_name) && !manifest.excluded?(dep_pkg_name)
+                            pkg.depends_on dep_pkg_name
                         end
                     end
-                    osdeps.each do |pkg_name|
-                        if !manifest.ignored?(pkg_name) && !manifest.excluded?(pkg_name)
-                            pkg.os_packages << pkg_name
+                    osdeps.each do |osdep_pkg_name|
+                        if !manifest.ignored?(osdep_pkg_name) && !manifest.excluded?(osdep_pkg_name)
+                            pkg.os_packages << osdep_pkg_name
                         end
                     end
 

data/lib/autoproj/ops/snapshot.rb

@@ -48,7 +48,7 @@ def save_versions( versions, versions_file, options = Hash.new )
                 replace: false
 
             existing_versions = Array.new
-            if !options[:replace] && File.exists?(versions_file)
+            if !options[:replace] && File.exist?(versions_file)
                 existing_versions = YAML.load( File.read( versions_file ) ) ||
                     Array.new
             end

data/lib/autoproj/options.rb

@@ -60,10 +60,6 @@ def self.save_config
         config.save
     end
 
-    def self.config
-        workspace.config
-    end
-
     def self.load_config
         workspace.load_config
     end

data/lib/autoproj/os_package_installer.rb

@@ -299,7 +299,7 @@ def pristine(packages, options = Hash.new)
 
             packages = packages.map do |handler_name, list|
                 if manager = package_managers[handler_name]
-                    [package_managers[handler_name], list]
+                    [manager, list]
                 else
                     raise ArgumentError, "no package manager called #{handler_name} found"
                 end
@@ -317,14 +317,13 @@ def pristine(packages, options = Hash.new)
         # Requests the installation of the given set of packages
         def install(osdep_packages, install_only: false, **options)
             osdep_packages = osdep_packages.to_set - installed_packages
-            return if osdep_packages.empty?
 
             setup_package_managers(**options)
 
             packages = os_package_resolver.resolve_os_packages(osdep_packages)
             packages = packages.map do |handler_name, list|
                 if manager = package_managers[handler_name]
-                    [package_managers[handler_name], list]
+                    [manager, list]
                 else
                     raise ArgumentError, "no package manager called #{handler_name} found"
                 end

data/lib/autoproj/os_package_resolver.rb

@@ -258,13 +258,13 @@ def supported_operating_system?
         end
 
         def self.guess_operating_system
-            if File.exists?('/etc/debian_version')
+            if File.exist?('/etc/debian_version')
                 versions = [File.read('/etc/debian_version').strip]
                 if versions.first =~ /sid/
                     versions = ["unstable", "sid"]
                 end
                 [['debian'], versions]
-            elsif File.exists?('/etc/redhat-release')
+            elsif File.exist?('/etc/redhat-release')
                 release_string = File.read('/etc/redhat-release').strip
                 release_string =~ /(.*) release ([\d.]+)/
                 name = $1.downcase
@@ -273,12 +273,12 @@ def self.guess_operating_system
                     name = 'rhel'
                 end
                 [[name], [version]]
-            elsif File.exists?('/etc/gentoo-release')
+            elsif File.exist?('/etc/gentoo-release')
                 release_string = File.read('/etc/gentoo-release').strip
                 release_string =~ /^.*([^\s]+)$/
                 version = $1
                 [['gentoo'], [version]]
-            elsif File.exists?('/etc/arch-release')
+            elsif File.exist?('/etc/arch-release')
                 [['arch'], []]
             elsif Autobuild.macos? 
                 version=`sw_vers | head -2 | tail -1`.split(":")[1]
@@ -300,7 +300,7 @@ def self.guess_operating_system
                 [[*managers, 'darwin'], [version.strip]]
             elsif Autobuild.windows?
                 [['windows'], []]
-            elsif File.exists?('/etc/SuSE-release')
+            elsif File.exist?('/etc/SuSE-release')
                 version = File.read('/etc/SuSE-release').strip
                 version =~/.*VERSION\s+=\s+([^\s]+)/
                 version = $1
@@ -320,7 +320,7 @@ def self.ensure_derivatives_refer_to_their_parents(names)
                 '/etc/arch-release' => 'arch',
                 '/etc/SuSE-release' => 'opensuse']
             version_files.each do |file, name|
-                if File.exists?(file) && !names.include?(name)
+                if File.exist?(file) && !names.include?(name)
                     names << name
                 end
             end
@@ -349,6 +349,7 @@ def operating_system=(values)
         def self.operating_system
             @operating_system
         end
+        @operating_system = nil
 
         def self.operating_system=(values)
             @operating_system = values
@@ -387,7 +388,7 @@ def self.autodetect_operating_system
                 # flavour. it seems that "/etc/debian_version" does not contain
                 # "sid" (but "8.0" for example) during the feature freeze
                 # phase...
-                if File.exists?('/etc/debian_version')
+                if File.exist?('/etc/debian_version')
                     debian_versions = [File.read('/etc/debian_version').strip]
                     if debian_versions.first =~ /sid/
                         versions = ["unstable", "sid"]
@@ -403,7 +404,7 @@ def self.autodetect_operating_system
         end
 
         def self.os_from_os_release(filename = '/etc/os-release')
-            return if !File.exists?(filename)
+            return if !File.exist?(filename)
 
             fields = Hash.new
             File.readlines(filename).each do |line|

data/lib/autoproj/package_definition.rb

@@ -33,6 +33,7 @@ def initialize(autobuild, package_set, file)
                 autobuild, package_set, file
             @user_blocks = []
             @modes = ['import', 'build']
+            @setup = false
         end
 
         # The modes in which this package will be used

data/lib/autoproj/package_managers/apt_dpkg_manager.rb

@@ -7,6 +7,7 @@ class AptDpkgManager < ShellScriptManager
 
             def initialize(ws, status_file = "/var/lib/dpkg/status")
                 @status_file = status_file
+                @installed_packages = nil
                 super(ws, true,
                       "apt-get install '%s'",
                       "export DEBIAN_FRONTEND=noninteractive; apt-get install -y '%s'")

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -75,14 +75,13 @@ def initialize_environment
 
                 ws.config.each_reused_autoproj_installation do |p|
                     reused_w = ws.new(p)
-                    reused_c = reused_w.load_config
                     env.add_path 'PATH', File.join(reused_w.prefix_dir, 'gems', 'bin')
                 end
 
                 prefix_gems = File.join(ws.prefix_dir, "gems")
                 FileUtils.mkdir_p prefix_gems
                 gemfile = File.join(prefix_gems, 'Gemfile')
-                if !File.exists?(gemfile)
+                if !File.exist?(gemfile)
                     File.open(gemfile, 'w') do |io|
                         io.puts "eval_gemfile \"#{File.join(ws.dot_autoproj_dir, 'autoproj', 'Gemfile')}\""
                     end
@@ -211,6 +210,7 @@ def merge_gemfiles(*path, unlock: [])
                             if d.source
                                 options = d.source.options.dup
                                 options.delete 'root_path'
+                                options.delete 'uri'
                                 options = options.map { |k, v| "#{k}: \"#{v}\"" }
                             end
                             contents << ["  #{platform_indent}gem \"#{d.name}\", \"#{d.requirement}\"", *options].join(", ")
@@ -257,7 +257,7 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
                 # Save the osdeps entries in a temporary gemfile and finally
                 # merge the whole lot of it
                 gemfile_contents = Tempfile.open 'autoproj-gemfile' do |io|
-                    osdeps_gemfile_lines = gems.sort.map do |name|
+                    gems.sort.each do |name|
                         name, version = parse_package_entry(name)
                         io.puts "gem \"#{name}\", \"#{version || ">= 0"}\""
                     end
@@ -292,7 +292,7 @@ def install(gems, filter_uptodate_packages: false, install_only: false)
                     raise NotCleanState, "bundler executed successfully, but the result was not in a clean state"
                 end
 
-            rescue Exception => e
+            rescue Exception
                 Autoproj.warn "saved the new Gemfile in #{gemfile_path}.FAILED and restored the last Gemfile version"
                 FileUtils.cp gemfile_path, "#{gemfile_path}.FAILED"
                 backup_restore(backups)

data/lib/autoproj/package_set.rb

@@ -127,8 +127,8 @@ def local?; vcs.local? end
         def empty?
             !source_definition['version_control'] && overrides.empty?
                 !each_package.find { true } &&
-                !File.exists?(File.join(raw_local_dir, "overrides.rb")) &&
-                !File.exists?(File.join(raw_local_dir, "init.rb"))
+                !File.exist?(File.join(raw_local_dir, "overrides.rb")) &&
+                !File.exist?(File.join(raw_local_dir, "init.rb"))
         end
 
         # Defined for coherence with the API on {PackageDefinition}
@@ -278,7 +278,7 @@ def raw_description_file
             end
 
             master_source_file = File.join(raw_local_dir, PackageSet.master_source_file)
-            if !File.exists?(master_source_file)
+            if !File.exist?(master_source_file)
                 raise ConfigError.new, "source #{vcs.type}:#{vcs.url} should have a source.yml file, but does not"
             end
 

data/lib/autoproj/test.rb

@@ -45,7 +45,7 @@ module SelfTest
         def setup
             @tmpdir = Array.new
             @ws = Workspace.new('/test/dir')
-            ws.config = Configuration.new
+            ws.load_config
             Autoproj.workspace = ws
 
             super

data/lib/autoproj/variable_expansion.rb

@@ -61,7 +61,7 @@ def self.single_expansion(data, definitions, options = Hash.new)
         end
         definitions = { 'HOME' => ENV['HOME'] }.merge(definitions)
 
-        data = data.gsub /(.|^)\$(\w+)/ do |constant_name|
+        data = data.gsub(/(.|^)\$(\w+)/) do |constant_name|
             prefix = constant_name[0, 1]
             if prefix == "\\"
                 next(constant_name[1..-1])

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc26"
+    VERSION = "2.0.0.rc27"
 end

data/lib/autoproj/workspace.rb

@@ -195,7 +195,7 @@ def load_config(reconfigure = false)
         end
 
         def load_manifest
-            if File.exists?(manifest_file_path)
+            if File.exist?(manifest_file_path)
                 manifest.load(manifest_file_path)
             end
         end
@@ -423,9 +423,6 @@ def load_package_sets(options = Hash.new)
 
             # Loads OS package definitions once and for all
             load_osdeps_from_package_sets
-            # And exclude any package that is not available on this particular
-            # configuration
-            mark_unavailable_osdeps_as_excluded
 
             # Load the required autobuild definitions
             Autoproj.message("autoproj: loading ...", :bold)
@@ -459,7 +456,7 @@ def load_package_sets(options = Hash.new)
                 full_path = File.expand_path(File.join(root_dir, layout_level, pkg_or_set))
                 next if !File.directory?(full_path)
 
-                handler, srcdir = Autoproj.package_handler_for(full_path)
+                handler, _srcdir = Autoproj.package_handler_for(full_path)
                 if handler
                     Autoproj.message "  auto-adding #{pkg_or_set} #{"in #{layout_level} " if layout_level != "/"}using the #{handler.gsub(/_package/, '')} package handler"
                     in_package_set(manifest.local_package_set, manifest.file) do
@@ -477,10 +474,9 @@ def load_package_sets(options = Hash.new)
                 end
             end
 
-            # We finished loading the configuration files. Not all configuration
-            # is done (since we need to process the package setup blocks), but
-            # save the current state of the configuration anyway.
-            config.save
+            # And exclude any package that is not available on this particular
+            # configuration
+            mark_unavailable_osdeps_as_excluded
         end
 
         def mark_unavailable_osdeps_as_excluded
@@ -492,7 +488,7 @@ def mark_unavailable_osdeps_as_excluded
                     next
                 end
 
-                case availability = os_package_resolver.availability_of(osdep_name)
+                case os_package_resolver.availability_of(osdep_name)
                 when OSPackageResolver::UNKNOWN_OS
                     manifest.add_exclusion(osdep_name, "this operating system is unknown to autoproj")
                 when OSPackageResolver::WRONG_OS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc26
+  version: 2.0.0.rc27
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild