build-buddy 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20b7313e36172e051a99a9b341a94fc92338455a
-  data.tar.gz: 578b2c07c30fc4d4cf678049ae2e9212883e1857
+  metadata.gz: 42ef29e6a888d9a89ced4aa309d964810eb39727
+  data.tar.gz: 9042302dd8276aa3f0cb4e6b6d56f5bb8d32a869
 SHA512:
-  metadata.gz: 144e5b4600e573917693fd6389c8d7e9e7f9ea1d53a27f65806779014cbdbe6748c2add4ded28a36f619830348bd43e4a552f902a8322bf5c71920d3006e9ad3
-  data.tar.gz: c96c2800fa8975b29e3511c23dc108c78f316f103d61f6245b0d33d36098daaeacc8a9dfebcf85f3ad217930f5e4b0b6c520f55d6952a6fcd8949d32f9d0e212
+  metadata.gz: ec95fce9bc150e5d93210959c58d8840ceefe1b8ef4ef4b99e18a7de742e091ee142a016aa25428040779895740f9ba21476e7cc3bbbd7613cb85f17c182a293
+  data.tar.gz: 1e64657ef0e400bac314eb75a1fcab1d1b60ba3a18cc5a0d7e53568b6b80c6ba3ddafb39b34f1573ae8ae10ba5f6012c13230e11fe3387a2eff6d1723c754ca7

data/bin/build-buddy

@@ -8,46 +8,48 @@ require 'celluloid/supervision/container'
 require 'methadone'
 require 'build_buddy'
 
-class Tool
-  include Methadone::Main
-  include Methadone::CLILogging
+module BuildBuddy
+  class Tool
+    include Methadone::Main
+    include Methadone::CLILogging
 
-  main do |config_name|
-    config_file_name = config_name
+    main do |config_name|
+      config_file_name = config_name
 
-    if File.extname(config_file_name) != '.bbconfig'
-      config_file_name += '.bbconfig'
-    end
+      if File.extname(config_file_name) != '.bbconfig'
+        config_file_name += '.bbconfig'
+      end
 
-    load config_file_name
+      load config_file_name
 
-    config_path = File.dirname(config_file_name)
-    BuildBuddy::Config.pull_request_build_script = File.expand_path(BuildBuddy::Config.pull_request_build_script, config_path)
-    BuildBuddy::Config.master_build_script = File.expand_path(BuildBuddy::Config.master_build_script, config_path)
-    BuildBuddy::Config.release_build_script = File.expand_path(BuildBuddy::Config.release_build_script, config_path)
-    BuildBuddy::Config.build_log_dir = File.expand_path(BuildBuddy::Config.build_log_dir, config_path)
+      config_path = File.dirname(config_file_name)
+      Config.pull_request_build_script = File.expand_path(Config.pull_request_build_script, config_path)
+      Config.master_build_script = File.expand_path(Config.master_build_script, config_path)
+      Config.release_build_script = File.expand_path(Config.release_build_script, config_path)
+      Config.build_log_dir = File.expand_path(Config.build_log_dir, config_path)
 
-    build_log_dir = BuildBuddy::Config.build_log_dir
+      build_log_dir = BuildBuddy::Config.build_log_dir
 
-    unless Dir.exist?(build_log_dir)
-      Dir.mkdir(build_log_dir)
-    end
+      unless Dir.exist?(build_log_dir)
+        Dir.mkdir(build_log_dir)
+      end
 
-    Slack.configure do |config|
-      config.token = BuildBuddy::Config.slack_api_token
-    end
+      Slack.configure do |config|
+        config.token = Config.slack_api_token
+      end
 
-    Celluloid.logger = Reel::Logger.logger
+      Celluloid.logger = Reel::Logger.logger
 
-    BuildBuddy::Builder.supervise as: :builder
-    BuildBuddy::Server.supervise as: :server
+      Builder.supervise as: :builder
+      Server.supervise as: :server
 
-    sleep
-  end
+      sleep
+    end
 
-  version BuildBuddy::VERSION
-  description 'Build Buddy'
-  arg :config_name, :required
+    version BuildBuddy::VERSION
+    description 'Build Buddy'
+    arg :config_name, :required
 
-  go!
-end
+    go!
+  end
+end

data/lib/build_buddy.rb

@@ -2,8 +2,8 @@ require 'build_buddy/config'
 require 'build_buddy/server'
 require 'build_buddy/builder'
 require 'build_buddy/watcher'
+require 'build_buddy/build_data'
 
 module BuildBuddy
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end
-

data/lib/build_buddy/build_data.rb

@@ -0,0 +1,21 @@
+module BuildBuddy
+  class BuildData
+    attr_accessor :build_type # one of :master, :release or :pull_request
+    attr_accessor :repo_full_name
+    attr_accessor :build_version
+    attr_accessor :repo_full_name
+    attr_accessor :repo_sha
+    attr_accessor :termination_type
+    attr_accessor :exit_code
+    attr_accessor :start_time
+    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]
+    end
+  end
+end

data/lib/build_buddy/builder.rb

@@ -46,8 +46,10 @@ module BuildBuddy
           raise "Unknown build type"
       end
 
-      build_log_filename = File.join(Config.build_log_dir, "build_#{build_data.build_type.to_s}_#{Time.now.utc.strftime('%Y%m%d%_H%M%S')}.log")
-      build_data.build_log_filename = build_log_filename
+      @build_data.start_time = Time.now.utc
+      build_log_filename = File.join(Config.build_log_dir,
+        "build_#{build_data.build_type.to_s}_#{build_data.start_time.strftime('%Y%m%d_%H%M%S')}.log")
+      @build_data.build_log_filename = build_log_filename
 
       Bundler.with_clean_env do
         @pid = Process.spawn(env, command, :pgroup => true, [:out, :err] => build_log_filename)
@@ -64,6 +66,7 @@ module BuildBuddy
     end
 
     def process_done(status)
+      @build_data.end_time = Time.now.utc
       @build_data.termination_type = (status.signaled? ? :killed : :exited)
       @build_data.exit_code = (status.exited? ? status.exitstatus : -1)
       info "Process #{status.pid} #{@build_data.termination_type == :killed ? 'was terminated' : "exited (#{@build_data.exit_code})"}"
@@ -76,6 +79,7 @@ module BuildBuddy
       if @gid
         info "Killing gid #{@gid}"
         Process.kill(:SIGABRT, -@gid)
+        @gid = nil
       end
     end
   end

data/lib/build_buddy/config.rb

@@ -2,6 +2,8 @@ module BuildBuddy
   module Config
     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
@@ -14,10 +16,15 @@ module BuildBuddy
     attr_accessor :pull_request_build_script
     attr_accessor :master_build_script
     attr_accessor :release_build_script
-   end
+    attr_accessor :valid_release_versions
+    attr_accessor :kill_build_after_mins
+  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/server.rb

@@ -3,7 +3,6 @@ require 'celluloid/current'
 require 'reel'
 require 'slack-ruby-client'
 require 'json'
-require 'ostruct'
 require 'octokit'
 require 'thread'
 require 'timers'
@@ -14,7 +13,7 @@ module BuildBuddy
   class Server < Reel::Server::HTTP
     include Celluloid::Internals::Logger
 
-    def initialize(host = "127.0.0.1", port = 4567)
+    def initialize(host = "127.0.0.1", port = Config.github_webhook_port)
       super(host, port, &method(:on_connection))
       @gh_client ||= Octokit::Client.new(:access_token => Config.github_api_token)
       @rt_client = Slack::RealTime::Client.new
@@ -106,23 +105,24 @@ module BuildBuddy
             case message
               when /master/i
                 response = "OK, I've queued a build of the `master` branch."
-                queue_a_build(OpenStruct.new(
-                    :build_type => :master,
+                queue_a_build(BuildData.new(:master,
                     :repo_full_name => Config.github_webhook_repo_full_name))
               when /(?<version>v\d+\.\d+)/
                 version = $~[:version]
-                response = "OK, I've queued a build of `#{version}` branch."
-                queue_a_build(OpenStruct.new(
-                    :build_type => :release,
-                    :build_version => version,
-                    :repo_full_name => Config.github_webhook_repo_full_name))
+                if Config.valid_release_versions.include?(version)
+                  response = "OK, I've queued a build of `#{version}` branch."
+                  queue_a_build(BuildData.new(: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
               when /stop/i
                 build_data = @active_build
                 if build_data.nil?
                   response = "There is no build running to stop"
                 else
-                  # TODO: We need some more checks here to avoid accidental stoppage
-                  response = "OK, I'm trying to *stop* the currently running build..."
+                  response = "OK, I killed the currently running build..."
                   Celluloid::Actor[:builder].async.stop_build
                 end
               else
@@ -178,7 +178,7 @@ module BuildBuddy
         case request.method
         when 'POST'
           case request.path
-          when '/webhook'
+          when Config.github_webhook_path
             case request.headers["X-GitHub-Event"]
               when 'pull_request'
                 payload_text = request.body.to_s
@@ -188,12 +188,11 @@ module BuildBuddy
                 else
                   payload = JSON.parse(payload_text)
                   pull_request = payload['pull_request']
-                  build_data = OpenStruct.new(
-                    :build_type => :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'])
-                  info "Got pull request #{build_data[:pull_request]} from GitHub"
+                  info "Got pull request #{build_data.pull_request} from GitHub"
                   queue_a_build(build_data)
                   request.respond 200
                 end
@@ -235,7 +234,6 @@ module BuildBuddy
         if @build_queue.length > 0
           build_data = @build_queue.pop()
           @active_build = build_data
-          # TODO: Add timing information into the build_data
           if build_data.build_type == :pull_request
             @gh_client.create_status(
               build_data.repo_full_name, build_data.repo_sha, 'pending',
@@ -243,7 +241,6 @@ module BuildBuddy
           end
           Celluloid::Actor[:builder].async.start_build(build_data)
         elsif @done_queue.length > 0
-          # TODO: Should pop everything in the done queue
           build_data = @done_queue.pop
           term_msg = (build_data.termination_type == :killed ? "was stopped" : "completed")
           if build_data.termination_type == :exited
@@ -279,7 +276,10 @@ module BuildBuddy
           info "Build timer stopped"
         end
       else
-        # TODO: Make sure that the build has not run too long and kill if necessary
+        # 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
+          Celluloid::Actor[:builder].async.stop_build()
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-buddy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - John Lyon-smith
@@ -173,6 +173,7 @@ extra_rdoc_files: []
 files:
 - bin/build-buddy
 - lib/build_buddy.rb
+- lib/build_buddy/build_data.rb
 - lib/build_buddy/builder.rb
 - lib/build_buddy/config.rb
 - lib/build_buddy/server.rb