autobuild 1.9.6 → 1.10.0.b1

data/lib/autobuild/packages/autotools.rb

@@ -54,7 +54,7 @@ module Autobuild
                     if internal_doxygen_mode?
                         run_doxygen
                     else
-                        Subprocess.run(self, utility.name, Autobuild.tool(:make), "-j#{parallel_build_level}", target, :working_directory => builddir)
+                        run(utility.name, Autobuild.tool(:make), "-j#{parallel_build_level}", target, :working_directory => builddir)
                     end
                     yield if block_given?
                 end
@@ -254,10 +254,10 @@ module Autobuild
 
                     progress_start "generating autotools for %s", :done_message => 'generated autotools for %s' do
                         if using[:libtool]
-                            Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy')
+                            run('configure', Autobuild.tool('libtoolize'), '--copy')
                         end
                         if using[:autogen]
-                            Subprocess.run(self, 'configure', File.expand_path(using[:autogen], srcdir))
+                            run('configure', File.expand_path(using[:autogen], srcdir))
                         else
                             [ :aclocal, :autoconf, :autoheader, :automake ].each do |tool|
                                 if tool_flag = using[tool]
@@ -266,7 +266,7 @@ module Autobuild
                                                    else; Autobuild.tool(tool)
                                                    end
 
-                                    Subprocess.run(self, 'configure', tool_program, *send("#{tool}_flags"))
+                                    run('configure', tool_program, *send("#{tool}_flags"))
                                 end
                             end
                         end
@@ -290,7 +290,7 @@ module Autobuild
                     command += Array[*configureflags]
 
                     progress_start "configuring autotools for %s", :done_message => 'configured autotools for %s' do
-                        Subprocess.run(self, 'configure', *command)
+                        run('configure', *command)
                     end
                 end
             end
@@ -301,9 +301,9 @@ module Autobuild
             in_dir(builddir) do
                 progress_start "building %s [progress not available]", :done_message => 'built %s' do
                     if force_config_status
-                        Subprocess.run(self, 'build', './config.status')
+                        run('build', './config.status')
                     end
-                    Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}")
+                    run('build', Autobuild.tool(:make), "-j#{parallel_build_level}")
                 end
             end
             Autobuild.touch_stamp(buildstamp)
@@ -313,7 +313,7 @@ module Autobuild
         def install
             in_dir(builddir) do
                 progress_start "installing %s", :done_message => 'installed %s' do
-                    Subprocess.run(self, 'install', Autobuild.tool(:make), 'install')
+                    run('install', Autobuild.tool(:make), 'install')
                 end
             end
 

data/lib/autobuild/packages/cmake.rb

@@ -226,7 +226,7 @@ module Autobuild
             File.open(doxyfile, 'w') do |io|
                 io.write(doxyfile_data)
             end
-            Subprocess.run(self, 'doc', Autobuild.tool(:doxygen), doxyfile)
+            run('doc', Autobuild.tool(:doxygen), doxyfile)
         end
 
         def common_utility_handling(utility, target, start_msg, done_msg)
@@ -235,11 +235,11 @@ module Autobuild
                     if internal_doxygen_mode?
                         run_doxygen
                     else
-                        Subprocess.run(self, utility.name,
-                                       Autobuild.tool(:make),
-                                       "-j#{parallel_build_level}",
-                                       target,
-                                       :working_directory => builddir)
+                        run(utility.name,
+                            Autobuild.tool(:make),
+                            "-j#{parallel_build_level}",
+                            target,
+                            working_directory: builddir)
                     end
                     yield if block_given?
                 end
@@ -329,7 +329,7 @@ module Autobuild
                     end
 
                     value = value.to_s
-                    old_value = cache_line.partition("=").last.chomp if cache_line
+                    old_value = cache_line.split("=")[1].chomp if cache_line
                     if !old_value || !equivalent_option_value?(old_value, value)
                         if Autobuild.debug
                             message "%s: option '#{name}' changed value: '#{old_value}' => '#{value}'"
@@ -381,7 +381,7 @@ module Autobuild
                         if full_reconfigures?
                             FileUtils.rm_f cmake_cache
                         end
-                        Subprocess.run(self, 'configure', *command)
+                        run('configure', *command)
                     end
                 end
             end
@@ -412,7 +412,7 @@ module Autobuild
             in_dir(builddir) do
                 progress_start "building %s" do
                     if always_reconfigure || !File.file?('Makefile')
-                        Subprocess.run(self, 'build', Autobuild.tool(:cmake), '.')
+                        run('build', Autobuild.tool(:cmake), '.')
                     end
 
                     warning_count = 0
@@ -458,7 +458,7 @@ module Autobuild
         def install
             in_dir(builddir) do
                 progress_start "installing %s", :done_message => 'installed %s' do
-                    Subprocess.run(self, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
+                    run('install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
                 end
             end
             super

data/lib/autobuild/packages/genom.rb

@@ -134,7 +134,7 @@ module Autobuild
                 isolate_errors do
                     in_dir(srcdir) do
                         progress_start "generating GenoM for %s", :done_message => 'generated GenoM for %s' do
-                            Subprocess.run(self, 'genom', *cmdline)
+                            run('genom', *cmdline)
                         end
                     end
                 end
@@ -147,7 +147,7 @@ module Autobuild
                     # since the generation takes care of rebuilding configure
                     # if .gen has changed
                     progress_start "generating autotools for %s", :done_message => 'generated autotools for %s' do
-                        in_dir(srcdir) { Subprocess.run(self, 'genom', File.expand_path('autogen',  srcdir)) }
+                        in_dir(srcdir) { run('genom', File.expand_path('autogen',  srcdir)) }
                     end
                 end
             end

data/lib/autobuild/packages/gnumake.rb

@@ -41,7 +41,7 @@ module Autobuild
     
     def self.make_subcommand(pkg, phase, *options, &block)
         invoke_make_parallel(pkg, Autobuild.tool(:make)) do |*make_parallel_options|
-            Subprocess.run(pkg, phase, Autobuild.tool(:make), *make_parallel_options, *options, &block)
+            pkg.run(phase, Autobuild.tool(:make), *make_parallel_options, *options, &block)
         end
     end
 end

data/lib/autobuild/packages/orogen.rb

@@ -178,15 +178,10 @@ module Autobuild
         end
 
         def update_environment
-            super
             typelib_plugin = File.join(prefix, 'share', 'typelib', 'ruby')
-            if File.directory?(typelib_plugin)
-                Autobuild.env_add_path 'TYPELIB_RUBY_PLUGIN_PATH', typelib_plugin
-            end
+            env_add_path 'TYPELIB_RUBY_PLUGIN_PATH', typelib_plugin
             roby_plugin = File.join(prefix, 'share', 'orocos', 'roby')
-            if File.directory?(roby_plugin)
-                Autobuild.env_add_path 'OROCOS_ROBY_PLUGIN_PATH',  roby_plugin
-            end
+            env_add_path 'OROCOS_ROBY_PLUGIN_PATH',  roby_plugin
         end
 
         def prepare
@@ -331,7 +326,7 @@ module Autobuild
             if needs_regen
                 progress_start "generating oroGen %s", :done_message => 'generated oroGen %s' do
                     in_dir(srcdir) do
-                        Subprocess.run self, 'orogen', guess_ruby_name, self.class.orogen_bin, *cmdline
+                        run 'orogen', guess_ruby_name, '-S', self.class.orogen_bin, *cmdline
                         File.open(genstamp, 'w') do |io|
                             io.print cmdline.join("\n")
                         end

data/lib/autobuild/packages/ruby.rb

@@ -30,7 +30,7 @@ module Autobuild
         def with_doc
             doc_task do
                 progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
-                    Autobuild::Subprocess.run self, 'doc',
+                    run 'doc',
                         Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), rake_doc_task,
                         :working_directory => srcdir
                 end
@@ -40,7 +40,7 @@ module Autobuild
         def with_tests
             test_utility.task do
                 progress_start "running tests for %s", :done_message => 'tests passed for %s' do
-                    Autobuild::Subprocess.run self, 'test',
+                    run 'test',
                         Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), rake_test_task,
                         :working_directory => srcdir
                 end
@@ -49,7 +49,7 @@ module Autobuild
 
         def invoke_rake(setup_task = rake_setup_task)
             if setup_task && File.file?(File.join(srcdir, 'Rakefile'))
-                Autobuild::Subprocess.run self, 'post-install',
+                run 'post-install',
                     Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), setup_task,
                     :working_directory => srcdir
             end
@@ -57,14 +57,6 @@ module Autobuild
 
         def install
             progress_start "setting up Ruby package %s", :done_message => 'set up Ruby package %s' do
-                Autobuild.update_environment srcdir
-                # Add lib/ unconditionally, as we know that it is a ruby package.
-                # update_environment will add it only if there is a .rb file in the directory
-                libdir = File.join(srcdir, 'lib')
-                if File.directory?(libdir)
-                    Autobuild.env_add_path 'RUBYLIB', libdir
-                end
-
                 invoke_rake
             end
             super
@@ -86,7 +78,7 @@ module Autobuild
             super
             if rake_clean_task && File.file?(File.join(srcdir, 'Rakefile'))
                 begin
-                    Autobuild::Subprocess.run self, 'clean',
+                    run 'clean',
                         Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), rake_clean_task,
                         :working_directory => srcdir
                 rescue Autobuild::SubcommandFailed => e
@@ -98,10 +90,10 @@ module Autobuild
         end
 
         def update_environment
-            Autobuild.update_environment srcdir
+            env_add_prefix srcdir
             libdir = File.join(srcdir, 'lib')
             if File.directory?(libdir)
-                Autobuild.env_add_path 'RUBYLIB', libdir
+                env_add_path 'RUBYLIB', libdir
             end
         end
     end

data/lib/autobuild/reporting.rb

@@ -1,3 +1,4 @@
+require 'autobuild/exceptions'
 module Autobuild
     class << self
         attr_reader :display_lock
@@ -350,101 +351,3 @@ module Autobuild
     end
 end
 
-## Report by mail
-if Autobuild::HAS_RMAIL
-module Autobuild
-    class MailReporter < Reporter
-        def default_mail
-            Etc::endpwent
-            uname = while (pwent = Etc::getpwent)
-                        break (pwent.name) if pwent.uid == Process.uid
-                    end
-
-            raise "FATAL: cannot find a user with uid=#{Process.uid}" unless uname
-            "#{pwent.name}@#{Socket.gethostname}"
-        end
-        
-	attr_reader :from_email, :to_email, :smtp_hostname, :smtp_port, :subject, :only_errors
-        def initialize(config)
-            @from_email = (config[:from] || default_mail)
-            @to_email   = (config[:to]   || default_mail)
-	    @subject = (config[:subject] || "Build %result% on #{Socket.gethostname} at %time%")
-	    @only_errors = config[:only_errors]
-            @smtp_hostname = (config[:smtp] || "localhost" )
-            @smtp_port = Integer(config[:port] || Socket.getservbyname('smtp'))
-        end
-
-        def error(error)
-            if error.mail?
-                send_mail("failed", error.to_s)
-            end
-        end
-
-        def success
-	    unless only_errors
-		send_mail("success", Autobuild.post_success_message || "")
-	    end
-        end
-
-        def send_mail(result, body = "")
-            mail = RMail::Message.new
-            mail.header.date = Time.now
-            mail.header.from = from_email
-            mail.header.subject = subject.
-		gsub('%result%', result).
-		gsub('%time%', Time.now.to_s).
-		gsub('%hostname%', Socket.gethostname)
-
-            part = RMail::Message.new
-            part.header.set('Content-Type', 'text/plain')
-            part.body = body
-            mail.add_part(part)
-
-            # Attach log files
-            Reporting.each_log do |file|
-                name = file[Autobuild.logdir.size..-1]
-                mail.add_file(name, file)
-            end
-
-            # Send the mails
-            if smtp_hostname =~ /\// && File.directory?(File.dirname(smtp_hostname))
-                File.open(smtp_hostname, 'w') do |io|
-                    io.puts "From: #{from_email}"
-                    io.puts "To: #{to_email.join(" ")}"
-                    io.write RMail::Serialize.write('', mail)
-                end
-                puts "saved notification email in #{smtp_hostname}"
-            else
-                smtp = Net::SMTP.new(smtp_hostname, smtp_port)
-                smtp.start {
-                    to_email.each do |email|
-                        mail.header.to = email
-                        smtp.send_mail RMail::Serialize.write('', mail), from_email, email
-                    end
-                }
-
-                # Notify the sending
-                puts "sent notification mail to #{to_email} with source #{from_email}"
-            end
-        end
-    end
-end
-
-module RMail
-    class Message
-        ## Attachs a file to a message
-        def add_file(name, path, content_type='text/plain')
-            part = RMail::Message.new
-            part.header.set('Content-Type', content_type)
-            part.header.set('Content-Disposition', 'attachment', 'filename' => name)
-            part.body = ''
-            File.open(path) do |file|
-                part.body << file.readlines.join("")
-            end
-            self.add_part(part)
-        end
-    end
-end
-end # if Autobuild::HAS_RMAIL
-
-

data/lib/autobuild/subcommand.rb

@@ -197,12 +197,15 @@ module Autobuild::Subprocess
         STDOUT.sync = true
 
         input_streams = []
-        options = Hash[retry: false]
+        options = Hash[retry: false, env: ENV.to_hash, env_inherit: true]
         if command.last.kind_of?(Hash)
             options = command.pop
             options = Kernel.validate_options options,
                 input: nil, working_directory: nil, retry: false,
-                input_streams: []
+                input_streams: [],
+                env: ENV.to_hash,
+                env_inherit: true
+
             if options[:input]
                 input_streams << File.open(options[:input])
             end
@@ -250,6 +253,15 @@ module Autobuild::Subprocess
         Autobuild.register_logfile(logname)
         subcommand_output = Array.new
 
+        env = options[:env].dup
+        if options[:env_inherit]
+            ENV.each do |k, v|
+                if !env.has_key?(k)
+                    env[k] = v
+                end
+            end
+        end
+
         status = File.open(logname, open_flag) do |logfile|
             if Autobuild.keep_oldlogs
                 logfile.puts
@@ -258,8 +270,8 @@ module Autobuild::Subprocess
             logfile.puts "#{Time.now}: running"
             logfile.puts "    #{command.join(" ")}"
 	    logfile.puts "with environment:"
-            ENV.keys.sort.each do |key|
-                logfile.puts "  '#{key}'='#{ENV[key]}'"
+            env.keys.sort.each do |key|
+                logfile.puts "  '#{key}'='#{env[key]}'"
             end
             logfile.puts
             logfile.puts "#{Time.now}: running"
@@ -291,6 +303,13 @@ module Autobuild::Subprocess
 
             pid = fork do
                 begin
+                    env.each do |k, v|
+                        if v
+                            ENV[k] = v
+                        else
+                            ENV.delete(k)
+                        end
+                    end
                     if options[:working_directory] && (options[:working_directory] != Dir.pwd)
                         Dir.chdir(options[:working_directory])
                     end

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.9.6" unless defined? Autobuild::VERSION
+    VERSION = "1.10.0.b1" unless defined? Autobuild::VERSION
 end
 
 

data/test/import/test_tar.rb

@@ -25,25 +25,6 @@ class TC_TarImporter < Minitest::Test
         assert_equal(TarImporter::Bzip, TarImporter.filename_to_mode('tarfile.tar.bz2'))
     end
 
-    def test_it_sets_the_repository_id_to_the_normalized_URL
-        importer = TarImporter.new "FILE://test/file"
-        assert_equal "file://test/file", importer.repository_id.to_str
-    end
-
-    def test_it_sets_the_source_id_to_the_normalized_URL
-        importer = TarImporter.new "FILE://test/file"
-        assert_equal "file://test/file", importer.source_id.to_str
-    end
-
-    def test_it_does_not_delete_a_locally_specified_archive_on_error
-        dummy_tar = File.join(@datadir, "dummy.tar")
-        FileUtils.touch dummy_tar
-        importer = TarImporter.new "file://#{dummy_tar}"
-        pkg = Package.new 'tarimport'
-        assert_raises(Autobuild::SubcommandFailed) { importer.checkout(pkg) }
-        assert File.file?(dummy_tar)
-    end
-
     def test_tar_valid_url
         assert_raises(ConfigException) {
             TarImporter.new 'ccc://localhost/files/tarimport.tar.gz', :cachedir => @cachedir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.10.0.b1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,16 +28,16 @@ dependencies:
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.13'
 description: Collection of classes to handle build systems (CMake, autotools, ...)
   and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration
   to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj)
@@ -93,6 +93,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
+- ".gemtest"
 - Changes.txt
 - Manifest.txt
 - README.txt
@@ -113,6 +114,7 @@ files:
 - lib/autobuild/import/svn.rb
 - lib/autobuild/import/tar.rb
 - lib/autobuild/importer.rb
+- lib/autobuild/mail_reporter.rb
 - lib/autobuild/package.rb
 - lib/autobuild/packages/autotools.rb
 - lib/autobuild/packages/cmake.rb
@@ -165,12 +167,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms