autoproj 1.9.7.rc11 → 1.9.7.rc12

data/Rakefile

@@ -14,6 +14,9 @@ Utilrb::Rake.hoe do
             self.email = "rock-dev@dfki.de"
 
             self.spec_extras[:required_ruby_version] = ">= 1.9.2"
+
+            license 'BSD'
+
             extra_deps << 
                 ['autobuild',   '>= 1.7.0'] <<
                 ['utilrb', '>= 1.6.0'] <<

data/bin/autoproj_bootstrap

@@ -74,6 +74,9 @@ module Autoproj
         string
     end
 
+    def self.warn(str, *args)
+        STDERR.puts "WARN #{str}"
+    end
     def self.message(str)
         STDERR.puts "  #{str}"
     end
@@ -1147,9 +1150,11 @@ fi
 
             fields = Hash.new
             File.readlines(filename).each do |line|
+                line = line.strip
                 if line.strip =~ /^(\w+)=(?:["'])?([^"']+)(?:["'])?$/
                     fields[$1] = $2
-                else Autoproj.warn "error parsing /etc/os-release, line: #{line.inspect}"
+                elsif !line.empty?
+                    Autoproj.warn "could not parse line '#{line.inspect}' in /etc/os-release"
                 end
             end
 
@@ -1787,6 +1792,14 @@ module Autobuild
             programs[name.to_sym] || programs[name.to_s] || name.to_s
         end
 
+        def find_in_path(file)
+            path = ENV['PATH'].split(File::PATH_SEPARATOR).
+                find { |dir| File.exists?(File.join(dir, file)) }
+            if path
+                return File.join(path, file)
+            end
+        end
+
         # Resolves the absolute path to a given tool
         def tool_in_path(name)
             path, path_name, path_env = programs_in_path[name]
@@ -1798,11 +1811,7 @@ module Autobuild
                     # This is already a full path
                     path = current
                 else
-                    path = ENV['PATH'].split(':').
-                        find { |dir| File.exists?(File.join(dir, current)) }
-                    if path
-                        path = File.join(path, current)
-                    end
+                    path = find_in_path(current)
                 end
 
                 if !path

data/bin/autoproj_bootstrap.in

@@ -74,6 +74,9 @@ module Autoproj
         string
     end
 
+    def self.warn(str, *args)
+        STDERR.puts "WARN #{str}"
+    end
     def self.message(str)
         STDERR.puts "  #{str}"
     end

data/lib/autoproj/osdeps.rb

@@ -1023,9 +1023,11 @@ fi
 
             fields = Hash.new
             File.readlines(filename).each do |line|
+                line = line.strip
                 if line.strip =~ /^(\w+)=(?:["'])?([^"']+)(?:["'])?$/
                     fields[$1] = $2
-                else Autoproj.warn "error parsing /etc/os-release, line: #{line.inspect}"
+                elsif !line.empty?
+                    Autoproj.warn "could not parse line '#{line.inspect}' in /etc/os-release"
                 end
             end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc11"
+    VERSION = "1.9.7.rc12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc11
+  version: 1.9.7.rc12
   prerelease: 6
 platform: ruby
 authors:
@@ -202,7 +202,7 @@ files:
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses:
-- MIT
+- BSD
 post_install_message: 
 rdoc_options:
 - --main