autoproj 2.0.0.rc27 → 2.0.0.rc28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43ece02cf158c387946061509fabaac433aaf36
-  data.tar.gz: 81dae227e65b0f8584bfb96f4ab7c0978b5979c3
+  metadata.gz: 9ff2813bce521361e3a276e51e0216c18d8b1c00
+  data.tar.gz: 78a98d21be75cc93a22aac09620237764eb72601
 SHA512:
-  metadata.gz: 281464e3457065d796ffd7a6834ac47e107d12b2222cf08ea9c73486fd628699986dd7a577ca83da715b258d26e2648981347ed6282281d6b02f2bba268e47dc
-  data.tar.gz: 9ffa7fce1ebc1e0f38487efa4dad6c067f8b078aa1a69be0aee63a254f76db796e750def42fad371ba877b95b5ae72effa6f4ac5c2a0a3af4ca831043ad49cdf
+  metadata.gz: 413db816723732af3a77178b5cfdad3af88b68fc2444378f1202f4ce914b8370bb887067b0d7d12b0cb89d61508cfddc1a7122354441ff6562fedc033a263ab4
+  data.tar.gz: a3666e0265f2c94ef9616610bcbd78d474384360ff73c8fe56e86b3427927840b97365d3be33406d000f90ab3bc90396b35b734c9bb86935dd64b61af5bc722c

data/bin/autoproj_bootstrap

@@ -204,13 +204,13 @@ module Autoproj
                         self.private_autoproj = false
                         self.private_gems     = false
                     end
-                    opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace' do |path|
+                    opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace, or in a dedicated path' do |path|
                         self.private_bundler = path || true
                     end
-                    opt.on '--private-autoproj[=PATH]', 'install autoproj locally in the workspace' do |path|
+                    opt.on '--private-autoproj[=PATH]', 'install autoproj locally in the workspace, or in a dedicated path' do |path|
                         self.private_autoproj = path || true
                     end
-                    opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory' do |path|
+                    opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory, or in a dedicated path' do |path|
                         self.private_gems = path || true
                     end
                     opt.on '--private[=PATH]', "whether bundler, autoproj and the workspace gems should be installed locally in the workspace. This is the default, with a path of #{default_gem_path}" do |path|
@@ -224,6 +224,9 @@ module Autoproj
                     opt.on '--gemfile=PATH', String, 'use the given Gemfile to install autoproj instead of the default' do |path|
                         @gemfile = File.read(path)
                     end
+                    opt.on '--seed-config=PATH', String, 'path to a seed file that should be used to initialize the configuration' do |path|
+                        @config.merge!(YAML.load(File.read(path)))
+                    end
                     opt.on '--prefer-os-independent-packages', 'prefer OS-independent packages (such as a RubyGem) over their OS-packaged equivalent (e.g. the thor gem vs. the ruby-thor debian package)' do
                         @prefer_indep_over_os_packages = true
                     end
@@ -242,53 +245,41 @@ module Autoproj
                 autoproj_options + args
             end
 
-            def install_bundler
-                gem_program  = guess_gem_program
-                puts "Detected 'gem' to be #{gem_program}"
+            def find_bundler(gem_program)
+                result = system(
+                    env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
+                    Gem.ruby, gem_program, 'which', 'bundler/setup',
+                    out: '/dev/null')
+                return if !result
+
+                bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
+                if File.exist?(bundler_path)
+                    bundler_path
+                else
+                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
+                    nil
+                end
+            end
 
+            def install_bundler(gem_program)
                 local = ['--local'] if local?
 
                 result = system(
                     env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
-                    Gem.ruby, gem_program, 'install', '--no-document', '--no-format-executable',
+                    Gem.ruby, gem_program, 'install', '--env-shebang', '--no-document', '--no-format-executable',
                         *local,
                         "--bindir=#{File.join(bundler_gem_home, 'bin')}", 'bundler')
 
-                if result
-                    File.join(bundler_gem_home, 'bin', 'bundler')
-                else
-                    STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
+                if !result
+                    STDERR.puts "FATAL: failed to install bundler in #{bundler_gem_home}"
                     nil
                 end
-            end
-
-            def find_bundler
-                clean_env = env_for_child
-                if bundler   = find_in_clean_path('bundler', gem_bindir)
-                    return bundler
-                end
-
-                clean_path = env_for_child['PATH']
-                STDERR.puts "cannot find 'bundler' in PATH=#{clean_path}#{File::PATH_SEPARATOR}#{gem_bindir}"
-                STDERR.puts "installing it now ..."
-                bundler = install_bundler
-                if !bundler
-                    if ENV['PATH'] != clean_path
-                        STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
-                        STDERR.puts "  - if you are upgrading a v1 install, please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
-                        STDERR.puts "  - if you are running a fresh install, try again in a console where the env.sh is not loaded"
-                        exit 1
-                    else
-                        STDERR.puts "  you might want to try and install it manually first by running 'gem install bundler'"
-                        STDERR.puts "  or call this command again with --private-bundler to have it installed in the workspace"
-                        exit 1
-                    end
-                end
 
-                if File.exist?(bundler)
-                    bundler
+                bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
+                if File.exist?(bundler_path)
+                    bundler_path
                 else
-                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler}"
+                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
                     nil
                 end
             end
@@ -440,21 +431,29 @@ module Autoproj
             end
 
             def install
-                if private_bundler?
+                if ENV['BUNDLER_GEMFILE']
+                    raise "cannot run autoproj_install or autoproj_bootstrap while under a 'bundler exec' subcommand or having loaded an env.sh. Open a new console and try again"
+                end
+
+                gem_program  = guess_gem_program
+                puts "Detected 'gem' to be #{gem_program}"
+
+                if bundler = find_bundler(gem_program)
+                    puts "Detected bundler at #{bundler}"
+                else
                     puts "Installing bundler in #{bundler_gem_home}"
-                    if !(bundler = install_bundler)
+                    if !(bundler = install_bundler(gem_program))
                         exit 1
                     end
-                    env['GEM_PATH'].unshift bundler_gem_home
-                elsif bundler = find_bundler
-                    puts "Detected bundler at #{bundler}"
-                else
-                    exit 1
+                    if private_bundler?
+                        env['GEM_PATH'].unshift bundler_gem_home
+                    end
                 end
                 save_ruby_and_bundler_shims(bundler)
                 env['PATH'].unshift shim_path
                 save_gemfile
-                puts "Installing autoproj in #{dot_autoproj}"
+
+                puts "Installing autoproj#{"in #{autoproj_gem_home}" if private_autoproj?}"
                 install_autoproj(bundler)
             end
 

data/bin/autoproj_install

@@ -204,13 +204,13 @@ module Autoproj
                         self.private_autoproj = false
                         self.private_gems     = false
                     end
-                    opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace' do |path|
+                    opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace, or in a dedicated path' do |path|
                         self.private_bundler = path || true
                     end
-                    opt.on '--private-autoproj[=PATH]', 'install autoproj locally in the workspace' do |path|
+                    opt.on '--private-autoproj[=PATH]', 'install autoproj locally in the workspace, or in a dedicated path' do |path|
                         self.private_autoproj = path || true
                     end
-                    opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory' do |path|
+                    opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory, or in a dedicated path' do |path|
                         self.private_gems = path || true
                     end
                     opt.on '--private[=PATH]', "whether bundler, autoproj and the workspace gems should be installed locally in the workspace. This is the default, with a path of #{default_gem_path}" do |path|
@@ -224,6 +224,9 @@ module Autoproj
                     opt.on '--gemfile=PATH', String, 'use the given Gemfile to install autoproj instead of the default' do |path|
                         @gemfile = File.read(path)
                     end
+                    opt.on '--seed-config=PATH', String, 'path to a seed file that should be used to initialize the configuration' do |path|
+                        @config.merge!(YAML.load(File.read(path)))
+                    end
                     opt.on '--prefer-os-independent-packages', 'prefer OS-independent packages (such as a RubyGem) over their OS-packaged equivalent (e.g. the thor gem vs. the ruby-thor debian package)' do
                         @prefer_indep_over_os_packages = true
                     end
@@ -242,53 +245,41 @@ module Autoproj
                 autoproj_options + args
             end
 
-            def install_bundler
-                gem_program  = guess_gem_program
-                puts "Detected 'gem' to be #{gem_program}"
+            def find_bundler(gem_program)
+                result = system(
+                    env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
+                    Gem.ruby, gem_program, 'which', 'bundler/setup',
+                    out: '/dev/null')
+                return if !result
+
+                bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
+                if File.exist?(bundler_path)
+                    bundler_path
+                else
+                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
+                    nil
+                end
+            end
 
+            def install_bundler(gem_program)
                 local = ['--local'] if local?
 
                 result = system(
                     env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
-                    Gem.ruby, gem_program, 'install', '--no-document', '--no-format-executable',
+                    Gem.ruby, gem_program, 'install', '--env-shebang', '--no-document', '--no-format-executable',
                         *local,
                         "--bindir=#{File.join(bundler_gem_home, 'bin')}", 'bundler')
 
-                if result
-                    File.join(bundler_gem_home, 'bin', 'bundler')
-                else
-                    STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
+                if !result
+                    STDERR.puts "FATAL: failed to install bundler in #{bundler_gem_home}"
                     nil
                 end
-            end
-
-            def find_bundler
-                clean_env = env_for_child
-                if bundler   = find_in_clean_path('bundler', gem_bindir)
-                    return bundler
-                end
-
-                clean_path = env_for_child['PATH']
-                STDERR.puts "cannot find 'bundler' in PATH=#{clean_path}#{File::PATH_SEPARATOR}#{gem_bindir}"
-                STDERR.puts "installing it now ..."
-                bundler = install_bundler
-                if !bundler
-                    if ENV['PATH'] != clean_path
-                        STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
-                        STDERR.puts "  - if you are upgrading a v1 install, please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
-                        STDERR.puts "  - if you are running a fresh install, try again in a console where the env.sh is not loaded"
-                        exit 1
-                    else
-                        STDERR.puts "  you might want to try and install it manually first by running 'gem install bundler'"
-                        STDERR.puts "  or call this command again with --private-bundler to have it installed in the workspace"
-                        exit 1
-                    end
-                end
 
-                if File.exist?(bundler)
-                    bundler
+                bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
+                if File.exist?(bundler_path)
+                    bundler_path
                 else
-                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler}"
+                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
                     nil
                 end
             end
@@ -440,21 +431,29 @@ module Autoproj
             end
 
             def install
-                if private_bundler?
+                if ENV['BUNDLER_GEMFILE']
+                    raise "cannot run autoproj_install or autoproj_bootstrap while under a 'bundler exec' subcommand or having loaded an env.sh. Open a new console and try again"
+                end
+
+                gem_program  = guess_gem_program
+                puts "Detected 'gem' to be #{gem_program}"
+
+                if bundler = find_bundler(gem_program)
+                    puts "Detected bundler at #{bundler}"
+                else
                     puts "Installing bundler in #{bundler_gem_home}"
-                    if !(bundler = install_bundler)
+                    if !(bundler = install_bundler(gem_program))
                         exit 1
                     end
-                    env['GEM_PATH'].unshift bundler_gem_home
-                elsif bundler = find_bundler
-                    puts "Detected bundler at #{bundler}"
-                else
-                    exit 1
+                    if private_bundler?
+                        env['GEM_PATH'].unshift bundler_gem_home
+                    end
                 end
                 save_ruby_and_bundler_shims(bundler)
                 env['PATH'].unshift shim_path
                 save_gemfile
-                puts "Installing autoproj in #{dot_autoproj}"
+
+                puts "Installing autoproj#{"in #{autoproj_gem_home}" if private_autoproj?}"
                 install_autoproj(bundler)
             end
 

data/lib/autoproj/manifest.rb

@@ -94,6 +94,8 @@ def auto_osdeps?
         attr_reader :metapackages
 
         # The VCS object for the main configuration itself
+        #
+        # @return [VCSDefinition]
         attr_accessor :vcs
 
         # The definition of all OS packages available on this installation

