autoproj 1.12.6 → 1.13.0.b1

data/bin/autoproj_bootstrap.in

@@ -180,7 +180,7 @@ rescue Autoproj::ConfigError => e
 end
 
 # Now try to find out the name of the gem binary
-PACKAGES      = []
+PACKAGES      = ['build-essential', 'sudo']
 
 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
@@ -213,7 +213,6 @@ if ARGV.first != "localdev"
         ARGV.shift
     end
     begin
-        osdeps_management.install(['build-essential'])
         osdeps_management.install(['autobuild'])
         osdeps_management.install(['autoproj'])
     rescue Autoproj::ConfigError => e

data/lib/autoproj.rb

@@ -17,6 +17,8 @@ require 'autoproj/system'
 require 'autoproj/build_option'
 require 'autoproj/configuration'
 require 'autoproj/options'
+# Required for auto-saving in import_packages
+require 'autoproj/ops/snapshot'
 require 'autoproj/cmdline'
 require 'autoproj/query'
 

data/lib/autoproj/autobuild.rb

@@ -222,14 +222,14 @@ module Autoproj
     class Reporter < Autobuild::Reporter
         def error(error)
             error_lines = error.to_s.split("\n")
-            Autoproj.message("Build failed", :bold, :red)
-            Autoproj.message("#{error_lines.shift}", :bold, :red)
+            Autoproj.message("Command failed", :bold, :red, STDERR)
+            Autoproj.message("#{error_lines.shift}", :bold, :red, STDERR)
             error_lines.each do |line|
-                Autoproj.message line
+                Autoproj.message line, STDERR
             end
         end
         def success
-            Autoproj.message("Build finished successfully at #{Time.now}", :bold, :green)
+            Autoproj.message("Command finished successfully at #{Time.now}", :bold, :green)
             if Autobuild.post_success_message
                 Autoproj.message Autobuild.post_success_message
             end
@@ -405,8 +405,8 @@ end
 def cmake_package(options, &block)
     package_common(:cmake, options) do |pkg|
         pkg.depends_on 'cmake'
-        yield(pkg) if block_given?
         common_make_based_package_setup(pkg)
+        yield(pkg) if block_given?
     end
 end
 
@@ -422,8 +422,8 @@ end
 def autotools_package(options, &block)
     package_common(:autotools, options) do |pkg|
         pkg.depends_on 'autotools'
-        yield(pkg) if block_given?
         common_make_based_package_setup(pkg)
+        yield(pkg) if block_given?
     end
 end
 
@@ -447,8 +447,6 @@ end
 # information.
 def ruby_package(options)
     package_common(:ruby, options) do |pkg|
-        yield(pkg) if block_given?
-
         # Documentation code. Ignore if the user provided its own documentation
         # task, or disabled the documentation generation altogether by setting
         # rake_doc_task to nil
@@ -467,6 +465,8 @@ def ruby_package(options)
                 pkg.with_tests
             end
         end
+
+        yield(pkg) if block_given?
     end
 end
 
@@ -483,6 +483,7 @@ end
 # information.
 def orogen_package(options, &block)
     package_common(:orogen, options) do |pkg|
+        common_make_based_package_setup(pkg)
         yield(pkg) if block_given?
     end
 end
@@ -569,21 +570,44 @@ def user_config(key)
 end
 
 class Autobuild::Git
-    def snapshot(package, target_dir)
-        Dir.chdir(package.srcdir) do
-            head_commit   = `git rev-parse #{branch}`.chomp
-            { 'commit' => head_commit }
+    # get version information from the importer
+    def snapshot(package, target_dir = nil)
+        info = Hash.new
+        if local_branch != remote_branch
+            info['local_branch'] = local_branch
+            info['remote_branch'] = remote_branch
+        else
+            info['branch'] = branch
+        end
+
+        begin
+            tag = run_git_bare(package, 'describe', '--tags', '--exact-match', 'HEAD').first.strip
+            info.merge('tag' => tag.encode('UTF-8'), 'commit' => nil)
+        rescue Autobuild::SubcommandFailed
+            head_commit = rev_parse(package, 'HEAD')
+            info.merge('tag' => nil, 'commit' => head_commit.encode('UTF-8'))
         end
     end
 end
 
+class Autobuild::SVN
+    def snapshot(package, target_dir = nil)
+        version = svn_revision(package)
+        Hash['revision' => version]
+    end
+end
+
 class Autobuild::ArchiveImporter
-    def snapshot(package, target_dir)
-        archive_dir = File.join(target_dir, 'archives')
-        FileUtils.mkdir_p archive_dir
-        FileUtils.cp @cachefile, archive_dir
+    def snapshot(package, target_dir = nil)
+        if target_dir
+            archive_dir = File.join(target_dir, 'archives')
+            FileUtils.mkdir_p archive_dir
+            FileUtils.cp @cachefile, archive_dir
 
-        { 'url' =>  "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}" }
+            { 'url' =>  "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}" }
+        else
+            { 'url' => @url.to_s }
+        end
     end
 end
 

data/lib/autoproj/cli.rb

@@ -0,0 +1,7 @@
+module Autoproj
+    module CLI
+        class InvalidArguments < Autobuild::Exception
+        end
+    end
+end
+

data/lib/autoproj/cli/reset.rb

@@ -0,0 +1,79 @@
+require 'autoproj/cli'
+require 'autoproj/cli/versions'
+
+module Autoproj
+    module CLI
+        class Reset
+            include Ops::Tools
+
+            attr_reader :manifest
+
+            def initialize(manifest)
+                @manifest = manifest
+            end
+
+            def parse_options(args)
+                options = Hash[]
+                parser = OptionParser.new do |opt|
+                    opt.banner = ["autoproj reset COMMIT_ID", "resets the current autoproj installation to the state saved in the given commit ID"].join("\n")
+                    opt.on "--freeze", "freezes the project at the requested version" do
+                        options[:freeze] = true
+                    end
+                end
+                common_options(parser)
+                remaining = parser.parse(args)
+                if remaining.empty?
+                    puts parser
+                    raise InvalidArguments, "expected a reference (tag or log ID) as argument and got nothing"
+                elsif remaining.size > 1
+                    puts parser
+                    raise InvalidArguments, "expected only the tag name as argument"
+                end
+                return remaining.first, options
+            end
+
+            def run(ref_name, options)
+                pkg = manifest.main_package_set.create_autobuild_package
+                importer = pkg.importer
+                if !importer || !importer.kind_of?(Autobuild::Git)
+                    raise ConfigError, "cannot use autoproj reset if the main configuration is not managed by git"
+                end
+                
+                # Check if the reflog entry exists
+                begin
+                    importer.rev_parse(pkg, ref_name)
+                rescue Autobuild::PackageException
+                    raise InvalidArguments, "#{ref_name} does not exist, run autoproj log for log entries and autoproj tag without arguments for the tags"
+                end
+
+                # Checkout the version file
+                versions_file = File.join(
+                    OVERRIDES_DIR,
+                    Versions::DEFAULT_VERSIONS_FILE_BASENAME)
+                begin
+                    file_data = importer.show(pkg, ref_name, versions_file)
+                    versions_path = File.join(Autoproj.config_dir, versions_file)
+                    if File.file?(versions_path)
+                        old_versions_path = "#{versions_path}.old"
+                        FileUtils.rm_f old_versions_path
+                        FileUtils.cp versions_path, old_versions_path
+                    end
+                    FileUtils.mkdir_p File.join(Autoproj.config_dir, OVERRIDES_DIR)
+                    File.open(versions_path, 'w') do |io|
+                        io.write file_data
+                    end
+                    system("autoproj", "update", '--reset')
+
+                ensure
+                    if !options[:freeze]
+                        FileUtils.rm_f versions_path
+                        if old_versions_path
+                            FileUtils.mv old_versions_path, versions_path
+                        end
+                    end
+                end
+            end
+        end
+    end
+end
+

