pkg-wizard 0.1.14 → 0.1.15

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

@@ -3,6 +3,7 @@ require 'pkg-wizard/rpm'
 require 'pkg-wizard/logger'
 require 'pkg-wizard/git'
 require 'pkg-wizard/mock'
+require 'pkg-wizard/utils'
 require 'tmpdir'
 require 'fileutils'
 require 'uri'
@@ -46,6 +47,17 @@ module PKGWizard
       post '/createsnapshot' do
         FileUtils.touch 'snapshot/.createsnapshot'
       end
+      
+      post '/job/clean' do
+        dir = params[:dir] || 'output'
+        if dir == 'output'
+          FileUtils.touch 'output/.clean'
+        elsif dir == 'failed'
+          FileUtils.touch 'failed/.clean'
+        else
+          $stderr.puts "WARNING: job/clean Unknown dir #{dir}. Ignoring."
+        end
+      end
 
       post '/build/' do
         pkg = params[:pkg]
@@ -73,8 +85,16 @@ module PKGWizard
         end
       end
       
+      get '/server/stats' do
+        fs = PKGWizard::Utils.filesystem_status
+        { 
+          :filesystem => fs,
+        }.to_yaml
+      end
+      
       get '/job/stats' do
         fjobs = Dir["failed/job*"].size
+        snapshots = Dir["snapshot/snapshot*"].size
         sjobs = Dir["output/job*"].size
         qjobs = Dir["incoming/*.src.rpm"].size
         total_jobs = fjobs + sjobs
@@ -82,7 +102,8 @@ module PKGWizard
           :failed_jobs => fjobs,
           :successful_jobs => sjobs,
           :enqueued => qjobs,
-          :total_jobs => total_jobs
+          :total_jobs => total_jobs,
+          :snapshots => snapshots
         }.to_yaml
       end
 
@@ -171,6 +192,24 @@ module PKGWizard
       Dir.mkdir 'snapshot' if not File.exist?('snapshot')
       FileUtils.ln_sf 'output', 'repo' if not File.exist?('repo')
       
+      cleaner = Rufus::Scheduler.start_new
+      cleaner.every '2s', :blocking => true do
+        if File.exist?('failed/.clean')
+          $stdout.puts '* cleaning FAILED jobs'
+          Dir["failed/job_*"].each do |d|
+            FileUtils.rm_rf d
+          end
+          FileUtils.rm 'failed/.clean'
+        end
+        if File.exist?('output/.clean')
+          $stdout.puts '* cleaning OUTPUT jobs'
+          Dir["output/job_*"].each do |d|
+            FileUtils.rm_rf d
+          end
+          FileUtils.rm 'output/.clean'
+        end
+      end
+      
       # createrepo snapshot
       snapshot_sched = Rufus::Scheduler.start_new
       snapshot_sched.every '2s', :blocking => true do

data/lib/pkg-wizard/utils.rb

@@ -0,0 +1,23 @@
+module PKGWizard
+  module Utils
+    def self.filesystem_status
+      fs = {}
+      `df -P`.each_line do |line|
+        case line
+        when /^Filesystem\s+1024-blocks/
+          next
+        when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
+          next if %{none tmpfs usbfs debugfs}.include? $1
+          filesystem = $1
+          fs[filesystem] = {}
+          fs[filesystem][:kb_size] = $2
+          fs[filesystem][:kb_used] = $3
+          fs[filesystem][:kb_available] = $4
+          fs[filesystem][:percent_used] = $5
+          fs[filesystem][:mount] = $6
+        end
+      end
+      fs
+    end
+  end
+end

data/lib/pkg-wizard.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkg-wizard
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 15
+  version: 0.1.15
 platform: ruby
 authors: 
 - Sergio Rubio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +01:00
+date: 2011-03-10 00:00:00 +01:00
 default_executable: pkgwiz
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -190,6 +190,7 @@ files:
 - lib/pkg-wizard/rpm.rb
 - lib/pkg-wizard/streaming_downloader.rb
 - lib/pkg-wizard/streaming_uploader.rb
+- lib/pkg-wizard/utils.rb
 - packages/epel-release-5-4.noarch.rpm
 - packages/epel-release-6-5.noarch.rpm
 has_rdoc: true