autoproj 1.11.0.b2 → 1.11.0.b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c670cf6b348389cab2ef3f09609abdc52cf34d26
-  data.tar.gz: 8359d7efde856edd985fb20b04ce408ab4cb78f7
+  metadata.gz: b9bddbed5843f00a95b7b18d043b2b4b9793fbc6
+  data.tar.gz: 392659a2bb4009fde57fd5a72480193919752381
 SHA512:
-  metadata.gz: c82b58a30b359849675696ed7b53a805a4da7520a04769946275ec3c105e127d5cb1964b6dd4ea60cd448f391d41e0cedec0c30ac91c443b2117cc7b99b77eb3
-  data.tar.gz: b07ecf4b6f0b34f12516aa60eccf3c9695a63aee0c87b7ba819b309e42893020396f1a132ca42a22de2a9b8a2a6866460461c8dd43fe7c1b2ac61dcaf0a91562
+  metadata.gz: 430da15aab04ac6421ff38116ffb24b151669d632bb70e81d360117c3a36b8381fdac41a0080129d419c5d39837126636d4606659784186222b86d888f32eefc
+  data.tar.gz: 8576957180d5a637bb43949ca77fe5cd7d411699054827ba4d56e00bc9ca600fa1bf6b66b349b316189b45bbfd1eaaf2f3a2c60fb7cca666de9d791da58cfe41

data/bin/autoproj

@@ -89,16 +89,6 @@ Autoproj::CmdLine.report do
     Autoproj::CmdLine.load_configuration
     manifest = Autoproj.manifest
 
-    # Once thing left to do: handle the Autoproj.auto_update configuration
-    # parameter
-    #
-    # Namely, we must check if Autobuild.do_update has been explicitely set to
-    # true or false. If that is the case, don't do anything. Otherwise, set it
-    # to the value of Autoproj.auto_update
-    if Autobuild.do_update.nil?
-        Autobuild.do_update = Autoproj.auto_update?
-    end
-
     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 /

data/bin/autoproj-bootstrap

@@ -3,6 +3,10 @@ require 'autoproj'
 require 'autoproj/ops/main_config_switcher'
 
 root_dir = Dir.pwd
+if File.exists?(File.join(root_dir, 'autoproj', "manifest"))
+    raise ConfigError.new, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
+end
+
 Autoproj::CmdLine.report do
     switcher = Autoproj::Ops::MainConfigSwitcher.new(root_dir)
     begin
@@ -10,6 +14,7 @@ Autoproj::CmdLine.report do
         manifest = Autoproj::Manifest.load(File.join(Autoproj.config_dir, 'manifest'))
         update = Autoproj::Ops::Configuration.new(manifest, Autoproj::Ops.loader)
         update.update_configuration
+        Autoproj.save_config
 
         STDERR.puts <<EOTEXT
 
@@ -25,8 +30,8 @@ your consoles, or run the following in them:
   $ source #{root_dir}/#{Autoproj::ENV_FILENAME}
 
 #{color('To import and build the packages', :bold)}, you can now run
-  autoproj update
-  autoproj build
+  aup
+  amake
 
 The resulting software is installed in
   #{root_dir}/install

data/bin/autoproj-switch-config

@@ -18,6 +18,7 @@ Autoproj::CmdLine.report do
         manifest = Autoproj::Manifest.load(File.join(Autoproj.config_dir, 'manifest'))
         update = Autoproj::Ops::Configuration.new(manifest, Autoproj::Ops.loader)
         update.update_configuration
+        Autoproj.save_config
     end
 end
 

data/bin/autoproj_bootstrap

@@ -290,13 +290,15 @@ module Autoproj
         end
 
         # Get the value for a given option
-        def get(key)
+        def get(key, default_value = nil)
             if overrides.has_key?(key)
                 return overrides[key]
             end
 
             value, validated = config[key]
-            if value.nil? || (declared?(key) && !validated)
+            if value.nil? && !declared?(key) && !default_value.nil?
+                default_value
+            elsif value.nil? || (declared?(key) && !validated)
                 value = configure(key)
             else
                 if declared?(key) && (displayed_options[key] != value)
@@ -389,9 +391,68 @@ module Autoproj
                 io.write YAML.dump(h)
             end
         end
+
+        def each_reused_autoproj_installation
+            if has_value_for?('reused_autoproj_installations')
+                get('reused_autoproj_installations').each(&proc)
+            else [].each(&proc)
+            end
+        end
+
+        def ruby_executable
+            @ruby_executable ||= OSDependencies.autodetect_ruby_program
+        end
+
+        def validate_ruby_executable
+            if has_value_for?('ruby_executable')
+                expected = get('ruby_executable')
+                if expected != ruby_executable
+                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{ruby_executable}. This is usually caused by calling a wrong gem program (for instance, gem1.8 instead of gem1.9.1)"
+                end
+            end
+            set('ruby_executable', ruby_executable, true)
+        end
+
+        def use_prerelease?
+            use_prerelease =
+                if env_flag = ENV['AUTOPROJ_USE_PRERELEASE']
+                    env_flag == '1'
+                elsif has_value_for?('autoproj_use_prerelease')
+                    get('autoproj_use_prerelease')
+                end
+            set "autoproj_use_prerelease", (use_prerelease ? true : false), true
+            use_prerelease
+        end
+
+        def apply_autobuild_configuration
+            if has_value_for?('autobuild')
+                params = get('autobuild')
+                if params.kind_of?(Hash)
+                    params.each do |k, v|
+                        Autobuild.send("#{k}=", v)
+                    end
+                end
+            end
+        end
+
+        def apply_autoproj_prefix
+            if has_value_for?('prefix')
+                Autoproj.prefix = get('prefix')
+            else Autoproj.prefix = 'install'
+            end
+        end
+
+        def randomize_layout?
+            get('randomize_layout', false)
+        end
+
+        def randomize_layout=(value)
+            set('randomize_layout', value, true)
+        end
     end
 end
 
+
 module Autoproj
     def self.config
         @config ||= Configuration.new

data/lib/autoproj/cmdline.rb

@@ -43,21 +43,15 @@ module Autoproj
     end
 
     module CmdLine
-        class << self
-            attr_reader :ruby_executable
+        def self.config
+            Autoproj.config
         end
 
-        def self.handle_ruby_version
-            @ruby_executable = Autoproj::OSDependencies.autodetect_ruby_program
-
-            if Autoproj.has_config_key?('ruby_executable')
-                expected = Autoproj.user_config('ruby_executable')
-                if expected != ruby_executable
-                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{ruby_executable}. This is usually caused by calling a wrong gem program (for instance, gem1.8 instead of gem1.9.1)"
-                end
-            end
-            Autoproj.change_option('ruby_executable', ruby_executable, true)
+        def self.ruby_executable
+            Autoproj.config.ruby_executable
+        end
 
+        def self.install_ruby_shims
             install_suffix = ""
             if match = /ruby(.*)$/.match(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
                 install_suffix = match[1]
@@ -110,60 +104,32 @@ module Autoproj
             Autoproj.loaded_autobuild_files.clear
             Autoproj.load_config
 
-            handle_ruby_version
+            config.validate_ruby_executable
+            install_ruby_shims
 
-            if Autoproj.has_config_key?('autobuild')
-                params = Autoproj.user_config('autobuild')
-                if params.kind_of?(Hash)
-                    params.each do |k, v|
-                        Autobuild.send("#{k}=", v)
-                    end
-                end
-            end
-
-            if Autoproj.has_config_key?('prefix')
-                Autoproj.prefix = Autoproj.user_config('prefix')
-            end
+            config.apply_autobuild_configuration
+            config.apply_autoproj_prefix
 
-            if Autoproj.has_config_key?('randomize_layout')
-                @randomize_layout = Autoproj.user_config('randomize_layout')
-            end
-
-            Autoproj.manifest = Manifest.new
+            manifest = Manifest.new
+            Autoproj.manifest = manifest
             Autoproj.prepare_environment
             Autobuild.prefix  = Autoproj.build_dir
             Autobuild.srcdir  = Autoproj.root_dir
             Autobuild.logdir = File.join(Autobuild.prefix, 'log')
 
-            load_autoprojrc
+            Ops::Tools.load_autoprojrc
 
-            Autoproj.manifest.each_reused_autoproj_installation do |p|
-                Autoproj.manifest.reuse(p)
+            config.each_reused_autoproj_installation do |p|
+                manifest.reuse(p)
             end
 
             # 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")
+            Ops::Tools.load_main_initrb(manifest)
 
             manifest_path = File.join(Autoproj.config_dir, 'manifest')
-            Autoproj.manifest.load(manifest_path)
-
-            # Once thing left to do: handle the Autoproj.auto_update
-            # configuration parameter. This has to be done here as the rest of
-            # the configuration update/loading procedure rely on it.
-            #
-            # Namely, we must check if Autobuild.do_update has been explicitely
-            # set to true or false. If that is the case, don't do anything.
-            # Otherwise, set it to the value of auto_update (set in the
-            # manifest)
-            if Autobuild.do_update.nil?
-                Autobuild.do_update = manifest.auto_update?
-            end
-            if @update_os_dependencies.nil?
-                @update_os_dependencies = manifest.auto_update?
-            end
+            manifest.load(manifest_path)
 
             # Initialize the Autoproj.osdeps object by loading the default. The
             # rest is loaded later
@@ -190,23 +156,7 @@ module Autoproj
         end
 
         def self.load_autoprojrc
-            home_dir =
-                if Dir.respond_to?(:home) # 1.9 specific
-                    Dir.home
-                else ENV['HOME']
-                end
-
-            # Load the user-wide autoproj RC file
-            if home_dir
-                rcfile = File.join(home_dir, '.autoprojrc')
-                if File.file?(rcfile)
-                    begin
-                        Kernel.load rcfile
-                    rescue Interrupt
-                        raise
-                    end
-                end
-            end
+            Ops::Tools.load_autoprojrc
         end
 
         def self.update_myself(options = Hash.new)
@@ -214,7 +164,7 @@ module Autoproj
                 force: false, restart_on_update: true
             return if !options[:force] && !Autoproj::CmdLine.update_os_dependencies?
 
-            handle_ruby_version
+            Autoproj.config.validate_ruby_executable
 
             # This is a guard to avoid infinite recursion in case the user is
             # running autoproj osdeps --force
@@ -222,18 +172,10 @@ module Autoproj
                 return
             end
 
-            use_prerelease =
-                if env_flag = ENV['AUTOPROJ_USE_PRERELEASE']
-                    env_flag == '1'
-                elsif Autoproj.has_config_key?('autoproj_use_prerelease')
-                    Autoproj.user_config('autoproj_use_prerelease')
-                end
-            Autoproj.change_option "autoproj_use_prerelease", (use_prerelease ? true : false), true
-
             did_update =
                 begin
                     saved_flag = PackageManagers::GemManager.with_prerelease
-                    PackageManagers::GemManager.with_prerelease = use_prerelease
+                    PackageManagers::GemManager.with_prerelease = Autoproj.config.use_prerelease?
                     OSDependencies.load_default.install(%w{autobuild autoproj})
                 ensure
                     PackageManagers::GemManager.with_prerelease = saved_flag
@@ -326,7 +268,7 @@ module Autoproj
             pkg_name = pkg.name
 
             layout =
-                if randomize_layout?
+                if config.randomize_layout?
                     Digest::SHA256.hexdigest(pkg_name)[0, 12]
                 else manifest.whereis(pkg_name)
                 end
@@ -840,7 +782,7 @@ module Autoproj
         def self.check?; !!@check end
         def self.manifest_update?; !!@manifest_update end
         def self.only_config?; !!@only_config end
-        def self.randomize_layout?; !!@randomize_layout end
+        def self.randomize_layout?; config.randomize_layout? end
         def self.update_os_dependencies?
             # Check if the mode disables osdeps anyway ...
             if !@update_os_dependencies.nil? && !@update_os_dependencies
@@ -1070,8 +1012,7 @@ where 'mode' is one of:
                     @status_exit_code = true
                 end
                 opts.on('--randomize-layout', 'in build and full-build, generate a random layout') do
-                    @randomize_layout = true
-                    Autoproj.change_option('randomize_layout', true)
+                    config.randomize_layout = true
                 end
 
                 opts.on("--verbose", "verbose output") do

data/lib/autoproj/configuration.rb

@@ -58,13 +58,15 @@ module Autoproj
         end
 
         # Get the value for a given option
-        def get(key)
+        def get(key, default_value = nil)
             if overrides.has_key?(key)
                 return overrides[key]
             end
 
             value, validated = config[key]
-            if value.nil? || (declared?(key) && !validated)
+            if value.nil? && !declared?(key) && !default_value.nil?
+                default_value
+            elsif value.nil? || (declared?(key) && !validated)
                 value = configure(key)
             else
                 if declared?(key) && (displayed_options[key] != value)
@@ -157,5 +159,64 @@ module Autoproj
                 io.write YAML.dump(h)
             end
         end
+
+        def each_reused_autoproj_installation
+            if has_value_for?('reused_autoproj_installations')
+                get('reused_autoproj_installations').each(&proc)
+            else [].each(&proc)
+            end
+        end
+
+        def ruby_executable
+            @ruby_executable ||= OSDependencies.autodetect_ruby_program
+        end
+
+        def validate_ruby_executable
+            if has_value_for?('ruby_executable')
+                expected = get('ruby_executable')
+                if expected != ruby_executable
+                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{ruby_executable}. This is usually caused by calling a wrong gem program (for instance, gem1.8 instead of gem1.9.1)"
+                end
+            end
+            set('ruby_executable', ruby_executable, true)
+        end
+
+        def use_prerelease?
+            use_prerelease =
+                if env_flag = ENV['AUTOPROJ_USE_PRERELEASE']
+                    env_flag == '1'
+                elsif has_value_for?('autoproj_use_prerelease')
+                    get('autoproj_use_prerelease')
+                end
+            set "autoproj_use_prerelease", (use_prerelease ? true : false), true
+            use_prerelease
+        end
+
+        def apply_autobuild_configuration
+            if has_value_for?('autobuild')
+                params = get('autobuild')
+                if params.kind_of?(Hash)
+                    params.each do |k, v|
+                        Autobuild.send("#{k}=", v)
+                    end
+                end
+            end
+        end
+
+        def apply_autoproj_prefix
+            if has_value_for?('prefix')
+                Autoproj.prefix = get('prefix')
+            else Autoproj.prefix = 'install'
+            end
+        end
+
+        def randomize_layout?
+            get('randomize_layout', false)
+        end
+
+        def randomize_layout=(value)
+            set('randomize_layout', value, true)
+        end
     end
 end
+

data/lib/autoproj/manifest.rb

@@ -101,12 +101,6 @@ module Autoproj
             end
         end
 
-        # True if autoproj should run an update automatically when the user
-        # uses" build"
-        def auto_update?
-            !!data['auto_update']
-        end
-
         attr_reader :constant_definitions
 
         attr_reader :metapackages
@@ -1091,10 +1085,9 @@ module Autoproj
             result
         end
 
+        # @deprecated use Autoproj.config.each_reused_autoproj_installation
         def each_reused_autoproj_installation
-            if Autoproj.has_config_key?('reused_autoproj_installations')
-                Autoproj.user_config('reused_autoproj_installations').each(&proc)
-            end
+            Autoproj.config.each_reused_autoproj_installation(&proc)
         end
 
         def reuse(*dir)

data/lib/autoproj/ops/configuration.rb

@@ -45,6 +45,14 @@ module Autoproj
             File.join(config_dir, "remotes")
         end
 
+        # The path to the main manifest file
+        #
+        # @return [String]
+        def manifest_path
+            File.join(config_dir, 'manifest')
+        end
+
+
         # @param [Manifest] manifest
         # @param [Loader] loader
         # @option options [InstallationManifest] :update_from
@@ -278,9 +286,9 @@ module Autoproj
             # installed (i.e. that the user did not remove it)
             if manifest.vcs && !manifest.vcs.local?
                 update_main_configuration(only_local)
-                manifest_path = File.join(config_dir, 'manifest')
-                manifest.load(manifest_path)
             end
+            Tools.load_main_initrb(manifest)
+            manifest.load(manifest_path)
 
             root_pkg_set = LocalPackageSet.new(manifest)
             root_pkg_set.load_description_file

data/lib/autoproj/ops/main_config_switcher.rb

@@ -83,15 +83,12 @@ module Autoproj
                         reuse << path
                     end
                 end
+                Tools.common_options(parser)
                 args = parser.parse(args)
                 return args, reuse
             end
 
             def bootstrap(*args)
-                if File.exists?(File.join(root_dir, 'autoproj', "manifest"))
-                    raise ConfigError.new, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
-                end
-
                 check_root_dir_empty
                 args, reuse = handle_bootstrap_options(args)
                 validate_autoproj_current_root(reuse)
@@ -102,15 +99,13 @@ module Autoproj
                 Autobuild.logdir = File.join(Autobuild.prefix, 'log')
 
                 Autoproj.manifest = Manifest.new
-                load_autoprojrc
+                Tools.load_autoprojrc
                 Autoproj.prepare_environment
 
                 Autoproj::OSDependencies.define_osdeps_mode_option
                 osdeps = Autoproj::OSDependencies.load_default
-                if osdeps_forced_mode
-                    osdeps.osdeps_mode = osdeps_forced_mode
-                end
                 osdeps.osdeps_mode
+                Autoproj.osdeps = osdeps
 
                 CmdLine.update_myself :force => true, :restart_on_update => false
                 Autoproj.change_option 'reused_autoproj_installations', reuse, true

data/lib/autoproj/ops/tools.rb

@@ -47,6 +47,37 @@ module Autoproj
             raise ConfigError.new, "cannot import #{text_name}: #{e.message}", e.backtrace
         end
 
+        def load_autoprojrc
+            # Load the user-wide autoproj RC file
+            if home_dir = Dir.home
+                rcfile = File.join(home_dir, '.autoprojrc')
+                if File.file?(rcfile)
+                    Kernel.load rcfile
+                end
+            end
+        end
+
+        def load_main_initrb(manifest = Autoproj.manifest)
+            local_source = LocalPackageSet.new(manifest)
+            Autoproj.load_if_present(local_source, local_source.local_dir, "init.rb")
+        end
+
+        def common_options(parser)
+            parser.on '--verbose' do
+                Autoproj.verbose  = true
+                Autobuild.verbose = true
+                Rake.application.options.trace = false
+                Autobuild.debug = false
+            end
+
+            parser.on '--debug' do
+                Autoproj.verbose  = true
+                Autobuild.verbose = true
+                Rake.application.options.trace = true
+                Autobuild.debug = true
+            end
+        end
+
         extend Tools
     end
     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.b2"
+    VERSION = "1.11.0.b3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.b2
+  version: 1.11.0.b3
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild