build-buddy 1.4.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77e4f6935ead118d2908d44a69515dee524b9eb
-  data.tar.gz: 13dd9ad73465c2069b9922bc62e26718161ff949
+  metadata.gz: bef0733301b651a89087ca1ff896ca3a94b71770
+  data.tar.gz: 41362a034b27006f47ac7523c1c0679e908c8e20
 SHA512:
-  metadata.gz: 02b0a753a08207047d8413ca2335c3845735e3db8d93367ff52daf45a71d4ea1293915c49699cd32416fe90a3d3adb1abfe6763e8d31e75563ff719329c12861
-  data.tar.gz: f6d6b31b9231c8ae69a55ce6e87775460dacde77741e6b622b099f132298c98b956a00737702b32e3886f76b88063c3423273a2442075ceb2a715b5e0a6690fb
+  metadata.gz: 45de0b0813df8f847226008136eb741e73b1ae172f86b8992b83d6ceb671aeb661597039b14aa79fcb39c976108eedddc2c2e4fede13b1ad46f9289c1c7ca79d
+  data.tar.gz: ef301af974c69cad37e50d230b799c587aab6b583aa7ee73829f3863278f3da23cdd1971de6e75f307462cde3a66cb0faa1387e30180605d46cccde5523f92b4

data/bin/build-buddy

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'bundler/setup'
 require 'celluloid/current'
 require 'celluloid/supervision'
 require 'celluloid/supervision/container'
@@ -45,6 +44,7 @@ module BuildBuddy
       Gitter.supervise as: :gitter
       Scheduler.supervise as: :scheduler
       Server.supervise as: :server
+      Recorder.supervise as: :recorder
 
       begin
         sleep

data/lib/build_buddy.rb

@@ -5,8 +5,9 @@ require 'build_buddy/builder'
 require 'build_buddy/watcher'
 require 'build_buddy/scheduler'
 require 'build_buddy/server'
+require 'build_buddy/recorder'
 require 'build_buddy/build_data'
 
 module BuildBuddy
-  VERSION = "1.4.5"
+  VERSION = "1.6.0"
 end

data/lib/build_buddy/build_data.rb

@@ -1,5 +1,6 @@
 module BuildBuddy
   class BuildData
+    attr_accessor :_id # Mongo ID
     attr_accessor :build_type # one of :master, :release or :pull_request
     attr_accessor :repo_full_name
     attr_accessor :build_version
@@ -12,12 +13,20 @@ module BuildBuddy
     attr_accessor :end_time
     attr_accessor :build_log_filename
 
-    def initialize(build_type, args)
-      @build_type = build_type
-      @repo_full_name = args[:repo_full_name]
-      @repo_sha = args[:repo_sha]
-      @build_version = args[:build_version]
-      @pull_request = args[:pull_request]
+    def initialize(args)
+      args.each do |key, value|
+        setter = self.method((key.to_s + '=').to_sym)
+
+        unless setter.nil?
+          setter.call(value)
+        end
+      end
+    end
+
+    def to_h
+      hash = {}
+      instance_variables.each {|var| hash[var.to_s.delete("@")] = instance_variable_get(var) }
+      hash
     end
   end
 end

data/lib/build_buddy/config.rb

@@ -3,7 +3,6 @@ module BuildBuddy
     extend self
 
     attr_accessor :github_webhook_port
-    attr_accessor :github_webhook_path
     attr_accessor :github_webhook_secret_token
     attr_accessor :github_webhook_repo_full_name
     attr_accessor :github_api_token
@@ -18,12 +17,12 @@ module BuildBuddy
     attr_accessor :release_build_script
     attr_accessor :valid_release_versions
     attr_accessor :kill_build_after_mins
+    attr_accessor :server_base_uri
   end
 
   class << self
     def configure
       Config.github_webhook_port = 4567
-      Config.github_webhook_path = '/webhook'
       Config.kill_build_after_mins = 30
       block_given? ? yield(Config) : Config
     end

data/lib/build_buddy/gitter.rb

@@ -19,4 +19,4 @@ module BuildBuddy
           repo_full_name, repo_sha, status.to_s, { :description => description.length > 140 ? "#{description[0..136]}..." : description})
     end
   end
-end
+end

data/lib/build_buddy/recorder.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'bundler'
+require 'celluloid'
+require 'mongo'
+require_relative './config.rb'
+
+module BuildBuddy
+  class Recorder
+    include Celluloid
+    include Celluloid::Internals::Logger
+
+    def initialize()
+      @mongo ||= Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'build-buddy')
+      info "Connected to MongoDB"
+    end
+
+    def record_build_data(build_data)
+      builds = @mongo[:builds]
+      result = builds.insert_one(build_data.to_h)
+      build_data._id = result.inserted_id
+    end
+
+    def update_build_data(build_data)
+      unless build_data._id.nil?
+        builds = @mongo[:builds]
+        builds.replace_one({ :_id => build_data._id }, build_data.to_h)
+      end
+    end
+
+    def get_build_data(id)
+      builds = @mongo[:builds]
+      document = builds.find({ :_id => BSON::ObjectId.from_string(id) }, { :limit => 1 }).first
+      if document.nil?
+        return nil
+      end
+      BuildData.new(document)
+    end
+  end
+end

data/lib/build_buddy/scheduler.rb

@@ -56,6 +56,7 @@ module BuildBuddy
         if @build_queue.length > 0
           build_data = @build_queue.pop()
           @active_build = build_data
+          Celluloid::Actor[:recorder].async.record_build_data(build_data)
           if build_data.build_type == :pull_request
             Celluloid::Actor[:gitter].async.set_status(
                 build_data.repo_full_name, build_data.repo_sha, :pending, "This build has started")
@@ -64,6 +65,7 @@ module BuildBuddy
         elsif @done_queue.length > 0
           build_data = @done_queue.pop
           status_message = build_data.termination_type == :killed ? "was stopped" : build_data.exit_code != 0 ? "failed" : "succeeded"
+          status_message += '. '
 
           if build_data.build_type == :pull_request
             message = "The buddy build #{status_message}"
@@ -73,9 +75,7 @@ module BuildBuddy
                 message)
             info "Pull request build #{status_message}"
           else
-            if build_data.exit_code != 0
-              status_message += ". Exit code #{build_data.exit_code}, log file `#{build_data.build_log_filename}`."
-            end
+            status_message += "Log file at #{Config.server_base_uri + '/log/' + build_data._id.to_s}."
             if build_data.build_type == :master
               message = "A build of the `master` branch #{status_message}"
               info "`master` branch build #{status_message}"
@@ -85,6 +85,7 @@ module BuildBuddy
             end
             Celluloid::Actor[:slacker].async.notify_channel(message)
           end
+          Celluloid::Actor[:recorder].async.update_build_data(build_data)
         else
           @build_timer.cancel
           @build_timer = nil
@@ -92,7 +93,8 @@ module BuildBuddy
         end
       else
         # Make sure that the build has not run too long and kill if necessary
-        if Time.now.utc - @active_build.start_time > Config.kill_build_after_mins * 60
+        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()
         end
       end

data/lib/build_buddy/server.rb

@@ -16,10 +16,10 @@ module BuildBuddy
 
     def on_connection(connection)
       connection.each_request do |request|
-        case request.method
-        when 'POST'
-          case request.path
-          when Config.github_webhook_path
+        case request.path
+        when '/webhook'
+          case request.method
+          when 'POST'
             case request.headers["X-GitHub-Event"]
             when 'pull_request'
               payload_text = request.body.to_s
@@ -28,10 +28,11 @@ module BuildBuddy
               else
                 payload = JSON.parse(payload_text)
                 pull_request = payload['pull_request']
-                build_data = BuildData.new(:pull_request,
-                  :pull_request => pull_request['number'],
-                  :repo_sha => pull_request['head']['sha'],
-                  :repo_full_name => pull_request['base']['repo']['full_name'])
+                build_data = BuildData.new(
+                    build_type => :pull_request,
+                    :pull_request => pull_request['number'],
+                    :repo_sha => pull_request['head']['sha'],
+                    :repo_full_name => pull_request['base']['repo']['full_name'])
                 info "Got pull request #{build_data.pull_request} from GitHub"
                 Celluloid::Actor[:scheduler].queue_a_build(build_data)
                 request.respond 200
@@ -39,15 +40,56 @@ module BuildBuddy
             when 'ping'
               request.respond 200, "Running"
             else
-              request.respond 404, "Path not found"
+              request.respond 404, "Event not supported"
             end
           else
-           request.respond 404, "Path not found"
+            request.respond 404, "Method not supported"
+          end
+        when /^\/log\/([0-9a-z]*)$/
+          case request.method
+          when 'GET'
+            build_data = Celluloid::Actor[:recorder].get_build_data($1)
+            log_contents = nil
+            if build_data.nil? or build_data.build_log_filename.nil? or !File.exist?(build_data.build_log_filename)
+              sleep 1
+              request.respond 404, "Not found"
+            end
+            log_contents = 'Log file has been deleted.'
+            File.open(build_data.build_log_filename) 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>
+)
+            request.respond 200, html
+          else
+            request.respond 404, "Method not supported"
           end
-        # TODO: Implement basic access authentication from config file
-        # TODO: Implement getting the log file
         else
-          request.respond 404, "Method not supported"
+           request.respond 404, "Path not found"
         end
       end
     end

data/lib/build_buddy/slacker.rb

@@ -18,17 +18,16 @@ module BuildBuddy
         self.on_slack_data(data)
       end
       @rt_client.on :error do |error|
-        self.on_slack_error(error)
+        sub_error = error['error']
+        error "Slack error #{sub_error['code']} - #{sub_error['msg']}}"
+      end
+      @rt_client.on :close do |event|
+        raise "Slack connection was closed"
       end
       @rt_client.start_async
       @notify_slack_channel = nil
     end
 
-    def on_slack_error(error)
-      sub_error = error['error']
-      error "Whoops! Slack error #{sub_error['code']} - #{sub_error['msg']}}"
-    end
-
     def on_slack_hello
       user_id = @rt_client.self['id']
       map_user_id_to_name = @rt_client.users.map {|id, user| [id, user.name]}.to_h
@@ -102,15 +101,17 @@ module BuildBuddy
             case message
               when /master/i
                 response = "OK, I've queued a build of the `master` branch."
-                scheduler.queue_a_build(BuildData.new(:master,
-                                            :repo_full_name => Config.github_webhook_repo_full_name))
+                scheduler.queue_a_build(BuildData.new(
+                    :build_type => :master,
+                    :repo_full_name => Config.github_webhook_repo_full_name))
               when /(?<version>v\d+\.\d+)/
                 version = $~[:version]
                 if Config.valid_release_versions.include?(version)
                   response = "OK, I've queued a build of `#{version}` branch."
-                  scheduler.queue_a_build(BuildData.new(:release,
-                                              :build_version => version,
-                                              :repo_full_name => Config.github_webhook_repo_full_name))
+                  scheduler.queue_a_build(BuildData.new(
+                    :build_type => :release,
+                    :build_version => version,
+                    :repo_full_name => Config.github_webhook_repo_full_name))
                 else
                   response = "I'm sorry, I cannot build the #{version} release branch"
                 end
@@ -174,4 +175,4 @@ You can also ask me for `status` and I'll tell you what's being built and what's
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.6.0
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers
@@ -112,16 +112,16 @@ dependencies:
   name: reel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.pre3
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0.pre3
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: code-tools
   requirement: !ruby/object:Gem::Requirement
@@ -177,11 +191,12 @@ files:
 - lib/build_buddy/builder.rb
 - lib/build_buddy/config.rb
 - lib/build_buddy/gitter.rb
+- lib/build_buddy/recorder.rb
 - lib/build_buddy/scheduler.rb
 - lib/build_buddy/server.rb
 - lib/build_buddy/slacker.rb
 - lib/build_buddy/watcher.rb
-homepage: http://rubygems.org/gems/build-buddy
+homepage: https://github.com/jlyonsmith/build-buddy
 licenses:
 - MIT
 metadata: {}