autoproj 1.13.0.b2 → 1.13.0.b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ffd7e81680cb3d5a08ab5d94dcf9f100578562
-  data.tar.gz: 438bede94ddd5131c96796007dc6345e12643680
+  metadata.gz: 267a53a915d1942b6ed2c047f9e01b0de00b5b86
+  data.tar.gz: d3ebff740a4501a34c37bdb0ee76ae3eecfeb9e5
 SHA512:
-  metadata.gz: 62c3b97119253f82520d93534a1c0335c0f6edff6912b2da539c143e1115bf82c69d0f82e19c74993c9cb8f07b2431441e8bb05bad8f448cb679282d9e87e2d7
-  data.tar.gz: a237838820c63fa498cfa8ea493143221920b313bf6001183c68c8219709eefec29cc0b8abfede7ea46c7fc9a711806614a02109d5abbff56779a4134a54ec07
+  metadata.gz: c18c79c0311a77c735bb21a70349c83f9a5bc77cd3b9dd38535dcc1530368cc30262448cce83d052db1827a63b16ade2f7d7ec3ed907c3b59ed889c5bd5393cb
+  data.tar.gz: 86d8c54ae3c7ff1158c5d8cdf93fa30fd40799417b556b09df76e9c56d6e71f32193f8b7483864ad3177cc94127058db637b71ffe1073230a026413690afe9f7

data/Rakefile

@@ -18,7 +18,7 @@ Utilrb::Rake.hoe do
             license 'BSD'
 
             extra_deps << 
-                ['autobuild', '>= 1.9.0.b1', '< 2.0.0'] <<
+                ['autobuild',   '>= 1.9.0.b1', '< 2.0.0'] <<
                 ['utilrb', '>= 1.6.0'] <<
                 ['highline', '>= 1.5.0']
         end

data/bin/autoproj-bootstrap

@@ -7,7 +7,10 @@ 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.root_dir = root_dir
+Autoproj.manifest = Autoproj::Manifest.new
 Ops::Tools.load_autoprojrc
+Autoproj.prepare_environment
 
 # Check if the .autoprojrc changed the PATH and therefore which autoproj script
 # should be executed ... and restart if it did

data/bin/autoproj_bootstrap

@@ -5,17 +5,6 @@ if RUBY_VERSION < "1.9.2"
     exit 1
 end
 
-if defined? Encoding # This is a 1.9-only thing
-    Encoding.default_internal = Encoding::UTF_8
-    Encoding.default_external = Encoding::UTF_8
-end
-
-if ENV['AUTOPROJ_CURRENT_ROOT'] && ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd
-    STDERR.puts "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
-    STDERR.puts "start a new shell and try to bootstrap again"
-    exit 1
-end
-
 require 'rbconfig'
 module Autobuild
     @windows = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
@@ -29,38 +18,6 @@ module Autobuild
     end
 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'
-
-gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, '.gems')
-gem_path = ([gem_home] + Gem.default_path).join(":")
-Gem.paths = Hash['GEM_HOME' => gem_home, 'GEM_PATH' => gem_path]
-
-ENV['GEM_HOME'] = gem_home
-ENV['GEM_PATH'] = gem_path
-ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
-
 require 'yaml'
 require 'set'
 
@@ -1113,16 +1070,7 @@ fi
                 # Now, reset the directories in our own RubyGems instance
                 Gem.paths = ENV
 
-                # If there is a cache directory, make sure .gems/cache points to
-                # it (there are no programmatic ways to override this)
-                if cache = cache_dir
-                    gem_cache_dir = File.join(gem_home, 'cache')
-                    if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
-                        FileUtils.mkdir_p gem_home
-                        FileUtils.rm_rf gem_cache_dir
-                        Autoproj.create_symlink(cache, gem_cache_dir)
-                    end
-                end
+                use_cache_dir
             end
 
             # A global cache directory that should be used to avoid
@@ -1135,6 +1083,19 @@ fi
                 end
             end
 
+            def self.use_cache_dir
+                # If there is a cache directory, make sure .gems/cache points to
+                # it (there are no programmatic ways to override this)
+                if cache = cache_dir
+                    gem_cache_dir = File.join(gem_home, 'cache')
+                    if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
+                        FileUtils.mkdir_p gem_home
+                        FileUtils.rm_rf gem_cache_dir
+                        Autoproj.create_symlink(cache, gem_cache_dir)
+                    end
+                end
+            end
+
             # Return the directory in which RubyGems package should be installed
             def self.gem_home
                 ENV['AUTOPROJ_GEM_HOME'] || File.join(Autoproj.root_dir, ".gems")
@@ -2871,14 +2832,6 @@ end
 
 
 
-# Override Autoproj.root_dir
-module Autoproj
-    def self.root_dir
-        @root_dir
-    end
-    @root_dir = Dir.pwd
-end
-
 DEFS = <<EODEFS
 ---
 none: ignore
@@ -3070,6 +3023,65 @@ sudo:
 
 EODEFS
 
+# Override Autoproj.root_dir
+module Autoproj
+    def self.root_dir
+        @root_dir
+    end
+    @root_dir = Dir.pwd
+end
+
+if File.directory?(File.join(Autoproj.root_dir, 'autoproj'))
+    STDERR.puts "there is already an autoproj/ directory here, cannot bootstrap"
+    STDERR.puts "Either delete it and attempt bootstrapping again, or source env.sh"
+    STDERR.puts "and use the usual autoproj workflow"
+    exit 1
+end
+
+if defined? Encoding # This is a 1.9-only thing
+    Encoding.default_internal = Encoding::UTF_8
+    Encoding.default_external = Encoding::UTF_8
+end
+
+if ENV['AUTOPROJ_CURRENT_ROOT'] && ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd
+    STDERR.puts "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
+    STDERR.puts "start a new shell and try to bootstrap again"
+    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'
+
+gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, '.gems')
+gem_path = ([gem_home] + Gem.default_path).join(":")
+Gem.paths = Hash['GEM_HOME' => gem_home, 'GEM_PATH' => gem_path]
+
+ENV['GEM_HOME'] = gem_home
+ENV['GEM_PATH'] = gem_path
+ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
+
+
 Autoproj::OSDependencies.define_osdeps_mode_option
 osdeps_mode = Autoproj::OSDependencies.osdeps_mode.join(",")
 ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
@@ -3088,6 +3100,7 @@ osdeps_management =
         Autoproj::OSDependencies.new(YAML.load(DEFS))
     end
 osdeps_management.silent = false
+Autoproj::PackageManagers::GemManager.use_cache_dir
 
 begin
     STDERR.puts "autoproj: installing a proper Ruby environment (this can take a long time)"

data/bin/autoproj_bootstrap.in

@@ -5,17 +5,6 @@ if RUBY_VERSION < "1.9.2"
     exit 1
 end
 
-if defined? Encoding # This is a 1.9-only thing
-    Encoding.default_internal = Encoding::UTF_8
-    Encoding.default_external = Encoding::UTF_8
-end
-
-if ENV['AUTOPROJ_CURRENT_ROOT'] && ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd
-    STDERR.puts "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
-    STDERR.puts "start a new shell and try to bootstrap again"
-    exit 1
-end
-
 require 'rbconfig'
 module Autobuild
     @windows = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
@@ -29,38 +18,6 @@ module Autobuild
     end
 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'
-
-gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, '.gems')
-gem_path = ([gem_home] + Gem.default_path).join(":")
-Gem.paths = Hash['GEM_HOME' => gem_home, 'GEM_PATH' => gem_path]
-
-ENV['GEM_HOME'] = gem_home
-ENV['GEM_PATH'] = gem_path
-ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
-
 require 'yaml'
 require 'set'
 
@@ -140,6 +97,10 @@ TOOLS_CODE
 OPTIONS_CODE
 SYSTEM_CODE
 
+DEFS = <<EODEFS
+OSDEPS_DEFAULTS
+EODEFS
+
 # Override Autoproj.root_dir
 module Autoproj
     def self.root_dir
@@ -148,9 +109,56 @@ module Autoproj
     @root_dir = Dir.pwd
 end
 
-DEFS = <<EODEFS
-OSDEPS_DEFAULTS
-EODEFS
+if File.directory?(File.join(Autoproj.root_dir, 'autoproj'))
+    STDERR.puts "there is already an autoproj/ directory here, cannot bootstrap"
+    STDERR.puts "Either delete it and attempt bootstrapping again, or source env.sh"
+    STDERR.puts "and use the usual autoproj workflow"
+    exit 1
+end
+
+if defined? Encoding # This is a 1.9-only thing
+    Encoding.default_internal = Encoding::UTF_8
+    Encoding.default_external = Encoding::UTF_8
+end
+
+if ENV['AUTOPROJ_CURRENT_ROOT'] && ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd
+    STDERR.puts "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
+    STDERR.puts "start a new shell and try to bootstrap again"
+    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'
+
+gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, '.gems')
+gem_path = ([gem_home] + Gem.default_path).join(":")
+Gem.paths = Hash['GEM_HOME' => gem_home, 'GEM_PATH' => gem_path]
+
+ENV['GEM_HOME'] = gem_home
+ENV['GEM_PATH'] = gem_path
+ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
+
 
 Autoproj::OSDependencies.define_osdeps_mode_option
 osdeps_mode = Autoproj::OSDependencies.osdeps_mode.join(",")
@@ -170,6 +178,7 @@ osdeps_management =
         Autoproj::OSDependencies.new(YAML.load(DEFS))
     end
 osdeps_management.silent = false
+Autoproj::PackageManagers::GemManager.use_cache_dir
 
 begin
     STDERR.puts "autoproj: installing a proper Ruby environment (this can take a long time)"

data/lib/autoproj/gitorious.rb

@@ -25,35 +25,51 @@ module Autoproj
             :http_url => "https://git.#{base_url}",
             :ssh_url  => "git@#{base_url}:",
             :fallback_to_http => true,
-            :default => 'git,ssh'
-
-        gitorious_long_doc = [
-            "How should I interact with #{base_url} (git, http or ssh)",
-            "If you give two values, comma-separated, the first one will be",
-            "used for pulling and the second one for pushing"]
+            :default => 'http,ssh',
+            :disabled_methods => []
+            
+        disabled_methods = Array(options[:disabled_methods])
 
         access_methods = Hash[
             'git' => 'git,ssh',
             'ssh' => 'ssh,ssh',
             'http' => 'http,http']
 
-        configuration_option name, 'string',
-            :default => options[:default],
-            :doc => gitorious_long_doc do |value|
-                if value =~ /,/
-                    value.split(',').each do |method|
-                        if !access_methods.has_key?(method)
-                            raise Autoproj::InputError, "#{method} is not a known access method"
-                        end
+        gitorious_long_doc = [
+            "How should I interact with #{base_url} (#{(access_methods.keys - disabled_methods).sort.join(", ")})",
+            "If you give two values, comma-separated, the first one will be",
+            "used for pulling and the second one for pushing"]
+
+        validator = lambda do |value|
+            if value =~ /,/
+                value.split(',').each do |method|
+                    if !access_methods.has_key?(method)
+                        raise Autoproj::InputError, "#{method} is not a known access method"
+                    elsif disabled_methods.include?(method)
+                        raise Autoproj::InputError, "#{method} is disabled on #{base_url}"
                     end
-                elsif !access_methods.has_key?(value)
-                    raise Autoproj::InputError, "#{value} is not a known access method"
                 end
-
-                value
+            elsif !access_methods.has_key?(value)
+                raise Autoproj::InputError, "#{value} is not a known access method"
+            elsif disabled_methods.include?(value)
+                raise Autoproj::InputError, "#{method} is disabled on #{base_url}"
             end
 
-        access_mode = Autoproj.user_config(name)
+            value
+        end
+
+        configuration_option name, 'string',
+            :default => options[:default],
+            :doc => gitorious_long_doc, &validator
+
+        access_mode = Autoproj.config.get(name)
+        begin
+            validator[access_mode]
+        rescue Autoproj::InputError => e
+            Autoproj.warn e.message
+            Autoproj.config.reset(name)
+            access_mode = Autoproj.config.get(name)
+        end
         access_mode = access_methods[access_mode] || access_mode
         pull, push = access_mode.split(',')
         [[pull, "_ROOT"], [push, "_PUSH_ROOT"]].each do |method, var_suffix|
@@ -82,6 +98,6 @@ module Autoproj
     end
 end
 
-Autoproj.gitorious_server_configuration('GITORIOUS', 'gitorious.org')
+Autoproj.gitorious_server_configuration('GITORIOUS', 'gitorious.org', :default => 'http,ssh', :disabled_methods => 'git')
 Autoproj.gitorious_server_configuration('GITHUB', 'github.com', :http_url => 'https://github.com', :default => 'http,ssh')
 

data/lib/autoproj/osdeps.rb

@@ -555,16 +555,7 @@ fi
                 # Now, reset the directories in our own RubyGems instance
                 Gem.paths = ENV
 
-                # If there is a cache directory, make sure .gems/cache points to
-                # it (there are no programmatic ways to override this)
-                if cache = cache_dir
-                    gem_cache_dir = File.join(gem_home, 'cache')
-                    if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
-                        FileUtils.mkdir_p gem_home
-                        FileUtils.rm_rf gem_cache_dir
-                        Autoproj.create_symlink(cache, gem_cache_dir)
-                    end
-                end
+                use_cache_dir
             end
 
             # A global cache directory that should be used to avoid
@@ -577,6 +568,19 @@ fi
                 end
             end
 
+            def self.use_cache_dir
+                # If there is a cache directory, make sure .gems/cache points to
+                # it (there are no programmatic ways to override this)
+                if cache = cache_dir
+                    gem_cache_dir = File.join(gem_home, 'cache')
+                    if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
+                        FileUtils.mkdir_p gem_home
+                        FileUtils.rm_rf gem_cache_dir
+                        Autoproj.create_symlink(cache, gem_cache_dir)
+                    end
+                end
+            end
+
             # Return the directory in which RubyGems package should be installed
             def self.gem_home
                 ENV['AUTOPROJ_GEM_HOME'] || File.join(Autoproj.root_dir, ".gems")

data/lib/autoproj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.0.b2
+  version: 1.13.0.b3
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -250,11 +250,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages
-test_files:
-- test/package_managers/test_apt_dpkg_manager.rb
-- test/package_managers/test_gem.rb
-- test/package_managers/test_pip.rb
-- test/test_manifest.rb
-- test/test_os_dependencies.rb
-- test/test_package_manifest.rb
-- test/ops/test_configuration.rb
+test_files: []