autoproj 1.9.0.rc4 → 1.9.0.rc5

data/Manifest.txt

@@ -9,10 +9,13 @@ bin/autolocate
 bin/autoproj
 bin/autoproj-clean
 bin/autoproj-create-set
-bin/autoproj-inspect
+bin/autoproj-envsh
+bin/autoproj-list
 bin/autoproj-locate
 bin/autoproj-query
+bin/autoproj-show
 bin/autoproj_bootstrap
+bin/autoproj_bootstrap.in
 bin/autoproj_stress_test
 lib/autoproj.rb
 lib/autoproj/autobuild.rb
@@ -42,6 +45,10 @@ test/data/full_manifest.xml
 test/data/invalid_manifest.xml
 test/data/test_manifest/autoproj/local/local.autobuild
 test/data/test_manifest/autoproj/manifest
+test/package_managers/apt-dpkg-status
+test/package_managers/apt-dpkg-status.installed-last
+test/package_managers/apt-dpkg-status.noninstalled-last
+test/package_managers/test_apt_dpkg_manager.rb
 test/package_managers/test_gem.rb
 test/test_debian.rb
 test/test_manifest.rb

data/bin/autoproj-envsh

@@ -0,0 +1,11 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+Autoproj.silent do
+    Autoproj::CmdLine.initialize_root_directory
+    Autoproj::CmdLine.initialize_and_load(ARGV)
+end
+Autoproj.export_env_sh
+Autoproj.message "autoproj: updated #{Autoproj.root_dir}/#{Autoproj::ENV_FILENAME}", :green
+

data/bin/autoproj-list

@@ -0,0 +1,68 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+Autoproj.silent do
+    Autoproj::CmdLine.initialize_root_directory
+    Autoproj::CmdLine.initialize_and_load(ARGV)
+end
+manifest = Autoproj.manifest
+
+# Load the manifest for packages that are already present on the
+# file system
+manifest.packages.each_value do |pkg|
+    if File.directory?(pkg.autobuild.srcdir)
+        manifest.load_package_manifest(pkg.autobuild.name)
+    end
+end
+
+all_packages = Hash.new
+package_sets = manifest.each_package_set.to_a
+package_sets.each do |pkg_set|
+    pkg_set.each_package.each do |pkg|
+        all_packages[pkg.name] = [pkg, pkg_set.name]
+    end
+end
+
+metapackages = manifest.metapackages.values
+
+if package_sets.empty?
+    Autoproj.message("autoproj: no package sets defined in autoproj/manifest", :bold, :red)
+    exit(0)
+end
+
+Autoproj.message
+Autoproj.message("autoproj: package sets", :bold)
+package_sets.sort_by(&:name).each do |pkg_set|
+    next if pkg_set.empty?
+    if pkg_set.imported_from
+        Autoproj.message "  #{pkg_set.name} (imported by #{pkg_set.imported_from.name})"
+    else
+        Autoproj.message "  #{pkg_set.name} (listed in manifest)"
+    end
+end
+
+Autoproj.message
+Autoproj.message("autoproj: metapackages", :bold)
+metapackages.sort_by(&:name).each do |metap|
+    Autoproj.message "  #{metap.name}"
+end
+
+packages_not_present = []
+
+Autoproj.message
+Autoproj.message("autoproj: packages", :bold)
+all_packages.to_a.sort_by(&:first).map(&:last).each do |pkg, pkg_set|
+    if File.exists?(File.join(pkg.srcdir, "manifest.xml"))
+        manifest.load_package_manifest(pkg.name)
+        manifest.resolve_optional_dependencies
+    end
+
+    pkg_manifest = pkg.description
+    if File.directory?(pkg.srcdir)
+        Autoproj.message "  #{pkg.name}#{": #{pkg_manifest.short_documentation}" if pkg_manifest && pkg_manifest.short_documentation}"
+    else
+        Autoproj.message "  #{pkg.name}: not yet checked out", :magenta
+    end
+end

data/bin/{autoproj-inspect → autoproj-show}

@@ -51,13 +51,13 @@ packages.each do |name|
                 puts "  is directly selected by the manifest via #{selection.to_a.join(", ")}"
             end
         else
-            puts "  is not directly selected by the manifest"
+            puts " is not directly selected by the manifest"
         end
         if Autoproj.manifest.ignored?(pkg_name)
-            puts "  is ignored"
+            puts " is ignored"
         end
         if Autoproj.manifest.excluded?(pkg_name)
-            puts "  is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
+            puts " is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
         end
 
         all_reverse_dependencies = Set.new

data/bin/autoproj_bootstrap.in

@@ -0,0 +1,190 @@
+#! /usr/bin/ruby
+
+if RUBY_VERSION < "1.8.7"
+    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+    exit 1
+end
+
+require 'set'
+curdir_entries = Dir.entries('.').to_set - [".", "..", "autoproj_bootstrap", ".gems", 'env.sh'].to_set
+if !curdir_entries.empty? && ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] != '1'
+    while true
+        print "The current directory is not empty, continue bootstrapping anyway ? [yes] "
+        STDOUT.flush 
+        answer = STDIN.readline.chomp
+        if answer == "no"
+            exit
+        elsif answer == "" || answer == "yes"
+            # Set the environment variable since we might restart the
+            # autoproj_bootstrap script and -- anyway -- will run "autoproj
+            # bootstrap" later on
+            break
+        else
+            STDOUT.puts "invalid answer. Please answer 'yes' or 'no'"
+            STDOUT.flush
+        end
+    end
+end
+
+# Environment is clean, so just mark it as so unconditionally
+ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] = '1'
+
+needed_gem_home = ENV['AUTOPROJ_GEM_HOME'] || "#{Dir.pwd}/.gems"
+if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
+    if ENV['GEM_HOME'] != needed_gem_home
+        require 'rbconfig'
+        RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+
+        ENV['GEM_HOME'] = needed_gem_home
+        exec RUBY, __FILE__, *ARGV
+    end
+end
+
+
+ENV['GEM_HOME'] = needed_gem_home
+ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
+
+require 'yaml'
+require 'set'
+
+module Autoproj
+    class ConfigError < RuntimeError; end
+    class << self
+        attr_reader :verbose
+    end
+
+    def self.color(string, *args)
+        string
+    end
+
+    def self.message(str)
+        STDERR.puts "  #{str}"
+    end
+end
+
+module Autobuild
+    def self.do_update
+        true
+    end
+    def self.message(str)
+        STDERR.puts "  #{str}"
+    end
+
+    class << self
+        attr_reader :programs
+    end
+    @programs = Hash.new
+    def self.tool(name)
+        # Let the ability to set programs[name] to nil to make sure we don't use
+        # that program. This is used later on in this file to make sure we
+        # aren't using the wrong rubygems binary
+        if programs.has_key?(name)
+            programs[name]
+        else
+            name
+        end
+    end
+
+    module Subprocess
+        def self.run(name, phase, *cmd)
+            output = `#{cmd.join(" ")}`
+            if $?.exitstatus != 0
+                STDERR.puts "ERROR: failed to run #{cmd.join(" ")}"
+                STDERR.puts "ERROR: command output is: #{output}"
+                exit 1
+            end
+        end
+    end
+end
+
+OSDEPS_CODE
+OPTIONS_CODE
+SYSTEM_CODE
+
+# Override Autoproj.root_dir
+module Autoproj
+    def self.root_dir
+        @root_dir
+    end
+    @root_dir = Dir.pwd
+end
+
+DEFS = <<EODEFS
+OSDEPS_DEFAULTS
+EODEFS
+
+Autoproj::OSDependencies.define_osdeps_mode_option
+osdeps_mode = Autoproj::OSDependencies.osdeps_mode
+ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
+
+# First thing we do is install a proper ruby environment. We make sure that we
+# aren't installing any gems for now (as we need to choose the right gem
+# binary) by setting Autobuild.programs['gem'] to nil
+Autobuild.programs['gem'] = nil
+Autoproj::OSDependencies.autodetect_ruby
+
+osdeps_management = 
+    if ENV['AUTOPROJ_DEFAULT_OSDEPS']
+        Autoproj::OSDependencies.load(ENV['AUTOPROJ_DEFAULT_OSDEPS'])
+    else
+        Autoproj::OSDependencies.new(YAML.load(DEFS))
+    end
+osdeps_management.silent = false
+
+begin
+    STDERR.puts "autoproj: installing a proper Ruby environment (this can take a long time)"
+    osdeps_management.install(['ruby'])
+rescue Autoproj::ConfigError => e
+    STDERR.puts "failed: #{e.message}"
+    exit(1)
+end
+
+# Now try to find out the name of the gem binary
+PACKAGES      = %w{lsb_release}
+
+ENV['RUBYOPT']  = "-rubygems"
+require 'rubygems'
+
+STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
+# First install the dependencies of autoproj, as we don't want them to be
+# affected by the prerelease flag
+begin
+    osdeps_management.install(PACKAGES)
+rescue Autoproj::ConfigError => e
+    STDERR.puts "failed: #{e.message}"
+    exit(1)
+end
+
+File.open('env.sh', 'w') do |io|
+    io.write <<-EOSHELL
+export RUBYOPT=-rubygems
+export GEM_PATH=#{needed_gem_home}:$GEM_PATH
+export GEM_HOME=#{needed_gem_home}
+export PATH=$GEM_HOME/bin:$PATH
+    EOSHELL
+end
+
+# If the user specifies "dev" on the command line, install the prerelease
+# version of autoproj. If it is "localdev", expect him to install autoproj and
+# run autoproj bootstrap manually.
+if ARGV.first != "localdev"
+    if ARGV.first == "dev"
+        Autoproj::PackageManagers::GemManager.with_prerelease = true
+        ARGV.shift
+    end
+    begin
+        osdeps_management.install(['build-essential'])
+        osdeps_management.install(['autobuild'])
+        osdeps_management.install(['autoproj'])
+    rescue Autoproj::ConfigError => e
+        STDERR.puts "failed: #{e.message}"
+        exit(1)
+    end
+    Autoproj::PackageManagers::GemManager.with_prerelease = false
+
+    if !system('autoproj', 'bootstrap', *ARGV)
+        STDERR.puts "ERROR: failed to run autoproj bootstrap #{ARGV.join(", ")}"
+        exit 1
+    end
+end
+

data/lib/autoproj/cmdline.rb

@@ -112,10 +112,14 @@ module Autoproj
 
             Autoproj.manifest = Manifest.new
 
+            local_source = LocalPackageSet.new(Autoproj.manifest)
+
+            # Load the user-wide autoproj RC file
+            Autoproj.load_if_present(local_source, Dir.home, ".autoprojrc")
+
             # We load the local init.rb first so that the manifest loading
             # process can use options defined there for the autoproj version
             # control information (for instance)
-            local_source = LocalPackageSet.new(Autoproj.manifest)
             Autoproj.load_if_present(local_source, local_source.local_dir, "init.rb")
 
             manifest_path = File.join(Autoproj.config_dir, 'manifest')

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.0.rc4"
+    VERSION = "1.9.0.rc5"
 end

data/test/package_managers/apt-dpkg-status

@@ -0,0 +1,41 @@
+Package: noninstalled-package
+Status: bla
+Priority: optional
+Section: unknown
+Installed-Size: 17480
+Maintainer: Ruben Smits
+Architecture: amd64
+Version: 0.2.3-s1336530597~oneiric
+Depends: ros-electric-ros (= 1.6.9-s1336528271~oneiric), ros-electric-common-rosdeps (= 1.0.2-s1336530376~oneiric), build-essential, python-yaml, cmake, subversion, python-sip-dev, libc6, libeigen3-dev, libcppunit-dev, pkg-config
+Description: orocos_kinematics_dynamics
+ orocos_kinematics_dynamics
+Wg-Rosdistro: electric
+
+Package: installed-package
+Status: install ok installed
+Priority: optional
+Section: x11
+Installed-Size: 114
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: amd64
+Version: 1:12.9.0-0ubuntu0.1
+Provides: xorg-driver-input
+Depends: libc6 (>= 2.7), xorg-input-abi-16, xserver-xorg-core (>= 2:1.10.99.901), xserver-xorg-input-mouse, udev
+Description: X.Org X server -- VMMouse input driver to use with VMWare
+ This package provides the driver for the X11 vmmouse input device.
+ .
+ The VMMouse driver enables support for the special VMMouse protocol
+ that is provided by VMware virtual machines to give absolute pointer
+ positioning.
+ .
+ The vmmouse driver is capable of falling back to the standard "mouse"
+ driver if a VMware virtual machine is not detected. This allows for
+ dual-booting of an operating system from a virtual machine to real hardware
+ without having to edit xorg.conf every time.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-input-vmmouse driver module.
+Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+

data/test/package_managers/apt-dpkg-status.installed-last

@@ -0,0 +1,27 @@
+Package: installed-package
+Status: install ok installed
+Priority: optional
+Section: x11
+Installed-Size: 114
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Architecture: amd64
+Version: 1:12.9.0-0ubuntu0.1
+Provides: xorg-driver-input
+Depends: libc6 (>= 2.7), xorg-input-abi-16, xserver-xorg-core (>= 2:1.10.99.901), xserver-xorg-input-mouse, udev
+Description: X.Org X server -- VMMouse input driver to use with VMWare
+ This package provides the driver for the X11 vmmouse input device.
+ .
+ The VMMouse driver enables support for the special VMMouse protocol
+ that is provided by VMware virtual machines to give absolute pointer
+ positioning.
+ .
+ The vmmouse driver is capable of falling back to the standard "mouse"
+ driver if a VMware virtual machine is not detected. This allows for
+ dual-booting of an operating system from a virtual machine to real hardware
+ without having to edit xorg.conf every time.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ .
+ This package is built from the X.org xf86-input-vmmouse driver module.
+Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>

data/test/package_managers/apt-dpkg-status.noninstalled-last

@@ -0,0 +1,12 @@
+Package: noninstalled-package
+Status: bla
+Priority: optional
+Section: unknown
+Installed-Size: 17480
+Maintainer: Ruben Smits
+Architecture: amd64
+Version: 0.2.3-s1336530597~oneiric
+Depends: ros-electric-ros (= 1.6.9-s1336528271~oneiric), ros-electric-common-rosdeps (= 1.0.2-s1336530376~oneiric), build-essential, python-yaml, cmake, subversion, python-sip-dev, libc6, libeigen3-dev, libcppunit-dev, pkg-config
+Description: orocos_kinematics_dynamics
+ orocos_kinematics_dynamics
+Wg-Rosdistro: electric

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.0.rc4
+  version: 1.9.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &17687980 !ruby/object:Gem::Requirement
+  requirement: &22328000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *17687980
+  version_requirements: *22328000
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &17686580 !ruby/object:Gem::Requirement
+  requirement: &22327540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *17686580
+  version_requirements: *22327540
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &17685660 !ruby/object:Gem::Requirement
+  requirement: &22327080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *17685660
+  version_requirements: *22327080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17684660 !ruby/object:Gem::Requirement
+  requirement: &22326640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *17684660
+  version_requirements: *22326640
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17700960 !ruby/object:Gem::Requirement
+  requirement: &22326200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *17700960
+  version_requirements: *22326200
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.
@@ -78,10 +78,13 @@ executables:
 - autoproj
 - autoproj-clean
 - autoproj-create-set
-- autoproj-inspect
+- autoproj-envsh
+- autoproj-list
 - autoproj-locate
 - autoproj-query
+- autoproj-show
 - autoproj_bootstrap
+- autoproj_bootstrap.in
 - autoproj_stress_test
 extensions: []
 extra_rdoc_files:
@@ -101,10 +104,13 @@ files:
 - bin/autoproj
 - bin/autoproj-clean
 - bin/autoproj-create-set
-- bin/autoproj-inspect
+- bin/autoproj-envsh
+- bin/autoproj-list
 - bin/autoproj-locate
 - bin/autoproj-query
+- bin/autoproj-show
 - bin/autoproj_bootstrap
+- bin/autoproj_bootstrap.in
 - bin/autoproj_stress_test
 - lib/autoproj.rb
 - lib/autoproj/autobuild.rb
@@ -134,12 +140,15 @@ files:
 - test/data/invalid_manifest.xml
 - test/data/test_manifest/autoproj/local/local.autobuild
 - test/data/test_manifest/autoproj/manifest
+- test/package_managers/apt-dpkg-status
+- test/package_managers/apt-dpkg-status.installed-last
+- test/package_managers/apt-dpkg-status.noninstalled-last
+- test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb
 - test/test_debian.rb
 - test/test_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_package_manifest.rb
-- test/package_managers/test_apt_dpkg_manager.rb
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses: []