pkg-wizard 0.1.21 → 0.1.22

data/README.buildbot

@@ -0,0 +1,31 @@
+# Create yum repo in the output directory
+curl  -X POST http://bh01.frameos.org:4567/createrepo
+
+# Create a snapshot of the output directory
+curl  -X POST http://bh01.frameos.org:4567/createsnapshot
+
+# Clean output dir
+curl  -X POST http://bh01.frameos.org:4567/job/clean
+
+# Clean failed dir
+curl  -X POST http://bh01.frameos.org:4567/job/clean -ddir=failed
+
+# list failed jobs (yaml)
+curl http://bh01.frameos.org:4567/job/failed
+
+# server stats (yaml)
+curl http://bh01.frameos.org:4567/server/stats
+
+# job stats (yaml)
+curl http://bh01.frameos.org:4567/job/stats
+
+# list successfully built pkgs
+curl http://bh01.frameos.org:4567/job/successful
+
+# Rebuild a previous job (It can be either successful or failed build)
+curl -X POST http://bh01.frameos.org:4567/job/rebuild/job_XXXXX_XXXX
+
+# Get job info
+curl http://bh01.frameos.org:4567/job/job_XXXXX_XXXX
+
+

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

@@ -133,9 +133,8 @@ module PKGWizard
           "Missing pkg parameter.\n"
         else
           incoming_file = "incoming/#{pkg[:filename]}"
-          puts "Incoming file".ljust(40) + "#{pkg[:filename]}"
+          puts "* incoming file".ljust(40) + "#{pkg[:filename]}"
           FileUtils.cp pkg[:tempfile].path, incoming_file
-          puts "File saved".ljust(40) + "#{pkg[:filename]}"
         end
       end
 
@@ -431,7 +430,6 @@ module PKGWizard
           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'
-          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)

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

@@ -35,7 +35,11 @@ module PKGWizard
       :short => '-p PORT',
       :description => 'rpmwiz build-bot PORT (default 80)',
       :long => '--buildbot-port PORT',
-      :default => 80 
+      :default => 4567
+
+    option :source,
+      :short => '-s SOURCE',
+      :long => '--source SRC'
 
     option :tmpdir,
       :short => '-t TEMP',
@@ -62,6 +66,33 @@ module PKGWizard
           $stdout.puts "Downloading: #{pkg}"
           downloaded_pkgs << download_from_url(p,cli.config[:tmpdir]) 
           true
+        elsif p =~ /git:\/\//
+          require 'tmpdir'
+          d = Dir.mktmpdir
+
+          # Fetch the package sources using Git
+          $stdout.puts "Fetching package sources from Git..."
+          PKGWizard::GitRPM.fetch p, d
+          spec = Dir["#{d}/*.spec"].first
+          pwd = Dir.pwd
+          Dir.chdir d
+
+          # Download sources
+          source = cli.config[:source]
+          if source and source =~ /http:\/\//
+            url = URI.parse(source)
+            $stdout.puts "Downloading source #{File.basename(url.path)}..."
+            download_from_url(source,d) 
+            puts
+          end
+
+          # Create the SRPM
+          $stdout.puts "Creating SRPM for #{spec}..."
+          srpm = SRPM.create
+          downloaded_pkgs << srpm
+          Dir.chdir pwd
+          FileUtils.rm_rf d
+          true
         else
           false
         end

data/lib/pkg-wizard.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkg-wizard
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 1
-  - 21
-  version: 0.1.21
+  - 22
+  version: 0.1.22
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-04-07 00:00:00 +02:00
 default_executable: pkgwiz
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -184,11 +184,13 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
+- README.buildbot
 - README.rdoc
 files: 
 - .document
 - Gemfile
 - LICENSE.txt
+- README.buildbot
 - README.rdoc
 - Rakefile
 - bin/pkgwiz