xcskarel 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a547dddbe32f8f28af3767137ebfc4b47dd0b871
-  data.tar.gz: a2a28673151ff2563b383738ffd8f3d4dbe42345
+  metadata.gz: cf58b04b0c57a70a57293e17fe3bb66bde17a5f8
+  data.tar.gz: afb87c39726475e9e85b1c04d74bef54adb7a104
 SHA512:
-  metadata.gz: 93a7d7b5afd1a0478643c0ad70effc2fa01aafcf3c9d4ffcdbf4037d7e09deafef97738550c2c2eea7cd2f8d73717e4fbc9c6cc15aa44044ac580a9fa2a43b70
-  data.tar.gz: 21502e25cffc850bd1010daadc200b70ababb16480db04953d6cc98fc5b05e96c138f3ba985b15015f423788426b12ef6a93f56ce200ff176da7a306bd12acc1
+  metadata.gz: 8f8aaa7c01000090168ef4f12445395135508928271ae0db44bd9a8f57a7e9c13b7fcf6a3b633e4189948044ae25a60b559ebaef8785a3e0779d90d2a6709b39
+  data.tar.gz: 9e0b9728393772d7ecef24d97162e31c10f023819fa3176fc7c9c16b7eb2b93b79ad12dee1e43630e0febbbbd5bbcfbd7477e38798e6b08c1413585f71beb7ed

data/lib/xcskarel/application.rb

@@ -52,7 +52,7 @@ module XCSKarel
     def self.colorize(key, value)
       value ||= ""
       case key
-      when "integration_step"
+      when "current_step"
         case value
         when "completed"
           value = value.white
@@ -61,7 +61,7 @@ module XCSKarel
         else
           value = value.yellow
         end
-      when "integration_result"
+      when "result"
         case value
         when "succeeded"
           value = value.green

data/lib/xcskarel/config.rb

@@ -14,6 +14,14 @@ module XCSKarel
       (config_json['name'] || File.basename(@path).split('.').first).gsub("botconfig_", "")
     end
 
+    def branch
+      blueprint = @json['configuration']['sourceControlBlueprint']
+      primary_repo_key = blueprint['DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey']
+      location = blueprint['DVTSourceControlWorkspaceBlueprintLocationsKey'][primary_repo_key]
+      # might be nil if we're pointing to a commit, for instance.
+      return location['DVTSourceControlBranchIdentifierKey']
+    end
+
     def original_bot_name
       @json['name'] || config_json['original_bot_name']
     end

data/lib/xcskarel/server.rb

@@ -25,7 +25,10 @@ module XCSKarel
       response = get_endpoint('/bots')
       raise "You are unauthorized to access data on #{@host}, please check that you're passing in a correct username and password.".red if response.status == 401
       raise "Failed to fetch Bots from Xcode Server at #{@host}, response: #{response.status}: #{response.body}.".red if response.status != 200
-      JSON.parse(response.body)['results']
+      bots = JSON.parse(response.body)['results']
+
+      # sort them alphabetically by name
+      bots.sort_by { |bot| bot['name'] }
     end
 
     def get_integrations(bot_id)
@@ -46,12 +49,17 @@ module XCSKarel
       bots = self.get_bots
       bots.map do |bot|
         status = {}
-        status['bot_name'] = bot['name']
-        status['bot_id'] = bot['_id']
+        status['name'] = bot['name']
+        status['id'] = bot['_id']
+        status['branch'] = XCSKarel::Config.new(bot, nil, nil).branch
         last_integration = self.get_integrations(bot['_id']).first # sorted from newest to oldest
-        status['integration_step'] = last_integration['currentStep']
-        status['integration_result'] = last_integration['result']
-        status['integration_number'] = last_integration['number']
+        if last_integration
+          status['current_step'] = last_integration['currentStep']
+          status['result'] = last_integration['result']
+          status['count'] = last_integration['number']
+        else
+          status['count'] = 0
+        end
         bot_statuses << status
       end
       return bot_statuses

data/lib/xcskarel/version.rb

@@ -1,3 +1,3 @@
 module XCSKarel
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xcskarel
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Honza Dvorsky