data/lib/autoproj/ops/install.rb

@@ -194,13 +194,13 @@ def parse_options(args = ARGV)
                         self.private_autoproj = false
                         self.private_gems     = false
                     end
-                    opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace' do |path|
+                    opt.on '--private-bundler[=PATH]', 'install bundler locally in the workspace, or in a dedicated path' do |path|
                         self.private_bundler = path || true
                     end
-                    opt.on '--private-autoproj[=PATH]', 'install autoproj locally in the workspace' do |path|
+                    opt.on '--private-autoproj[=PATH]', 'install autoproj locally in the workspace, or in a dedicated path' do |path|
                         self.private_autoproj = path || true
                     end
-                    opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory' do |path|
+                    opt.on '--private-gems[=PATH]', 'install gems locally in the prefix directory, or in a dedicated path' do |path|
                         self.private_gems = path || true
                     end
                     opt.on '--private[=PATH]', "whether bundler, autoproj and the workspace gems should be installed locally in the workspace. This is the default, with a path of #{default_gem_path}" do |path|
@@ -214,6 +214,9 @@ def parse_options(args = ARGV)
                     opt.on '--gemfile=PATH', String, 'use the given Gemfile to install autoproj instead of the default' do |path|
                         @gemfile = File.read(path)
                     end
+                    opt.on '--seed-config=PATH', String, 'path to a seed file that should be used to initialize the configuration' do |path|
+                        @config.merge!(YAML.load(File.read(path)))
+                    end
                     opt.on '--prefer-os-independent-packages', 'prefer OS-independent packages (such as a RubyGem) over their OS-packaged equivalent (e.g. the thor gem vs. the ruby-thor debian package)' do
                         @prefer_indep_over_os_packages = true
                     end
@@ -232,10 +235,23 @@ def parse_options(args = ARGV)
                 autoproj_options + args
             end
 
-            def install_bundler
-                gem_program  = guess_gem_program
-                puts "Detected 'gem' to be #{gem_program}"
+            def find_bundler(gem_program)
+                result = system(
+                    env_for_child.merge('GEM_PATH' => "", 'GEM_HOME' => bundler_gem_home),
+                    Gem.ruby, gem_program, 'which', 'bundler/setup',
+                    out: '/dev/null')
+                return if !result
+
+                bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
+                if File.exist?(bundler_path)
+                    bundler_path
+                else
+                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
+                    nil
+                end
+            end
 
+            def install_bundler(gem_program)
                 local = ['--local'] if local?
 
                 result = system(
@@ -244,41 +260,16 @@ def install_bundler
                         *local,
                         "--bindir=#{File.join(bundler_gem_home, 'bin')}", 'bundler')
 
-                if result
-                    File.join(bundler_gem_home, 'bin', 'bundler')
-                else
-                    STDERR.puts "FATAL: failed to install bundler in #{dot_autoproj}"
+                if !result
+                    STDERR.puts "FATAL: failed to install bundler in #{bundler_gem_home}"
                     nil
                 end
-            end
-
-            def find_bundler
-                clean_env = env_for_child
-                if bundler   = find_in_clean_path('bundler', gem_bindir)
-                    return bundler
-                end
-
-                clean_path = env_for_child['PATH']
-                STDERR.puts "cannot find 'bundler' in PATH=#{clean_path}#{File::PATH_SEPARATOR}#{gem_bindir}"
-                STDERR.puts "installing it now ..."
-                bundler = install_bundler
-                if !bundler
-                    if ENV['PATH'] != clean_path
-                        STDERR.puts "  it appears that you already have some autoproj-generated env.sh loaded"
-                        STDERR.puts "  - if you are upgrading a v1 install, please contact the autoproj author at https://github.com/rock-core/autoproj/issues/new"
-                        STDERR.puts "  - if you are running a fresh install, try again in a console where the env.sh is not loaded"
-                        exit 1
-                    else
-                        STDERR.puts "  you might want to try and install it manually first by running 'gem install bundler'"
-                        STDERR.puts "  or call this command again with --private-bundler to have it installed in the workspace"
-                        exit 1
-                    end
-                end
 
-                if File.exist?(bundler)
-                    bundler
+                bundler_path = File.join(bundler_gem_home, 'bin', 'bundler')
+                if File.exist?(bundler_path)
+                    bundler_path
                 else
-                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler}"
+                    STDERR.puts "gem install bundler returned successfully, but still cannot find bundler in #{bundler_path}"
                     nil
                 end
             end
@@ -430,21 +421,29 @@ def save_ruby_and_bundler_shims(bundler_path)
             end
 
             def install
-                if private_bundler?
+                if ENV['BUNDLER_GEMFILE']
+                    raise "cannot run autoproj_install or autoproj_bootstrap while under a 'bundler exec' subcommand or having loaded an env.sh. Open a new console and try again"
+                end
+
+                gem_program  = guess_gem_program
+                puts "Detected 'gem' to be #{gem_program}"
+
+                if bundler = find_bundler(gem_program)
+                    puts "Detected bundler at #{bundler}"
+                else
                     puts "Installing bundler in #{bundler_gem_home}"
-                    if !(bundler = install_bundler)
+                    if !(bundler = install_bundler(gem_program))
                         exit 1
                     end
-                    env['GEM_PATH'].unshift bundler_gem_home
-                elsif bundler = find_bundler
-                    puts "Detected bundler at #{bundler}"
-                else
-                    exit 1
+                    if private_bundler?
+                        env['GEM_PATH'].unshift bundler_gem_home
+                    end
                 end
                 save_ruby_and_bundler_shims(bundler)
                 env['PATH'].unshift shim_path
                 save_gemfile
-                puts "Installing autoproj in #{dot_autoproj}"
+
+                puts "Installing autoproj#{"in #{autoproj_gem_home}" if private_autoproj?}"
                 install_autoproj(bundler)
             end
 

data/lib/autoproj/vcs_definition.rb

@@ -2,15 +2,35 @@ module Autoproj
     # Representation of a VCS definition contained in a source.yml file or in
     # autoproj/manifest
     class VCSDefinition
+        # The VCS type
+        #
+        # @return [Symbol]
         attr_reader :type
+
+        # The VCS URL
+        #
+        # @return [String]
         attr_reader :url
+
+        # The VCS options
+        #
+        # @return [Hash]
         attr_reader :options
 
-        # This VCSDefinition history, i.e. the list of VCSDefinition objects
-        # that led to this one by means of calls to {#update}
+        # This VCSDefinition history
+        #
+        # i.e. the list of VCSDefinition objects that led to this one by means
+        # of calls to {#update}
+        #
+        # @return [Array<VCSDefinition>]
         attr_reader :history
-        # The original spec in hash form. Set if this VCSDefinition object has
-        # been created using VCSDefinition.from_raw
+
+        # The original spec in hash form
+        #
+        # Set if this VCSDefinition object has been created using
+        # VCSDefinition.from_raw
+        #
+        # @return [nil,Hash]
         attr_reader :raw
 
         def initialize(type, url, vcs_options, options = Hash.new)
@@ -34,12 +54,16 @@ def initialize(type, url, vcs_options, options = Hash.new)
             @raw = options[:raw] || [[options[:from], to_hash]]
         end
 
+        # Whether this points to a local directory
         def local?
             @type == 'local'
         end
 
+        # Converts self to a Hash description that could be passed to {.from_raw}
+        #
+        # @return [Hash]
         def to_hash
-            Hash[:type => type, :url => url].merge(options)
+            Hash[type: type, url: url].merge(options)
         end
 
         # Update this VCS definition with new information / options and return

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc27"
+    VERSION = "2.0.0.rc28"
 end

data/lib/autoproj/workspace.rb

@@ -7,7 +7,12 @@ class Workspace < Ops::Loader
 
         attr_accessor :config
         attr_reader :env
+
+        # The installation manifest
+        #
+        # @return [Manifest]
         attr_reader :manifest
+
         attr_reader :loader
 
         def os_package_resolver; manifest.os_package_resolver end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc27
+  version: 2.0.0.rc28
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild