autoproj 1.13.0.b3 → 1.13.0.b4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 267a53a915d1942b6ed2c047f9e01b0de00b5b86
-  data.tar.gz: d3ebff740a4501a34c37bdb0ee76ae3eecfeb9e5
+  metadata.gz: 0c7557ff9fad5a370e5cc7988a711831e62c33a3
+  data.tar.gz: 621912f3aa71dee3de8a88101540ec44b8fc2160
 SHA512:
-  metadata.gz: c18c79c0311a77c735bb21a70349c83f9a5bc77cd3b9dd38535dcc1530368cc30262448cce83d052db1827a63b16ade2f7d7ec3ed907c3b59ed889c5bd5393cb
-  data.tar.gz: 86d8c54ae3c7ff1158c5d8cdf93fa30fd40799417b556b09df76e9c56d6e71f32193f8b7483864ad3177cc94127058db637b71ffe1073230a026413690afe9f7
+  metadata.gz: 9c7ac823f52ab7e75c9c3ba89a9a639d01d9fa6560ce9142c223ff8e4bad6b50d45c70559042919a9aa5c10dae7e8d7400aa10e6859441e949723c1fb91b86c6
+  data.tar.gz: eb4f9a03b3c7d649c3460567935d906e638251d35f8f5dd3167604408cc98b93f056babf630f77cb4ea0352c26ee79d6cd61917a4cdecc3f56785a1802d015f8

data/bin/autoproj_bootstrap

@@ -1795,12 +1795,25 @@ fi
             Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
             names, versions = os_from_os_release
 
-            # Don't use the os-release information on Debian, since they
-            # refuse to put enough information to detect 'unstable'
-            # reliably. So, we use the heuristic method for it
-            if !names || names[0] == 'debian'
+            if !names
                 names, versions = guess_operating_system
             end
+
+            # on Debian, they refuse to put enough information to detect
+            # 'unstable' reliably. So, we use the heuristic method for it
+            if names[0] = "debian"
+                # check if we actually got a debian with the "unstable" (sid)
+                # 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')
+                    debian_versions = [File.read('/etc/debian_version').strip]
+                    if debian_versions.first =~ /sid/
+                        versions = ["unstable", "sid"]
+                    end
+                end
+                # otherwise "versions" contains the result it previously had
+            end
             return if !names
 
             names = ensure_derivatives_refer_to_their_parents(names)
@@ -1841,8 +1854,7 @@ fi
                 return
             end
 
-            distributor = `lsb_release -i -s`
-            distributor = distributor.strip.downcase
+            distributor = [`lsb_release -i -s`.strip.downcase]
             codename    = `lsb_release -c -s`.strip.downcase
             version     = `lsb_release -r -s`.strip.downcase
 

data/lib/autoproj/autobuild.rb

@@ -599,15 +599,22 @@ end
 
 class Autobuild::ArchiveImporter
     def snapshot(package, target_dir = nil)
+        result = Hash[
+            'mode' => mode,
+            'no_subdirectory' => !has_subdirectory?,
+            'archive_dir' => archive_dir || tardir]
+
         if target_dir
             archive_dir = File.join(target_dir, 'archives')
             FileUtils.mkdir_p archive_dir
             FileUtils.cp @cachefile, archive_dir
 
-            { 'url' =>  "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}" }
+            result['url'] = "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}"
         else
-            { 'url' => @url.to_s }
+            result['url'] = @url.to_s
         end
+        
+        result
     end
 end
 

data/lib/autoproj/manifest.rb

@@ -929,6 +929,7 @@ module Autoproj
                         "manifest #{manifest_path} of #{package.name} from #{package_set.name} lists '#{name}' as dependency, but it is neither a normal package nor an osdeps package. osdeps reports: #{e.message}", e.backtrace
                 end
             end
+            manifest
         end
 
         # Loads the manifests for all packages known to this project.

data/lib/autoproj/ops/snapshot.rb

@@ -31,9 +31,9 @@ module Autoproj
         end
 
         def sort_versions(versions)
-            pkg_sets, pkgs = versions.partition { |n, _| n =~ /^pkg_set:/ }
-            pkg_sets.sort_by { |n, _| n.keys.first } +
-                pkgs.sort_by { |n, _| n.keys.first }
+            pkg_sets, pkgs = versions.partition { |vcs| vcs.keys.first =~ /^pkg_set:/ }
+            pkg_sets.sort_by { |vcs| vcs.keys.first } +
+                pkgs.sort_by { |vcs| vcs.keys.first }
         end
 
         def save_versions( versions, versions_file, options = Hash.new )
@@ -214,7 +214,7 @@ module Autoproj
         #   the root of the git repository
         # @param [String] the commit message
         # @return [String] the commit ID
-        def self.create_commit(pkg, path, message)
+        def self.create_commit(pkg, path, message, parent_id = nil)
             importer = pkg.importer
             object_id = Tempfile.open 'autoproj-versions' do |io|
                 yield(io)
@@ -247,11 +247,11 @@ module Autoproj
                 FileUtils.rm_f our_index
             end
 
-            head_id = importer.rev_parse(pkg, 'HEAD')
+            parent_id ||= importer.rev_parse(pkg, 'HEAD')
 
             importer.run_git_bare(
                 pkg, 'commit-tree',
-                tree_id, '-p', head_id, input_streams: [message]).first
+                tree_id, '-p', parent_id, input_streams: [message]).first
         end
     end
     end

data/lib/autoproj/osdeps.rb

@@ -1280,12 +1280,25 @@ fi
             Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
             names, versions = os_from_os_release
 
-            # Don't use the os-release information on Debian, since they
-            # refuse to put enough information to detect 'unstable'
-            # reliably. So, we use the heuristic method for it
-            if !names || names[0] == 'debian'
+            if !names
                 names, versions = guess_operating_system
             end
+
+            # on Debian, they refuse to put enough information to detect
+            # 'unstable' reliably. So, we use the heuristic method for it
+            if names[0] = "debian"
+                # check if we actually got a debian with the "unstable" (sid)
+                # 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')
+                    debian_versions = [File.read('/etc/debian_version').strip]
+                    if debian_versions.first =~ /sid/
+                        versions = ["unstable", "sid"]
+                    end
+                end
+                # otherwise "versions" contains the result it previously had
+            end
             return if !names
 
             names = ensure_derivatives_refer_to_their_parents(names)
@@ -1326,8 +1339,7 @@ fi
                 return
             end
 
-            distributor = `lsb_release -i -s`
-            distributor = distributor.strip.downcase
+            distributor = [`lsb_release -i -s`.strip.downcase]
             codename    = `lsb_release -c -s`.strip.downcase
             version     = `lsb_release -r -s`.strip.downcase
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.0.b3"
+    VERSION = "1.13.0.b4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.0.b3
+  version: 1.13.0.b4
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -250,4 +250,11 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages
-test_files: []
+test_files:
+- test/package_managers/test_apt_dpkg_manager.rb
+- test/package_managers/test_gem.rb
+- test/package_managers/test_pip.rb
+- test/test_manifest.rb
+- test/test_os_dependencies.rb
+- test/test_package_manifest.rb
+- test/ops/test_configuration.rb