build-buddy 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76cc3ddfbee154ee1432443968a760f9e17e79e8
-  data.tar.gz: 575d15f41abb55fcbc7e0e8174144f3926e5c568
+  metadata.gz: 2a8a7992124d1da142da38648ea45d39b805582f
+  data.tar.gz: 6785a428216e7499fc90d437692715f3442434b2
 SHA512:
-  metadata.gz: cc093742b96214e7f4f5a2e1c58bb1fe39efe77fadacec41d75a86672da153d6098bc90b48dbc11c7571bb83c490fad7b19a7cba2dc04e536c110a72763c88c2
-  data.tar.gz: 456bcf537cd820466616367118a23fdef23c67c08842c9d6ead7ed35cf3ed86fa38809f303be637ab81f67dd91b423d4ba89a295ae1e247cd034cd9a3841dfc4
+  metadata.gz: 1b789719672f1d11b0bf637063db822d66a4867d2f430e478cf7a6c212209081b2a3e00e95bcad838a220eca323142a39edc35c5fadc07e887825b820861c01d
+  data.tar.gz: 05299a51f399a428f3038f1da2de44edc9b9d671d65a7cdc9b8009f035a9173e356ae35d94b79b7aaf994bb69041ffa6e72d22ccc214f5261abf82ce5664b410

data/bin/build-buddy

@@ -22,12 +22,7 @@ module BuildBuddy
       load config_file_name
 
       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 = File.expand_path(Config.build_log_dir, config_path)
 
       unless Dir.exist?(build_log_dir)
         Dir.mkdir(build_log_dir)

data/lib/build_buddy.rb

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

data/lib/build_buddy/builder.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bundler'
 require 'celluloid'
 require 'psych'
+require 'fileutils'
 require_relative './watcher.rb'
 require_relative './config.rb'
 
@@ -18,51 +19,123 @@ module BuildBuddy
     end
 
     def start_build(build_data)
+      def expand_vars(s)
+        s.gsub(/\$([a-zA-Z_]+[a-zA-Z0-9_]*)|\$\{(.+)\}/) { ENV[$1||$2] }
+      end
+
       @build_data = build_data
       @metrics_tempfile = Tempfile.new('build-metrics')
       @metrics_tempfile.close()
 
       repo_parts = build_data.repo_full_name.split('/')
-      command = "bash "
-      env = {
-          "GIT_REPO_OWNER" => repo_parts[0],
-          "GIT_REPO_NAME" => repo_parts[1],
+      git_repo_owner = repo_parts[0]
+      git_repo_name = repo_parts[1]
+      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
+  exit 1
+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
+fi
+)
+      when :branch
+        build_script += %q(
+if [[ -z "$GIT_BRANCH" ]]; then
+  echo Must set GIT_BRANCH before calling
+fi
+)
+      else
+        raise "Unknown build type"
+      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}
+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 ERROR: Unable to clone repository
+  exit 1
+fi
+
+cd ${GIT_REPO_NAME}
+)
+
+      case build_data.type
+      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
+        })
+        # See https://gist.github.com/piscisaureus/3342247
+        build_script += %q(
+echo Switching to pr/${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
+)
+      when :branch
+        build_root_dir = expand_vars(Config.branch_root_dir)
+        env.merge!({
+          "GIT_BRANCH" => 'master',
+          "BUILD_SCRIPT" => Config.branch_build_script
+        })
+        build_script += %q(
+echo Switching to ${GIT_BRANCH} branch
+git checkout ${GIT_BRANCH}
+)
+      end
+
+      build_script += %q(
+source ${BUILD_SCRIPT}
+)
+      env.merge!({
+          "GIT_REPO_OWNER" => git_repo_owner,
+          "GIT_REPO_NAME" => git_repo_name,
           "METRICS_DATA_FILE" => @metrics_tempfile.path,
           "RBENV_DIR" => nil,
           "RBENV_VERSION" => nil,
           "RBENV_HOOK_PATH" => nil,
           "RBENV_ROOT" => nil,
-          "PATH" => ENV['PATH'].split(':').select { |v| !v.match(/\.rbenv\/versions|Cellar\/rbenv/) }.join(':')
-      }
+          "PATH" => ENV['PATH'].split(':').select { |v| !v.match(/\.rbenv\/versions|Cellar\/rbenv/) }.join(':'),
+      })
+
       unless build_data.flags.nil?
         build_data.flags.each do |flag|
          env["BUILD_FLAG_#{flag.to_s.upcase}"] = '1'
         end
       end
 
-      case build_data.type
-        when :pull_request
-          env["GIT_PULL_REQUEST"] = build_data.pull_request.to_s
-          command += Config.pull_request_build_script
-        when :master
-          command += Config.master_build_script
-        when :release
-          env["GIT_BRANCH"] = build_data.branch
-          command += Config.release_build_script
-        else
-          raise "Unknown build type"
-      end
-
       @build_data.start_time = Time.now.utc
-      log_filename = File.join(Config.build_log_dir,
+      log_filename = File.join(File.expand_path(Config.build_log_dir),
         "build_#{build_data.type.to_s}_#{build_data.start_time.strftime('%Y%m%d_%H%M%S')}.log")
       @build_data.log_filename = log_filename
 
+      # Ensure build root and git user directory exists
+      clone_dir = File.join(build_root_dir, git_repo_owner)
+      FileUtils.mkdir_p(clone_dir)
+
+      # Write the bootstrapping build script to it
+      script_filename = File.join(clone_dir, "build-buddy-bootstrap.sh")
+      File.write(script_filename, build_script)
+
+      # Run the build script
       Bundler.with_clean_env do
-        @pid = Process.spawn(env, command, :pgroup => true, [:out, :err] => log_filename)
+        @pid = Process.spawn(env, "bash #{script_filename}", :pgroup => true, :chdir => clone_dir, [:out, :err] => log_filename)
         @gid = Process.getpgid(@pid)
       end
-      info "Running #{File.basename(command)} (pid #{@pid}, gid #{@gid}) : Log #{log_filename}"
+      info "Running build script (pid #{@pid}, gid #{@gid}) : Log #{log_filename}"
 
       if @watcher
         @watcher.terminate

data/lib/build_buddy/config.rb

@@ -14,9 +14,10 @@ module BuildBuddy
     attr_accessor :xcode_test_scheme
     attr_accessor :build_log_dir
     attr_accessor :pull_request_build_script
-    attr_accessor :master_build_script
-    attr_accessor :release_build_script
-    attr_accessor :valid_release_versions
+    attr_accessor :branch_build_script
+    attr_accessor :pull_request_root_dir
+    attr_accessor :branch_root_dir
+    attr_accessor :allowed_build_branches
     attr_accessor :kill_build_after_mins
     attr_accessor :server_base_uri
     attr_accessor :mongo_uri

data/lib/build_buddy/scheduler.rb

@@ -25,10 +25,8 @@ module BuildBuddy
           Celluloid::Actor[:gitter].async.set_status(
               build_data.repo_full_name, build_data.repo_sha, :pending, "This build is in the queue")
           info "Pull request build queued"
-        when :master
-          info "`master` branch build queued"
-        when :release
-          info "Release branch build queued"
+        when :branch
+          info "'#{build_data.branch}' branch build queued"
       end
 
       if @build_timer.nil?

data/lib/build_buddy/slacker.rb

@@ -56,21 +56,22 @@ module BuildBuddy
           flags = Slacker.get_build_flags($~[:flags])
           response = "OK, I've queued a build of the `master` branch."
           scheduler.queue_a_build(BuildData.new(
-              :type => :master,
+              :type => :branch,
+              :branch => 'master',
               :flags => flags,
               :repo_full_name => Config.github_webhook_repo_full_name))
         when /^(?<version>v\d+\.\d+)(?: with )?(?<flags>.*)?/
           flags = Slacker.get_build_flags($~[:flags])
           version = $~[:version]
-          if Config.valid_release_versions.include?(version)
+          if Config.allowed_build_branches.include?(version)
             response = "OK, I've queued a build of the `#{version}` branch."
             scheduler.queue_a_build(BuildData.new(
-                :type => :release,
+                :type => :branch,
                 :branch => version,
                 :flags => flags,
                 :repo_full_name => Config.github_webhook_repo_full_name))
           else
-            response = "I'm sorry, I am not allowed to build the `#{version}` release branch"
+            response = "I'm sorry, I am not allowed to build the `#{version}` branch"
           end
         else
           response = "Sorry#{from_slack_channel ? " <@#{data['user']}>" : ""}, I'm not sure if you want do a `master` or release branch build"
@@ -107,9 +108,7 @@ module BuildBuddy
         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}."
-        when :master
-          response = "There is a build of the `master` branch of https://github.com/#{build_data.repo_full_name} in progress."
-        when :release
+        when :branch
           response = "There is a build of the `#{build_data.branch}` branch of https://github.com/#{build_data.repo_full_name} in progress."
         end
         if queue_length == 1
@@ -159,10 +158,8 @@ Ask me `what happened` to get a list of recent builds and log files and `what op
           build_datas.each do |build_data|
             response += "A "
             response += case build_data.type
-                        when :master
-                          "`master` branch build"
-                        when :release
-                          "`#{build_data.branch}` release branch build"
+                        when :branch
+                          "`#{build_data.branch}` branch build"
                         when :pull_request
                           "pull request `#{build_data.pull_request}` build"
                         end
@@ -278,10 +275,7 @@ Ask me `what happened` to get a list of recent builds and log files and `what op
         info "Pull request build #{status_message}"
       else
         status_message += "Log file at #{log_url}."
-        if build_data.type == :master
-          message = "A build of the `master` branch #{status_message}"
-          info "`master` branch build #{status_message}"
-        else
+        if build_data.type == :branch
           message = "A build of the `#{build_data.branch}` branch #{status_message}"
           info "Release branch build #{status_message}"
         end

metadata

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