autoproj 2.0.0.rc6 → 2.0.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b7b5cc8969f1630e17120dd32b47332d17c005
-  data.tar.gz: 8f58b3e604cd28f113130babad1734142022f7c5
+  metadata.gz: bddd3ede1fe4f58fe3cc3c9b7e37b05a06c3c3cb
+  data.tar.gz: 300374bfb1cb43ed90200d5d19c049cf1b001a3f
 SHA512:
-  metadata.gz: e6804b7d07665ef3d29456b01c267c27f59f7c5244a7af3cf4466b8c0a8e55e61604eedf6a1af723b24c4804ec988679f3732d9a799d2a963550245636aa01a9
-  data.tar.gz: a81c7bb354134172817c912e2031400b89d687e54d3d9c9c9bc4e76b6329150d84ccf5d9f81e3d58ed085d892660c1a8f701a1bacbcae8cd80bcd172dd13c97f
+  metadata.gz: 6ec06a35be38735bf8b45ea5eb29a0e48a3dba7ea52be07b0ff32d76e3267aa2a423ad4b978f1c9aabfc1a68011a3d881cbf235342b210a69068dfec9a68bbd6
+  data.tar.gz: 327f067eac8418c5829c1ebb054eb9e06d7518f23d7626263009eff45f62d3cd1bac7353753f26e800b6467d42ea53d2236212c21b47655f7ecaa99c2b146c07

data/autoproj.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
     s.homepage = "http://rock-robotics.org"
     s.licenses = ["BSD"]
 
+    s.required_ruby_version = ">= 2.0.0"
     s.bindir = 'bin'
     s.executables = ['autoproj', 'aup', 'amake', 'alocate']
     s.require_paths = ["lib"]

data/bin/autoproj_bootstrap

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.9.2"
-    STDERR.puts "autoproj requires Ruby >= 1.9.2"
+if RUBY_VERSION < "2.0.0"
+    STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
 end
 
@@ -413,12 +413,12 @@ module Autoproj
                 clean_env = env_for_child
                 stage2_vars = clean_env.map { |k, v| "#{k}=#{v}" }
                 puts "starting the newly installed autoproj for stage2 install"
-                puts [clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
-                    'install-stage2', root_dir, *stage2_vars].inspect
-                exec clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
+                result = system clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
                     Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
                     'install-stage2', root_dir, *stage2_vars
+                if !result
+                    raise "failed to execute autoproj install-stage2"
+                end
             end
 
             def stage2(*vars)
@@ -434,9 +434,11 @@ end
 
 
 
+ENV.delete('BUNDLE_GEMFILE')
+ENV.delete('RUBYLIB')
 ops = Autoproj::Ops::Install.new(Dir.pwd)
-bootstrap_options = ops.parse_options(ARGV)
-ops.run
+ops.parse_options(ARGV)
+ops.stage1
 
 # we assume that Install#run loads bundler and autobuild. Load autoproj and run
 # bootstrap

data/bin/autoproj_bootstrap.in

@@ -1,15 +1,17 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.9.2"
-    STDERR.puts "autoproj requires Ruby >= 1.9.2"
+if RUBY_VERSION < "2.0.0"
+    STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
 end
 
 AUTOPROJ_OPS_INSTALL
 
+ENV.delete('BUNDLE_GEMFILE')
+ENV.delete('RUBYLIB')
 ops = Autoproj::Ops::Install.new(Dir.pwd)
-bootstrap_options = ops.parse_options(ARGV)
-ops.run
+ops.parse_options(ARGV)
+ops.stage1
 
 # we assume that Install#run loads bundler and autobuild. Load autoproj and run
 # bootstrap

data/bin/autoproj_install

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.9.2"
-    STDERR.puts "autoproj requires Ruby >= 1.9.2"
+if RUBY_VERSION < "2.0.0"
+    STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
 end
 
@@ -413,12 +413,12 @@ module Autoproj
                 clean_env = env_for_child
                 stage2_vars = clean_env.map { |k, v| "#{k}=#{v}" }
                 puts "starting the newly installed autoproj for stage2 install"
-                puts [clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
-                    'install-stage2', root_dir, *stage2_vars].inspect
-                exec clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
+                result = system clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
                     Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
                     'install-stage2', root_dir, *stage2_vars
+                if !result
+                    raise "failed to execute autoproj install-stage2"
+                end
             end
 
             def stage2(*vars)

data/bin/autoproj_install.in

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.9.2"
-    STDERR.puts "autoproj requires Ruby >= 1.9.2"
+if RUBY_VERSION < "2.0.0"
+    STDERR.puts "autoproj requires Ruby >= 2.0.0"
     exit 1
 end
 

data/lib/autoproj/ops/install.rb

@@ -406,12 +406,12 @@ def stage1
                 clean_env = env_for_child
                 stage2_vars = clean_env.map { |k, v| "#{k}=#{v}" }
                 puts "starting the newly installed autoproj for stage2 install"
-                puts [clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
-                    'install-stage2', root_dir, *stage2_vars].inspect
-                exec clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
+                result = system clean_env.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
                     Gem.ruby, File.join(autoproj_install_dir, 'bin', 'autoproj'),
                     'install-stage2', root_dir, *stage2_vars
+                if !result
+                    raise "failed to execute autoproj install-stage2"
+                end
             end
 
             def stage2(*vars)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc6"
+    VERSION = "2.0.0.rc8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc6
+  version: 2.0.0.rc8
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -265,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"