metabuild 0.3.2 → 0.3.3

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('metabuild', '0.3.2') do |s|
+Echoe.new('metabuild', '0.3.3') do |s|
   s.author = "F. Brault"
   s.email = "castorpilot@yahoo.com"
   s.description = "MetaBuild is a ruby make-like tool that builds components. It supports tracking of dependencies among components, and a hierarchical reporting facility."

data/lib/metabuild.rb

@@ -42,7 +42,7 @@ module Metabuild
   DEFAULT_TAGS = [
                  lambda {`uname -p`},
                  lambda {`uname -o`},
-                 lambda {File.read("/etc/fedora-release")},
+                 lambda {File.read("/etc/fedora-release") if File.exists? "/etc/fedora-release"},
                  lambda {s = ""; 1.upto(ARGV.length-1) {|i| s += ARGV[i]};s}
                  ]
   
@@ -55,8 +55,16 @@ module Metabuild
                     "logfile" => "",
                     "dep_graph" => ["no", "Output Dependency graph in Graphviz dot format"],
                     "parallel" => ["no", "Run threads in parallel. Make sure that your dependency graph can handle this !"],
+                    "prefix" => ["", "Prefix for the final installation"],
                     }
 
+
+  METABUILD_VERSION = 0.4
+
+  def require_version(ver)
+    raise "Error, version #{ver} needed (current version is #{METABUILD_VERSION})" unless ver == METABUILD_VERSION
+  end
+
   # Function to extend fileutils
 
   # helper function that does (rm -rf dir; mkdir dir; cd dir)
@@ -66,65 +74,62 @@ module Metabuild
     cd dir
   end
 
-  # helper function that does goes into dir if it exists, or create it and goes into it
+  # helper function that goes into dir if it exists, or create it and goes into it
   def cd!(dir)
     mkdir_p dir unless File.directory? dir
     cd dir
   end
 
     
-  # Mother class for all SCM access, "virtual"
-  class SCM
+  # Git access
+  class Git 
 
-    attr_accessor :path
+    attr_accessor :path, :dir
 
-    def initialize(path)
-      @path = path
+    def initialize(dir = nil, path = nil)
+      @path, @dir = path, dir
     end
 
-    def cksum
-      raise "Should be implemented in child class"
+    def inside_git_dir
+      raise "Directory not set for git repo #{@path}" if @dir.nil? or not File.exists? @dir
+      old_dir = pwd
+      cd dir
+      yield
+      cd old_dir
     end
 
+    # Like running "git diff" in a git repo
     def get_diff
-      raise "Should be implemented in child class"
-    end
-
-    def apply_patch(patch)
-      raise "Should be implemented in child class"
-    end
-
-    def clone(path)
-      raise "Should be implemented in child class"
-    end
-
-  end
-
-  # Git access, uses Grit ruby lib
-  class Git < SCM
-
-    def initialize(path)
-      super
+      inside_git_dir do
+        `git diff` 
+      end
     end
 
-    # Like running "git diff" in a git repo
-    def get_diff
-      `cd #{path} && git diff` 
+    def run(cmd)
+      inside_git_dir do
+        raise "Git command #{cmd} failed in  #{@path}" unless system("git #{cmd}") 
+      end
     end
 
     def apply_patch(patch)
-      pipe = IO.popen("git apply -")
-      pipe.puts patch
-      pipe.close_write
+      inside_git_dir do
+        pipe = IO.popen("git apply -")
+        pipe.puts patch
+        pipe.close_write
+      end
     end
 
-    def clone(path)
-      raise "unable to clone #{path}" unless system("git clone " + path)
+    def clone
+      raise "Cannot clone empty path" if @path.nil?
+      @dir = pwd + File.basename(@path, ".git") if @dir.nil?
+      run("clone #{@path} #{@dir}")
     end
 
     # id is the SHA1 of head + of any diff (locals)
     def cksum
-      `cd #{path};git log --pretty=format:'%H' | head -n 1`.to_i(16) ^ Digest::SHA1.hexdigest(get_diff).to_i(16)
+      inside_git_dir do
+        `git log --pretty=format:'%H' | head -n 1`.to_i(16) ^ Digest::SHA1.hexdigest(get_diff).to_i(16)
+      end
     end
 
   end
@@ -147,8 +152,8 @@ module Metabuild
     end
 
     # Run a shell command, log its status  (override in child class)
-    def run(command, env, fail_msg)
-      env_system(command, env)
+    def run(command, env, fail_msg, skip)
+      env_system(command, env) unless skip
     end
 
     # Run a shell command, no logging (override in child class)
@@ -157,8 +162,8 @@ module Metabuild
     end
 
     # Run a shell command. Log success +and+ failure (override in child class)
-    def valid(command, env, fail_msg, success_msg)
-      env_system(command, env)
+    def valid(command, env, fail_msg, success_msg, skip)
+      env_system(command, env) unless skip
     end
 
     # Spawn with env
@@ -217,11 +222,11 @@ module Metabuild
   # Simple log that just prints out text (for console builds)
   class LogText < Log
 
-    attr_reader :name, :success, :fail
+    attr_reader :name, :success, :fail, :skip
 
     def initialize(name)
       super(name)
-      @fail, @success = [], []
+      @fail, @success, @skip = [], [], []
       @subscripts = []
       @report_done = false
     end 
@@ -234,6 +239,10 @@ module Metabuild
       @success.push msg
     end
 
+    def add_skip(msg)
+      @skip.push "SKIPPED : #{msg}"
+    end
+
     def report
       return if @report_done # prevent reporting several times
       if @subscript
@@ -257,6 +266,9 @@ module Metabuild
       puts "Fail : "
       @fail.each {|s| puts s}
       puts "----------------------------------------------"
+      puts "Skipped : "
+      @skip.each {|s| puts s}
+      puts "----------------------------------------------"
     end
 
     def status
@@ -264,11 +276,15 @@ module Metabuild
     end
 
     # Run a shell command, log 
-    def run(command, env, fail_msg)
-      if env_system(command, env)
-        add_success "[#{@name}] #{command} SUCCESS"
+    def run(command, env, fail_msg, skip)
+      if skip
+        add_skip command
       else
-        failure fail_msg
+        if env_system(command, env)
+          add_success "[#{@name}] #{command} SUCCESS"
+        else
+          failure fail_msg
+        end
       end
     end
 
@@ -278,11 +294,16 @@ module Metabuild
     end
 
     # Run a shell command. Log success +and+ failure 
-    def valid(command, env, fail_msg, success_msg)
-      if env_system(command, env)
-        add_success success_msg if success_msg != ""
+    def valid(command, env, fail_msg, success_msg, skip)
+      if skip
+        add_skip command
       else
-        add_fail fail_msg
+        if env_system(command, env)
+          add_success success_msg if success_msg != ""
+        else
+          failure(fail_msg) if ENV.has_key? "METABUILD_PARALLEL"
+          add_fail fail_msg
+        end
       end
     end
 
@@ -290,6 +311,7 @@ module Metabuild
       @subscripts.push log.name
       log.success.each {|s| @success.push("[#{log.name}] " + s)}
       log.fail.each {|f| @fail.push("[#{log.name}] " + f)}
+      log.skip.each {|f| @skip.push("[#{log.name}] " + f)}
     end
 
     # Stop script, adding a message to the log
@@ -319,7 +341,7 @@ module Metabuild
     def initialize(name, file)
       super(name)
       @file = file
-      @fail, @success = [], []
+      @fail, @success, @skip = [], [], []
       @subscripts = []
       @report_done = false
       @html = ""
@@ -334,6 +356,10 @@ module Metabuild
       @success.push [cmd, msg, output]
     end
 
+    def add_skip(cmd)
+      @skip.push "SKIPPED : #{cmd}"
+    end
+
     def report
       return if @report_done # prevent reporting several times
       fill_html
@@ -368,6 +394,19 @@ module Metabuild
                 QvOlTS2eFNHN127bhzIuAgCRYlHJuiKikkWKVYhYsUbb28i4iOZN5agTRY+czl7VYnGaLE4Ty4o0
                 7hNDXR5nNhTtXx5nJvXfpI7Pw9VhHly99rDX82v/7WHXlPfL/K1knVZOr707zeLjFH/6BQC8XLzY
                 fvFVPXMe1qPe1y/ZDt7tn1jpQgAAAABJRU5ErkJggg=='>" 
+      yellow = "<img src='data:image/png;base64,
+                iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAIAAABL1vtsAAAAAXNSR0IArs4c6QAAAg1JREFUOMul
+                lEFP20AQhWdtb8xuGttSUGK7WKVSEpVje0OiQlz7b7n02gM3iJpyKwSprQL1YpoqWcu7iR07PRjF
+                VkCJK+Zo6X2eeTvzUL/fh5eV9vRTkiRSSiGEECJJEgDAGFNKKaWEEIzxFoQQgjGGsoHb+tp1f9Up
+                B4BIGH8mb34HH5bKe9u2KaVlCSoPwjmP+Nle6/OefUN2ZA3HqpoCQJqqcVKTM3LLOrfBp7rx0TCM
+                Z7rgnE//ful4p539qxqOy/9R1ZSokuzIV/VvmipvRguAkxVFW/Uf8bNn9eWq4bizfwVw+tPXNO0k
+                n0jJ/WOMUf1is75MofoFYyw3WwEAKSXKBm5ruFW/oritIcoGUspHhBCC6KOmNa6+C01rTPSREKKM
+                CCxjUh1hGROiBwUiSRIEj+9XsVQ1RRAXXrywlHx/xcwKo0Z1WRg1xMzKl10BAErpLG5PuVkdMeXm
+                LG4Xe0EpnYQHI9+rjhj53iQ8KBCEEMN02UPPD5wqej9w2EPPMF1CSOGFbdvz7PD88mgrxQ+c88uj
+                eXZo23bhRT6L43RDebyZkutDeew43dXJrx+77w+j8Kbd/N57e+20/UY9zP33753rH7378bt6o+M4
+                3fKxo7XgyyOHT++W2ThLp8vlHAAQ0hXVRErTMF8/jZz11KKUep4nd3fz4FssFgCgadp/BF/uLsa4
+                3Orm+gdpYQabBkXtNgAAAABJRU5ErkJggg=='>"
+
 
       unless @subscript
         @html << "<html>\n"
@@ -545,6 +584,10 @@ module Metabuild
         id += 1
       end
 
+      @skip.each do |cmd|
+        @html << "<br>#{yellow} #{cmd}\n"
+      end
+
       @html << "<br></p>\n"
 
       @html << bottom + "</div>"
@@ -614,13 +657,17 @@ module Metabuild
 
 
     # Run a shell command, log exit status 
-    def run(command, env, fail_msg)
-      success, output= env_system(command, env)
-      if success
-        add_success command, "#{command} success", output
+    def run(command, env, fail_msg, skip)
+      if skip
+        add_skip command
       else
-        add_fail command, fail_msg, output
-        stop
+        success, output= env_system(command, env)
+        if success
+          add_success command, "#{command} success", output
+        else
+          add_fail command, fail_msg, output
+          stop
+        end
       end
     end
 
@@ -631,12 +678,17 @@ module Metabuild
     end
 
     # Run a shell command. Log success +and+ failure, do not abort on failure 
-    def valid(command, env, fail_msg, success_msg)
-      success, output = env_system(command, env)
-      if success
-        add_success command, success_msg, output
+    def valid(command, env, fail_msg, success_msg, skip)
+      if skip
+        add_skip command
       else
-        add_fail command, fail_msg, output
+        success, output = env_system(command, env)
+        if success
+          add_success command, success_msg, output
+        else
+          failure(fail_msg) if ENV.has_key? "METABUILD_PARALLEL"
+          add_fail command, fail_msg, output
+        end
       end
     end
 
@@ -755,17 +807,25 @@ module Metabuild
 
     # Run according to dependency list, from bottom to top
     def propagate_run(use_cache=false, parallel=false)
+      success = true
       if parallel
         each_dep do |d|
-          fork {d.propagate_run(use_cache, parallel)}
+          fork { 
+            ENV["METABUILD_PARALLEL"] = "1"
+            d.propagate_run(use_cache, parallel) 
+          }
         end
-        Process.waitall unless @depends.empty?
+        Process.waitall.each { |a| success = false unless a[1].success? } unless @depends.empty?
       else
         each_dep do |d|
           d.propagate_run(use_cache, parallel)
         end
       end
-      run(use_cache)
+      if success
+        run(use_cache) 
+      else
+        raise "Dependency failed for #{name}"
+      end
     end
 
     def propagate_disable
@@ -775,6 +835,14 @@ module Metabuild
       end
     end
 
+    def propagate_restart_at(restart_at)
+        each_dep do |d|
+            return true if d.propagate_restart_at restart_at
+            d.done = true 
+        end
+        return @name == restart_at
+    end
+
     def output_graph
       each_dep do |d|
         puts "#{@name} -> #{d.name};"
@@ -787,7 +855,7 @@ module Metabuild
   class Options
 
     extend Forwardable
-    attr_reader :opts, :rest, :from_targets
+    attr_reader :opts, :rest, :from_targets, :restart_at
     def_delegators :@opts, :[], :fetch, :each
 
     # By default, the following options are set : --help, and DEFAULT_OPTIONS. 
@@ -800,7 +868,9 @@ module Metabuild
       @parser = OptionParser.new
       @parser.on("--help") {|val| @help = true}
       @from_targets = []
+      @restart_at = nil
       @parser.on("--from=[target]", "Disable everything below target in dep tree. Only with dependency=yes") {|val| @from_targets.push val}
+      @parser.on("--restart-at=[target]", "Disable everything before target in sequential build order. Only with dependency=yes") {|val| @restart_at = val}
       hash.each do |opt, default|
         if default.kind_of? Array
           @parser.on("--#{opt}=[#{default[0]}]", default[1]) {|val| @opts[opt] = val}
@@ -889,6 +959,12 @@ module Metabuild
         use_cache = (@options.fetch("cache", "no").downcase == "yes")
         parallel = (@options.fetch("parallel", "no").downcase == "yes")
         targs = @options.rest.empty? ? @default_targets.map {|t| t.to_s} : @options.rest
+        if @options.restart_at
+           targs.each do |t|
+              break if get_target(t).propagate_restart_at(@options.restart_at)
+           end
+        end         
+
         if @options.fetch("dependency", "yes").downcase != "yes"
           targs.each { |t| targ = get_target(t); targ.run(use_cache) unless targ.nil? }
         else
@@ -924,14 +1000,14 @@ module Metabuild
     # Run a shell command, giving it (optional) env variables (a hashmap), and (optional) failure message
     # Log success +and+ failure. Abort on failure.
     # :call-seq:
-    #   run(:cmd => "cmd", :env => env, :msg => "msg")  -> nil
+    #   run(:cmd => "cmd", :env => env, :msg => "msg", :skip => bool)  -> nil
     #   run("cmd")                                      -> nil    
     def run(h)
       if h.kind_of? String
-        @log.run(h, @env, "#{h} FAIL")
+        @log.run(h, @env, "#{h} FAIL", false)
       else
         raise "run command needs a non nil command" if h[:cmd].nil?
-        @log.run(h[:cmd], @env.merge(h.fetch(:env, @env)), h.fetch(:msg, "#{h[:cmd]} FAIL"))
+        @log.run(h[:cmd], @env.merge(h.fetch(:env, @env)), h.fetch(:msg, "#{h[:cmd]} FAIL"), h.fetch(:skip, false))
       end
     end
 
@@ -951,14 +1027,14 @@ module Metabuild
     # Run a shell command, giving it (optional) env variables (a hashmap), and (optional) failure message
     # Log success +and+ failure. Do not abort on failure.
     # :call-seq:
-    #   valid(:cmd => "cmd", :env => env, :fail_msg => "msg", :success_msg => "msg")    -> nil
+    #   valid(:cmd => "cmd", :env => env, :fail_msg => "msg", :success_msg => "msg", :skip => bool)    -> nil
     #   valid("cmd")                                                                    -> nil    
     def valid(h)
       if h.kind_of? String
-        @log.valid(h, @env, "#{h} FAIL", "#{h} SUCCESS")
+        @log.valid(h, @env, "#{h} FAIL", "#{h} SUCCESS", false)
       else
         raise "valid command needs a non nil command" if h[:cmd].nil?
-        @log.valid(h[:cmd], @env.merge(h.fetch(:env, {})), h.fetch(:fail_msg, "#{h[:cmd]} FAIL"), h.fetch(:success_msg, "#{h[:cmd]} SUCCESS"))
+        @log.valid(h[:cmd], @env.merge(h.fetch(:env, {})), h.fetch(:fail_msg, "#{h[:cmd]} FAIL"), h.fetch(:success_msg, "#{h[:cmd]} SUCCESS"), h.fetch(:skip, false))
       end
     end
 
@@ -1009,7 +1085,7 @@ module Metabuild
       @targets.each do |t|
         return t if t.name == name
       end
-      raise "Unkonwn target #{name} for build #{@name}"
+      raise "Unknown target #{name} for build #{@name}"
     end
 
     # Set a block of code to be run as target, catching doing logging

data/metabuild.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{metabuild}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["F. Brault"]
-  s.date = %q{2010-05-28}
+  s.date = %q{2010-09-14}
   s.description = %q{MetaBuild is a ruby make-like tool that builds components. It supports tracking of dependencies among components, and a hierarchical reporting facility.}
   s.email = %q{castorpilot@yahoo.com}
   s.extra_rdoc_files = ["README", "lib/metabuild.rb"]
@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Metabuild", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{metabuild}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{MetaBuild is a ruby make-like tool that builds components. It supports tracking of dependencies among components, and a hierarchical reporting facility.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metabuild
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - F. Brault
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 +02:00
+date: 2010-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -48,16 +49,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -65,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: metabuild
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: MetaBuild is a ruby make-like tool that builds components. It supports tracking of dependencies among components, and a hierarchical reporting facility.