ciquantum 0.0.10 → 0.0.11

data/ciquantum.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency     'sinatra'
   gem.add_runtime_dependency     'choice'
   gem.add_runtime_dependency     'pony'
-  gem.add_runtime_dependency     'sq_auth', '>= 0.0.24'
+  gem.add_runtime_dependency     'sq_auth', '>= 0.0.25'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'mocha'
 

data/lib/ciquantum/build.rb

@@ -29,6 +29,10 @@ module CIQuantum
       finished_at - started_at
     end
 
+    def id
+      "#{sha}-#{finished_at.to_i}"
+    end
+
     def short_sha
       if sha
         sha[0,7]
@@ -42,7 +46,7 @@ module CIQuantum
     end
 
     def env_output
-      out = clean_output
+      out = output # clean_output
       out.size > 100_000 ? out[-100_000,100_000] : out
     end
 
@@ -51,6 +55,18 @@ module CIQuantum
       @commit ||= Commit.new(sha, user, project, project_path)
     end
 
+    def test_results
+      stat = { success: 0, failures:0, pending:0 }
+      clean_output.gsub(/(\d+) examples, (\d+) failures(?:, (\d+) pending)?/) do
+        stat[:success] += $1.to_i
+        stat[:failures] += $2.to_i
+        stat[:pending] += $3.to_i
+      end
+      res = "#{stat[:success]} examples, #{stat[:failures]} failures"
+      res += ", #{stat[:pending]} pending" if stat[:pending] > 0
+      res
+    end
+
     def dump file
       config = [user, project, started_at, finished_at, sha, status, output, pid, branch]
       data = YAML.dump(config)

data/lib/ciquantum/core.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module CIQuantum
   class Core
     attr_reader :user
@@ -5,9 +7,9 @@ module CIQuantum
     attr_reader :url
     attr_reader :current_build
     attr_reader :last_build
-    attr_reader :campfire
     attr_reader :projectname
     attr_reader :coverage_path
+    attr_accessor :shared_path
 
     HistoryLimit = 10
 
@@ -63,6 +65,7 @@ module CIQuantum
       write_current_build
       write_last_build
       run_hook "postbuild"
+      save_coverage_for_build @last_build
 
       build(@queue.next_branch_to_build) if @queue.waiting?
     end
@@ -100,8 +103,8 @@ module CIQuantum
     def build!(branch=nil)
       @git_branch = branch
       build = @current_build
-      run_hook "prebuild"
       git_update
+      run_hook "prebuild"
       output = ''
       build.sha = git_sha
       build.branch = git_branch
@@ -129,7 +132,7 @@ module CIQuantum
     # shellin' out
     def runner_command
       runner = repo_config.runner.to_s
-      runner == '' ? "rake -s test:units" : runner
+      runner == '' ? "rake -s --color test:units" : runner
     end
 
     def git_update
@@ -148,7 +151,8 @@ module CIQuantum
 
     # massage our repo
     def run_hook(hook)
-      if File.exists?(file=path_in_project(".git/hooks/#{hook}")) && File.executable?(file)
+      file = path_in_project(".git/hooks/#{hook}")
+      if File.exists?(file) && File.executable?(file)
         data =
           if @last_build && @last_build.commit
             {
@@ -184,10 +188,26 @@ module CIQuantum
       @current_build = nil
     end
 
-    def path_in_project(path)
+    def path_in_project path
       File.join(@project_path, path)
     end
 
+    def coverage_for_build build
+      File.join build.id, "coverage"
+    end
+
+    def coverage_path_for_build build
+      File.join @shared_path, coverage_for_build(build)
+    end
+
+    def save_coverage_for_build build
+      return unless @coverage_path
+      build_coverage_path = coverage_path_for_build(build)
+      puts "Coverage path: #{build_coverage_path}"
+      FileUtils.mkdir_p build_coverage_path
+      FileUtils.cp_r "#{path_in_project(@coverage_path)}/.", build_coverage_path
+    end
+
     def repo_config
       Config.ciquantum(@project_path)
     end
@@ -207,6 +227,10 @@ module CIQuantum
       @git_branch = (branch == '' ? "master" : branch)
     end
 
+    def is_current_git_branch? branch
+      return branch.eql? git_branch
+    end
+
     def git_sha
       `cd #{@project_path} && git rev-parse origin/#{git_branch}`.chomp
     end
@@ -224,7 +248,20 @@ module CIQuantum
     end
 
     def read_build_by_index index
-      read_build old_builds[index] if old_builds[index]
+      old_builds[index] ? read_build(old_builds[index]) : nil
+    end
+
+    def active_builds
+      active_builds = []
+      old_builds.each do |build_file|
+        build = read_build(build_file)
+        active_builds << build
+        if build.status == :worked
+          remove_builds_from build
+          break
+        end
+      end
+      active_builds
     end
 
     def old_builds
@@ -254,12 +291,12 @@ module CIQuantum
       remove_unused_build
     end
 
-    def remove_unused_build
-      builds = old_builds
-      if builds.size > HistoryLimit
-        builds[HistoryLimit..builds.size].each do |file|
-          file = path_in_project(".git/builds/#{file}")
-          File.delete file if File.exists? file
+    def remove_builds_from limit_build
+      old_builds.each do |build_file|
+        build = read_build(build_file)
+        if build.finished_at < limit_build.finished_at
+          FileUtils.rm_r build_file
+          FileUtils.rm_r coverage_path_for_build build_file
         end
       end
     end

data/lib/ciquantum/public/javascript.js

@@ -0,0 +1,6 @@
+function toggleVisibility(id) {
+  var e = document.getElementById(id);
+  if(!e) return true;
+  e.style.display = (e.style.display == "none" ? "block" : "none")
+  return true;
+}

data/lib/ciquantum/public/screen.css

@@ -35,18 +35,6 @@ h1 a {
   color: #000;
 }
 
-.failed, .color31 {
-  color: red !important;
-}
-
-.worked, .color32 {
-  color: green !important;
-}
-
-.errored, .color33 {
-  color: yellow !important;
-}
-
 p {
   margin: 1em 0;
 }
@@ -79,16 +67,16 @@ ul.posts {
   margin-bottom: 2em;
 }
 
-  ul.posts li {
-    line-height: 1.75em;
-  }
+ul.posts li {
+  line-height: 1.75em;
+}
 
-  ul.posts .date,
-  ul.posts .duration {
-    color: #aaa;
-    font-family: Monaco, "Courier New", monospace;
-    font-size: 80%;
-  }
+ul.posts .date,
+ul.posts .duration {
+  color: #aaa;
+  font-family: Monaco, "Courier New", monospace;
+  font-size: 80%;
+}
 
 /*****************************************************************************/
 /*
@@ -110,97 +98,117 @@ ul.posts {
   margin-bottom: 2em;
 }
 
-  .site .title a {
-    color: #a00;
-    text-decoration: none;
-  }
+.site .title a {
+  color: #a00;
+  text-decoration: none;
+}
 
-  .site .title a:hover {
-    color: black;
-  }
+.site .title a:hover {
+  color: black;
+}
 
-  .site .title .extra {
-    color: #aaa;
-    text-decoration: none;
-    margin-left: 1em;
-    font-size: 0.9em;
-  }
+.site .title .extra {
+  color: #aaa;
+  text-decoration: none;
+  margin-left: 1em;
+  font-size: 0.9em;
+}
 
-  .site .title a.extra:hover {
-    color: black;
-  }
+.site .title a.extra:hover {
+  color: black;
+}
 
-  .site .meta {
-    color: #aaa;
-  }
+.site .meta {
+  color: #aaa;
+}
 
-  .site .footer {
-    font-size: 80%;
-    color: #666;
-    border-top: 4px solid #eee;
-    margin-top: 2em;
-    overflow: hidden;
-  }
+.site .footer {
+  font-size: 80%;
+  color: #666;
+  border-top: 4px solid #eee;
+  margin-top: 2em;
+  overflow: hidden;
+}
 
-    .site .footer .contact {
-      float: left;
-      margin-right: 3em;
-    }
+.site .footer .contact {
+  float: left;
+  margin-right: 3em;
+}
 
-      .site .footer .contact a {
-        color: #8085C1;
-      }
+  .site .footer .contact a {
+    color: #8085C1;
+  }
 
-    .site .footer .rss {
-      margin-top: 1.1em;
-      margin-right: -.2em;
-      float: right;
-    }
+.site .footer .rss {
+  margin-top: 1.1em;
+  margin-right: -.2em;
+  float: right;
+}
 
-      .site .footer .rss img {
-        border: 0;
-      }
+  .site .footer .rss img {
+    border: 0;
+  }
 
 /*****************************************************************************/
 /*
-/* Posts
+/* Builds
 /*
 /*****************************************************************************/
 
-#post {
+span.failed, .color36 {
+  color: red !important;
+}
 
+span.worked, .color32 {
+  color: green !important;
 }
 
-/* standard */
+span.errored, .color33 {
+  color: yellow !important;
+}
 
-#post pre {
-  border: 1px solid #ddd;
-  background-color: #eef;
-  padding: 0 .4em;
+div.build, div.commit, div.result {
+  border: 1px solid black;
+  background-color: #E0E0E0;
 }
 
-#post ul,
-#post ol {
-  margin-left: 1.25em;
+div.commit {
+  font-family: 'Bitstream Vera Sans Mono', 'Courier', monospace;
 }
 
-#post code {
-  border: 1px solid #ddd;
-  background-color: #eef;
-  font-size: 95%;
-  padding: 0 .2em;
+div.build div {
+  padding: 5px;
 }
 
-  #post pre code {
-    border: none;
-  }
+div.build {
+  padding: 0px;
+  margin: 30px 0px;
+}
+
+div.failed {
+  background-color: #CC3333;
+}
+
+div.worked {
+  background-color: #33CC33;
+}
+
+div.errored {
+  background-color: #CCCC33;
+}
+
+pre {
+  overflow: auto;
+  word-wrap: break-word;
+}
 
 /* terminal */
 
 pre.terminal {
   border: 1px solid black;
-  background-color: #333;
+  background-color: #E0E0E0;
   color: white;
+  margin: 0px;
   padding: 5px;
   overflow: auto;
   word-wrap: break-word;

data/lib/ciquantum/server.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'json'
+require 'fileutils'
 
 require 'sinatra'
 require 'sq_auth'
@@ -33,10 +34,15 @@ module CIQuantum
       quantum.last_build.sha
     end
 
-    get ["ci::view", "ci::change_branch"], '/?' do
+    get ["ci::view"], '/?' do
       erb(:template, {}, :quantum => quantum, :can_change_branch => accessed_by?("ci::change_branch"))
     end
 
+    get ["ci::view"], "/*/coverage/?" do |build_id|
+      puts "Public folder: #{settings.public_folder}"
+      redirect "/#{build_id}/coverage/index.html"
+    end
+
     sq_auth_access do
       access_action "/build" do
         execute_for "ci::view"
@@ -47,7 +53,7 @@ module CIQuantum
     end
 
     post '/build' do
-      quantum.build quantum.repo_config.branch
+      quantum.build quantum.git_branch
       redirect '/'
     end
 
@@ -80,8 +86,7 @@ module CIQuantum
     end
 
     get ["ci::view"], '/coverage?' do
-      link_coverage_path
-      redirect "coverage/index.html"
+      redirect "/#{quantum.last_build.sha}/coverage/index.html"
     end
 
     helpers do
@@ -110,10 +115,14 @@ module CIQuantum
       super
       check_project
       @quantum = CIQuantum.new(settings.project_path)
+      @quantum.shared_path = settings.public_folder
     end
 
     def self.start(host, port, project_path)
+      git_path = File.join(project_path, ".git")
+      FileUtils.cp_r settings.public_folder, git_path
       set :project_path, project_path
+      set :public_folder, "#{git_path}/public"
       CIQuantum::Server.run! :host => host, :port => port
     end
 
@@ -122,16 +131,6 @@ module CIQuantum
       self.new
     end
 
-    def link_coverage_path
-      public_coverage_path = File.join settings.public_folder, "coverage"
-      project_coverage_path = File.join settings.project_path, quantum.coverage_path
-
-      File.unlink public_coverage_path if File.exists? public_coverage_path
-      if !quantum.coverage_path.empty? and File.exists? project_coverage_path
-        File.symlink project_coverage_path, public_coverage_path
-      end
-    end
-
     def self.project_path=(project_path)
       set :project_path, Proc.new{project_path}, true
     end

data/lib/ciquantum/version.rb

@@ -1,3 +1,3 @@
 module CIQuantum
-  Version = VERSION = "0.0.10"
+  Version = VERSION = "0.0.11"
 end

data/lib/ciquantum/views/build.erb

@@ -0,0 +1,22 @@
+
+<div class="build" >
+  <div class="<%= build.status %>">
+    <b><%= build.branch %></b> : <%= build.status %> at <b><%= pretty_time(build.finished_at) %></b>. Build duration: <b><%= build.duration %></b> seconds.
+  </div>
+  <% if build.sha %>
+    <div class="commit">
+      Commit : <a href="<%= build.commit.url %>"><%= build.commit.sha %></a><br/>
+      Author : <%= build.commit.author %><br/>
+      Message: <pre><%= build.commit.message %></pre>
+    </div>
+  <% end %>
+  <div class="results">
+    <h4 class="result">>Test results: <%= build.test_results %></h4>
+    <a href="<%= quantum.coverage_for_build(build) %>">Show coverage</a> | 
+    <a href="#" onclick="toggleVisibility('<%= build.id %>')">Show output</a>
+    <div id="<%= build.id %>" style="display:none">
+      <pre class="terminal"><code><%= ansi_color_codes h(build.output) %></code></pre>
+    </div>
+
+  </div>
+</div>

data/lib/ciquantum/views/json.erb

@@ -1,16 +1,19 @@
-{ "jobs": [
-<% if quantum.last_build %>
-{"name":"<%= quantum.projectname || quantum.project %>",
- "url":"<%= quantum.url %>",
- "color":"<%= quantum.last_build.status.to_s == "failed" ? 'red' : 'blue' %>",
- "status":"<%= quantum.last_build.status %>",
- "started_at":"<%= pretty_time(quantum.last_build.started_at) %>",
- "finished_at":"<%= pretty_time(quantum.last_build.finished_at) %>",
- "duration":"<%= quantum.last_build.duration if quantum.last_build.duration %>",
- "sha":"<%= quantum.last_build.sha %>",
- "short_sha":"<%= quantum.last_build.short_sha %>",
- "commit_url":"<%= quantum.last_build.commit.url if quantum.last_build.commit %>",
- "branch":"<%= quantum.last_build.branch %>"
- }
-<% end %>
-]}
+{
+  "jobs": [
+  <% if quantum.last_build %>
+    {
+      "name":"<%= quantum.projectname || quantum.project %>",
+      "url":"<%= quantum.url %>",
+      "color":"<%= quantum.last_build.status.to_s == "failed" ? 'red' : 'blue' %>",
+      "status":"<%= quantum.last_build.status %>",
+      "started_at":"<%= pretty_time(quantum.last_build.started_at) %>",
+      "finished_at":"<%= pretty_time(quantum.last_build.finished_at) %>",
+      "duration":"<%= quantum.last_build.duration if quantum.last_build.duration %>",
+      "sha":"<%= quantum.last_build.sha %>",
+      "short_sha":"<%= quantum.last_build.short_sha %>",
+      "commit_url":"<%= quantum.last_build.commit.url if quantum.last_build.commit %>",
+      "branch":"<%= quantum.last_build.branch %>"
+    }
+  <% end %>
+  ]
+}

data/lib/ciquantum/views/template.erb

@@ -2,6 +2,7 @@
 <html>
   <head>
     <link href="<%= ciquantum_root %>/screen.css" media="screen" rel="stylesheet" type="text/css" />
+    <script type="text/JavaScript" src="<%= ciquantum_root %>/javascript.js"></script>
     <title><%= h(quantum.projectname) %>: CI Quantum</title>
   </head>
   <body>
@@ -35,7 +36,7 @@
               <form method="POST" action="/switch_branch">
                 <select name="branch">
                   <% for @branch in quantum.git_branches %>
-                    <option value="<%= @branch %>" <%= 'selected="selected"' if (@branch == quantum.git_branch) %>>"<%= @branch %>"</option>
+                    <option value="<%= @branch %>" <%= 'selected="selected"' if quantum.is_current_git_branch?(@branch) %>>"<%= @branch %>"</option>
                   <% end %>
                 </select>
                 <input type="submit" name="switch" value="Switch branch and build"/>
@@ -43,25 +44,10 @@
               <% end %>
             </li>
           <% end %>
-          
-          <% if quantum.last_build %>
-            <li>
-              <span class="date"><%= pretty_time(quantum.last_build.finished_at) %></span> &raquo;
-              <% if quantum.last_build.sha %>
-                Built <%= quantum.last_build.branch %> at <a href="<%= quantum.last_build.commit.url %>"><%= quantum.last_build.short_sha %></a>
-              <% end %>
-              <span class="<%= quantum.last_build.status %>">(<%= quantum.last_build.status %>)</span>
-              
-              <% if quantum.last_build.duration %>
-                in <span class="duration"><%= quantum.last_build.duration %></span> seconds.
-              <% end %>
 
-              <% if !quantum.coverage_path.empty? || true %>
-                <span class="coverage"><a href="coverage">Code coverage</a>
-             <% end %>
-            </li>
-            <% if quantum.last_build.failed? %>
-              <li><pre class="terminal"><code><%=ansi_color_codes h(quantum.last_build.output) %></code></pre></li>
+          <% if ! quantum.active_builds.empty?%>
+            <% for @build in quantum.active_builds %>
+              <ul><%= erb(:build, {}, :quantum => quantum, :build => @build) %></ul>
             <% end %>
           <% end %>
         </ul>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciquantum
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.25
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ files:
 - lib/ciquantum/commit.rb
 - lib/ciquantum/config.rb
 - lib/ciquantum/core.rb
+- lib/ciquantum/public/javascript.js
 - lib/ciquantum/public/screen.css
 - lib/ciquantum/queue.rb
 - lib/ciquantum/server.rb
@@ -205,8 +206,8 @@ files:
 - lib/ciquantum/utils/coverage_merger.rb
 - lib/ciquantum/utils/mailer.rb
 - lib/ciquantum/version.rb
+- lib/ciquantum/views/build.erb
 - lib/ciquantum/views/json.erb
-- lib/ciquantum/views/mail.erb
 - lib/ciquantum/views/mailer/html.erb
 - lib/ciquantum/views/mailer/text.erb
 - lib/ciquantum/views/template.erb

data/lib/ciquantum/views/mail.erb

@@ -1,48 +0,0 @@
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>[<%= @project %>] CIServer: state on branch <%= @build.branch %></title>
-  <style type="text/css">
-
-    .title {
-      font-size: 120%; 
-      font-family: Verdana, Arial, Helvetica, sans-serif;
-      border: 1px solid black;
-      margin: 10px 20px;
-      padding: 20px 10px;
-    }
-
-    .failed {
-      background-color: #CC0000;
-    }
-
-    .worked {
-      background-color: #00CC00;
-    }
-
-    pre {
-      border: 1px solid black;
-      background-color: #E0E0E0;
-    }
-
-  </style>
-</head>
-<body>
-  <div class="title <%= @build.status.to_s %>"><%= @caption %></div><br>
-  <div class="text">
-    Last build <%= @project %> on branch <%= @build.branch %> <%= @build.status.to_s %>."<br><br>
-
-    Details: <%= @build.commit.url %><br>
-    Author: <%= @build.commit.author %><br>
-    Message: <%= @build.commit.message %><br>
-  </div>
-  <% if @build.status == :failed %>
-  <br>
-  <code>
-    <pre>
-      Output:<br>
-      <%= @build.clean_output %>
-    </pre>
-  </code>
-  <% end %>
-  <br><br><br>
-</body>