WTBuildHelpers 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ec35c6b582f9c0be3c38c5119f245cf7a07f739
-  data.tar.gz: f2fbd77dac604af4dd1eb44f3363381f318b8b99
+  metadata.gz: f4cb2d1b4ccc6ea6717cf0e2e00ad2c71da93fa6
+  data.tar.gz: 5a8f9e8efc904d320f4a82ad01997cb7bcacf9e4
 SHA512:
-  metadata.gz: 60d57e67f3cf76bc886cd11df27163636edff0b871496a2ec2707a54bc93634adf98ca1f47fb9ff50aea221b33d9e7f78b1ae42a721714442d800a8658ca72f3
-  data.tar.gz: aa3c032c5983e43a130d49e005e791fba76d28c09c499b05be3f798ae58bf8e133fb0cd165e1e64717674d8716386df70bc43fb523b8545242dcc1cf2b67a7a5
+  metadata.gz: c3ccced0bb074d3097ce5afbd86fc4c5576d12d4b410be3ac33418d76008ce89704075148ebcfedd523d9cdc96d1865bf08eddf75e01a5f8f5a64ba98cbf4a12
+  data.tar.gz: e944cac46b9fd0ec8160575abfcd013aa0572f011978c3129bf0b983d3393b4289614de73f4017478d7d87cd76375c1d4a5a8c2d072123e660a84d85051aafcf

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.vscode

data/README.md

@@ -38,7 +38,7 @@ $ wtbuild teamcity_fetch_git_range --url "%teamcity.serverUrl%" --build_type "%s
 
 Command Line Usage (when run as part of a larger build step):
 ```bash
-$ export TEAMCITY_COMMIT_RANGE=`$ wtbuild teamcity_fetch_git_range --url "%teamcity.serverUrl%" --build_type "%system.teamcity.buildType.id%" --username "%system.teamcity.auth.userId%" --password "%system.teamcity.auth.password%" --export`
+$ export TEAMCITY_COMMIT_RANGE=`wtbuild teamcity_fetch_git_range --url "%teamcity.serverUrl%" --build_type "%system.teamcity.buildType.id%" --username "%system.teamcity.auth.userId%" --password "%system.teamcity.auth.password%" --export`
 ```
 
 ## Installation
@@ -63,4 +63,4 @@ Or install it yourself as:
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/WTBuildHelpers/version.rb

@@ -1,3 +1,3 @@
 module WTBuildHelpers
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/jira.rb

@@ -115,7 +115,7 @@ module WTBuildHelpers::JIRA
     def self.find_jira_issues(logs)
         issue_set = Set.new
         logs.each do |log|
-            issues = log.scan(/[A-Z][A-Z]+-[1-9][0-9]*/)
+            issues = log.scan(/[A-Za-z][A-Za-z]+-[1-9][0-9]*/)
             issue_set.merge(issues)
         end
         
@@ -125,8 +125,10 @@ module WTBuildHelpers::JIRA
     def self.get_git_history(commit_range)
         puts "Getting git history for #{commit_range}"
         happyface = "\u263A".encode('utf-8')
-        git_log = `git --no-pager log --format="%B#{happyface}" #{commit_range} `
-        
+        extra_params = commit_range.index('..') == nil ? "-n 1" : ""
+        git_log = `git --no-pager log --format="%B#{happyface}" #{commit_range} #{extra_params}`
+        puts(git_log)
+
         #parse out the log
         logs = git_log.split(happyface)
         
@@ -149,7 +151,7 @@ module WTBuildHelpers::JIRA
             
             #still nil? Can't perform this transition
             if !jira_info.build_complete_transition_id
-                puts "Could no update issue #{issue_key}: could not find transition"
+                puts "Could not update issue #{issue_key}: could not find transition"
                 next
             end
             
@@ -231,8 +233,10 @@ module WTBuildHelpers::JIRA
             logs = get_git_history(options.commit_range)
             issue_set = find_jira_issues(logs)
             
