autoproj 1.8.2.rc5 → 1.8.2

data/Manifest.txt

@@ -2,11 +2,13 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/alocate
 bin/amake
 bin/aup
 bin/autolocate
 bin/autoproj
 bin/autoproj-clean
+bin/autoproj-create-set
 bin/autoproj-inspect
 bin/autoproj-locate
 bin/autoproj-query
@@ -23,6 +25,8 @@ lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
 lib/autoproj/query.rb
 lib/autoproj/system.rb
+lib/autoproj/templates/create-set/packages.autobuild
+lib/autoproj/templates/create-set/source.yml
 lib/autoproj/version.rb
 samples/autoproj/README.txt
 samples/autoproj/init.rb
@@ -33,7 +37,13 @@ samples/manifest.xml
 samples/osdeps.yml
 shell/autoproj_bash
 shell/autoproj_zsh
+test/data/empty_manifest.xml
+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/test_gem.rb
 test/test_debian.rb
 test/test_manifest.rb
+test/test_os_dependencies.rb
+test/test_package_manifest.rb

data/README.txt

@@ -43,7 +43,8 @@ Each package definition includes:
 * on what the package depends. This can be either another package built by
   autoproj, or an operating system package.
 
-See this page[http://rock-robotics.org/writing_manifest.html] for more information.
+See this
+page[http://www.rock-robotics.org/stable/documentation/autoproj/writing_manifest.html] for more information.
 
 
 Software packages in Autoproj
@@ -60,5 +61,5 @@ using pkg-config.
 
 To describe the package, and more importantly to setup cross-package
 dependencies, an optional manifest file can be
-added[http://rock-robotics.org/package_sets/manifest-xml.html].
+added[http://www.rock-robotics.org/stable/documentation/autoproj/advanced/manifest-xml.html].
 

data/bin/alocate

@@ -0,0 +1,2 @@
+#! /usr/bin/env ruby
+load File.expand_path('autoproj-locate', File.dirname(__FILE__))

data/bin/autoproj

@@ -99,24 +99,11 @@ EOTEXT
         end
     end
 
-    needs_update_config = false
-    selected_packages.delete_if do |name|
-        if name =~ /^#{Regexp.quote(Autoproj.config_dir + File::SEPARATOR)}/ ||
-            name =~ /^#{Regexp.quote(Autoproj.remotes_dir + File::SEPARATOR)}/
-            needs_update_config = true
-        end
-    end
-
     Dir.chdir(root_dir)
 
     # Basic initialization
     Autoproj::CmdLine.initialize
-    if needs_update_config
-        Autoproj::CmdLine.update_configuration
-        if selected_packages.empty?
-            exit 0
-        end
-    elsif selected_packages.empty?
+    if selected_packages.empty?
         Autoproj::CmdLine.update_myself
         Autoproj::CmdLine.update_configuration
     else

data/bin/autoproj-create-set

@@ -0,0 +1,86 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+pwd = Dir.pwd
+root_dir  = Autoproj::CmdLine.initialize_root_directory
+selection = Autoproj::CmdLine.initialize_and_load(ARGV)
+
+if !(new_set_path = File.expand_path(selection.shift, pwd))
+    Autoproj.message("missing package set name on the command line", :red)
+    exit 1
+end
+new_set_name = File.basename(new_set_path)
+selection = Autoproj::CmdLine.resolve_user_selection(selection)
+
+# Must re-load the package manifests, as the user selection might have triggered
+# some auto-add
+Autoproj.manifest.packages.each_value do |pkg|
+    if File.directory?(pkg.autobuild.srcdir)
+        Autoproj.manifest.load_package_manifest(pkg.autobuild.name)
+    end
+end
+
+# Extract auto-import and new package information
+new_packages, imported_packages = [], []
+selection.each do |pkg_name|
+    pkgs = Autoproj.manifest.resolve_package_name(pkg_name)
+    pkgs = pkgs.
+        map { |type, name| name if type == :package }.
+        compact
+
+    # We look only at direct dependencies. The rest is not our problem (the
+    # other package set must take care of importing / loading what's needed)
+    deps = Set.new
+    pkgs.each do |pkg_name|
+        Autobuild::Package[pkg_name].dependencies.each do |dep_name|
+            deps << dep_name
+        end
+    end
+    pkgs = pkgs.to_set | deps
+    pkgs.each do |pkg_name|
+        pkg_def = Autoproj.manifest.package(pkg_name)
+
+        if pkg_def.package_set.name == "local"
+            new_packages << pkg_def
+        else
+            imported_packages << pkg_def
+        end
+    end
+end
+
+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"
+    end
+end
+
+TEMPLATE_DIR = File.expand_path(File.join("..", "lib", "autoproj", "templates"), File.dirname(__FILE__))
+def render_template(*args)
+    binding = args.pop
+    template = File.read(File.join(TEMPLATE_DIR, *args))
+    template = ERB.new(template)
+    template.result(binding)
+end
+
+if File.exists?(new_set_path)
+    Autoproj.error("There is already a directory, file or symlink in #{new_set_path}.")
+    Autoproj.error("Delete it or move it before trying again")
+    exit 1
+end
+
+FileUtils.mkdir_p new_set_path
+autobuild = render_template("create-set", "packages.autobuild", binding)
+File.open(File.join(new_set_path, "packages.autobuild"), "w") do |io|
+    io.write autobuild
+end
+
+source_yml = render_template("create-set", "source.yml", binding)
+File.open(File.join(new_set_path, "source.yml"), "w") do |io|
+    io.write source_yml
+end
+

data/bin/autoproj_bootstrap

@@ -1395,9 +1395,14 @@ So, what do you want ? (all, ruby, os or none)
             end.compact
             return false if packages.empty?
 
-            packages.each do |handler, list|
-                handler.install(list)
-                @installed_packages |= list.to_set
+            # Install OS packages first, as the other package handlers might
+            # depend on OS packages
+            os_packages, other_packages = packages.partition { |handler, list| handler == os_package_handler }
+            [os_packages, other_packages].each do |packages|
+                packages.each do |handler, list|
+                    handler.install(list)
+                    @installed_packages |= list.to_set
+                end
             end
             true
         end

data/lib/autoproj/cmdline.rb

@@ -1298,6 +1298,10 @@ where 'mode' is one of:
             vcs_def[:url]  = VCSDefinition.to_absolute_url(url)
             options.each do |opt|
                 name, value = opt.split("=")
+                if value =~ /^\d+$/
+                    value = Integer(value)
+                end
+
                 vcs_def[name] = value
             end
 

data/lib/autoproj/manifest.rb

@@ -1973,12 +1973,14 @@ module Autoproj
                     File.file?(path)
             end
 
-            if !manifest_path
-                Autoproj.warn "#{package.name} from #{package_set.name} does not have a manifest"
-                return
-            end
+            manifest =
+                if !manifest_path
+                    Autoproj.warn "#{package.name} from #{package_set.name} does not have a manifest"
+                    PackageManifest.new(package)
+                else
+                    PackageManifest.load(package, manifest_path)
+                end
 
-            manifest = PackageManifest.load(package, manifest_path)
             pkg.autobuild.description = manifest
             package_manifests[package.name] = manifest
 
@@ -2115,6 +2117,10 @@ module Autoproj
                 @selection = Hash.new { |h, k| h[k] = Set.new }
                 @matches = Hash.new { |h, k| h[k] = Set.new }
             end
+            
+            def each(&block)
+                selection.each_key(&block)
+            end
 
             def select(sel, packages)
                 if !packages.respond_to?(:each)
@@ -2345,7 +2351,7 @@ module Autoproj
             "no documentation available for #{package.name} in its manifest.xml file"
         end
 
-        def initialize(package, doc)
+        def initialize(package, doc = REXML::Document.new)
             @package = package
             @xml = doc
         end

data/lib/autoproj/osdeps.rb

@@ -1296,9 +1296,14 @@ So, what do you want ? (all, ruby, os or none)
             end.compact
             return false if packages.empty?
 
-            packages.each do |handler, list|
-                handler.install(list)
-                @installed_packages |= list.to_set
+            # Install OS packages first, as the other package handlers might
+            # depend on OS packages
+            os_packages, other_packages = packages.partition { |handler, list| handler == os_package_handler }
+            [os_packages, other_packages].each do |packages|
+                packages.each do |handler, list|
+                    handler.install(list)
+                    @installed_packages |= list.to_set
+                end
             end
             true
         end

data/lib/autoproj/templates/create-set/packages.autobuild

@@ -0,0 +1,10 @@
+# This file tells autoproj which packages are made available by the package set,
+# and also allows to customize the configuration of the packages themselves
+#
+# See http://rock-robotics.org/documentation/autoproj/advanced/autobuild.html
+
+<%= new_packages.map do |pkg|
+    declname = pkg.autobuild.class.name.gsub(/.*::/, '').downcase
+    "#{declname}_package \"#{pkg.autobuild.name}\""
+end.join("\n") %>
+

data/lib/autoproj/templates/create-set/source.yml

@@ -0,0 +1,51 @@
+# This file gives information about the package (mainly its name) and
+# information about where to get the packages
+#
+# See http://rock-robotics.org/documentation/autoproj/advanced/creating_pkg_set.html
+name: <%= new_set_name %>
+<% def render_vcs(vcs)
+       pkg_import = []
+       pkg_import << "type: #{vcs.type}"
+       pkg_import << "url: #{vcs.url}"
+       vcs.options.each do |k, v|
+           if v.kind_of?(String)
+               pkg_import << "#{k}: \"#{v}\""
+           else
+               pkg_import << "#{k}: #{v}"
+           end
+       end
+       pkg_import
+   end
+
+   imports = imported_packages.map do |pkg|
+       pkg_import = render_vcs(pkg.package_set.vcs)
+       "  # #{pkg.package_set.name}\n  - #{pkg_import.join("\n    ")}"
+   end %>
+<% new_vcs = new_packages.map do |pkg|
+       pkg_import = []
+       if pkg.vcs
+           pkg_import = render_vcs(pkg.vcs)
+       else
+           pkg_import = ["type: git",
+                "url: git://gitorious.org/dummy_project/dummy_package.git",
+                "push_to: git@gitorious.org:dummy_project/dummy_package.git"]
+       end
+       "  - #{pkg.autobuild.name}\n    #{pkg_import.join("\n    ")}"
+   end %>
+# This section allows to make autoproj load some other package sets
+# automatically
+#
+# Example:
+#   - type: git
+#     url: git://gitorious.org/rock/package_set.git
+#
+# See http://rock-robotics.org/documentation/autoproj/advanced/cross_set_dependencies.html
+imports:
+<%= imports.join("\n") %>
+       
+
+# This section declares where the packages can be loaded from
+#
+# See http://rock-robotics.org/documentation/autoproj/advanced/importers.html
+version_control:
+<%= new_vcs.join("\n") %>

data/lib/autoproj/version.rb

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

data/test/data/empty_manifest.xml

@@ -0,0 +1,2 @@
+<project>
+</project>

data/test/data/full_manifest.xml

@@ -0,0 +1,19 @@
+<package>
+    <description brief="short_doc">
+        full_doc
+    </description>
+    <author>Author1/author1@email,Author2/author2@email</author>
+    <author>Author3</author>
+
+    <license>BSD</license>
+    <url>the_url</url>
+    <logo>the_logo</logo>
+    <depend package="dep1"/> 
+    <depend package="dep2"/>
+    <depend package="opt_dep1" optional="1"/> 
+    <depend_optional package="opt_dep2"/>
+    <rosdep name="osdep1"/>
+
+    <tags>tag1,tag2</tags>
+    <tags>tag3</tags>
+</package>

data/test/data/invalid_manifest.xml

@@ -0,0 +1,3 @@
+<package>
+    <bla
+</package>

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.rc5
-  prerelease: 6
+  version: 1.8.2
+  prerelease: 
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &6585400 !ruby/object:Gem::Requirement
+  requirement: &20293000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *6585400
+  version_requirements: *20293000
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &6584240 !ruby/object:Gem::Requirement
+  requirement: &20292240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *6584240
+  version_requirements: *20292240
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &6582160 !ruby/object:Gem::Requirement
+  requirement: &20291220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *6582160
+  version_requirements: *20291220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &6580580 !ruby/object:Gem::Requirement
+  requirement: &20289640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *6580580
+  version_requirements: *20289640
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &6578900 !ruby/object:Gem::Requirement
+  requirement: &20288800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,17 +65,19 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *6578900
+  version_requirements: *20288800
 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.
 email: rock-dev@dfki.de
 executables:
+- alocate
 - amake
 - aup
 - autolocate
 - autoproj
 - autoproj-clean
+- autoproj-create-set
 - autoproj-inspect
 - autoproj-locate
 - autoproj-query
@@ -92,11 +94,13 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/alocate
 - bin/amake
 - bin/aup
 - bin/autolocate
 - bin/autoproj
 - bin/autoproj-clean
+- bin/autoproj-create-set
 - bin/autoproj-inspect
 - bin/autoproj-locate
 - bin/autoproj-query
@@ -113,6 +117,8 @@ files:
 - lib/autoproj/osdeps.rb
 - lib/autoproj/query.rb
 - lib/autoproj/system.rb
+- lib/autoproj/templates/create-set/packages.autobuild
+- lib/autoproj/templates/create-set/source.yml
 - lib/autoproj/version.rb
 - samples/autoproj/README.txt
 - samples/autoproj/init.rb
@@ -123,13 +129,16 @@ files:
 - samples/osdeps.yml
 - shell/autoproj_bash
 - shell/autoproj_zsh
+- test/data/empty_manifest.xml
+- 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/test_gem.rb
 - test/test_debian.rb
 - test/test_manifest.rb
-- test/test_package_manifest.rb
 - test/test_os_dependencies.rb
-- test/package_managers/test_gem.rb
+- test/test_package_manifest.rb
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses: []
@@ -148,9 +157,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: autobuild
 rubygems_version: 1.8.11