autobuild 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60642848d28e7f8df4bbc60cd96fdcc5d170778
-  data.tar.gz: 983a96918df8249f3917b8ca773a6d31f598bdc3
+  metadata.gz: cc3844e5cb144f3b3e1fda8a22ac5b6531c12439
+  data.tar.gz: ddbecdd7203bd378c2c4504d1598e8da3be460aa
 SHA512:
-  metadata.gz: a7e29d504f3b6cb4389ebf1319dcfae314039ebb3f9424a33feeefc3df5f5324f094db3f5fc1a7e2e2ad5bfdfc27f321fc4c45755087fb1e8a0285119533eea1
-  data.tar.gz: 66acd15c957082f400fbfe9ca95860e4874cf116ab83a692271a217918cb67e72c2322586d0630b5d3d82a9ec47aaa209970ac16536402bde13f1038962f17a0
+  metadata.gz: aa366e2f4f0b29e6c9f2752528fb44445cb419cc7b1e0fd697f7b4a1cf66d174d86f11e5eabc5872ba90e8f27ec0cdbcc68a1a097096fa5d3d3fc59fdf8558e3
+  data.tar.gz: 72ec8e6137f757cd13af392076b7e6b3b04af67963628e4d8a4de823fe1b631363d3b45f03dc22a69b1432a6dd198a4e51144105231b3924153928ea453b7262

data/lib/autobuild.rb

@@ -61,6 +61,6 @@ module Autobuild
 require 'autobuild/packages/pkgconfig'
 require 'autobuild/packages/dummy'
 require 'autobuild/packages/ruby'
+require 'autobuild/packages/python'
 
 require 'autobuild/rake_task_extension'
-

data/lib/autobuild/configurable.rb

@@ -12,7 +12,7 @@ module Autobuild
     #   source files have been updated. The #buildstamp stampfile represents when
     #   the last build has been done. The build must be done in the #builddir directory.
     # * +install+ is ran after +build+.
-    #   
+    #
     class Configurable < Package
         # Set of regexp matching paths that should not be considered as source
         # files
@@ -51,7 +51,7 @@ def builddir=(new)
             end
         end
         @builddir = 'build'
-        
+
         def builddir=(new)
             raise ConfigException.new(self), "builddir must be non-empty" if new.empty?
             @builddir = new
@@ -122,7 +122,7 @@ def configure
             end
             FileUtils.mkdir_p builddir if !File.directory?(builddir)
 
-            yield
+            yield if block_given?
 
             Autobuild.touch_stamp(configurestamp)
         end

data/lib/autobuild/packages/python.rb

@@ -0,0 +1,93 @@
+require 'autobuild/configurable'
+require 'open3'
+
+# Main Autobuild module
+module Autobuild
+    def self.python(opts, &proc)
+        Python.new(opts, &proc)
+    end
+
+    # Handler class to build python-based packages
+    class Python < Configurable
+        attr_accessor   :buildflags
+        attr_accessor   :installflags
+
+        def configurestamp
+            "#{builddir}/configure-autobuild-stamp"
+        end
+
+        def initialize(options)
+            @buildflags = []
+            @installflags = []
+            super
+        end
+
+        def prepare
+            super
+            @install_mode = File.file?(File.join(srcdir, 'setup.py'))
+        end
+
+        def prepare_for_forced_build
+            super
+            FileUtils.rm_f configurestamp
+            @forced = true
+        end
+
+        def generate_build_command
+            command = ['python', 'setup.py', 'build']
+            command << "--build-base=#{builddir}"
+            command += buildflags.flatten
+            command
+        end
+
+        def generate_install_command
+            command = generate_build_command
+            command << 'install'
+            command << "--prefix=#{prefix}"
+            command += installflags.flatten
+            command
+        end
+
+        def python_path
+            begin
+                _, output, _, ret = Open3.popen3({ 'PYTHONUSERBASE' => prefix },
+                                                 'python -m site --user-site')
+            rescue Exception => e
+                raise "Unable to set PYTHONPATH: #{e.message}"
+            end
+
+            return output.read.chomp if ret.value.success?
+            raise 'Unable to set PYTHONPATH: user site directory disabled?'
+        end
+
+        # Do the build in builddir
+        def build
+            return unless @install_mode
+            command = generate_build_command
+            command << '--force' if @forced
+            progress_start 'building %s [progress not available]',
+                           done_message: 'built %s' do
+                run 'build', *command, working_directory: srcdir
+            end
+            Autobuild.touch_stamp(buildstamp)
+        end
+
+        # Install the result in prefix
+        def install
+            return unless @install_mode
+            command = generate_install_command
+            command << '--force' if @forced
+            progress_start 'installing %s',
+                           done_message: 'installed %s' do
+                run 'install', *command, working_directory: srcdir
+            end
+            super
+        end
+
+        def update_environment
+            super
+            path = @install_mode ? python_path : srcdir
+            env_add_path 'PYTHONPATH', path
+        end
+    end
+end

data/lib/autobuild/reporting.rb

@@ -52,15 +52,10 @@ def self.display_message(*args)
             return
         end
 
-        size =
-            if @last_progress_msg then @last_progress_msg.size
-            else 0
-            end
-
         if !silent?
-            io.puts "\r#{msg}#{" " * [size - msg.size, 0].max}"
+            io.puts "#{clear_line}#{msg}"
             if @last_progress_msg
-                print "#{@last_progress_msg}"
+                io.print @last_progress_msg
             end
         end
     end
@@ -86,6 +81,10 @@ def self.has_progress_for?(key)
         progress_messages.any? { |msg_key, _| msg_key == key }
     end
 
+    def self.clear_line
+        "\e[2K\e[1G"
+    end
+
     def self.progress_start(key, *args)
         if args.last.kind_of?(Hash)
             options = Kernel.validate_options args.pop, :done_message => nil
@@ -226,24 +225,17 @@ def self.format_progress_message(messages)
 
     def self.display_progress
         msg = format_progress_message(progress_messages.map(&:last))
-        last_msg_length =
-            if @last_progress_msg then @last_progress_msg.length
-            else 0
-            end
 
         if msg.empty?
-            blank = " " * last_msg_length
             @last_progress_msg = nil
         else
             msg = "  #{msg}"
-            blank = " " * [last_msg_length - msg.length, 0].max
             @last_progress_msg = msg
         end
 
         if !silent?
             if Autobuild.progress_display_enabled?
-                print "\r#{msg}#{blank}"
-                print "\r#{msg}"
+                print "#{clear_line}#{msg}"
             elsif @last_progress_msg
                 puts msg
             end

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.13.0" unless defined? Autobuild::VERSION
+    VERSION = "1.14.0" unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -196,6 +196,7 @@ files:
 - lib/autobuild/packages/import.rb
 - lib/autobuild/packages/orogen.rb
 - lib/autobuild/packages/pkgconfig.rb
+- lib/autobuild/packages/python.rb
 - lib/autobuild/packages/ruby.rb
 - lib/autobuild/parallel.rb
 - lib/autobuild/pkgconfig.rb