-            jira_info = JiraInfo.new options.site, options.username, options.password 
-            jira_update(jira_info, issue_set, options.build)
+            if issue_set.size > 0
+                jira_info = JiraInfo.new options.site, options.username, options.password 
+                jira_update(jira_info, issue_set, options.build)
+            end
         end
     end
 end

data/lib/teamcity.rb

@@ -82,7 +82,7 @@ module WTBuildHelpers::TeamCity
         escaped_branch = URI.escape(branch)
         
         full_url = "#{options.url}/app/rest/buildTypes/id:#{options.build_type_id}/builds/?locator=status:SUCCESS,branch:name:#{escaped_branch}"
-
+        
         response = RestClient.get(full_url, headers=headers)
         json_response = JSON.parse(response.body)
 
@@ -110,13 +110,13 @@ module WTBuildHelpers::TeamCity
         STDERR.puts "Start revision is #{start_revision}"
         
         begin
-            end_revision = get_last_successful_rev(options, branch)
-            if !end_revision
-                # Check refs/heads instead
-                branch = "refs/heads/#{branch}"
-                end_revision = get_last_successful_rev(options, branch)
+            check_branches = [branch, "refs/heads/#{branch}", branch.split("/").last]
+            end_revision = nil
+            while end_revision == nil && check_branches.length > 0 do
+                check_branch = check_branches.shift
+                end_revision = get_last_successful_rev(options, check_branch)
             end
-
+            
             put_range(options, start_revision, end_revision)
         rescue RestClient::Exception => e
             puts "ERROR getting last successful build from TeamCity:"

data/lib/teamcity_git_range_fetch.rb

@@ -0,0 +1,46 @@
+#! /usr/bin/env ruby
+
+require 'base64'
+require 'json'
+require 'rest_client'
+require 'pp'
+
+module WTBuildHelpers
+    module TeamCity
+        def self.fetch_commit_range(teamcity_url, build_type_id, username, password)
+
+            auth = "#{username}:#{password}"
+            auth_token = Base64.strict_encode64(auth)
+
+            headers = { "Authorization" => "Basic #{auth_token}",
+                        "Accept" => "application/json" 
+                      }
+            full_url = "#{teamcity_url}/app/rest/buildTypes/id:#{build_type_id}/builds/status:SUCCESS"
+
+            begin
+                response = RestClient.get(full_url, headers=headers)
+                json_response = JSON.parse(response.body)
+            rescue RestClient::Exception => e 
+                pp e
+                exit
+            end
+
+            start_revision = ENV["BUILD_VCS_NUMBER"]
+            end_revision = json_response["revisions"]["revision"][0]["version"]
+            
+            puts "##teamcity[setParameter name='env.TEAMCITY_COMMIT_RANGE' value='#{end_revision}..#{start_revision}']" 
+        end
+    end
+end
+
+if __FILE__ == $0
+    if ARGV.length < 4
+        puts "Usage: teamcity_git_range_fetch.rb [TeamCity Url] [TeamCity Build Type Id] [TeamCity User Name] [TeamCity Password]"
+        puts "These parameters can be passed from TeamCity with the following line: "
+        puts "    teamcity_git_range_fetch.rb \"%teamcity.serverUrl%\" \"%system.teamcity.buildType.id%\" \"%system.teamcity.auth.userId%\" \"%system.teamcity.auth.password%\""
+        
+        exit
+    end
+
+    WTBuildHelpers::TeamCity.fetch_commit_range(ARGV[0], ARGV[1], ARGV[2], ARGV[3])
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: WTBuildHelpers
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - WillowTreeApps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: OptionParser
@@ -88,6 +88,7 @@ files:
 - lib/help.rb
 - lib/jira.rb
 - lib/teamcity.rb
+- lib/teamcity_git_range_fetch.rb
 homepage: 
 licenses:
 - MIT
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Helpers for performing common WillowTree build tasks and integrations