bantic-integrity 0.1.4.2 → 0.1.4.3

data/app.rb

@@ -123,7 +123,7 @@ post "/:project/builds" do
   login_required
 
   current_project.build
-  redirect project_url(@project)
+  redirect "/"
 end
 
 get '/:project/builds/:build' do

data/integrity.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{integrity}
-  s.version = "0.1.4.2"
+  s.version = "0.1.4.3"
 
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

data/lib/integrity/builder.rb

@@ -10,11 +10,17 @@ module Integrity
       @branch = project.branch
       @scm = SCM.new(@uri, @branch, export_directory)
       @build = Build.new(:project => project)
+      @project = project
     end
 
     def build(commit)
       Integrity.log "Building #{commit} (#{@branch}) of #{@build.project.name} in #{export_directory} using #{scm_name}"
-      @scm.with_revision(commit) { run_build_script }
+      @scm.with_revision(commit) { 
+        @project.update_attributes(:shortened_current_commit_msg => @scm.commit_metadata(commit)[:message][0..40])
+        @project.update_attributes(:current_commit_identifier => @scm.commit_identifier(commit)[0..6])
+        
+        run_build_script
+      }
       @build
     ensure
       @build.commit_identifier = @scm.commit_identifier(commit)

data/lib/integrity/project.rb

@@ -10,6 +10,8 @@ module Integrity
     property :command,    String,   :nullable => false, :length => 255, :default => "rake"
     property :public,     Boolean,  :default => true
     property :started_build_at,   DateTime
+    property :shortened_current_commit_msg, String
+    property :current_commit_identifier, String
     property :created_at, DateTime
     property :updated_at, DateTime
 
@@ -24,6 +26,8 @@ module Integrity
     def build(commit_identifier="HEAD")
       return if building?
       update_attributes(:started_build_at => Time.now)
+      update_attributes(:current_commit_identifier => "unknown commit id")
+      update_attributes(:shortened_current_commit_msg => "unknown msg")
       Thread.new(self) do |project|
         begin
           Builder.new(project).build(commit_identifier)

data/views/home.haml

@@ -11,16 +11,16 @@
       %li{ :class => cycle("even", "odd") + (project.building? ? ' building' : '') + (project.last_build ? (project.last_build.successful? ? ' success' : ' failed') : '') }
         %a{ :href => project_url(project) }&= project.name
         .meta
-          - last_build = project.last_build
-          - short_commit_identifier = last_build ? last_build.short_commit_identifier : "unknown commit"
-          - commit_message = last_build ? last_build.commit_message : "unknown commit message"
-          - shortened_commit_message = commit_message ? commit_message.slice(0,40) + "..." : "unknown commit message"
+          
+          - short_commit_identifier = project.current_commit_identifier ? project.current_commit_identifier : "unknown commit id"
+          - shortened_commit_message = project.shortened_current_commit_msg + "..."
+          
           - if project.building?
-            = "Building #{short_commit_identifier} (#{shortened_commit_message}) for #{pretty_time_since(project.started_build_at)}"
+            = "Building <b>#{short_commit_identifier}</b> (#{shortened_commit_message}) for #{pretty_time_since(project.started_build_at)}"
           - elsif project.last_build.nil?
             Never built yet
           - else
-            = "Built #{short_commit_identifier} (#{shortened_commit_message}) "
+            = "Built <b>#{short_commit_identifier}</b> (#{shortened_commit_message}) "
             = project.last_build.successful? ? "successfully" : "and failed"
   %p#new
     %a{ :href => "/new" } Add a new project

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bantic-integrity
 version: !ruby/object:Gem::Version 
-  version: 0.1.4.2
+  version: 0.1.4.3
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"