autoproj 1.13.0.b3 → 1.13.0.b4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 267a53a915d1942b6ed2c047f9e01b0de00b5b86
4
- data.tar.gz: d3ebff740a4501a34c37bdb0ee76ae3eecfeb9e5
3
+ metadata.gz: 0c7557ff9fad5a370e5cc7988a711831e62c33a3
4
+ data.tar.gz: 621912f3aa71dee3de8a88101540ec44b8fc2160
5
5
  SHA512:
6
- metadata.gz: c18c79c0311a77c735bb21a70349c83f9a5bc77cd3b9dd38535dcc1530368cc30262448cce83d052db1827a63b16ade2f7d7ec3ed907c3b59ed889c5bd5393cb
7
- data.tar.gz: 86d8c54ae3c7ff1158c5d8cdf93fa30fd40799417b556b09df76e9c56d6e71f32193f8b7483864ad3177cc94127058db637b71ffe1073230a026413690afe9f7
6
+ metadata.gz: 9c7ac823f52ab7e75c9c3ba89a9a639d01d9fa6560ce9142c223ff8e4bad6b50d45c70559042919a9aa5c10dae7e8d7400aa10e6859441e949723c1fb91b86c6
7
+ data.tar.gz: eb4f9a03b3c7d649c3460567935d906e638251d35f8f5dd3167604408cc98b93f056babf630f77cb4ea0352c26ee79d6cd61917a4cdecc3f56785a1802d015f8
@@ -1795,12 +1795,25 @@ fi
1795
1795
  Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
1796
1796
  names, versions = os_from_os_release
1797
1797
 
1798
- # Don't use the os-release information on Debian, since they
1799
- # refuse to put enough information to detect 'unstable'
1800
- # reliably. So, we use the heuristic method for it
1801
- if !names || names[0] == 'debian'
1798
+ if !names
1802
1799
  names, versions = guess_operating_system
1803
1800
  end
1801
+
1802
+ # on Debian, they refuse to put enough information to detect
1803
+ # 'unstable' reliably. So, we use the heuristic method for it
1804
+ if names[0] = "debian"
1805
+ # check if we actually got a debian with the "unstable" (sid)
1806
+ # flavour. it seems that "/etc/debian_version" does not contain
1807
+ # "sid" (but "8.0" for example) during the feature freeze
1808
+ # phase...
1809
+ if File.exists?('/etc/debian_version')
1810
+ debian_versions = [File.read('/etc/debian_version').strip]
1811
+ if debian_versions.first =~ /sid/
1812
+ versions = ["unstable", "sid"]
1813
+ end
1814
+ end
1815
+ # otherwise "versions" contains the result it previously had
1816
+ end
1804
1817
  return if !names
1805
1818
 
1806
1819
  names = ensure_derivatives_refer_to_their_parents(names)
@@ -1841,8 +1854,7 @@ fi
1841
1854
  return
1842
1855
  end
1843
1856
 
1844
- distributor = `lsb_release -i -s`
1845
- distributor = distributor.strip.downcase
1857
+ distributor = [`lsb_release -i -s`.strip.downcase]
1846
1858
  codename = `lsb_release -c -s`.strip.downcase
1847
1859
  version = `lsb_release -r -s`.strip.downcase
1848
1860
 
@@ -599,15 +599,22 @@ end
599
599
 
600
600
  class Autobuild::ArchiveImporter
601
601
  def snapshot(package, target_dir = nil)
602
+ result = Hash[
603
+ 'mode' => mode,
604
+ 'no_subdirectory' => !has_subdirectory?,
605
+ 'archive_dir' => archive_dir || tardir]
606
+
602
607
  if target_dir
603
608
  archive_dir = File.join(target_dir, 'archives')
604
609
  FileUtils.mkdir_p archive_dir
605
610
  FileUtils.cp @cachefile, archive_dir
606
611
 
607
- { 'url' => "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}" }
612
+ result['url'] = "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}"
608
613
  else
609
- { 'url' => @url.to_s }
614
+ result['url'] = @url.to_s
610
615
  end
616
+
617
+ result
611
618
  end
612
619
  end
613
620
 
@@ -929,6 +929,7 @@ module Autoproj
929
929
  "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
930
930
  end
931
931
  end
932
+ manifest
932
933
  end
933
934
 
934
935
  # Loads the manifests for all packages known to this project.
@@ -31,9 +31,9 @@ module Autoproj
31
31
  end
32
32
 
