pkg-wizard 0.1.3 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/lib/pkg-wizard/commands/build_bot.rb

@@ -43,9 +43,9 @@ module PKGWizard
           "Missing pkg parameter.\n"
         else
           incoming_file = "incoming/#{pkg[:filename]}"
-          $stdout.puts "Incoming file".ljust(40).bold.yellow + "#{pkg[:filename]}"
+          $stdout.puts "Incoming file".ljust(40) + "#{pkg[:filename]}"
           FileUtils.cp pkg[:tempfile].path, incoming_file
-          $stdout.puts "File saved".ljust(40).green.bold + "#{pkg[:filename]}"
+          $stdout.puts "File saved".ljust(40) + "#{pkg[:filename]}"
         end
       end
 
@@ -67,39 +67,47 @@ module PKGWizard
       Dir.mkdir 'output' if not File.exist?('output')
       Dir.mkdir 'workspace' if not File.exist?('workspace')
       Dir.mkdir 'archive' if not File.exist?('archive')
+      Dir.mkdir 'failed' if not File.exist?('failed')
       scheduler = Rufus::Scheduler.start_new
       scheduler.every '2s', :blocking => true do
         meta[:start_time] = Time.now
         queue = Dir['incoming/*.src.rpm'].sort_by {|filename| File.mtime(filename) }
         if not queue.empty?
-          job_time = Time.now.strftime '%Y%m%d_%H%M%S'
-          $stdout.puts "Job accepted [#{queue.size} Queued]".ljust(40).blue.bold + job_time
           job_dir = "workspace/job_#{Time.now.strftime '%Y%m%d_%H%M%S'}"
+          qfile = File.join(job_dir, File.basename(queue.first))
+          job_time = Time.now.strftime '%Y%m%d_%H%M%S'
+          $stdout.puts "Job accepted [job_#{job_time}]".ljust(40) + File.basename(qfile)
           result_dir = job_dir + '/result'
           FileUtils.mkdir_p result_dir
           meta[:source] = File.basename(queue.first)
-          qfile = File.join(job_dir, File.basename(queue.first))
           FileUtils.mv queue.first, qfile
-          $stdout.puts "Building pkg [#{job_time}]".ljust(40).yellow.bold +  "#{File.basename(qfile)}"
+          $stdout.puts "Building pkg [job_#{job_time}]".ljust(40).yellow.bold +  "#{File.basename(qfile)}"
 
+          rdir = nil
           begin
             PKGWizard::Mock.srpm :srpm => qfile, :profile => mock_profile, :resultdir => result_dir
             meta[:status] = 'ok'
-            $stdout.puts "Finished building [#{job_time}]".ljust(40).green.bold + "#{File.basename(qfile)}"
+            meta[:end_time] = Time.now
+            meta[:build_time] = meta[:end_time] - meta[:start_time]
+            $stdout.puts "Build OK [job_#{job_time}] #{meta[:build_time].to_i}s ".ljust(40).green.bold + "#{File.basename(qfile)}"
           rescue Exception => e
             meta[:status] = 'error'
-            $stdout.puts "Job failed [#{job_time}]".ljust(40).red.bold 
+            $stdout.puts "Build FAILED [job_#{job_time}]".ljust(40).red.bold  + "#{File.basename(qfile)}"
             File.open(job_dir + '/buildbot.log', 'w') do |f|
               f.puts "#{e.backtrace.join("\n")}"
               f.puts "#{e.message}"
             end
           ensure
-            meta[:end_time] = Time.now
-            meta[:build_time] = meta[:end_time] - meta[:start_time]
             File.open(job_dir + '/meta.yml', 'w') do |f|
               f.puts meta.to_yaml
             end
-            FileUtils.mv job_dir, 'output/'
+            if meta[:status] == 'error'  
+              FileUtils.mv job_dir, 'failed/'
+              FileUtils.ln_sf "#{File.basename(job_dir)}", "failed/last"
+            else
+              FileUtils.mv job_dir, 'output/'
+              FileUtils.ln_sf "#{File.basename(job_dir)}", "output/last"
+            end
           end
         end
       end

data/lib/pkg-wizard/commands/remote_build.rb

@@ -30,6 +30,12 @@ module PKGWizard
       :short => '-b URL',
       :description => 'rpmwiz build-bot URL',
       :long => '--buildbot URL'
+    
+    option :buildbot_port,
+      :short => '-p PORT',
+      :description => 'rpmwiz build-bot PORT (default 4567)',
+      :long => '--buildbot-port PORT',
+      :default => 4567
 
     option :tmpdir,
       :short => '-t TEMP',
@@ -41,7 +47,9 @@ module PKGWizard
       cli = RemoteBuild.new
       cli.banner = "\nUsage: rpmwiz remote-build (options)\n\n"
       pkgs = cli.parse_options
-      bbot_url = cli.config[:buildbot]
+      bbot_host = cli.config[:buildbot]
+      bbot_port = cli.config[:buildbot_port]
+      bbot_url = "http://#{bbot_host}:#{bbot_port}"
       if bbot_url.nil?
         $stderr.puts "\n--buildbot is required.\n"
         puts cli.opt_parser.help
@@ -51,7 +59,7 @@ module PKGWizard
       pkgs.reject! do |p|
         if p =~ /http:\/\//
           pkg = URI.parse(p).path.split("/").last
-          $stdout.puts "Downloading #{pkg}..."
+          $stdout.puts "Downloading: #{pkg}"
           downloaded_pkgs << download_from_url(p,cli.config[:tmpdir]) 
           true
         else
@@ -83,6 +91,7 @@ module PKGWizard
         fo = File.new(pkg)
         fsize = File.size(pkg)
         count = 0
+        pcount = 0
         $stdout.sync = true
         line_reset = "\r\e[0K" 
         res = StreamingUploader.post(
@@ -92,11 +101,11 @@ module PKGWizard
           count += size
           per = (100*count)/fsize 
           if per %10 == 0
-            print "#{line_reset}Uploading:".ljust(40) + "#{(100*count)/fsize}% " 
+            pcount += 10
+            print "#{line_reset}Uploading:".ljust(40) + "#{pcount}%" 
           end
         end
-        #puts "#{line_reset}Uploading: #{File.basename(pkg).gsub(/-((\d|\.)*)-(.*)\.src\.rpm/,'')} ".ljust(40) + "#{(100*count)/fsize}% [COMPLETE]"
-        puts "#{line_reset}Uploading: #{File.basename(pkg)} ".ljust(40) + "#{(100*count)/fsize}% [COMPLETE]"
+        puts "#{line_reset}Uploading: #{File.basename(pkg)} ".ljust(40) + "[#{fsize}] [COMPLETE]"
       end
     end
 
@@ -105,7 +114,9 @@ module PKGWizard
       remote_pkg = uri.path.split('/').last
       d = StreamingDownloader.new
       f = "#{tmpdir}/#{remote_pkg}"
-      d.download!(url, File.new(f, 'w'))
+      tmpfile = File.new(f, 'w')
+      d.download!(url, tmpfile)
+      tmpfile.close
       f
     end
 

data/lib/pkg-wizard.rb

@@ -4,7 +4,7 @@ require 'mixlib/cli'
 
 module PKGWizard
 
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
   
   class Distribution
     def self.detect

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkg-wizard
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: pkgwiz
 dependencies: 
 - !ruby/object:Gem::Dependency