data/lib/autoproj/cli/snapshot.rb

@@ -0,0 +1,63 @@
+require 'autoproj'
+require 'autoproj/cli/versions'
+
+module Autoproj
+    module CLI
+        class Snapshot
+            include Ops::Tools
+
+            attr_reader :manifest
+
+            def initialize(manifest)
+                @manifest = manifest
+            end
+
+            def parse_options(args)
+                options = Hash.new
+                parser = OptionParser.new do |opt|
+                    opt.on '-k', '--keep-going', "ignore packages that can't be snapshotted (the default is to terminate with an error)" do
+                        options[:keep_going] = true
+                    end
+                end
+                common_options(parser)
+                remaining_args = parser.parse(args)
+                return remaining_args, options
+            end
+
+            def run(target_dir, options)
+                # First, copy the configuration directory to create target_dir
+                #
+                # This must be done first as the snapshot calls might copy stuff in
+                # there
+                if File.exists?(target_dir)
+                    raise ArgumentError, "#{target_dir} already exists"
+                end
+                FileUtils.cp_r Autoproj.config_dir, target_dir
+
+                begin
+                    versions = Versions.new(manifest)
+                    versions_file = File.join(
+                        target_dir,
+                        OVERRIDES_DIR,
+                        Versions::DEFAULT_VERSIONS_FILE_BASENAME)
+
+                    versions.run([],
+                                 replace: true,
+                                 package_sets: true,
+                                 keep_going: options[:keep_going],
+                                 output_file: versions_file)
+                rescue ::Exception
+                    FileUtils.rm_rf target_dir
+                    raise
+                end
+
+                # Finally, remove the remotes/ directory from the generated
+                # buildconf, it is obsolete now
+                FileUtils.rm_rf File.join(target_dir, 'remotes')
+
+                Autoproj.message "successfully created a snapshot of the current autoproj configuration in #{target_dir}"
+            end
+        end
+    end
+end
+

data/lib/autoproj/cli/tag.rb

@@ -0,0 +1,82 @@
+require 'autoproj/cli'
+require 'autoproj/cli/versions'
+module Autoproj
+    module CLI
+        class Tag
+            include Ops::Tools
+
+            attr_reader :manifest
+
+            def initialize(manifest)
+                @manifest = manifest
+            end
+
+            def parse_options(args)
+                options = Hash[package_sets: true, keep_going: false]
+                parser = OptionParser.new do |opt|
+                    opt.on '--[no-]package-sets', 'commit the package set state as well (enabled by default)' do |flag|
+                        options[:package_sets] = flag
+                    end
+                    opt.on '-k', '--keep-going', "ignore packages that can't be snapshotted (the default is to terminate with an error)" do
+                        options[:keep_going] = true
+                    end
+                    opt.on '-m MESSAGE', '--message=MESSAGE', String, "the message to use for the new commit (defaults to mentioning the tag creation)" do |message|
+                        options[:message] = message
+                    end
+                end
+                common_options(parser)
+                remaining = parser.parse(args)
+                if remaining.size > 1
+                    raise InvalidArguments, "expected only the tag name as argument"
+                end
+                return remaining.first, options
+            end
+
+            def run(tag_name, options)
+                pkg = manifest.main_package_set.create_autobuild_package
+                importer = pkg.importer
+                if !importer || !importer.kind_of?(Autobuild::Git)
+                    raise ConfigError, "cannot use autoproj tag if the main configuration is not managed by git"
+                end
+
+                versions_file = File.join(
+                    OVERRIDES_DIR,
+                    Versions::DEFAULT_VERSIONS_FILE_BASENAME)
+
+                if tag_name.nil?
+                    importer = pkg.importer
+                    all_tags = importer.run_git_bare(pkg, 'tag')
+                    all_tags.sort.each do |tag|
+                        begin importer.show(pkg, "refs/tags/#{tag}", versions_file)
+                            puts tag
+                        rescue Autobuild::PackageException
+                        end
+                    end
+                    return
+                end
+                
+                # Check if the tag already exists
+                begin
+                    importer.rev_parse(pkg, "refs/tags/#{tag_name}")
+                    raise InvalidArguments, "tag #{tag_name} already exists"
+                rescue Autobuild::PackageException
+                end
+
+                message = options[:message] ||
+                    "autoproj created tag #{tag_name}"
+                commit_id = Ops::Snapshot.create_commit(pkg, versions_file, message) do |io|
+                    versions = CLI::Versions.new(manifest)
+                    Autoproj.message "creating versions file, this may take a while"
+                    versions.run(Array.new,
+                                 package_sets: options[:package_sets],
+                                 output_file: io.path,
+                                 replace: true,
+                                 keep_going: options[:keep_going])
+                end
+
+                importer.run_git_bare(pkg, 'tag', tag_name, commit_id)
+            end
+        end
+    end
+end
+

data/lib/autoproj/cli/test.rb

@@ -0,0 +1,90 @@
+require 'autoproj/ops/tools'
+
+module Autoproj
+    module CLI
+        class Test
+            include Ops::Tools
+
+            attr_reader :manifest
+
+            def initialize(manifest)
+                @manifest = manifest
+            end
+
+            def parse_options(args)
+                Autoproj.load_config
+
+                modified_config = false
+                mode = nil
+                options = Hash.new
+                option_parser = OptionParser.new do |opt|
+                    opt.on '--enable[=PACKAGE,PACKAGE]', Array, 'enable tests for all packages or for specific packages (does not run the tests)' do |packages|
+                        if !packages
+                            Autoproj.config.utility_enable_all('test')
+                        else
+                            Autoproj.config.utility_enable_for('test', *packages)
+                        end
+                        modified_config = true
+                    end
+                    opt.on '--disable[=PACKAGE,PACKAGE]', Array, 'disable tests for all packages or for specific packages (does not run the tests)' do |packages|
+                        if !packages
+                            Autoproj.config.utility_disable_all('test')
+                        else
+                            Autoproj.config.utility_disable_for('test', *packages)
+                        end
+                        modified_config = true
+                    end
+                    opt.on '--list', 'list the test availability and enabled/disabled state information' do
+                        mode = 'list'
+                    end
+                    opt.on '--[no-]recursion', '(do not) run or list the tests of the dependencies of the packages given on the command line (the default is false)' do |flag|
+                        options[:recursive] = flag
+                    end
+                end
+
+                user_selection = option_parser.parse(ARGV)
+                if !mode && !(modified_config && user_selection.empty?)
+                    mode = 'run'
+                end
+
+                if modified_config
+                    Autoproj.save_config
+                end
+                return mode, user_selection, options
+            end
+
+            def list(user_selection, options = Hash.new)
+                resolved_selection = resolve_selection(
+                    user_selection,
+                    recursive: options[:recursive],
+                    ignore_non_imported_packages: true)
+
+                lines = Array.new
+                resolved_selection.each do |pkg_name|
+                    pkg = manifest.find_package(pkg_name).autobuild
+                    lines << [pkg.name, pkg.test_utility.enabled?, pkg.test_utility.available?]
+                end
+                lines = lines.sort_by { |name, _| name }
+                w     = lines.map { |name, _| name.length }.max
+                format = "%-#{w}s %-7s %-9s"
+                puts format % ["Package Name", "Enabled", "Available"]
+                lines.each do |name, enabled, available|
+                    puts(format % [name, (!!enabled).to_s, (!!available).to_s])
+                end
+            end
+
+            def run(user_selection, options = Hash.new)
+                packages = resolve_selection(
+                    user_selection,
+                    recursive: options[:recursive],
+                    ignore_non_imported_packages: true)
+                # This calls #prepare, which is required to run build_packages
+                packages.each do |pkg|
+                    Autobuild::Package[pkg].disable_phases('import', 'prepare', 'install')
+                end
+                Autobuild.apply(packages, "autoproj-test", ['test'])
+            end
+        end
+    end
+end
+