cbgit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd5ba4d3710ddad57600bb6c804f1ded2c652bf
-  data.tar.gz: 8c8238da1a49450cef23425fcf4f17e0ac28c913
+  metadata.gz: 29ac1484be87d5a91ae309dd6cab38ed50351b11
+  data.tar.gz: b730e6f50f2913b251a34674d8fe316dfe8071ab
 SHA512:
-  metadata.gz: cb3aa975e99cb5981376146b463dc003441e10e8da0798ca357cdda53a36c8ba03d59803440b38b6c604c9a979443e4025c74bc44c0716978b0cd64f40d7ba77
-  data.tar.gz: 1c0366016154d2864b8ba401729eab0b00b5b9622bc492d76f2f75c3c496a5fc7cfdf7d064376956847a95378dcd19745be4d47afe13f79bfae893812ca62d8a
+  metadata.gz: 0c7164d12b28b93c6558454d6d735f6c51cf4fa96d3d82061b737e8fce57a8085fdef36832df4f0ca5dff43e1bb2212effb7dde5ef03210d4dc8f28737794115
+  data.tar.gz: b9ccc321e0c984f27cb5310184991283c88555f849851c84634856f84d78f3c497bab1d560ed9a1ffea06bc22d25cfb305eb1fc7bb7866c64d080c96fa4f6218

data/bin/gitbuild

@@ -88,11 +88,20 @@ def git command, *args
   @g.lib.send :command, command, args
 end
 
-PULLS_LIMIT = 1000
-def fetch_github_pulls repo=calculate_github_repo
-  # Access pull requests
+ISSUES_LIMIT = 1000
+def fetch_github_pulls repo
+  # Access pull requests via issues API, because PRs API does not expose labels
+  # but the issues API does. Technically, all the PRs are issues, so we just 
+  # pull all the issues and sort the ones that are not PRs out.
   @logger.debug "Fetching pull requests from #{repo}"
-  pulls = Octokit.pulls(repo, state: :open, per_page: PULLS_LIMIT)
+  Octokit.issues(repo, state: :open, per_page: ISSUES_LIMIT)
+         .select { |i| i[:pull_request] }
+end
+
+def fetch_github_pulls_to_build repo=calculate_github_repo
+  fetch_github_pulls(repo).select { |pull|
+    pull[:labels].find { |label| label[:name] == OPTS[:BUILD_NAME] }
+  }
 end
 
 def calculate_github_repo
@@ -120,10 +129,6 @@ def calculate_build_number
   end
 end
 
-def pull_tag_regex
-  /\B\##{OPTS[:BUILD_NAME]}\b/
-end
-
 # --------------------------------------------------
 # MAIN SCRIPT
 
@@ -143,8 +148,7 @@ begin
 
   # --------------------------------------------------------------------
   # Figure out branches we will merge, by looking for the magic tag
-  pulls = fetch_github_pulls
-  pulls = pulls.select{ |pull| pull.body.match pull_tag_regex }
+  pulls = fetch_github_pulls_to_build
   raise 'No pull requests to merge!' if pulls.empty?
   brnames = pulls.map{ |b| b.head.ref }
   puts "---- Found Github branches to build:\n#{brnames.join "\n" }"
@@ -237,6 +241,3 @@ rescue
   branch.delete rescue nil
   raise
 end
-
-
-

data/lib/cbgit/version.rb

@@ -1,3 +1,3 @@
 module Cbgit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cbgit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jaime Cham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler