autoproj 1.9.4 → 1.9.5.rc1

data/lib/autoproj/system.rb

@@ -116,10 +116,6 @@ module Autoproj
         File.join(root_dir, ".remotes")
     end
 
-    # Return the directory in which RubyGems package should be installed
-    def self.gem_home
-        ENV['AUTOPROJ_GEM_HOME'] || File.join(root_dir, ".gems")
-    end
 
     def self.env_inherit(*names)
         Autobuild.env_inherit(*names)
@@ -135,15 +131,30 @@ module Autoproj
         File.join(result, name)
     end
 
+    # @deprecated use isolate_environment instead
+    def self.set_initial_env
+        isolate_environment
+    end
+
     # Initializes the environment variables to a "sane default"
     #
     # Use this in autoproj/init.rb to make sure that the environment will not
     # get polluted during the build.
-    def self.set_initial_env
+    def self.isolate_environment
         Autobuild.env_inherit = false
-        Autoproj.env_set 'RUBYOPT', "-rubygems"
-        Autobuild.env_push_path 'GEM_PATH', Autoproj.gem_home
-        Autobuild.env_push_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
+        Autobuild.env_push_path 'PATH', "/usr/local/bin", "/usr/bin", "/bin"
+    end
+
+    def self.prepare_environment
+        # Set up some important autobuild parameters
+        env_inherit 'PATH', 'PKG_CONFIG_PATH', 'RUBYLIB', \
+            'LD_LIBRARY_PATH', 'CMAKE_PREFIX_PATH', 'PYTHONPATH'
+        
+        env_set 'AUTOPROJ_CURRENT_ROOT', Autoproj.root_dir
+        env_set 'RUBYOPT', "-rubygems"
+        Autoproj::OSDependencies::PACKAGE_HANDLERS.each do |pkg_mng|
+            pkg_mng.initialize_environment
+        end
     end
 
     class << self
@@ -154,10 +165,8 @@ module Autoproj
 
     # Create the env.sh script in +subdir+. In general, +subdir+ should be nil.
     def self.export_env_sh(subdir = nil)
-        # Make sure that we have the environment of all selected packages
-        if Autoproj.manifest # we don't have a manifest if we are bootstrapping
-            Autoproj::CmdLine.update_environment
-        end
+        # Make sure that we have as much environment as possible
+        Autoproj::CmdLine.update_environment
 
         filename = if subdir
                File.join(Autoproj.root_dir, subdir, ENV_FILENAME)
@@ -180,10 +189,13 @@ module Autoproj
         end
 
         File.open(filename, "w") do |io|
+            io.write <<-EOF
+            if test -n "$AUTOPROJ_CURRENT_ROOT" && test "$AUTOPROJ_CURRENT_ROOT" != "#{Autoproj.root_dir}"; then
+                echo "the env.sh from $AUTOPROJ_CURRENT_ROOT is already loaded. Start a new shell before sourcing this one"
+                return
+            fi
+            EOF
             Autobuild.export_env_sh(io)
-            if Autobuild.environment.has_key?('GEM_PATH')
-                io.puts "export GEM_PATH=$GEM_PATH:#{Gem.default_path.join(":")}"
-            end
         end
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.4"
+    VERSION = "1.9.5.rc1"
 end

data/test/package_managers/test_pip.rb

@@ -0,0 +1,42 @@
+$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
+require 'test/unit'
+require 'autoproj'
+require 'flexmock/test_unit'
+
+class TC_OSDependencies_Pip < Test::Unit::TestCase
+    include Autoproj
+
+    attr_reader :pip_manager
+
+    def setup
+        Autoproj::OSDependencies.operating_system = [['test', 'debian', 'default'], ['v1.0', 'v1', 'default']]
+
+        @pip_manager = PackageManagers::PipManager.new
+        Autobuild.programs['pip'] = 'mypip'
+        super
+    end
+
+    def teardown
+        super
+        Autobuild.programs['pip'] = nil
+    end
+
+    def test_install_packages
+        subprocess = flexmock(Autobuild::Subprocess)
+
+        packages = ['pkg0', 'pkg1', 'pkg2']
+        subprocess.should_receive(:run).
+            with(any, any, 'mypip', 'install', '--user', 'pkg0', 'pkg1','pkg2').once
+        pip_manager.install(packages)
+    end
+
+    def test_install_packaes_disabled_and_not_silent
+        subprocess = flexmock(Autobuild::Subprocess)
+
+        pip_manager.enabled = false
+        pip_manager.silent = false
+        subprocess.should_receive(:run).never
+        flexmock(STDIN).should_receive(:readline).once.and_return
+        pip_manager.install([['pkg0']])
+    end
+end

data/test/test_os_dependencies.rb

@@ -29,6 +29,7 @@ class TC_OSDependencies < Test::Unit::TestCase
         osdeps.package_handlers.clear
         osdeps.package_handlers['apt-dpkg'] = osdeps.os_package_handler
         osdeps.package_handlers['gem'] = flexmock(PackageManagers::Manager.new(['gem']))
+        osdeps.package_handlers['pip'] = flexmock(PackageManagers::Manager.new(['pip']))
         flexmock(osdeps)
     end
 
@@ -311,6 +312,11 @@ class TC_OSDependencies < Test::Unit::TestCase
         osdeps = create_osdep(data)
         expected = [[osdeps.package_handlers['gem'], FOUND_PACKAGES, ['gempkg', 'gempkg1']]]
         assert_equal expected, osdeps.resolve_package('pkg')
+
+        data = { 'pkg' => 'pip' }
+        osdeps = create_osdep(data)
+        expected = [[osdeps.package_handlers['pip'], FOUND_PACKAGES, ['pkg']]]
+        assert_equal expected, osdeps.resolve_package('pkg')
     end
 
     def test_resolve_osindep_packages_specific
@@ -344,7 +350,7 @@ class TC_OSDependencies < Test::Unit::TestCase
 
     def test_resolve_mixed_os_and_osindep_dependencies
         data = { 'pkg' =>
-                 { 'test' => { 'default' => ['ospkg', 'gem' => 'gempkg'] }
+                 { 'test' => { 'default' => 'ospkg', 'gem' => 'gempkg' }
                  }
                }
 

metadata

@@ -1,101 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: autoproj
-version: !ruby/object:Gem::Version
-  version: 1.9.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 1083816473
+  prerelease: 6
+  segments: 
+  - 1
+  - 9
+  - 5
+  - rc
+  - 1
+  version: 1.9.5.rc1
 platform: ruby
-authors:
+authors: 
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: autobuild
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 7
+        - 0
         version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: utilrb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: utilrb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.6'
-description: autoproj is a manager for sets of software packages. It allows the user
-  to import and build packages from source, still using the underlying distribution's
-  native package manager for software that is available on it.
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 3
+        - 7
+        version: "3.7"
+  type: :development
+  version_requirements: *id005
+description: autoproj is a manager for sets of software packages. It allows the user to import and build packages from source, still using the underlying distribution's native package manager for software that is available on it.
 email: rock-dev@dfki.de
-executables:
+executables: 
 - alocate
 - amake
 - aup
@@ -113,12 +117,13 @@ executables:
 - autoproj_bootstrap.in
 - autoproj_stress_test
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - samples/autoproj/README.txt
-files:
+files: 
 - History.txt
 - Manifest.txt
 - README.txt
@@ -176,37 +181,49 @@ files:
 - test/test_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_package_manifest.rb
+- test/package_managers/test_pip.rb
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
-licenses: []
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: autobuild
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of sets of software packages
-test_files:
-- test/test_os_dependencies.rb
-- test/test_debian.rb
+test_files: 
 - test/test_manifest.rb
 - test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb
+- test/package_managers/test_pip.rb
+- test/test_debian.rb
 - test/test_package_manifest.rb
+- test/test_os_dependencies.rb