33
33
  def sort_versions(versions)
34
- pkg_sets, pkgs = versions.partition { |n, _| n =~ /^pkg_set:/ }
35
- pkg_sets.sort_by { |n, _| n.keys.first } +
36
- pkgs.sort_by { |n, _| n.keys.first }
34
+ pkg_sets, pkgs = versions.partition { |vcs| vcs.keys.first =~ /^pkg_set:/ }
35
+ pkg_sets.sort_by { |vcs| vcs.keys.first } +
36
+ pkgs.sort_by { |vcs| vcs.keys.first }
37
37
  end
38
38
 
39
39
  def save_versions( versions, versions_file, options = Hash.new )
@@ -214,7 +214,7 @@ module Autoproj
214
214
  # the root of the git repository
215
215
  # @param [String] the commit message
216
216
  # @return [String] the commit ID
217
- def self.create_commit(pkg, path, message)
217
+ def self.create_commit(pkg, path, message, parent_id = nil)
218
218
  importer = pkg.importer
219
219
  object_id = Tempfile.open 'autoproj-versions' do |io|
220
220
  yield(io)
@@ -247,11 +247,11 @@ module Autoproj
247
247
  FileUtils.rm_f our_index
248
248
  end
249
249
 
250
- head_id = importer.rev_parse(pkg, 'HEAD')
250
+ parent_id ||= importer.rev_parse(pkg, 'HEAD')
251
251
 
252
252
  importer.run_git_bare(
253
253
  pkg, 'commit-tree',
254
- tree_id, '-p', head_id, input_streams: [message]).first
254
+ tree_id, '-p', parent_id, input_streams: [message]).first
255
255
  end
256
256
  end
257
257
  end
@@ -1280,12 +1280,25 @@ fi
1280
1280
  Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
1281
1281
  names, versions = os_from_os_release
1282
1282
 
1283
- # Don't use the os-release information on Debian, since they
1284
- # refuse to put enough information to detect 'unstable'
1285
- # reliably. So, we use the heuristic method for it
1286
- if !names || names[0] == 'debian'
1283
+ if !names
1287
1284
  names, versions = guess_operating_system
1288
1285
  end
1286
+
1287
+ # on Debian, they refuse to put enough information to detect
1288
+ # 'unstable' reliably. So, we use the heuristic method for it
1289
+ if names[0] = "debian"
1290
+ # check if we actually got a debian with the "unstable" (sid)
1291
+ # flavour. it seems that "/etc/debian_version" does not contain
1292
+ # "sid" (but "8.0" for example) during the feature freeze
1293
+ # phase...
1294
+ if File.exists?('/etc/debian_version')
1295
+ debian_versions = [File.read('/etc/debian_version').strip]
1296
+ if debian_versions.first =~ /sid/
1297
+ versions = ["unstable", "sid"]
1298
+ end
1299
+ end
1300
+ # otherwise "versions" contains the result it previously had
1301
+ end
1289
1302
  return if !names
1290
1303
 
1291
1304
  names = ensure_derivatives_refer_to_their_parents(names)
@@ -1326,8 +1339,7 @@ fi
1326
1339
  return
1327
1340
  end
1328
1341
 
1329
- distributor = `lsb_release -i -s`
1330
- distributor = distributor.strip.downcase
1342
+ distributor = [`lsb_release -i -s`.strip.downcase]
1331
1343
  codename = `lsb_release -c -s`.strip.downcase
1332
1344
  version = `lsb_release -r -s`.strip.downcase
1333
1345
 
@@ -1,3 +1,3 @@
1
1
  module Autoproj
2
- VERSION = "1.13.0.b3"
2
+ VERSION = "1.13.0.b4"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: autoproj
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.13.0.b3
4
+ version: 1.13.0.b4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rock Core Developers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-11 00:00:00.000000000 Z
11
+ date: 2015-03-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: autobuild
@@ -250,4 +250,11 @@ rubygems_version: 2.2.2
250
250
  signing_key:
251
251
  specification_version: 4
252
252
  summary: Easy installation and management of sets of software packages
253
- test_files: []
253
+ test_files:
254
+ - test/package_managers/test_apt_dpkg_manager.rb
255
+ - test/package_managers/test_gem.rb
256
+ - test/package_managers/test_pip.rb
257
+ - test/test_manifest.rb
258
+ - test/test_os_dependencies.rb
259
+ - test/test_package_manifest.rb
260
+ - test/ops/test_configuration.rb