autoproj 2.0.0.rc24 → 2.0.0.rc25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f23754f570b1d5e584512e527f2e0f546769e6
-  data.tar.gz: 8a01846ea05397a0831f2e7e390799f878be6e22
+  metadata.gz: d3a154afc488da79bd5b1ea99b71a2104e597a51
+  data.tar.gz: 63fd1ab12bb3da7c1df201232b0258b1e5e18fab
 SHA512:
-  metadata.gz: 54e4d351034d56840b6995da79bd34069fa782dbe7d63bcd9f44c0abff18663acf2ce1336abc91127ee570cb2267df59378028c3ef46d7532cc1b8c48dc7161c
-  data.tar.gz: 4e8146bb970912be4a8ca11d086991111e5122b618294360b58bb51f53491bf3fecd8b23e30302efcd6c2e67b9ec9a3145c8e340343278fe069a3ef52801236f
+  metadata.gz: 11a953e98a508631066821bb336e05201e4d136c9b07359cc2e48c916bfcb1c9e8a59b48df5e0beb88b31dac680681ded17396b7cb2e953d186b8852c84d4175
+  data.tar.gz: 5df95acb185feaacc83c145a0a6b1cb35834c459aec915d9bc5a01cb34502cb511b5c593e88e2bfa4c66b360d4a3fbbabe4c3e81acf9da9027fd9b1b74e14657

data/autoproj.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
     s.add_runtime_dependency "autobuild", ">= 1.10.0.a"
-    s.add_runtime_dependency "utilrb", ">= 2.0"
+    s.add_runtime_dependency "utilrb", ">= 3.0"
     s.add_runtime_dependency "thor", '~> 0.19.0', '>= 0.19.1'
     s.add_runtime_dependency 'concurrent-ruby'
     s.add_runtime_dependency 'tty-color', '~> 0.3.0', '>= 0.3.0'

data/lib/autoproj/cli/base.rb

@@ -1,3 +1,4 @@
+require 'tty/color'
 require 'autoproj'
 require 'autoproj/autobuild'
 
@@ -190,7 +191,7 @@ def self.validate_options(args, options)
                     remaining[:parallel] = Integer(level)
                 end
 
-                return args, remaining
+                return args, remaining.to_sym_keys
             end
         end
     end

data/lib/autoproj/find_workspace.rb

@@ -36,7 +36,7 @@ def self.find_prefix_dir(base_dir = default_find_base_dir)
     def self.find_v2_root_dir(base_dir, config_field_name)
         path = Pathname.new(base_dir).expand_path
         while !path.root?
-            if (path + ".autoproj").exist?
+            if (path + ".autoproj" + "config.yml").exist?
                 break
             end
             path = path.parent
@@ -47,22 +47,19 @@ def self.find_v2_root_dir(base_dir, config_field_name)
         end
 
         config_path = path + ".autoproj" + "config.yml"
-        if config_path.exist?
-            config = YAML.load(config_path.read) || Hash.new
-            result = config[config_field_name] || path.to_s
-            result = File.expand_path(result, path.to_s)
-            if result == path.to_s
-                return result
-            end
-            resolved = find_v2_root_dir(result, config_field_name)
 
-            if !resolved || (resolved != result)
-                raise ArgumentError, "found #{path} as possible workspace root for #{base_dir}, but it contains a configuration file in #{config_path} that points to #{result} and #{result} is not an autoproj workspace root"
-            end
-            resolved
-        else
-            path.to_s 
+        config = YAML.load(config_path.read) || Hash.new
+        result = config[config_field_name] || path.to_s
+        result = File.expand_path(result, path.to_s)
+        if result == path.to_s
+            return result
+        end
+        resolved = find_v2_root_dir(result, config_field_name)
+
+        if !resolved || (resolved != result)
+            raise ArgumentError, "found #{path} as possible workspace root for #{base_dir}, but it contains a configuration file in #{config_path} that points to #{result} and #{result} is not an autoproj workspace root"
         end
+        resolved
     end
 
     # {#find_workspace_dir} for v2 workspaces

data/lib/autoproj/ops/install.rb

@@ -240,7 +240,7 @@ def install_bundler
 
                 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')
 

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -33,6 +33,7 @@ def initialize_environment
 
                 env.add_path 'PATH', File.join(ws.prefix_dir, 'gems', 'bin')
                 env.add_path 'PATH', File.join(config.bundler_gem_home, 'bin')
+                env.add_path 'PATH', File.join(config.gems_gem_home, 'bin')
                 env.add_path 'PATH', File.join(ws.dot_autoproj_dir, 'autoproj', 'bin')
                 env.set 'GEM_HOME', config.gems_gem_home
                 env.set 'GEM_PATH', config.bundler_gem_home

data/lib/autoproj/package_manifest.rb

@@ -52,6 +52,19 @@ def documentation
             return short_documentation
         end
 
+        def has_short_documentation?
+            xml.elements.each('package/description') do |node|
+                doc = node.attributes['brief']
+                if doc
+                    doc = doc.to_s.strip
+                end
+                if doc && !doc.empty?
+                    return true
+                end
+            end
+            false
+        end
+
         def short_documentation
             xml.elements.each('package/description') do |node|
                 doc = node.attributes['brief']

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc24"
+    VERSION = "2.0.0.rc25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc24
+  version: 2.0.0.rc25
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -298,3 +298,4 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
+has_rdoc: