ginst 2.0.1 → 2009.11.23

data/Rakefile

@@ -17,9 +17,10 @@ begin
     gem.homepage = "http://guillermo.github.com/ginst"
     gem.authors = ["Guillermo Álvarez Fernández"]
     gem.rubyforge_project = "ginst"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "cucumber", ">= 0"
     gem.add_dependency "sys-proctable"
+    gem.add_dependency "mime-types"
+    gem.add_dependency "mongrel"
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -30,32 +31,30 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test' << 'app/*'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-task :spec => :check_dependencies
-
 begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'lib' << 'test' << 'app/*'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
 rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
   end
 end
 
-task :default => :spec
+task :test => :check_dependencies
+task :'test:integration' => [:install] # Integration test need the gem to be installed
+
+task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-2.0.1
+2009.11.23

data/app/controllers/application_controller.rb

@@ -1,6 +1,6 @@
 # Filters added to this controller apply to all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
- 
+
 class ApplicationController < ActionController::Base
   helper :all
   helper_method :current_user_session, :current_user

data/app/controllers/status_controller.rb

@@ -5,4 +5,14 @@ class StatusController < ApplicationController
     @environment = Rails.env
   end
 
+
+  def update
+    case params['what']
+    when 'restart_builder'
+      Ginst::Builder.restart
+    else
+    end
+    
+    redirect_to :back
+  end
 end

data/app/controllers/tasks_controller.rb

@@ -4,13 +4,16 @@ class TasksController < ApplicationController
   
   
   def index
-    scope = @project.tasks
-    if params[:scope] && Task.valid_scopes.include?(params[:scope].to_sym)
-      scope = scope.send(params[:scope].to_sym)
-    end
-    
-    @tasks = scope.all(:order => 'ended_at DESC')
+    if Task.valid_scopes.include?(params[:scope].try(:to_sym))
+      scope = @project.tasks
+      if params[:scope] && Task.valid_scopes.include?(params[:scope].to_sym)
+        scope = scope.send(params[:scope].to_sym)
+      end
     
+      @tasks = scope.all(:order => 'ended_at DESC')
+    else
+      redirect_to :scope => 'prepared'
+    end
   end
   
   def update
@@ -24,7 +27,6 @@ class TasksController < ApplicationController
   end
   
   def show
-    Task.first
     @task = @project.tasks.find(params[:id])
     
     respond_to do |wants|

data/app/helpers/projects_helper.rb

@@ -1,7 +1,7 @@
 module ProjectsHelper
   
   def show_branch_links
-    content_tag :ul, :id => 'heads', :class => 'tabs' do
+    content_tag :ul, :class => 'submenu' do
       @project.branchs.map{ |h|
         content_tag :li do
           link_to_unless params["branch"]==h.name,  h.name,"?branch=#{h.name}"
@@ -10,9 +10,14 @@ module ProjectsHelper
     end
   end
   
-  def gravatar_url_for(commit, size = 30)
-    md5 = Digest::MD5.hexdigest(commit.author.email.strip.downcase)
-    "http://www.gravatar.com/avatar/#{md5}?s=30"
+  def gravatar_img_for(commit,size = 30)
+    "<img class=\"avatar_#{size}\" src=\"#{gravatar_url_for(commit, size)}\" alt=\"#{commit.author.name}\" />"
+  end
+  
+  def gravatar_url_for(email, size = 30)
+    email = email.author.email.strip.downcase unless email.kind_of? String
+    md5 = Digest::MD5.hexdigest(email)
+    "http://www.gravatar.com/avatar/#{md5}?s=#{size}"
   end
   
   def show_time(time)

data/app/models/project.rb

@@ -1,10 +1,10 @@
 class Project < ActiveRecord::Base
   include Slugify
   
-  has_many :tasks, :order => 'system desc, priority ASC'
+  has_many :tasks, :order => 'updated_at desc, system desc, priority ASC'
   delegate :prepared, :to => :tasks, :prefix => :tasks
 
-  after_create :create_setup_task
+  after_create :log_create, :create_setup_task
   before_create :create_secret
   
   validates_presence_of :name, :repo
@@ -24,8 +24,12 @@ class Project < ActiveRecord::Base
     status == 'building'
   end
   
+  def log_create
+    logger "#{name} project created for #{repo}"
+  end
 
   def run_tasks!    
+    logger "Running tasks"
     if !:locked_at || !tasks_prepared.empty?
       update_attribute(:locked_at, Time.current)
 
@@ -40,13 +44,16 @@ class Project < ActiveRecord::Base
   
   
   def create_fetch_task
+    logger "creating fetch task"
     current_fetch_task = tasks.unfinished.fetch_tasks.first
+    
+    # Don't create another if one exists
     return current_fetch_task if current_fetch_task
     
-    Rails.logger.debug "[#{Time.current.to_s(:small)}] * Creating repo for #{name}"
+    Rails.logger.debug "[#{Time.current.to_s(:small)}] * Creating fetch task for #{name}"
 
     command = "cd #{local_repo_dir}
-    git fetch -t
+    git fetch -fv origin
     "
 
     tasks.create(
@@ -57,20 +64,17 @@ class Project < ActiveRecord::Base
     )
   end
   
+  # call after fetch, to check if new commits exists
   def process_new_heads
-    preferences.branch_status ||= {}
     #look for changes in heads
     branchs.each do |branch|
-      unless (branch.commit.id == preferences.branch_status[branch.name])
+      unless tasks.find_by_commit_sha1(branch.commit.id)
         process_new_head(branch)
-        preferences.branch_status[branch.name] = branch.commit.id
-        save
       end
     end
   end
   
   def process_new_head(branch)
-    logger.info("Processing new commit for #{branch.name}, #{branch.commit.id} ")
     plugins.each do |plugin|
       plugin.on_commit(self, branch) if plugin.respond_to? :on_commit
     end
@@ -81,8 +85,7 @@ class Project < ActiveRecord::Base
   end
   
   def create_setup_task
-    Rails.logger.debug "[#{Time.current.to_s(:small)}] * Creating repo for #{name}"
-
+    logger "created setup task"
     command = "
     echo removing previous repo
     rm -Rf #{local_repo_dir}
@@ -101,13 +104,13 @@ class Project < ActiveRecord::Base
       :on_success => "p = Project.find(#{id}) ; p.set_default_tracking_branchs ; p.update_attribute(:status, 'prepared') "
     )  
   end
-    
-    
-      
+  
+  
   def to_param
     slug
   end
-    
+  
+  
   def grit_repo
     @grit_repo || Grit::Repo.new(local_repo_dir)
   rescue Grit::NoSuchPathError
@@ -162,6 +165,10 @@ class Project < ActiveRecord::Base
     grit_repo.commits(*args)
   end
   
+  def commit(sha1)
+    grit_repo.commit(sha1)
+  end
+  
   def commits_between_dates(from,to)
     grit_repo.commits_between_dates(from,to)
   end
@@ -192,5 +199,21 @@ class Project < ActiveRecord::Base
     Array.new(8).map{ keys[rand(keys.size)] }.join
   end
   
+  
+  def log_file
+    Ginst.data_dir+"/log/#{slug}.log"
+  end
+  
+  
+  def logger(msg = nil)
+    if msg
+      logger.log(msg, caller)
+    else
+      @logger ||= Ginst::Logger.new(log_file)
+    end
+  end
+
+  
+    
 end
 

data/app/models/task.rb

@@ -23,6 +23,8 @@ class Task < ActiveRecord::Base
   
   named_scope :fetch_tasks, {:conditions => {:name => 'fetch.sh'}}
   
+  delegate :logger, :to => :project
+  
   def self.valid_scopes
     [:prepared,:building,:fail,:success,:finished]
   end
@@ -54,6 +56,7 @@ class Task < ActiveRecord::Base
   
   
   def kill(signal = 'INT')
+    logger "Recived kill signal #{signal} for task #{id}"
     return nil unless pid
     pids = Sys::ProcTable.ps.find_all{|p| p.ppid == pid || p.pid == pid }.map{|p| p.pid}
     pids.each{ |pid| Process.kill(signal,pid) }
@@ -73,7 +76,9 @@ class Task < ActiveRecord::Base
     end
   end
   
-  
+  def commit
+    project.commit(commit_sha1)
+  end
   
   class TaskAlreadyRunningException < Exception ; end
   class TaskAlreadyExecuteException < Exception ; end
@@ -81,6 +86,7 @@ class Task < ActiveRecord::Base
   def execute
     raise TaskAlreadyExecuteException if reload[:ended_at]
     raise TaskAlreadyRunningException if reload[:started_at]
+    logger "Executing task #{id} named #{name}"
     status = 'fail'
 
     ObjectSpace.define_finalizer(self,lambda{
@@ -148,16 +154,22 @@ class Task < ActiveRecord::Base
       while ( !inputs.empty? ) do 
         select(inputs).first.each do |input|
           begin
-            buff +=input.read_nonblock(9999999)
+            read = input.read_nonblock(99999999)
+            logger read
+            buff += read
             self.update_attribute(:output, buff) if output != buff && Time.now.to_i > updated_at.to_i + DATABASE_UPDATE_INTERVAL
           rescue EOFError
+            logger "EOFError. removing #{stdout == input ? 'stdout' : 'stderr'} input"
             inputs.delete input
           end
         end
       end
       
     end
-    process_status.exitstatus
+    logger "Finished popen"
+    Process.wait
+    logger "Really finished command"
+    process_status.exitstatus    
   ensure
     self.update_attributes(:output => buff,:pid => nil, :exit_code => (process_status && process_status.exitstatus))
   end

data/app/views/grit/commits/_commit.html.erb

@@ -1,18 +1,9 @@
 <% content_tag_for :li, commit do %>
   <pre><%= link_to commit.short_message, project_commit_path(@project, commit.id) %></pre>
-  <img src="<%= gravatar_url_for(commit) %>">
-  <p>
+<%=   gravatar_img_for(commit) %>
+
     <strong><%= commit.author.name  %></strong> (author)<br/>
-    <em><%= commit.committed_date.to_s(:short) %></em>
-    
-    <% task = @project.tasks.for_commit(commit.id).first %>
-    <% if task %>
-      <%= link_to "Build status: #{task.status}", project_task_path(@project,task), :class => task.status %>
-    <% else %>
-      <% form_for commit, :url => project_commit_path(@project, commit) do |f| %>
-        <button type="submit">build!</button>
-      <% end %>
-    <% end %>
+    <em><%= commit.committed_date.to_s(:short) %></em>    
   </p>
   <dl>
     <dt>sha1</dt>

data/app/views/layouts/projects.html.erb

@@ -26,10 +26,10 @@
     <div id="header">
       <h1><%= @project.slug %></h1>
       <ul class="tabs">
+        <%= plugins_links %>
         <li><%= link_to 'Commits', project_commits_path(@project) %></li>
         <li><%= link_to 'Tasks', project_tasks_path(@project) %></li>
         <li><%= link_to 'Admin', edit_project_path(@project) %></li>
-        <%= plugins_links %>
       </ul>
     </div>
 

data/app/views/status/show.html.erb

@@ -1,5 +1,10 @@
 <h1>Builder Daemon Status</h1>
-<p><%= @builder_daemon_status %></p>
+<p><%= @builder_daemon_status %>
+<% form_tag('/status', :method => :put) do  %>  
+<%= hidden_field_tag('what', 'restart_builder') %>
+<%= submit_tag 'restart' %>
+<% end  %>
+</p>
 
 <h1>Current plugins</h1>
 <ul>

data/app/views/tasks/_task.html.erb

@@ -1,29 +1,46 @@
-<% content_tag_for(:li, task, :class=> task.status) do %>
-<pre><%= link_to task.name, project_task_path(@project, task) %></pre>
-  <p><%= simple_format(h(truncate(task.output))) %></p>
-  <dl>
-    <dt>Command:</dt>
-    <dd><%= truncate(task.code,:length => 35) %></dd>
+<% content_tag_for :div, task, :class=> "#{task.status} task" do %>
+  <h1><%= task.name %></h1>
+  <p class="status <%= task.status %>">Build status: <%= task.status %></p>
 
-    <dt>created_at</dt>
-    <dd><%= show_time(task.created_at) %></dd>
-    <dt>started_at</dt>
-    <dd><%= show_time(task.started_at) %></dd>
+  <div class='task_description'>
+  <% if task.prepared? %>
+    <p>This tasks is prepared to be run. Please wait other tasks finish.</p>
+    <pre id="output"><%= task.parsed_output %></pre>
     
-    <dt>ended_At</dt>
-    <dd><%= show_time(task.ended_at) %></dd>
-    
-    <dt>status</dt>
-    <dd><%= task.status %></dd>
-    
-<!--     <dt>output</dt>
-    <dd><pre><code><%= simple_format(task.output) %></code></pre></dd>
-    
-    <dt>exit_code</dt>
-    <dd><%= task.exit_code %></dd> -->
-  </dl>
-  <!-- <% form_for task, :url => project_task_path(task.project, task) do |f| %>
-  <%= f.submit 'ReRun' %>
-  <% end %> -->
-<% end %>
+  <% else  %>
+    <dl>
+      <dt>Started at:</dt>
+      <dd><%= show_time(task.started_at) %></dd>
+  
+    <% if task.building? %>
+      <dt>Elapsed time</dt>
+      <dd class="elapsed_time"><%= show_elapsed(task.build_duration) %></dd>
+      <dt>Pid</dt>
+      <dd><%= task.pid %>
+        <% form_for task, :url => project_task_path(@project,task) do |f| %>  
+        <%= hidden_field_tag :kill, 'INT' %>
+        <%= f.submit 'INT' %>
+        <% end %>
+      
+        <% form_for task, :url => project_task_path(@project,task) do |f| %>  
+        <%= hidden_field_tag :kill, 'QUIT' %>
+        <%= f.submit 'QUIT' %>
+        <% end %>
+        
+        <% form_for task, :url => project_task_path(@project,task) do |f| %>  
+        <%= hidden_field_tag :kill, 'KILL' %>
+        <%= f.submit 'QUIT' %>
+        <% end %>
       
+      </dd>
+    <% else %>  
+      <dt>Ended at:</dt>
+      <dd><%= show_time(task.ended_at) %> 
+        <span><%= show_elapsed(task.build_duration) %></span></dd>
+    <% end %>
+    <%= link_to 'raw', project_task_path(@project,task, 'text'), :class => 'raw_link' %>
+    </dl>
+    <pre id="output"><%= task.parsed_output %></pre>
+  <% end %>
+  </div>
+<% end %>