autoproj 1.13.7 → 2.0.0.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9ce5749393ef4ef70b623d58c40081a5627c45
-  data.tar.gz: 531e965538bdfd19e8ae40290d2e53bcfd5031a6
+  metadata.gz: f1e302cab6677a8cb13970ecc83bd4df3b88be03
+  data.tar.gz: 5e4a7dfe45bbeab8e593c941990d30dd0c78d913
 SHA512:
-  metadata.gz: 0a834c5d645039281a09328febb4cf736d4b5a5151813752467195b36c6a15ba383352693a0df4a1443296d7e67574e2c396ceeee2f4a8697bdce8a037143d8b
-  data.tar.gz: 7f0359dbee5d7c6674e36af22d1096592aaec38640eeecc8ec6f075db14eee8482037bd5437b6370f920e30db4e5247d7a1b9831cccdaf4c0b7e1561b9edeed3
+  metadata.gz: f2238a795517a8bfa3261f8e8a2a14a1e1be30d90fbb56469cb6634520a5aed280bb1746c511fe1db7443725142d9f8a1a39a67422432977787dae61b6f02446
+  data.tar.gz: e02d859e9a811a1bd09bb1ac30e69d0c5ee3425ae28e1f704e938217b53c01bd4042d927ea54b9d24e9a3af0690c89c3d24cbc25cff5df7bff938c63bbf683d7

data/Manifest.txt

@@ -5,43 +5,43 @@ Rakefile
 bin/alocate
 bin/amake
 bin/aup
-bin/autolocate
 bin/autoproj
-bin/autoproj-bootstrap
-bin/autoproj-cache
-bin/autoproj-clean
-bin/autoproj-commit
-bin/autoproj-create-set
-bin/autoproj-doc
-bin/autoproj-envsh
-bin/autoproj-list
-bin/autoproj-locate
-bin/autoproj-log
-bin/autoproj-query
-bin/autoproj-reset
-bin/autoproj-show
-bin/autoproj-snapshot
-bin/autoproj-switch-config
-bin/autoproj-tag
-bin/autoproj-test
-bin/autoproj-versions
 bin/autoproj_bootstrap
 bin/autoproj_bootstrap.in
-bin/autoproj_stress_test
 lib/autoproj.rb
 lib/autoproj/autobuild.rb
 lib/autoproj/base.rb
 lib/autoproj/build_option.rb
 lib/autoproj/cli.rb
+lib/autoproj/cli/base.rb
+lib/autoproj/cli/bootstrap.rb
+lib/autoproj/cli/build.rb
+lib/autoproj/cli/cache.rb
+lib/autoproj/cli/clean.rb
+lib/autoproj/cli/commit.rb
+lib/autoproj/cli/doc.rb
+lib/autoproj/cli/envsh.rb
+lib/autoproj/cli/inspection_tool.rb
+lib/autoproj/cli/locate.rb
+lib/autoproj/cli/log.rb
+lib/autoproj/cli/main.rb
+lib/autoproj/cli/main_test.rb
+lib/autoproj/cli/osdeps.rb
+lib/autoproj/cli/query.rb
+lib/autoproj/cli/reconfigure.rb
 lib/autoproj/cli/reset.rb
+lib/autoproj/cli/show.rb
 lib/autoproj/cli/snapshot.rb
+lib/autoproj/cli/status.rb
+lib/autoproj/cli/switch_config.rb
 lib/autoproj/cli/tag.rb
 lib/autoproj/cli/test.rb
+lib/autoproj/cli/update.rb
 lib/autoproj/cli/versions.rb
-lib/autoproj/cmdline.rb
 lib/autoproj/configuration.rb
 lib/autoproj/default.osdeps
 lib/autoproj/environment.rb
+lib/autoproj/exceptions.rb
 lib/autoproj/gitorious.rb
 lib/autoproj/installation_manifest.rb
 lib/autoproj/manifest.rb
@@ -49,6 +49,7 @@ lib/autoproj/metapackage.rb
 lib/autoproj/ops/build.rb
 lib/autoproj/ops/cache.rb
 lib/autoproj/ops/configuration.rb
+lib/autoproj/ops/import.rb
 lib/autoproj/ops/loader.rb
 lib/autoproj/ops/main_config_switcher.rb
 lib/autoproj/ops/snapshot.rb
@@ -60,6 +61,7 @@ lib/autoproj/package_manifest.rb
 lib/autoproj/package_selection.rb
 lib/autoproj/package_set.rb
 lib/autoproj/query.rb
+lib/autoproj/reporter.rb
 lib/autoproj/system.rb
 lib/autoproj/templates/create-set/packages.autobuild
 lib/autoproj/templates/create-set/source.yml
@@ -67,6 +69,7 @@ lib/autoproj/test.rb
 lib/autoproj/variable_expansion.rb
 lib/autoproj/vcs_definition.rb
 lib/autoproj/version.rb
+lib/autoproj/workspace.rb
 samples/autoproj/README.txt
 samples/autoproj/init.rb
 samples/autoproj/manifest
@@ -88,6 +91,7 @@ test/data/test_manifest/autoproj/local_set/local.autobuild
 test/data/test_manifest/autoproj/local_set/source.yml
 test/data/test_manifest/autoproj/manifest
 test/ops/test_configuration.rb
+test/ops/test_snapshot.rb
 test/package_managers/apt-dpkg-status
 test/package_managers/apt-dpkg-status.installed-last
 test/package_managers/apt-dpkg-status.noninstalled-last
@@ -96,4 +100,6 @@ test/package_managers/test_gem.rb
 test/package_managers/test_pip.rb
 test/test_manifest.rb
 test/test_os_dependencies.rb
+test/test_package.rb
 test/test_package_manifest.rb
+test/test_vcs_definition.rb

data/Rakefile

@@ -18,9 +18,9 @@ Utilrb::Rake.hoe do
             license 'BSD'
 
             extra_deps << 
-                ['autobuild', '~> 1.9.0'] <<
-                ['utilrb', '~> 2.0.0'] <<
-                ['highline', '>= 1.5.0']
+                ['autobuild',   '~> 1.9', '>= 1.9.0'] <<
+                ['utilrb', '~> 2.0', '>= 2.0.0'] <<
+                ['highline', '~> 1.7', '>= 1.7.0']
         end
     end
 end
@@ -32,7 +32,6 @@ namespace 'dist' do
         build_option_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'build_option.rb'))
         config_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'configuration.rb'))
         osdeps_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'osdeps.rb'))
-        options_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'options.rb'))
         system_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'system.rb'))
         osdeps_defaults = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'default.osdeps'))
         require 'autobuild'
@@ -51,7 +50,7 @@ namespace 'dist' do
         osdeps_defaults = YAML.dump(osdeps)
         # Since we are using gsub to replace the content in the bootstrap file,
         # we have to quote all \
-        [osdeps_code, options_code, system_code, osdeps_defaults, tools_code].each do |text|
+        [osdeps_code, system_code, osdeps_defaults, tools_code].each do |text|
             text.gsub! /\\/, '\\\\\\\\'
         end
 
@@ -59,7 +58,6 @@ namespace 'dist' do
             gsub('BUILD_OPTION_CODE', build_option_code).
             gsub('CONFIG_CODE', config_code).
             gsub('OSDEPS_CODE', osdeps_code).
-            gsub('OPTIONS_CODE', options_code).
             gsub('SYSTEM_CODE', system_code).
             gsub('OSDEPS_DEFAULTS', osdeps_defaults).
             gsub('TOOLS_CODE', tools_code)

data/bin/alocate

@@ -1,2 +1,6 @@
 #! /usr/bin/env ruby
-load File.expand_path('autoproj-locate', File.dirname(__FILE__))
+
+require 'autoproj/cli/locate'
+Autoproj::CLI.basic_setup
+Autoproj::CLI::Main.start(['locate', *ARGV])
+

data/bin/amake

@@ -1,56 +1,6 @@
 #! /usr/bin/env ruby
 
