ciquantum 0.0.16 → 0.0.17

data/bin/ciquantum

@@ -43,6 +43,7 @@ Choice.options do
       exit
     end
   end
+
 end
 
 options = Choice.choices

data/lib/ciquantum.rb

@@ -5,6 +5,7 @@ require 'ciquantum/unfuddle'
 require 'ciquantum/unfuddle/changeset'
 require 'ciquantum/utils/mailer'
 require 'ciquantum/utils/coverage_merger'
+require 'ciquantum/git'
 require 'ciquantum/commit'
 require 'ciquantum/build'
 require 'ciquantum/server'

data/lib/ciquantum/build.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 
 module CIQuantum
-  class Build < Struct.new(:project_path, :user, :project, :started_at, :finished_at, :sha, :status, :output, :pid, :branch)
+  class Build < Struct.new(:project_path, :started_at, :finished_at, :sha, :status, :output, :pid, :branch)
     def initialize(*args)
       super
       self.started_at ||= Time.now
@@ -30,7 +30,7 @@ module CIQuantum
     end
 
     def id
-      "#{sha}-#{finished_at.to_i}"
+      finished_at.to_i.to_s
     end
 
     def short_sha
@@ -52,7 +52,7 @@ module CIQuantum
 
     def commit
       return if sha.nil?
-      @commit ||= Commit.new(sha, user, project, project_path)
+      @commit ||= Commit.new(sha, project_path)
     end
 
     def test_results
@@ -68,7 +68,7 @@ module CIQuantum
     end
 
     def dump file
-      config = [user, project, started_at, finished_at, sha, status, output, pid, branch]
+      config = [started_at, finished_at, sha, status, output, pid, branch]
       data = YAML.dump(config)
       File.open(file, 'wb') { |io| io.write(data) }
     end

data/lib/ciquantum/commit.rb

@@ -1,7 +1,10 @@
 module CIQuantum
-  class Commit < Struct.new(:sha, :user, :project, :project_path)
-    def url
-      Unfuddle.commit_url self
+  class Commit < Struct.new(:sha, :project_path)
+
+    attr_reader :url
+
+    def get_url! adapter
+      @url = adapter.commit_url self
     end
 
     def author

data/lib/ciquantum/config.rb

@@ -11,6 +11,10 @@ module CIQuantum
     end
 
     def method_missing(command, *args)
+      self[command]
+    end
+
+    def [](command)
       Config.new(command, @project_path, self)
     end
 

data/lib/ciquantum/core.rb

@@ -2,24 +2,26 @@ require 'fileutils'
 
 module CIQuantum
   class Core
-    attr_reader :user
-    attr_reader :project
+    attr_reader :adapter
     attr_reader :url
     attr_reader :current_build
     attr_reader :last_build
     attr_reader :projectname
     attr_reader :coverage_path
+    attr_reader :git
+    attr_reader :is_building
     attr_accessor :shared_path
 
-    HistoryLimit = 10
+    HistoryLimit = 20
 
     def initialize(project_path)
+      @is_building = false
       @project_path = File.expand_path(project_path)
+      @adapter = Unfuddle.from_config(repo_config)
 
-      @user, @project = git_user_and_project
-      @url = project_url
       @projectname = repo_config.projectname.to_s
       @coverage_path = repo_config.coveragepath.to_s
+      @git = Git.new(@project_path)
 
       @last_build = nil
       @current_build = nil
@@ -28,23 +30,26 @@ module CIQuantum
       trap("INT") { stop }
     end
 
-    # is a build running?
     def building?
       !!@current_build
     end
 
-    # the pid of the running child process
     def pid
       building? and current_build.pid
     end
 
-    # kill the child and exit
     def stop
-      Process.kill(9, pid) if pid
+      stop_build
       exit!
     end
 
-    # build callbacks
+    def stop_build
+      @is_building = false
+      Process.kill(9, @current_build.pid) if @current_build && @current_build.pid
+      write_build 'current', nil
+      @current_build = nil
+    end
+
     def build_failed(output, error)
       finish_build :failed, "#{error}\n\n#{output}"
       run_hook "build-failed"
@@ -66,23 +71,28 @@ module CIQuantum
       write_last_build
       run_hook "postbuild"
       save_coverage_for_build @last_build
+      @is_building = false
 
       build(@queue.next_branch_to_build) if @queue.waiting?
     end
 
     def build(branch=nil)
+      branch ||= tracked_branch
+      puts "Preparing branch build with param:#{branch}"
       if building?
         @queue.append_unless_already_exists(branch)
-        # leave anyway because a current build runs
         return
       end
-      @current_build = Build.new(@project_path, @user, @project)
+
+      @is_building = true
+      @current_build = Build.new(@project_path)
       write_current_build
 
       Thread.new {
         build!(branch)
       }
 
+      @current_build = read_current_build
     end
 
     def open_pipe(cmd)
@@ -99,14 +109,13 @@ module CIQuantum
       yield read, pid
     end
 
-    # update git then run the build
-    def build!(branch=nil)
-      @git_branch = branch
+    def build!(branch)
       build = @current_build
-      git_update
+      update_tracked_branch branch
+      @current_build = read_current_build
       output = ''
-      build.sha = git_sha
-      build.branch = git_branch
+      build.sha = @git.sha
+      build.branch = @git.branch
       write_build 'current', build
       run_hook "prebuild"
 
@@ -135,26 +144,13 @@ module CIQuantum
       runner == '' ? "rake -s --color test:units" : runner
     end
 
-    def git_update
-      `cd #{@project_path} && git fetch origin && git reset --hard origin/#{git_branch} && git submodule update --init`
-      run_hook "after-reset"
-    end
-
-    def git_user_and_project
-      config = repo_config.send Unfuddle.name
-      Unfuddle.git_user_and_project config
-    end
-
-    def project_url
-      Unfuddle.project_url @user, @project
-    end
-
     # massage our repo
     def run_hook(hook)
       file = path_in_project(".git/hooks/#{hook}")
       if File.exists?(file) && File.executable?(file)
         data =
           if @last_build && @last_build.commit
+            @last_build.commit.get_url! @adapter
             {
               "MESSAGE" => @last_build.commit.message,
               "AUTHOR" => @last_build.commit.author,
@@ -178,7 +174,6 @@ module CIQuantum
       end
     end
 
-    # restore current / last build state from disk.
     def restore
       @last_build = read_last_build
       @current_build = read_current_build
@@ -217,27 +212,16 @@ module CIQuantum
       Config.ciquantum(@project_path)
     end
 
-    def swith_branch branch
-      repo_config.branch.set branch if git_branches.include? branch
-    end
-
-    def git_branches
-      branches = `cd #{@project_path} && git branch -r`.split("\n")
-      branches.collect{|s| s =~ /(?:\s|^)origin\/(?!HEAD)(\w+)(?:\s|$)/ ? $1.strip : nil}.compact
+    def update_tracked_branch branch
+      new_branch = branch.strip
+      repo_config.branch.set new_branch
+      @tracked_branch = new_branch
+      @git.checkout new_branch
     end
 
-    def git_branch
-      return @git_branch if @git_branch
+    def tracked_branch
       branch = repo_config.branch.to_s
-      @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
+      @tracked_branch ||= (branch.empty? ? "master" : branch.strip)
     end
 
     def read_build(name)
@@ -261,8 +245,8 @@ module CIQuantum
       old_builds.each do |build_file|
         build = read_build(build_file)
         active_builds << build
-        if build.status == :worked
-          remove_builds_from build
+        if build.status == :worked || active_builds.size >= HistoryLimit
+          remove_elder_builds build
           break
         end
       end
@@ -287,7 +271,7 @@ module CIQuantum
 
     def write_build(name, build)
       filename = path_in_project(".git/builds/#{name}")
-      Dir.mkdir path_in_project('.git/builds') unless File.directory?(path_in_project('.git/builds'))
+      FileUtils.mkdir_p path_in_project('.git/builds')
       if build
         build.dump filename
       elsif File.exist?(filename)
@@ -295,7 +279,7 @@ module CIQuantum
       end
     end
 
-    def remove_builds_from limit_build
+    def remove_elder_builds limit_build
       old_builds.each do |build_file|
         build = read_build(build_file)
         if build.finished_at < limit_build.finished_at

data/lib/ciquantum/git.rb

@@ -0,0 +1,64 @@
+module CIQuantum
+  class Git < Struct.new(:path)
+
+    def exec command
+      puts "Executing git command: #{command}"
+      res = `#{command}`
+      puts "Result for git command:\n#{res}"
+      res
+    end
+
+    def sha
+      exec("cd #{path} && git rev-parse origin/#{branch}").chomp
+    end
+
+    def update
+      fetch
+      exec("cd #{path} && git reset --hard origin/#{branch} && git submodule update --init")
+    end
+
+    def branches
+      branches_to_list `cd #{path} && git branch -r`
+    end
+
+    def fetch
+      exec("cd #{path} && git fetch origin")
+    end
+
+    def branch
+      if !@branch && exec("cd #{path} && git branch 2>/dev/null | grep -e '\*' ") =~ /^\*\s(\w+)/
+        @branch = $1.strip
+      end
+      @branch
+    end
+
+    def is_current_branch? other_branch
+      return branch.eql? other_branch
+    end
+
+    def checkout other_branch
+      unless is_current_branch?(other_branch)
+        fetch
+        exec("cd #{path} && git checkout #{other_branch}") if branches.include?(other_branch)
+        @branch = nil
+      end
+      update
+    end
+
+    def branches_with_commit commit_sha
+      fetch
+      branches_to_list exec("cd #{path} && git branch -r --contains #{commit_sha}")
+    end
+
+    def current_branch_contains_commit? commit_sha
+      branches_with_commit(commit_sha).include?(branch)
+    end
+
+    private
+    def branches_to_list branch_output
+      raw_branches = branch_output.split("\n")
+      raw_branches.collect{|s| s =~ /^\s*(?:origin\/)?(\w+)\s*$/ ? $1.strip : nil}.compact.uniq
+    end
+
+  end
+end

data/lib/ciquantum/server.rb

@@ -53,13 +53,20 @@ module CIQuantum
     end
 
     post '/build' do
-      quantum.build quantum.git_branch
+      puts "Building!"
+      quantum.build
       redirect '/'
     end
 
     post '/switch_branch' do
-      quantum.swith_branch params[:branch]
-      quantum.build params[:branch]
+      puts "Switching branch! params: #{params.inspect}"
+      quantum.build params[:branch].strip
+      redirect '/'
+    end
+
+    post '/cancel_build' do
+      puts "Stop build!"
+      quantum.stop_build
       redirect '/'
     end
 
@@ -78,7 +85,9 @@ module CIQuantum
       begin
         xml = request.body.read
         changeset = Unfuddle::Changeset.new(xml)
-        quantum.build quantum.repo_config.branch
+        if quantum.git.current_branch_contains_commit? changeset.commit
+          quantum.build
+        end
       rescue Unfuddle::ChangesetError => e
         logger.error "[error] Changeset error: #{e.inspect}, Content: #{xml.inspect}"
         halt 400, "Changeset Error: #{e.message}"

data/lib/ciquantum/unfuddle.rb

@@ -1,20 +1,24 @@
 module CIQuantum
-  module Unfuddle
+  class Unfuddle < Struct.new(:config)
 
-    def self.name
-      "unfuddle"
+    def self.config_name
+      'unfuddle'
     end
 
-    def self.commit_url commit
-      "http://#{commit.user}.unfuddle.com/a#/repositories/#{commit.project}/commit?commit=#{commit.sha}"
+    def self.from_config config
+      self.new config[config_name]
     end
 
-    def self.git_user_and_project config
-      [ config.user, config.project ]
+    def commit_url commit
+      "http://#{config.user}.unfuddle.com/a#/repositories/#{config.project}/commit?commit=#{commit.sha}"
     end
 
-    def self.project_url user, project
-      "https://#{user}.unfuddle.com/a#/repositories/#{project}/browse"
+    def url
+      "https://#{config.user}.unfuddle.com/a#/repositories/#{config.project}/browse"
+    end
+
+    def [] command
+      return @config[command]
     end
 
   end

data/lib/ciquantum/unfuddle/changeset.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext'
 
 module CIQuantum
-  module Unfuddle
+  class Unfuddle
     class ChangesetError < StandardError ; end
 
     class Changeset

data/lib/ciquantum/version.rb

@@ -1,3 +1,3 @@
 module CIQuantum
-  Version = VERSION = "0.0.16"
+  Version = VERSION = "0.0.17"
 end

data/lib/ciquantum/views/build.erb

@@ -12,7 +12,7 @@
   <% 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="<%= 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>

data/lib/ciquantum/views/json.erb

@@ -3,7 +3,7 @@
   <% if quantum.last_build %>
     {
       "name":"<%= quantum.projectname || quantum.project %>",
-      "url":"<%= quantum.url %>",
+      "url":"<%= quantum.adapter.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) %>",
@@ -11,7 +11,7 @@
       "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 %>",
+      "commit_url":"<%= quantum.adapter_commit_url(quantum.last_build.commit) if quantum.last_build.commit %>",
       "branch":"<%= quantum.last_build.branch %>"
     }
   <% end %>

data/lib/ciquantum/views/mailer/html.erb

@@ -4,7 +4,7 @@
   <style type="text/css">
 
     .title {
-      font-size: 120%; 
+      font-size: 120%;
       font-family: Verdana, Arial, Helvetica, sans-serif;
       border: 1px solid black;
       margin: 10px 20px;

data/lib/ciquantum/views/template.erb

@@ -15,28 +15,32 @@
       <div id="home">
         <h1><a href="<%= quantum.url %>"><%= quantum.projectname %></a></h1>
         <ul class="posts">
-          <% if quantum.current_build %>
+          <% if quantum.is_building %>
             <li>
-              <span class="date"><%= pretty_time(quantum.current_build.started_at) if quantum.current_build %></span> &raquo;
-              <% if quantum.current_build.sha %>
-                Building <%= quantum.current_build.branch %> at <a href="<%= quantum.current_build.commit.url %>"><%= quantum.current_build.short_sha %></a> <small>(pid: <%= quantum.pid %>)</small>
-              <% else %>
-                Build starting...
-              <% end %>
+              <span class="date"><%= pretty_time(quantum.current_build ? quantum.current_build.started_at : Time.now) %></span> &raquo;
+              Current branch: <%= quantum.git.branch %>.
+                <% if quantum.current_build %>
+                  Building <%= quantum.current_build.branch %> at <a href="<%= quantum.current_build.commit.url %>"><%= quantum.current_build.short_sha %></a> <small>(pid: <%= quantum.pid %>)</small>
+                <% else %>
+                  Build starting...
+                <% end %>
+              <form method="POST" action="/cancel_build">
+                <input type="submit" name="cancel" value="Cancel"/>
+              </form>
             </li>
           <% else %>
             <li>
               <form method="POST" action="/build">
-                <span class="branch">Current branch: <%= quantum.git_branch %></span>  
-                <input type="submit" name="switch" value="Build"/>
+                <span class="branch">Current branch: <%= quantum.git.branch %></span>
+                <input type="submit" name="build" value="Build"/>
               </form>
             </li>
             <li>
               <% if can_change_branch %>
               <form method="POST" action="/switch_branch">
                 <select name="branch">
-                  <% for @branch in quantum.git_branches %>
-                    <option value="<%= @branch %>" <%= 'selected="selected"' if quantum.is_current_git_branch?(@branch) %>>"<%= @branch %>"</option>
+                  <% for @branch in quantum.git.branches %>
+                    <option value="<%= @branch %>" <%= 'selected="selected"' if quantum.git.is_current_branch?(@branch.strip) %>>"<%= @branch %>"</option>
                   <% end %>
                 </select>
                 <input type="submit" name="switch" value="Switch branch and build"/>
@@ -45,8 +49,9 @@
             </li>
           <% end %>
 
-          <% if ! quantum.active_builds.empty?%>
-            <% for @build in quantum.active_builds %>
+          <% builds = quantum.active_builds %>
+          <% if ! builds.empty?%>
+            <% for @build in builds %>
               <ul><%= erb(:build, {}, :quantum => quantum, :build => @build) %></ul>
             <% end %>
           <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciquantum
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ files:
 - lib/ciquantum/commit.rb
 - lib/ciquantum/config.rb
 - lib/ciquantum/core.rb
+- lib/ciquantum/git.rb
 - lib/ciquantum/public/javascript.js
 - lib/ciquantum/public/screen.css
 - lib/ciquantum/queue.rb