autoproj 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,7 @@
+= Version 1.3.1
+ * quick-fix bootstrapping from a git repository, and the switch-config
+   command
+
 = Version 1.3.0
  * Fix limitations of using layouts. autoproj is now able to find out
    cross-layout dependencies and act accordingly.

data/bin/autoproj

@@ -268,7 +268,7 @@ def do_switch_config(*args)
     # Install the OS dependencies required for this VCS
     osdeps = Autoproj::OSDependencies.load_default
     osdeps.install([vcs.type])
-    Autoproj::Manifest.update_source(vcs, "autoproj main configuration", File.join(Dir.pwd, "autoproj"))
+    Autoproj::Manifest.update_source(vcs, "autoproj main configuration", 'autoproj_config', File.join(Dir.pwd, "autoproj"))
 
     # Now write it in the config file
     File.open(File.join(Autoproj.config_dir, "config.yml"), "a") do |io|

data/doc/guide/src/autoproj_bootstrap

@@ -86,10 +86,10 @@ module Autoproj
                 # Need to do some heuristics unfortunately
                 @operating_system =
                     if File.exists?('/etc/debian_version')
-                        codename = File.read('/etc/debian_version').chomp
+                        codename = File.read('/etc/debian_version').strip
                         ['debian', [codename]]
                     elsif File.exists?('/etc/gentoo-release')
-                        release_string = File.read('/etc/gentoo-release').chomp
+                        release_string = File.read('/etc/gentoo-release').strip
                         release_string =~ /^.*([^\s]+)$/
                             version = $1
                         ['gentoo', [version]]
@@ -109,9 +109,9 @@ module Autoproj
             return unless $?.success?
 
             distributor = `lsb_release -i -s`
-            distributor = distributor.chomp.downcase
-            codename    = `lsb_release -c -s`.chomp.downcase
-            version     = `lsb_release -r -s`.chomp.downcase
+            distributor = distributor.strip.downcase
+            codename    = `lsb_release -c -s`.strip.downcase
+            version     = `lsb_release -r -s`.strip.downcase
 
             return [distributor, [codename, version]]
         end
@@ -242,7 +242,7 @@ module Autoproj
                 end
                 Autobuild.progress "installing/updating OS dependencies: #{osdeps.join(", ")}"
                 begin
-                    Autobuild::Subprocess.run 'autoproj', 'osdeps', 'bash', './osdeps.sh'
+                    Autobuild::Subprocess.run 'autoproj', 'osdeps', '/bin/bash', File.expand_path('osdeps.sh')
                 ensure
                     FileUtils.rm_f 'osdeps.sh'
                 end
@@ -332,6 +332,10 @@ lsb_release:
     debian,ubuntu: lsb-release
     gentoo: sys-apps/lsb-release
     
+archive:
+    debian,ubuntu: [tar, unzip]
+    gentoo: [app-arch/tar, app-arch/unzip]
+
 # vim: expandtab
 
 

data/lib/autoproj/osdeps.rb

@@ -40,10 +40,10 @@ module Autoproj
                 # Need to do some heuristics unfortunately
                 @operating_system =
                     if File.exists?('/etc/debian_version')
-                        codename = File.read('/etc/debian_version').chomp
+                        codename = File.read('/etc/debian_version').strip
                         ['debian', [codename]]
                     elsif File.exists?('/etc/gentoo-release')
-                        release_string = File.read('/etc/gentoo-release').chomp
+                        release_string = File.read('/etc/gentoo-release').strip
                         release_string =~ /^.*([^\s]+)$/
                             version = $1
                         ['gentoo', [version]]
@@ -63,9 +63,9 @@ module Autoproj
             return unless $?.success?
 
             distributor = `lsb_release -i -s`
-            distributor = distributor.chomp.downcase
-            codename    = `lsb_release -c -s`.chomp.downcase
-            version     = `lsb_release -r -s`.chomp.downcase
+            distributor = distributor.strip.downcase
+            codename    = `lsb_release -c -s`.strip.downcase
+            version     = `lsb_release -r -s`.strip.downcase
 
             return [distributor, [codename, version]]
         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 +01:00
+date: 2009-12-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.3.3
     version: 
 description: |-
   What is Autoproj