-require 'optparse'
-
-build_all = false
-mode = "build"
-
-parser = OptionParser.new do |opt|
-    opt.banner = "amake [options] [dir_or_package]
-Runs autoproj build for the given directory or package name.
-Selects the current directory if none is given
-
-Accepts all options from autoproj build plus the following options:
-
-"
-    opt.on('--all', 'runs autoproj build without arguments (does not add the current directory)') do
-        build_all = true
-    end
-    opt.on('--force', 'runs autoproj force-build instead of autoproj build') do
-        mode = "force-build"
-    end
-    opt.on('--rebuild', 'runs autoproj force-build instead of autoproj build') do
-        mode = "rebuild"
-    end
-    opt.on('--help', 'shows this help message') do
-        puts parser
-        exit(0)
-    end
-end
-
-# Accept options that are invalid in +parser+, to pass them on to autoproj
-# itself
-options = ARGV.dup
-remaining = []
-while !options.empty?
-    begin
-        head = options.shift
-        remaining.concat(parser.parse([head]))
-    rescue OptionParser::InvalidOption
-        remaining << head
-        retry
-    end
-end
-
-# If --all is not given *and* there is no non-option argument (i.e. no directory
-# / package name), add the current directory to the command line
-if remaining.grep(/^-/).size == remaining.size && !build_all
-    remaining.push '.'
-end
-
-remaining.unshift mode
-ORIGINAL_ARGV = ARGV.dup # This is used in case autoproj needs to update itself
-ARGV.clear
-ARGV.concat(remaining)
-load File.expand_path('autoproj', File.dirname(__FILE__))
+require 'autoproj/cli/main'
+Autoproj::CLI.basic_setup
+Autoproj::CLI::Main.start(['build', '--amake', *ARGV])
 

data/bin/aup

@@ -1,52 +1,5 @@
 #! /usr/bin/env ruby
-require 'optparse'
-require 'autoproj'
-
-build_all = (Dir.pwd == Autoproj.root_dir)
-parser = OptionParser.new do |opt|
-    opt.banner = "aup [options] [dir_or_package]
-Runs autoproj update for the given directory or package name.
-Selects the current directory if none is given. Override by
-passing the --all option.
-
-Accepts all options from autoproj update plus the following options:
-
-"
-    opt.on('--all', 'runs autoproj build without arguments (does not add the current directory)') do
-        build_all = true
-    end
-    opt.on('--help', 'shows this help message') do
-        puts parser
-        exit(0)
-    end
-end
-
-# Accept options that are invalid in +parser+, to pass them on to autoproj
-# itself
-options = ARGV.dup
-remaining = []
-while !options.empty?
-    begin
-        head = options.shift
-        remaining.concat(parser.parse([head]))
-    rescue OptionParser::InvalidOption
-        remaining << head
-        retry
-    end
-end
-
-
-# If --all is not given *and* there is no non-option argument (i.e. no directory
-# / package name), add the current directory to the command line
-#
-# BUT make running 'aup' in the root directory the equivalent of aup --all
-if remaining.grep(/^-/).size == remaining.size && !build_all
-    remaining.push '.'
-end
-remaining.unshift 'update'
-
-ORIGINAL_ARGV = ARGV.dup # This is used in case autoproj needs to update itself
-ARGV.clear
-ARGV.concat(remaining)
-load File.expand_path('autoproj', File.dirname(__FILE__))
 
+require 'autoproj/cli/main'
+Autoproj::CLI.basic_setup
+Autoproj::CLI::Main.start(['update', '--aup', *ARGV])

data/bin/autoproj

@@ -1,269 +1,8 @@
 #! /usr/bin/env ruby
 
-if !defined?(ORIGINAL_ARGV)
-    ORIGINAL_ARGV = ARGV.dup
-end
-
-if RUBY_VERSION < "1.9.2"
-    STDERR.puts "autoproj requires Ruby >= 1.9.2"
-    exit 1
-end
-
 require 'autoproj'
 require 'autoproj/autobuild'
-require 'open-uri'
-require 'autoproj/cmdline'
-
-include Autoproj
-
-InputError = Autoproj::InputError
-
-def color(*args)
-    Autoproj.color(*args)
-end
-
-Encoding.default_internal = Encoding::UTF_8
-Encoding.default_external = Encoding::UTF_8
-Autoproj::OSDependencies.autodetect_ruby
-
-# Check the first element of ARGV. If a tool called autoproj-VALUE exists, just
-# pass the hand to it
-prefix = File.expand_path(__FILE__)
-if File.file?("#{prefix}-#{ARGV.first}")
-    binary = "#{prefix}-#{ARGV.shift}"
-    # RubyGems have a BIG performance problem when $LOADED_PATH starts to be
-    # big. 
-    #
-    # So, if the sub-script is Ruby-based, just load it and exit
-    if File.readlines(binary).first =~ /ruby/
-        load binary
-        exit
-    else
-        exec(binary, *ARGV)
-    end
-end
-
-# Find the autoproj root dir
-Autoproj::CmdLine.report do
-    selected_packages = Autoproj::CmdLine.parse_arguments(ARGV.dup)
-
-    # Expand directories in the selected_packages set, before we chdir to the
-    # autoproj root
-    root_dir = Autoproj.root_dir
-    selected_packages.map! do |name|
-        if File.directory?(name)
-            File.expand_path(name) + File::SEPARATOR
-        else
-            name
-        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
-        elsif (Autoproj.config_dir + File::SEPARATOR) =~ /^#{Regexp.quote(name)}/
-            needs_update_config = true
-            false
-        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?
-        Autoproj::CmdLine.update_myself
-        Autoproj::CmdLine.update_configuration
-    else
-        begin
-            old_value = Autobuild.do_update
-            Autobuild.do_update = false
-            Autoproj::CmdLine.update_configuration
-        ensure
-            Autobuild.do_update = old_value
-        end
-    end
-    Autoproj::CmdLine.load_configuration
-    manifest = Autoproj.manifest
-
-    Autoproj::CmdLine.setup_all_package_directories
-    # resolve_user_selection auto-adds packages present on disk but not listed
-    # in the manifest. However, since we have not yet loaded overrides /
-    # package blocks, it is possible that it contains excluded / ignored
-    # packages
-    #
-    # First do the resolution to get auto-add, finalize the package
-    # configuration, and then re-resolve
-    Autoproj::CmdLine.resolve_user_selection(selected_packages)
-    # Now load the rest of the configuration
-    Autoproj::CmdLine.finalize_package_setup
-    # Finally, filter out exclusions
-    resolved_selected_packages =
-        Autoproj::CmdLine.resolve_user_selection(selected_packages)
-    Autoproj::CmdLine.validate_user_selection(selected_packages, resolved_selected_packages)
-
-    if !selected_packages.empty?
-        command_line_selection = resolved_selected_packages.dup
-    else
-        command_line_selection = Array.new
-    end
-    Autoproj.manifest.explicit_selection = resolved_selected_packages
-    selected_packages = resolved_selected_packages
-
-    if other_root = Autoproj::CmdLine.update_from
-        Autobuild::Package.each do |_, pkg|
-            if pkg.importer.respond_to?(:pick_from_autoproj_root)
-                if !pkg.importer.pick_from_autoproj_root(pkg, other_root)
-                    pkg.update = false
-                end
-            else
-                pkg.update = false
-            end
-        end
-    end
-
-    # If in verbose mode, or if we only update sources, list the sources
-    if Autoproj.verbose || Autoproj::CmdLine.display_configuration?
-        Autoproj::CmdLine.display_configuration(manifest, selected_packages.packages)
-    end
-    
-    if Autoproj::CmdLine.only_config? || Autoproj::CmdLine.reconfigure?
-        exit(0)
-    end
-
-    if Autoproj::CmdLine.only_status?
-        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        result = Autoproj::CmdLine.status(all_enabled_packages)
-        if Autoproj::CmdLine.status_exit_code?
-            code = 0
-            if result.uncommitted
-                code |= 1
-            end
-            if result.local
-                code |= 2
-            end
-            if result.remote
-                code |= 4
-            end
-            exit(code)
-        else
-            exit(0)
-        end
-    elsif Autoproj::CmdLine.check?
-        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        Autoproj::CmdLine.check(all_enabled_packages)
-        exit(0)
-    elsif Autoproj::CmdLine.manifest_update?
-        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        Autoproj::CmdLine.manifest_update(all_enabled_packages)
-        exit(0)
-    elsif Autoproj::CmdLine.snapshot?
-        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        Autoproj::CmdLine.snapshot(Autoproj::CmdLine.snapshot_dir, all_enabled_packages)
-        exit(0)
-    elsif Autoproj::CmdLine.revshow_osdeps?
-        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        Autoproj::CmdLine.revshow_osdeps(all_enabled_packages)
-        exit(0)
-    elsif Autoproj::CmdLine.show_osdeps?
-        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        Autoproj::CmdLine.show_osdeps(all_enabled_packages)
-        exit(0)
-    elsif Autoproj::CmdLine.list_unused?
-        all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-        Autoproj::CmdLine.list_unused(all_enabled_packages)
-        exit(0)
-    end
-
-    STDERR.puts
-    STDERR.puts color("autoproj: importing and loading selected packages", :bold)
-
-    # Install prepackaged dependencies needed to import and build the packages.
-    # The required information is in the package sets configuration.
-    if Autoproj::CmdLine.update_os_dependencies?
-        Autoproj.osdeps.install(Autoproj.build_system_dependencies)
-    end
-
-    # Now, we actually do the import. Unfortunately, at this stage, we need to
-    # import the package and its dependencies ourselves so that we are able to
-    # build the list of packages that have actually been selected on the command
-    # line.
-    all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
-    Autoproj::CmdLine.load_all_available_package_manifests(false)
-    Autoproj::CmdLine.export_installation_manifest
-
-    if Autoproj::CmdLine.update_os_dependencies? && !all_enabled_packages.empty?
-        begin
-            update_mode = Autobuild.do_update
-            Autobuild.do_update ||= Autoproj::CmdLine.osdeps?
-            manifest.install_os_dependencies(all_enabled_packages)
-        ensure
-            Autobuild.do_update = update_mode
-        end
-    end
-
-    if all_enabled_packages.empty?
-        STDERR.puts color("autoproj: nothing to do", :bold)
-    elsif Autoproj::CmdLine.build? 
-        Autoproj.message("autoproj: building and installing packages", :bold)
-        Autoproj::CmdLine.build_packages(command_line_selection, all_enabled_packages)
-    end
-
-    if Autoproj::CmdLine.update_envsh?
-        Autoproj.export_env_sh
-        Autoproj.message "autoproj: updated #{Autoproj.root_dir}/#{Autoproj::ENV_FILENAME}", :green
-    end
-
-    if Autoproj::CmdLine.show_statistics?
-        per_phase = Hash.new
-        per_type  = Hash.new
-
-        Autoproj.message
-        Autoproj.message "statistics about the build", :bold
-
-        Autoproj.manifest.each_autobuild_package.sort_by(&:name).each do |pkg|
-            next if pkg.statistics.empty?
-
-            if per_phase.empty?
-                Autoproj.message "detailed per package"
-            end
-
-            puts "  #{pkg.name}: %.1fs" % [pkg.statistics.values.inject(&:+)]
-            pkg.statistics.each_key.sort.each do |phase|
-                per_phase[phase] ||= 0
-                per_phase[phase] += pkg.statistics[phase]
-                per_type[pkg.class] ||= Hash.new
-                per_type[pkg.class][phase] ||= 0
-                per_type[pkg.class][phase] += pkg.statistics[phase]
-                puts "    #{phase}: %.1fs" % [pkg.statistics[phase]]
-            end
-        end
-
-        if !per_type.empty?
-            Autoproj.message
-            Autoproj.message "detailed per package type"
-            per_type.each do |pkg_type, phases|
-                Autoproj.message "  #{pkg_type.name}: %.1fs" % [phases.values.inject(&:+)]
-                phases.each_key.sort.each do |phase_name|
-                    Autoproj.message "    #{phase_name}: %.1fs" % [phases[phase_name]]
-                end
-            end
-        end
-
-        if !per_phase.empty?
-            Autoproj.message
-            Autoproj.message "summary per phase"
-            per_phase.keys.sort.each do |phase_name|
-                Autoproj.message "  #{phase_name}: %.1fs" % [per_phase[phase_name]]
-            end
-        end
-    end
-end
+require 'autoproj/cli/main'
+Autoproj::CLI.basic_setup
+Autoproj::CLI::Main.start(ARGV)