autoproj 1.9.7.rc20 → 1.9.7.rc21

data/bin/autoproj-create-set

@@ -5,12 +5,32 @@ require 'autoproj/cmdline'
 
 pwd = Dir.pwd
 root_dir  = Autoproj::CmdLine.initialize_root_directory
-selection = Autoproj::CmdLine.initialize_and_load(ARGV)
+Autoproj.silent do
+    Autoproj::CmdLine.initialize_and_load([])
+end
+
+parser = OptionParser.new do |opt|
+    opt.banner = ['autoproj create-set path [package package ..]',
+                  '',
+                  'Creates a new package set that includes the given packages',
+                  'Packages can be already defined in other package sets',
+                  'or (more commonly) paths to checked out packages on disk',
+                  '',
+                  'The path argument is the path where the package set should',
+                  'be created. The basename will be used as the package set name',
+                  'For instance,',
+                  '   autoproj create-set new_set/lead',
+                  'Will create a new package set definition in the new_set/lead',
+                  'directory. The new set will be named "lead"'].join("\n")
+                
+end
+user_selection = parser.parse(ARGV)
 
-if !(new_set_path = File.expand_path(selection.shift, pwd))
-    Autoproj.message("missing package set name on the command line", :red)
+if !(new_set_path = user_selection.shift)
+    Autoproj.message("missing path to the generated package set on the command line", :red)
     exit 1
 end
+new_set_path = File.expand_path(new_set_path, pwd)
 new_set_name = File.basename(new_set_path)
 selection = Autoproj::CmdLine.resolve_user_selection(user_selection)
 Autoproj::CmdLine.validate_user_selection(user_selection, selection)
@@ -55,8 +75,19 @@ puts
 puts
 new_packages.each do |pkg|
     if !pkg.vcs
-        puts "  package #{pkg.autobuild.name} has no version control information"
-        puts "  you will have to provide this in the generated source.yml file"
+        # Try to autodetect the VCS
+        srcdir = pkg.autobuild.srcdir
+        handler = [Autobuild::Git].find do |vcs_handler|
+            vcs_handler.can_handle?(srcdir)
+        end
+        if handler
+            raw_vcs = handler.vcs_definition_for(srcdir)
+            pkg.vcs = Autoproj::VCSDefinition.from_raw(raw_vcs)
+        else
+            puts "  package #{pkg.autobuild.name} has no version control information"
+            puts "  and I am not able to autodetect it."
+            puts "  you will have to provide this in the generated source.yml file"
+        end
     end
 end
 

data/bin/autoproj_bootstrap

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.8.7"
-    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+if RUBY_VERSION < "1.9.3"
+    STDERR.puts "autoproj requires Ruby >= 1.9.3"
     exit 1
 end
 
@@ -126,6 +126,7 @@ module Autobuild
 end
 
 require 'tempfile'
+require 'json'
 module Autoproj
     # Module that contains the package manager implementations for the
     # OSDependencies class
@@ -572,6 +573,7 @@ fi
                     is_installed = false
                     dpkg_status.each do |line|
                         line = line.chomp
+                        line = line.encode( "UTF-8", "binary", :invalid => :replace, :undef => :replace)
                         if line == ""
                             if is_installed
                                 current_packages.each do |pkg|
@@ -2520,7 +2522,7 @@ ruby19:
   - ruby19
   - rake
   macos-brew:
-  - ruby193
+  - gem: rake
   default: nonexistent
   opensuse: ruby19-devel
   arch: ignore
@@ -2537,6 +2539,8 @@ ruby20:
     - rubygem-rake
   opensuse: ruby20-devel
   arch: ignore
+  macos-brew:
+  - gem: rake
   default: nonexistent
 ruby21:
   debian:
@@ -2546,6 +2550,8 @@ ruby21:
   - rubygems-integration
   arch: ignore
   fedora: ruby-devel
+  macos-brew:
+  - gem: rake
   default: nonexistent
 build-essential:
   debian,ubuntu: build-essential

data/bin/autoproj_bootstrap.in

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.8.7"
-    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+if RUBY_VERSION < "1.9.3"
+    STDERR.puts "autoproj requires Ruby >= 1.9.3"
     exit 1
 end
 

data/lib/autoproj.rb

@@ -19,7 +19,6 @@ require 'autoproj/cmdline'
 require 'autoproj/query'
 require 'logger'
 require 'utilrb/logger'
-require 'json'
 
 module Autoproj
     class << self

data/lib/autoproj/default.osdeps

@@ -36,7 +36,7 @@ ruby19:
         - ruby19
         - rake
     macos-brew:
-        - ruby193
+        - gem: rake
     default: nonexistent
     opensuse: ruby19-devel
     arch: ignore # on arch, if ruby is installed then so is the supporting stuff
@@ -55,6 +55,8 @@ ruby20:
       - rubygem-rake
     opensuse: ruby20-devel
     arch: ignore # on arch, if ruby is installed then so is the supporting stuff
+    macos-brew:
+        - gem: rake
     default: nonexistent
 
 ruby21:
@@ -65,6 +67,8 @@ ruby21:
         - rubygems-integration
     arch: ignore # on arch, if ruby is installed then so is the supporting stuff
     fedora: ruby-devel
+    macos-brew:
+        - gem: rake
     default: nonexistent
 
 build-essential:

data/lib/autoproj/osdeps.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'json'
 module Autoproj
     # Module that contains the package manager implementations for the
     # OSDependencies class
@@ -445,6 +446,7 @@ fi
                     is_installed = false
                     dpkg_status.each do |line|
                         line = line.chomp
+                        line = line.encode( "UTF-8", "binary", :invalid => :replace, :undef => :replace)
                         if line == ""
                             if is_installed
                                 current_packages.each do |pkg|

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc20"
+    VERSION = "1.9.7.rc21"
 end

data/test/package_managers/test_apt_dpkg_manager.rb

@@ -11,6 +11,15 @@ class TC_OSDependencies_AptDpkgManager < Test::Unit::TestCase
         assert !mng.installed?('noninstalled-package')
     end
 
+    def test_status_file_parsing_is_robust_to_invalid_utf8
+        Tempfile.open 'osdeps_aptdpkg' do |io|
+            io.puts "Package: \x80\nStatus: installed ok install\n\nPackage: installed\nStatus: installed ok install"
+            io.flush
+            mng = Autoproj::PackageManagers::AptDpkgManager.new(io.path)
+            mng.installed?('installed')
+        end
+    end
+
     def test_status_file_parsing_last_entry_installed
         file = File.expand_path("apt-dpkg-status.installed-last", File.dirname(__FILE__))
         mng = Autoproj::PackageManagers::AptDpkgManager.new(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc20
+  version: 1.9.7.rc21
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild