ciquantum 0.0.6 → 0.0.8

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.21'
+  gem.add_runtime_dependency     'sq_auth', '>= 0.0.24'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'mocha'
 

data/lib/ciquantum.rb

@@ -3,6 +3,8 @@ require 'ciquantum/version'
 require 'ciquantum/config'
 require 'ciquantum/unfuddle'
 require 'ciquantum/unfuddle/changeset'
+require 'ciquantum/utils/mailer'
+require 'ciquantum/utils/coverage_merger'
 require 'ciquantum/commit'
 require 'ciquantum/build'
 require 'ciquantum/server'

data/lib/ciquantum/core.rb

@@ -133,7 +133,7 @@ module CIQuantum
     end
 
     def git_update
-      `cd #{@project_path} && git fetch origin && git reset --hard origin/#{git_branch}`
+      `cd #{@project_path} && git fetch origin && git submodule update && git reset --hard origin/#{git_branch}`
       run_hook "after-reset"
     end
 

data/lib/ciquantum/server.rb

@@ -48,16 +48,12 @@ module CIQuantum
 
     post '/build' do
       quantum.build quantum.repo_config.branch
-
-      link_coverage_path
       redirect '/'
     end
 
     post '/switch_branch' do
       quantum.swith_branch params[:branch]
       quantum.build params[:branch]
-
-      link_coverage_path
       redirect '/'
     end
 
@@ -77,7 +73,6 @@ module CIQuantum
         xml = request.body.read
         changeset = Unfuddle::Changeset.new(xml)
         quantum.build quantum.repo_config.branch
-        link_coverage_path
       rescue Unfuddle::ChangesetError => e
         logger.error "[error] Changeset error: #{e.inspect}, Content: #{xml.inspect}"
         halt 400, "Changeset Error: #{e.message}"
@@ -85,6 +80,7 @@ module CIQuantum
     end
 
     get ["ci::view"], '/coverage?' do
+      link_coverage_path
       redirect "coverage/index.html"
     end
 

data/lib/ciquantum/utils/coverage_merger.rb

@@ -0,0 +1,22 @@
+require 'json'
+
+module CIQuantum
+  module Utils
+    module CoverageMerger
+
+      def self.merge *child_project_paths
+        coverage = {}
+        child_project_paths.each do |path|
+          resultset = JSON.parse File.read(File.join path, "coverage/.resultset.json")
+          resultset.each do |key, value|
+            coverage = value["coverage"].merge_resultset coverage
+          end
+        end
+
+        merged_result = ::SimpleCov::Result.from_hash({"Combined" => { "coverage" => coverage, "timestamp" => Time.now.to_i }})
+        ::SimpleCov::ResultMerger.store_result merged_result
+      end
+
+    end
+  end
+end

data/lib/ciquantum/utils/mailer.rb

@@ -0,0 +1,63 @@
+require 'erb'
+require 'pony'
+require 'json'
+require 'cgi'
+
+module CIQuantum
+  module Utils
+    class Mailer
+
+      Captions = {
+        failed: "Build failed",
+        still_failed: "Buils hasn't been repaired yet",
+        repaired: "Build repaired",
+        worked: "Build worked"
+      }
+
+      attr_accessor :roles_with_keys
+      attr_accessor :project
+
+      def initialize project, roles_with_keys
+        @project = project
+        @roles_with_keys = roles_with_keys
+      end
+
+      def send_mail type, subject, body
+        data = "email=" + CGI::escape({subject: subject, body: body, type: type}.to_json)
+        @roles_with_keys.each do |role, api_key|
+          uri = URI.parse "https://sqauth.socialquantum.com/send_email/#{@project}/#{role}/#{api_key}"
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          response = http.post(uri.path, data, { 'Content-Type' => 'application/x-www-form-urlencoded' })
+        end
+      end
+
+      def template name, template_path = nil
+        template_path ||=  File.expand_path "#{File.dirname __FILE__}/../views/mailer"
+        template = File.read(File.join template_path, "#{name}.erb")
+        ERB.new(template)
+      end
+
+      def send_template template, build, status
+        @build = build
+        @status = status
+        @caption = Captions[status]
+
+        body = template(template.to_s).result(binding)
+        subject = "CIServer: state on branch #{build.branch}"
+        send_mail template.to_s, subject, body
+
+      end
+
+      def send_html build, status
+        send_template :html, build, status
+      end
+
+      def send_plain build, status
+        send_template :text, build, status
+      end
+
+    end
+  end
+end

data/lib/ciquantum/version.rb

@@ -1,3 +1,3 @@
 module CIQuantum
-  Version = VERSION = "0.0.6"
+  Version = VERSION = "0.0.8"
 end

data/lib/ciquantum/views/mail.erb

@@ -0,0 +1,48 @@
+<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>

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

@@ -0,0 +1,48 @@
+<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>

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

@@ -0,0 +1,12 @@
+<%= @caption %>
+
+Last build <%= @project %> on branch <%= @build.branch %> <%= @build.status.to_s %>.
+
+Details: <%= @build.commit.url %>
+Author: <%= @build.commit.author %>
+Message: <%= @build.commit.message %>
+
+<% if @build.status == :failed %>
+  Output:
+  <%= @build.clean_output %>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ciquantum
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-07 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.21
+        version: 0.0.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: 0.0.24
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,8 +202,13 @@ files:
 - lib/ciquantum/server.rb
 - lib/ciquantum/unfuddle.rb
 - lib/ciquantum/unfuddle/changeset.rb
+- lib/ciquantum/utils/coverage_merger.rb
+- lib/ciquantum/utils/mailer.rb
 - lib/ciquantum/version.rb
 - 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
 - sample.rb
 - test/fixtures/payload.json