build-buddy 1.12.2 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8370ef9234e1e2e2b53c9504a8626262ae7918
-  data.tar.gz: 405570c57c751895749b446cef081120f7e2787b
+  metadata.gz: 7db95cc8816c610a427233d3082ed8209c9a65b6
+  data.tar.gz: 235ad6277e52ad8be9747933133476562af77633
 SHA512:
-  metadata.gz: 672ffd5191ace8f70d7aac002625a1fb7b09ce8978c610acb9ae886767e542cdc9f9f3a4723e4f199a32c62ca29ca739ef9f4ad527e7ce0363246896f753ced4
-  data.tar.gz: 6d2eb7e0a8f71ade20c51db7fbc651c8ca5ff5cf91db354525f7d0b5da7167f1ee2efb5ac82d91995465de8f5a405ab10807a6f0f0dfaef85b12ddedaaa0b5e3
+  metadata.gz: af52e4b43610c3ff26c5d76c99c3b069f7ba393cb374a020e8954b75ea890447a950451f52bd96da1820b3afb0b85ca2eb17d707739ba1cec51d45f84ae63a91
+  data.tar.gz: a82009f93b686be80f338175408dc5d03bc8374189f60985fbd44112e4adce023205733f6b5a94e0e7d03a04d3921688dd0040c0f1081590fa582ffbf04b62a5

data/bin/build-buddy

@@ -19,8 +19,7 @@ module BuildBuddy
 
       load config_file_name
 
-      Dir.mkdir(Config.build_log_dir) unless Dir.exist?(Config.build_log_dir)
-      Dir.mkdir(Config.hud_image_dir) unless Dir.exist?(Config.hud_image_dir)
+      Dir.mkdir(Config.build_output_dir) unless Dir.exist?(Config.build_output_dir)
 
       Slack.configure do |config|
         config.token = Config.slack_api_token

data/lib/build_buddy.rb

@@ -9,5 +9,5 @@ require 'build_buddy/recorder'
 require 'build_buddy/build_data'
 
 module BuildBuddy
-  VERSION = "1.12.2"
+  VERSION = "1.14.0"
 end

data/lib/build_buddy/build_data.rb

@@ -1,6 +1,25 @@
+require 'thread'
+
 module BuildBuddy
+  @@bb_id = 100
+  @@bb_id_mutex = Mutex.new
+
+  def self.bb_id
+    @@bb_id
+  end
+
+  def self.bb_id=(bb_id)
+    @@bb_id = bb_id
+  end
+
+  def self.bb_id_mutex
+    @@bb_id_mutex
+  end
+
   class BuildData
     attr_accessor :_id # Mongo ID
+    attr_accessor :bb_id # Build Buddy id
+    attr_accessor :create_time
     attr_accessor :type # one of :master, :release or :pull_request
     attr_accessor :repo_full_name
     attr_accessor :branch
@@ -24,18 +43,32 @@ module BuildBuddy
         end
       end
 
-      # Set the id here so that we can use it to refer to this build_data in queue
-      @_id = BSON::ObjectId.new
+      BuildBuddy::bb_id_mutex.synchronize {
+        bb_id = BuildBuddy::bb_id
+        @bb_id = 'BB-' + bb_id.to_s
+        BuildBuddy::bb_id = bb_id + 1
+      }
+      @create_time = Time.now.utc
     end
 
     def to_h
       hash = {}
       instance_variables.each {|var| hash[var.to_s.delete("@")] = instance_variable_get(var) }
+      # Remove the bb_id field as it's only meaningful while the build-buddy is running
+      hash.delete(:bb_id)
       hash
     end
 
     def server_log_uri
-      Config.server_base_uri + '/log/' + @_id.to_s
+      BuildData.server_log_uri(@_id)
+    end
+
+    def self.server_log_uri(id)
+      Config.server_base_uri + '/build/' + id.to_s + '/log.html'
+    end
+
+    def self.server_report_uri(id)
+      Config.server_base_uri + '/build/' + id.to_s + '/report.html'
     end
 
     def status_verb
@@ -52,7 +85,7 @@ module BuildBuddy
 
     def log_file_name
       return nil if @start_time.nil?
-      File.join(Config.build_log_dir, "#{@start_time.strftime('%Y%m%d-%H%M%S')}.log")
+      File.join(Config.build_output_dir, "#{@start_time.strftime('%Y%m%d-%H%M%S')}.log")
     end
   end
 end

data/lib/build_buddy/builder.rb

@@ -16,6 +16,8 @@ module BuildBuddy
       @gid = nil
       @watcher = nil
       @metrics_tempfile = nil
+      @build_output_dir = nil
+      @log_file_name = nil
     end
 
     def start_build(build_data)
@@ -26,6 +28,10 @@ module BuildBuddy
       @build_data = build_data
       @metrics_tempfile = Tempfile.new('build-metrics')
       @metrics_tempfile.close()
+      @build_output_dir = File.join(Config.build_output_dir, @build_data._id.to_s)
+      @log_file_name = File.join(@build_output_dir, "log.txt")
+
+      FileUtils.mkdir(@build_output_dir)
 
       repo_parts = @build_data.repo_full_name.split('/')
       git_repo_owner = repo_parts[0]
@@ -33,8 +39,8 @@ module BuildBuddy
       env = {}
       build_script = %q(#!/bin/bash
 
-if [[ -z "$GIT_REPO_OWNER" || -z "$GIT_REPO_NAME" || -z "$BUILD_SCRIPT" ]]; then
-  echo Must set GIT_REPO_OWNER, GIT_REPO_NAME, GIT_PULL_REQUEST and BUILD_SCRIPT before calling
+if [[ -z "$BB_GIT_REPO_OWNER" || -z "$BB_GIT_REPO_NAME" || -z "$BB_BUILD_SCRIPT" ]]; then
+  echo Must set BB_GIT_REPO_OWNER, BB_GIT_REPO_NAME, BB_GIT_PULL_REQUEST and BB_BUILD_SCRIPT before calling
   exit 1
 fi
 )
@@ -42,14 +48,14 @@ fi
       case build_data.type
       when :pull_request
           build_script += %q(
-if [[ -z "$GIT_PULL_REQUEST" ]]; then
-  echo Must set GIT_PULL_REQUEST before calling
+if [[ -z "$BB_GIT_PULL_REQUEST" ]]; then
+  echo Must set BB_GIT_PULL_REQUEST before calling
 fi
 )
       when :branch
         build_script += %q(
-if [[ -z "$GIT_BRANCH" ]]; then
-  echo Must set GIT_BRANCH before calling
+if [[ -z "$BB_GIT_BRANCH" ]]; then
+  echo Must set BB_GIT_BRANCH before calling
 fi
 )
       else
@@ -57,18 +63,18 @@ fi
       end
 
       build_script += %q(
-if [[ -d ${GIT_REPO_NAME} ]]; then
-  echo WARNING: Deleting old clone directory $(pwd)/${GIT_REPO_NAME}
-  rm -rf ${GIT_REPO_NAME}
+if [[ -d ${BB_GIT_REPO_NAME} ]]; then
+  echo WARNING: Deleting old clone directory $(pwd)/${BB_GIT_REPO_NAME}
+  rm -rf ${BB_GIT_REPO_NAME}
 fi
 
-echo Pulling sources to $(pwd)/${GIT_REPO_NAME}
-if ! git clone git@github.com:${GIT_REPO_OWNER}/${GIT_REPO_NAME}.git ${GIT_REPO_NAME}; then
+echo Pulling sources to $(pwd)/${BB_GIT_REPO_NAME}
+if ! git clone git@github.com:${BB_GIT_REPO_OWNER}/${BB_GIT_REPO_NAME}.git ${BB_GIT_REPO_NAME}; then
   echo ERROR: Unable to clone repository
   exit 1
 fi
 
-cd ${GIT_REPO_NAME}
+cd ${BB_GIT_REPO_NAME}
 )
 
       build_root_dir = nil
@@ -77,35 +83,37 @@ cd ${GIT_REPO_NAME}
       when :pull_request
         build_root_dir = expand_vars(Config.pull_request_root_dir)
         env.merge!({
-          "GIT_PULL_REQUEST" => build_data.pull_request.to_s,
-          "BUILD_SCRIPT" => Config.pull_request_build_script
+          "BB_GIT_PULL_REQUEST" => build_data.pull_request.to_s,
+          "BB_BUILD_SCRIPT" => Config.pull_request_build_script
         })
         # See https://gist.github.com/piscisaureus/3342247
         build_script += %q(
-echo Switching to pr/${GIT_PULL_REQUEST} branch
+echo Switching to pr/${BB_GIT_PULL_REQUEST} branch
 git config --add remote.origin.fetch '+refs/pull/*/head:refs/remotes/origin/pr/*'
 git fetch -q origin
-git checkout pr/$GIT_PULL_REQUEST
+git checkout pr/$BB_GIT_PULL_REQUEST
 )
       when :branch
         build_root_dir = expand_vars(Config.branch_root_dir)
         env.merge!({
-          "GIT_BRANCH" => build_data.branch.to_s,
-          "BUILD_SCRIPT" => Config.branch_build_script
+          "BB_GIT_BRANCH" => build_data.branch.to_s,
+          "BB_BUILD_SCRIPT" => Config.branch_build_script
         })
         build_script += %q(
-echo Switching to ${GIT_BRANCH} branch
-git checkout ${GIT_BRANCH}
+echo Switching to ${BB_GIT_BRANCH} branch
+git checkout ${BB_GIT_BRANCH}
 )
       end
 
       build_script += %q(
-source ${BUILD_SCRIPT}
+source ${BB_BUILD_SCRIPT}
 )
       env.merge!({
-          "GIT_REPO_OWNER" => git_repo_owner,
-          "GIT_REPO_NAME" => git_repo_name,
-          "METRICS_DATA_FILE" => @metrics_tempfile.path,
+          "BB_GIT_REPO_OWNER" => git_repo_owner,
+          "BB_GIT_REPO_NAME" => git_repo_name,
+          "BB_METRICS_DATA_FILE" => @metrics_tempfile.path,
+          "BB_BUILD_OUTPUT_DIR" => @build_output_dir,
+          "BB_MONGO_URI" => Config.mongo_uri,
           "RBENV_DIR" => nil,
           "RBENV_VERSION" => nil,
           "RBENV_HOOK_PATH" => nil,
@@ -115,12 +123,11 @@ source ${BUILD_SCRIPT}
 
       unless build_data.flags.nil?
         build_data.flags.each do |flag|
-         env["BUILD_FLAG_#{key.to_s.upcase}"] = 1
+          env["BB_BUILD_FLAG_#{flag.to_s.upcase}"] = 1
         end
       end
 
       @build_data.start_time = Time.now.utc
-      log_file_name = @build_data.log_file_name
 
       # Ensure build root and git user directory exists
       clone_dir = File.join(build_root_dir, git_repo_owner)
@@ -139,10 +146,10 @@ source ${BUILD_SCRIPT}
 
       # Run the build script
       Bundler.with_clean_env do
-        @pid = Process.spawn(env, "bash #{script_filename}", :pgroup => true, :chdir => clone_dir, [:out, :err] => log_file_name)
+        @pid = Process.spawn(env, "bash #{script_filename}", :pgroup => true, :chdir => clone_dir, [:out, :err] => @log_file_name)
         @gid = Process.getpgid(@pid)
       end
-      info "Running build script (pid #{@pid}, gid #{@gid}) : Log #{log_file_name}"
+      info "Running build script (pid #{@pid}, gid #{@gid}) : Log #{@log_file_name}"
 
       if @watcher
         @watcher.terminate
@@ -152,6 +159,10 @@ source ${BUILD_SCRIPT}
       @watcher.async.watch_pid
     end
 
+    def self.get_log_file_name(build_data)
+      File.join(Config.build_output_dir, build_data._id.to_s, "log.txt")
+    end
+
     def process_done(status)
       @build_data.end_time = Time.now.utc
       @build_data.termination_type = (status.signaled? ? :killed : :exited)
@@ -180,18 +191,51 @@ source ${BUILD_SCRIPT}
             @build_data.server_log_uri)
       end
 
+      # Create a log.html file
+      log_contents = ''
+      File.open(@log_file_name) do |io|
+        log_contents = io.read
+      end
+      html = %Q(
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Build Log</title>
+  <meta name="description" content="Build Log">
+  <style>
+    body {
+      background-color: black;
+      color: #f0f0f0;
+    }
+    pre {
+      font-family: "Menlo", "Courier New";
+      font-size: 10pt;
+    }
+  </style>
+</head>
+
+<body>
+  <pre>
+#{log_contents}
+  </pre>
+</body>
+</html>
+)
+      File.open(File.join(@build_output_dir, "log.html"), 'w') { |f| f.write(html)}
+
       # Log the build completion and clean-up
       info "Process #{status.pid} #{@build_data.termination_type == :killed ? 'was terminated' : "exited (#{@build_data.exit_code})"}"
       Celluloid::Actor[:scheduler].async.on_build_completed(@build_data)
       @watcher.terminate
       @watcher = nil
 
-      # Delete older log files
-      log_file_names = Dir.entries(Config.build_log_dir).select { |f| !f.match(/\d{8}-\d{6}\.log/).nil? }.sort()
-      while log_file_names.count > Config.build_log_limit
-        file_name = log_file_names.shift
-        FileUtils.rm(File.join(Config.build_log_dir, file_name))
-        info "Removing oldest log file #{file_name}"
+      # Delete older log directories
+      log_dir_names = Dir.entries(Config.build_output_dir).select { |f| !f.match(/\d{8}-\d{6}\.log/).nil? }.sort()
+      while log_dir_names.count > Config.num_saved_build_outputs
+        dir_name = log_dir_names.shift
+        FileUtils.rm_rf(File.join(Config.build_output_dir, dir_name))
+        info "Removing oldest log directory #{dir_name}"
       end
     end
 

data/lib/build_buddy/config.rb

@@ -9,9 +9,10 @@ module BuildBuddy
       :github_api_token,
       :slack_api_token,
       :slack_build_channel,
+      :slack_pr_channel,
       :slack_builders,
-      :build_log_dir,
-      :build_log_limit,
+      :build_output_dir,
+      :num_saved_build_outputs,
       :pull_request_build_script,
       :branch_build_script,
       :pull_request_root_dir,
@@ -20,8 +21,6 @@ module BuildBuddy
       :kill_build_after_mins,
       :server_base_uri,
       :mongo_uri,
-      :hud_secret_token,
-      :hud_image_dir,
     ]
     attr_accessor(*ATTRS)
   end
@@ -31,10 +30,9 @@ module BuildBuddy
       config.github_webhook_port = 4567
       config.kill_build_after_mins = 30
       config.mongo_uri = 'mongodb://localhost:27017/build-buddy'
-      config.build_log_limit = 30
+      config.num_saved_build_outputs = 30
       block_given? ? yield(Config) : Config
-      config.build_log_dir = File.expand_path(Config.build_log_dir.gsub(/\$(\w+)/) { ENV[$1] })
-      config.hud_image_dir = File.expand_path(Config.hud_image_dir.gsub(/\$(\w+)/) { ENV[$1] })
+      config.build_output_dir = File.expand_path(Config.build_output_dir.gsub(/\$(\w+)/) { ENV[$1] })
       Config::ATTRS.map {|attr| ('@' + attr.to_s).to_sym }.each {|var|
         if config.instance_variable_get(var).nil?
           raise "Config value '#{var.to_s.delete('@')}' not set"

data/lib/build_buddy/recorder.rb

@@ -2,7 +2,9 @@ require 'rubygems'
 require 'bundler'
 require 'celluloid'
 require 'mongo'
+require 'bson'
 require 'gruff'
+require 'securerandom'
 require_relative './config.rb'
 
 module BuildBuddy
@@ -17,14 +19,18 @@ module BuildBuddy
       mongo_uri = BuildBuddy::Config.mongo_uri
       @mongo ||= Mongo::Client.new(mongo_uri)
       info "Connected to MongoDB at '#{mongo_uri}'"
-      @mongo[:builds].indexes.create_one({:start_time => -1}, :name => "reverse_build_order")
+      @mongo[:builds].indexes.create_one({:create_time => -1}, :name => "reverse_order")
     end
 
     def record_build_data(build_data)
       builds = @mongo[:builds]
-      result = builds.insert_one(build_data.to_h)
-      if build_data._id.nil?
-        build_data._id = result.inserted_id
+      begin
+        # Do this to prevent build _id's from being sequential and so reduce risk
+        # of someone guessing a valid build URL.
+        build_data._id = BSON::ObjectId.from_string(SecureRandom.hex(12).to_s)
+        builds.insert_one(build_data.to_h)
+      rescue Mongo::Error::OperationFailure => e
+        retry if e.to_s.start_with?('E11000') # Duplicate key error
       end
     end
 
@@ -35,8 +41,6 @@ module BuildBuddy
 
       builds = @mongo[:builds]
       builds.replace_one({ :_id => build_data._id }, build_data.to_h)
-
-      gen_charts
     end
 
     def get_build_data(id)
@@ -48,236 +52,21 @@ module BuildBuddy
     end
 
     def get_build_data_history(limit)
-      @mongo[:builds].find().sort(:start_time => -1).limit(limit).map do |doc|
+      @mongo[:builds].find().sort(:create_time => -1).limit(limit).map do |doc|
         BuildData.new(doc)
       end
     end
-    
-    def gen_charts
-      gen_daily_builds_chart
-      gen_coverage_chart
-      gen_lines_chart
-      gen_localized_chart
-      gen_times_chart
-      gen_warnings_chart
-    end
-    
-    def gen_daily_builds_chart
-      # Generates a chart showing builds per day
-      data = []
-      keys = []
-      @mongo[:builds].find().sort(:start_time => -1).limit(LIMIT).each do |doc|
-        next if doc['start_time'].nil?
-        start_data_components = doc['start_time'].to_s.split(' ')[0].split('-')
-        date_string = start_data_components[1] + "/" + start_data_components[2]
-    
-        if keys.include?(date_string)
-          data.each { |arr|
-            if arr[0] == date_string
-              if doc['pull_request'] != nil
-                arr[1] = arr[1] + 1
-              else
-                arr[2] = arr[2] + 1
-              end
-            end
-          }
-        else
-          keys.push(date_string)
-          if doc['pull_request'] != nil
-            data.insert(0, [date_string, 1, 0])
-          else
-            data.insert(0, [date_string, 0, 1])
-          end
-        end
-        end
-  
-      g = Gruff::StackedBar.new
-      g.title = "Builds per Day"
-      g.labels = data.each_with_index.map {|d, i| [ i, d[0] ]}.to_h
-      g.theme = {
-          :colors => ['#12a702', '#aedaa9'],
-          :font_color => 'black',
-          :background_colors => 'white'
-      }
-      g.font = '/Library/Fonts/Verdana.ttf'
-      g.data("Pull Request (#{data.size > 0 ? data[data.size - 1][1] : 0})", data.map {|d| d[1]})
-      g.data("Other (#{data.size > 0 ? data[data.size - 1][2] : 0})", data.map {|d| d[2]})
-      g.x_axis_label = 'Date'
-      g.y_axis_label = 'Number of Builds'
-      g.y_axis_increment = 2
-      g.write File.join(Config.hud_image_dir, "daily_builds.png")
-    end
-
-    def gen_coverage_chart
-      # Generate code coverage numbers
-      data = []
-      keys = []
-      @mongo[:builds].find().sort(:start_time => -1).limit(LIMIT).map do |doc|
-        next if doc['start_time'].nil?
-        start_date_components = doc['start_time'].to_s.split(' ')[0].split('-')
-        date_string = start_date_components[1] + "/" + start_date_components[2]
-        pull_number = doc['pull_request'].to_i
-        if pull_number == 0 && doc['metrics']['coverage'] != nil && !keys.include?(date_string)
-          keys.push(date_string)
-
-          missed_lines = doc['metrics']['coverage']['swift_files']['missed_lines'] + doc['metrics']['coverage']['m_files']['missed_lines']
-          total_lines = doc['metrics']['coverage']['swift_files']['total_lines'] + doc['metrics']['coverage']['m_files']['total_lines']
-          coverage_percent = ((1.0 * (total_lines - missed_lines) / total_lines) * 100).to_i
-          data.insert(0, [date_string, coverage_percent])
-        end
-      end
-
-      g = Gruff::Bar.new
-      g.minimum_value = 0
-      g.maximum_value = 100
-      g.title = "Coverage"
-      g.labels = data.each_with_index.map {|d, i| [ i, d[0] ]}.to_h
-      g.theme = {
-          :colors => ['#822F92'],
-          :font_color => 'black',
-          :background_colors => 'white'
-      }
-      g.font = '/Library/Fonts/Verdana.ttf'
-      g.data("covered % (#{data.size > 0 ? data[data.size - 1][1] : 0})", data.map {|d| d[1]})
-      g.x_axis_label = 'Date'
-      g.y_axis_label = 'Coverage %'
-      g.write File.join(Config.hud_image_dir, "code_coverage.png")    
-    end
-
-    def gen_lines_chart
-      # Generates a chart displaying number of lines of code by Swift/Objective-C.
-      data = []
-      keys = []
-      @mongo[:builds].find().sort(:start_time => -1).limit(LIMIT).map do |doc|
-        next if doc['start_time'].nil?
-        start_date_components = doc['start_time'].to_s.split(' ')[0].split('-')
-        date_string = start_date_components[1] + "/" + start_date_components[2]
-        pull_number = doc['pull_request'].to_i
-        if pull_number == 0 && doc['metrics']['coverage'] != nil && !keys.include?(date_string)
-          keys.push(date_string)
-          data.insert(0, [date_string, doc['metrics']['coverage']['swift_files']['total_lines'], doc['metrics']['coverage']['m_files']['total_lines']])
-        end
-      end
-
-      g = Gruff::StackedBar.new
-      g.title = "Lines of Code"
-      g.labels = data.each_with_index.map {|d, i| [ i, d[0] ]}.to_h
-      g.theme = {
-          :colors => ['#C17B3A', '#C1BA3A'],
-          :font_color => 'black',
-          :background_colors => 'white'
-      }
-      g.font = '/Library/Fonts/Verdana.ttf'
-      g.data("Swift (#{data.size > 0 ? data[data.size - 1][1] : 0})", data.map {|d| d[1]})
-      g.data("Objective-C (#{data.size > 0 ? data[data.size - 1][2] : 0})", data.map {|d| d[2]})
-      g.x_axis_label = 'Day'
-      g.y_axis_label = 'Lines of Code'
-      g.write File.join(Config.hud_image_dir, "lines_of_code.png")
-    end
-
-    def gen_localized_chart
-      # Generates a chart displaying localization information for past pull requests.
-      # Displays # strings, # descriptions, and # words.
-      data = []
-      keys = []
-      @mongo[:builds].find().sort(:start_time => -1).limit(LIMIT).map do |doc|
-        pull_number = doc['pull_request'].to_i
-        if pull_number != 0 && !keys.include?(pull_number)
-          keys.push(pull_number)
-          data.insert(0, [pull_number, doc['metrics']['strings'], doc['metrics']['descriptions'], doc['metrics']['words']])
-        end
-      end
-
-      g = Gruff::Line.new
-      g.title = 'Localization'
-      g.labels = data.each_with_index.map {|d, i| [ i, d[0] ]}.to_h
-      g.dot_style = :square
-      g.font = '/Library/Fonts/Verdana.ttf'
-      g.data("# strings (#{data.size > 0 ? data[data.size - 1][1] : 0})", data.map {|d| d[1]})
-      g.data("# descriptions (#{data.size > 0 ? data[data.size - 1][2] : 0})", data.map {|d| d[2]})
-      g.data("# words (#{data.size > 0 ? data[data.size - 1][3] : 0})", data.map {|d| d[3]})
-      g.x_axis_label = 'Pull Request'
-
-      g.theme = {
-          :colors => ['#e65954', '#0a2154', '#2a7b20'],
-          :font_color => 'black',
-          :background_colors => 'white'
-      }
-
-      g.write(File.join(Config.hud_image_dir, 'localization_data.png'))
-    end
-
-    def gen_times_chart
-      # Generates a chart displaying build time information for past pull requests.
-      data = []
-      keys = []
-      @mongo[:builds].find().sort(:start_time => -1).limit(LIMIT).map do |doc|
-        next if doc['metrics'].nil?
-        pull_number = doc['pull_request'].to_i
-        if pull_number != 0 && !keys.include?(pull_number) && doc['metrics']['test_build_end'] != nil && doc['metrics']['test_build_start'] != nil
-          end_time_components = doc['metrics']['test_build_end'].to_s.split(' ')[1].split(':')
-          end_date_components = doc['metrics']['test_build_end'].to_s.split(' ')[0].split('-')
-          end_time = Time.new(end_date_components[0], end_date_components[1], end_date_components[2], end_time_components[0], end_time_components[1], end_time_components[2])
-
-          start_time_components = doc['metrics']['test_build_start'].to_s.split(' ')[1].split(':')
-          start_date_components = doc['metrics']['test_build_start'].to_s.split(' ')[0].split('-')
-          start_time = Time.new(start_date_components[0], start_date_components[1], start_date_components[2], start_time_components[0], start_time_components[1], start_time_components[2])
 
-          build_time_mins = ((end_time - start_time) / 60).to_f.round(2)
-
-          keys.push(pull_number)
-          data.insert(0, [pull_number, build_time_mins])
-        end
-      end
-
-      g = Gruff::Line.new
-      g.minimum_value = 0
-      g.maximum_value = 10
-      g.title = 'Build Times'
-      g.labels = data.each_with_index.map {|d, i| [ i, d[0] ]}.to_h
-      g.dot_style = :square
-      g.font = '/Library/Fonts/Verdana.ttf'
-      g.data("minutes (#{data.size > 0 ? data[data.size - 1][1] : 0})", data.map {|d| d[1]})
-      g.x_axis_label = 'Pull Request'
-      g.y_axis_label = 'Time (mins)'
-      g.theme = {
-          :colors => ['#38c0df'],
-          :font_color => 'black',
-          :background_colors => 'white'
-      }
-
-      g.write(File.join(Config.hud_image_dir, 'build_times.png'))
-    end
-
-    def gen_warnings_chart
-      # Script that generates a chart displaying warning count information for past pull requests.
-      data = []
-      keys = []
-      @mongo[:builds].find().sort(:start_time => -1).limit(LIMIT).map do |doc|
-        next if doc['start_time'].nil?
-        start_date_components = doc['start_time'].to_s.split(' ')[0].split('-')
-        date_string = start_date_components[1] + "/" + start_date_components[2]
-        pull_number = doc['pull_request'].to_i
-        if pull_number == 0 && doc['metrics']['test_build_start'] != nil && !keys.include?(date_string)
-          keys.push(date_string)
-          data.insert(0, [date_string, doc['metrics']['warning_count']])
+    def find_report_uri
+      uri = nil
+      @mongo[:builds].find().sort(:create_time => -1).each do |doc|
+        file_name = File.join(Config.build_output_dir, doc[:_id].to_s, "report.html")
+        if File.exist?(file_name)
+          uri = BuildData.server_report_uri(doc[:_id])
+          break
         end
       end
-
-      g = Gruff::Line.new
-      g.title = 'Warnings'
-      g.labels = data.each_with_index.map {|d, i| [ i, d[0] ]}.to_h
-      g.dot_style = :square
-      g.font = '/Library/Fonts/Verdana.ttf'
-      g.data("# warnings (#{data.size > 0 ? data[data.size - 1][1] : 0})", data.map {|d| d[1]})
-      g.x_axis_label = 'Date'
-      g.y_axis_label = 'Number of Warnings'
-      g.theme = {
-          :colors => ['#c3a00b'],
-          :font_color => 'black',
-          :background_colors => 'white'
-      }
-      g.write(File.join(Config.hud_image_dir, 'warning_count.png'))
+      uri
     end
   end
 end

data/lib/build_buddy/scheduler.rb

@@ -17,24 +17,45 @@ module BuildBuddy
     end
 
     def queue_a_build(build_data)
-      @build_queue.unshift(build_data)
-
       case build_data.type
       when :pull_request
+        existing_bb_id = find_bb_id_for_pr(build_data.pull_request)
+
         Celluloid::Actor[:gitter].async.set_status(
             build_data.repo_full_name, build_data.repo_sha, :pending, "Build is queued",
             build_data.server_log_uri)
         info "Pull request build queued"
+
+        unless existing_bb_id.nil?
+          info "Stopping existing build #{existing_bb_id} for this PR"
+          stop_build(existing_bb_id, 'github')
+        end
       when :branch
         info "'#{build_data.branch}' branch build queued"
       end
 
+      @build_queue.unshift(build_data)
+
       if @build_timer.nil?
         @build_timer = every(5) { on_build_interval }
         info "Build timer started"
       end
     end
 
+    def find_bb_id_for_pr(pull_request)
+      if @active_build and @active_build.pull_request == pull_request
+        return @active_build.bb_id
+      end
+
+      build_data = @build_queue.find { |build_data| build_data.pull_request == pull_request}
+
+      if build_data.nil?
+        nil
+      else
+        build_data.bb_id
+      end
+    end
+
     def queue_length
       @build_queue.length
     end
@@ -43,17 +64,17 @@ module BuildBuddy
       @active_build
     end
 
-    def stop_build(id, slack_user_name)
+    def stop_build(bb_id, slack_user_name)
       # Centralize stopping builds here
-      if @active_build != nil and @active_build._id == id
+      if @active_build != nil and @active_build.bb_id == bb_id
         @active_build.stopped_by = slack_user_name
-        Celluloid::Actor[:builder].stop_build
+        Celluloid::Actor[:builder].async.stop_build
         # Build data will be recorded when the build stops
         return :active
       end
 
       # Look for the build in the queue
-      i = @build_queue.find_index { |build_data| build_data._id == id}
+      i = @build_queue.find_index { |build_data| build_data.bb_id == bb_id}
       if i != nil
         build_data = @build_queue[i]
         @build_queue.delete_at(i)
@@ -87,7 +108,7 @@ module BuildBuddy
         # Make sure that the build has not run too long and kill if necessary
         start_time = @active_build.start_time
         if !start_time.nil? and Time.now.utc - start_time > Config.kill_build_after_mins * 60
-          Celluloid::Actor[:builder].async.stop_build()
+          Celluloid::Actor[:builder].async.stop_build
         end
       end
     end

data/lib/build_buddy/server.rb

@@ -38,148 +38,50 @@ module BuildBuddy
                       :pull_request => pull_request['number'],
                       :flags => {},
                       :repo_sha => pull_request['head']['sha'],
-                      :repo_full_name => pull_request['base']['repo']['full_name'])
+                      :repo_full_name => pull_request['base']['repo']['full_name'],
+                      :started_by => 'github')
                   info "Got #{action} pull request #{build_data.pull_request} from GitHub"
                   Celluloid::Actor[:scheduler].queue_a_build(build_data)
                   request.respond 200, "Building"
-                  return
                 else
                   request.respond 200, "Ignoring"
-                  return
                 end
               end
             when 'ping'
               info "Got pinged from #{forwarded_for(request)}"
               request.respond 200, "Running"
-              return
             else
               request.respond 404, "Event not supported"
-              return
             end
           else
             request.respond 404, "Method not supported"
-            return
           end
-        when /^\/log\/([0-9abcdef]{24})$/
-          case request.method
-          when 'GET'
-            build_data = Celluloid::Actor[:recorder].get_build_data($1)
-            if build_data.nil?
-              request.respond 404, "Not found"
-              return
-            end
-            log_file_name = build_data.log_file_name
-            if log_file_name.nil? or !File.exist?(log_file_name)
-              log_contents = 'Log file has been deleted.'
-            else
-              File.open(log_file_name) do |io|
-                log_contents = io.read
-              end
-            end
-            html = %Q(
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Build Log</title>
-  <meta name="description" content="Build Log">
-  <style>
-    body {
-      background-color: black;
-      color: #f0f0f0;
-    }
-    pre {
-      font-family: "Menlo", "Courier New";
-      font-size: 10pt;
-    }
-  </style>
-</head>
-
-<body>
-  <pre>
-#{log_contents}
-  </pre>
-</body>
-</html>
-)
-            request.respond 200, html
-            return
-          else
+        when /^\/build\/([0-9abcdef]{24})\/(log\.html|report\.html|[a-z_]+\.png)$/
+          if request.method != 'GET'
             request.respond 404, "Method not supported"
             return
           end
-        when Regexp.new("^/hud/#{Config.hud_secret_token}/(index\\.html|[a-z_]+\\.png)$")
-          if request.method != 'GET'
-            request.response 404, "Method not supported"
+
+          build_id = $1
+          resource_name = $2
+          if build_id.nil? or resource_name.nil?
+            request.respond 404, "Not found"
             return
           end
 
-          if $1 == "index.html"
-            html = %q(
-<!doctype html>
-<html lang="en">
-<head>
-  <title>Build Metrics</title>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.3/css/bootstrap.min.css" integrity="sha384-MIwDKRSSImVFAZCVLtU0LMDdON6KVCrZHyVQQj6e8wIEJkW4tvwqXrbMIya1vriY" crossorigin="anonymous">
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.3/js/bootstrap.min.js" integrity="sha384-ux8v3A6CPtOTqOzMKiuo3d/DomGaaClxFYdCu2HPMBEkf6x2xiDyJ7gkXU0MWwaD" crossorigin="anonymous"></script>
-</head>
-<body>
-
-<div class="jumbotron text-center">
-  <h1>Build Metrics</h1>
-  <p>Build server data</p>
-</div>
-
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-sm-4">
-      <img class="img-fluid" src="code_coverage.png" alt="Code Coverage">
-    </div>
-    <div class="col-sm-4">
-      <img class="img-fluid" src="build_times.png" alt="Build Times">
-    </div>
-    <div class="col-sm-4">
-      <img class="img-fluid" src="daily_builds.png" alt="Daily Builds">
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-sm-4">
-      <img class="img-fluid" src="lines_of_code.png" alt="Lines of Code">
-    </div>
-    <div class="col-sm-4">
-      <img class="img-fluid" src="localization_data.png" alt="Localization Data">
-    </div>
-    <div class="col-sm-4">
-      <img class="img-fluid" src="warning_count.png" alt="Warning Count">
-    </div>
-  </div>
-</div>
-
-</body>
-</html>
-)
-            request.respond 200, html
+          resource_file_name = File.join(Config.build_output_dir, build_id, resource_name)
+          if !File.exist?(resource_file_name)
+            request.respond 404, "Not found"
             return
-          elsif
-            png_file_name = File.join(Config.hud_image_dir, $1)
+          end
 
-            if File.exist?(png_file_name)
-              request.respond Reel::Response.new(200, {"content-type" => "image/png"}, File.open(png_file_name))
-              return
-            else
-              request.response 404, "Image not found"
-              return
-            end
+          if resource_name.end_with?('.html')
+            request.respond Reel::Response.new(200, { 'content-type' => 'text/html'}, File.open(resource_file_name, 'r'))
           else
-            request.response 404, "Path not found"
-            return
+            request.respond Reel::Response.new(200, { 'content-type' => 'image/png'}, File.open(resource_file_name, 'rb'))
           end
         else
-          request.respond 404, "Path not found"
-          return
+          request.respond 404, "Not found"
         end
       end
     end

data/lib/build_buddy/slacker.rb

@@ -34,6 +34,7 @@ module BuildBuddy
       end
 
       @build_channel_id = nil
+      @pr_channel_id = nil
     end
 
     def self.extract_build_flags(message)
@@ -57,9 +58,10 @@ module BuildBuddy
         end
       else
         scheduler = Celluloid::Actor[:scheduler]
+        message = message.strip
 
         case message
-        when /^master(?: with )?(?<flags>.*)?/i
+        when /^master(?: +with +(?<flags>[a-z ]+))?/i
           flags = Slacker.extract_build_flags($~[:flags])
           response = "OK, I've queued a build of the `master` branch."
           scheduler.queue_a_build(BuildData.new(
@@ -90,14 +92,16 @@ module BuildBuddy
     end
 
     def do_stop(message, is_from_slack_channel, slack_user_name)
+      message = message.strip
       response = ''
-      m = message.match(/[0-9abcdef]{24}/)
+      m = message.match(/^(?:build +)?(bb-\d+)$/i)
 
       unless m.nil?
-        result = Celluloid::Actor[:scheduler].stop_build(BSON::ObjectId.from_string(m[0]), slack_user_name)
+        bb_id = m[1].upcase
+        result = Celluloid::Actor[:scheduler].stop_build(bb_id, slack_user_name)
         response = case result
                    when :active, :in_queue
-                     "OK#{is_from_slack_channel ? ' @' + slack_user_name : ''}, I #{result == :active ? "stopped" : "dequeued"} the build with identifier #{m[0]}."
+                     "OK#{is_from_slack_channel ? ' @' + slack_user_name : ''}, I #{result == :active ? "stopped" : "dequeued"} the build with identifier #{bb_id}."
                    when :not_found
                      "I could not find a queued or active build with that identifier"
                    end
@@ -115,7 +119,9 @@ I understand types of build - pull requests and branch. A pull request build hap
 
 For branch builds, I can run builds of the master branch if you say `build master`. I can do builds of release branches, e.g. `build v2.3` but only for those branches that I am allowed to build in by configuration file.
 
-I can stop any running build if you ask me to `stop build X`, even pull request builds if you give the id X from the `show status` or `show queue` command. I am configured to let the *#{Config.slack_build_channel}* channel know if builds are stopped.
+I can stop any running build if you ask me to `stop build X`, even pull request builds if you give the id X from the `show status` or `show queue` command.
+
+I will let the *#{Config.slack_build_channel}* channel know about branch build activity and the *#{Config.slack_pr_channel} channel know about PR activity.
 
 I have lots of `show` commands:
 
@@ -123,11 +129,26 @@ I have lots of `show` commands:
 - `show queue` and I will show you what is in the queue
 - `show options` to a see a list of build options
 - `show builds` to see the last 5 builds or `show last N builds` to see a list of the last N builds
-
-Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config.hud_secret_token}/index.html
+- `show report` to get a link to the latest build report
 )
     end
 
+    def do_relay(message, slack_user_name)
+      sender_is_a_builder = (Config.slack_builders.nil? ? true : Config.slack_builders.include?('@' + slack_user_name))
+      unless sender_is_a_builder
+        if is_from_slack_channel
+          response = "I'm sorry @#{slack_user_name} you are not on my list of allowed builders so I can't relay a message for you."
+        else
+          response = "I'm sorry but you are not on my list of allowed builders so I cannot relay a message for you."
+        end
+      else
+        message = message.strip.gsub('"', '')
+        @rt_client.message(channel: @build_channel_id, text: message) unless @build_channel_id.nil?
+      end
+      "Message relayed to #{Config.slack_build_channel}"
+      info "I relayed a message for #{slack_user_name} to #{Config.slack_build_channel}, \"#{message}\""
+    end
+
     def do_show(request)
       request = request.lstrip.rstrip
 
@@ -155,14 +176,14 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
                         when :pull_request
                           "pull request build #{build_data.pull_request_uri}"
                         end
-            response += " at #{build_data.start_time.to_s}. #{Config.server_base_uri + '/log/' + build_data._id.to_s}"
+            response += " at #{build_data.start_time.to_s}. #{BuildData.server_log_uri(build_data._id)}"
             unless build_data.started_by.nil?
               response += " started by #{build_data.started_by}"
             end
+            response += " #{build_data.status_verb}"
             unless build_data.stopped_by.nil?
-              response += " stopped by #{build_data.stopped_by}"
+              response += " by #{build_data.stopped_by}"
             end
-            response += " #{build_data.status_verb}"
             response += ".\n"
           end
         end
@@ -181,9 +202,9 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
         else
           case build_data.type
           when :pull_request
-            response = "There is a pull request build in progress for https://github.com/#{build_data.repo_full_name}/pull/#{build_data.pull_request} (identifier `#{build_data._id.to_s}`)"
+            response = "There is a pull request build in progress for https://github.com/#{build_data.repo_full_name}/pull/#{build_data.pull_request} (#{build_data.bb_id})"
           when :branch
-            response = "There is a build of the `#{build_data.branch}` branch of https://github.com/#{build_data.repo_full_name} in progress (identifier `#{build_data._id.to_s}`)"
+            response = "There is a build of the `#{build_data.branch}` branch of https://github.com/#{build_data.repo_full_name} in progress (#{build_data.bb_id})"
           end
           unless build_data.started_by.nil?
             response += " started by " + build_data.started_by
@@ -217,7 +238,7 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
                         when :pull_request
                           "pull request build #{build_data.pull_request_uri}"
                         end
-            response += " (identifier `#{build_data._id.to_s}`)"
+            response += " (#{build_data.bb_id})"
             unless build_data.started_by.nil?
               response += " started by #{build_data.started_by}"
             end
@@ -227,6 +248,14 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
             response += ".\n"
           }
         end
+      when /report/
+        response = ''
+        report_uri = Celluloid::Actor[:recorder].find_report_uri
+        if report_uri.nil?
+          response = "There do not appear to be any reports generated yet"
+        else
+          response = "The last build report is at #{report_uri}"
+        end
       else
         response = "I'm not sure what to say..."
       end
@@ -248,10 +277,18 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
       @build_channel_id = Slacker.get_channel_id(Config.slack_build_channel, map_channel_name_to_id, map_group_name_to_id)
 
       if @build_channel_id.nil?
-        error "Unable to identify the build slack channel #{channel}"
+        error "Unable to identify the slack build channel #{Config.slack_build_channel}"
       else
         info "Slack build notification channel is #{@build_channel_id} (#{Config.slack_build_channel})"
       end
+
+      @pr_channel_id = Slacker.get_channel_id(Config.slack_pr_channel, map_channel_name_to_id, map_group_name_to_id)
+
+      if @pr_channel_id.nil?
+        error "Unable to identify the PR slack channel #{channel}"
+      else
+        info "Slack PR notification channel is #{@pr_channel_id} (#{Config.slack_pr_channel})"
+      end
     end
 
     def on_slack_data(data)
@@ -298,18 +335,20 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
         return
       end
 
-      # Remove
+      message = message.strip
 
       response = case message
-                 when /^.*?build (.*)/i
+                 when /^build(.*)/i
                    do_build $1, is_from_slack_channel, slack_user_name
-                 when /^.*?status/ # Legacy support
+                 when /^status/ # Legacy support
                    do_show 'status'
-                 when /^.*?show(.*)/
+                 when /^show(.*)/
                    do_show $1
-                 when /^*?help/i
+                 when /^help/i
                    do_help is_from_slack_channel
-                 when /^.*?stop(?: build)(.*)/i
+                 when /^relay(.*)/i
+                   do_relay $1, slack_user_name
+                 when /^stop(.*)/i
                    do_stop $1, is_from_slack_channel, slack_user_name
                  else
                    "Sorry#{is_from_slack_channel ? ' ' + slack_user_name : ''}, I'm not sure how to respond."
@@ -323,9 +362,11 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
 
       if build_data.type == :branch
         message = "A `#{build_data.branch}` branch build #{status_verb}"
+        short_message = message
         info "Branch build #{status_verb}"
       else
-        message = "Pull request `#{build_data.pull_request}` #{status_verb}"
+        message = "A pull request https://github.com/#{build_data.repo_full_name}/pull/#{build_data.pull_request} build #{status_verb}"
+        short_message = "Pull request #{build_data.pull_request} #{status_verb}"
         info "Pull request build #{status_verb}"
       end
 
@@ -336,13 +377,17 @@ Build metrics and charts are available at #{Config.server_base_uri}/hud/#{Config
       message += ". Log file at #{build_data.server_log_uri}"
 
       # See https://api.slack.com/docs/attachments for more information about formatting Slack attachments
-      attach = [
+      attachments = [
           :title => build_data.type == :pull_request ? "Pull Request" : "Branch Build",
           :text => message,
           :color => build_data.termination_type == :killed ? :warning : build_data.exit_code != 0 ? :danger : :good,
       ]
 
-      @rt_client.message(channel: @build_channel_id, text: message, attachments: attach) unless @build_channel_id.nil?
+      if build_data.type == :branch
+        @rt_client.web_client.chat_postMessage(channel: @build_channel_id, text: short_message, attachments: attachments, as_user: true) unless @build_channel_id.nil?
+      else
+        @rt_client.web_client.chat_postMessage(channel: @pr_channel_id, text: short_message, attachments: attachments, as_user: true) unless @pr_channel_id.nil?
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.14.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers