fastlane-plugin-sonarcloud_metric_kit 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c0c5f65d4d9a28b71b7167801b1e482c6e5ebbca7a46004014d1beef6865011
-  data.tar.gz: 29b278995c38d9f31b62b7de49be795ce20298d385ec3bd420bed1018ff47f46
+  metadata.gz: eeddf4e49945c0dd9ea71e3e6226f7f3baea4fd1b7355f45c192776582acf528
+  data.tar.gz: f6d1000185737248180df90e63edaf85348cc6b675709e7e716b9a3501b6a9e3
 SHA512:
-  metadata.gz: 58685710cb6749e958f13bb529cd7d61ee5d7803c01e50489c0d1595024851fbf8554be0ec2e03f5a69098dc3a32baa2ae90e4e0838410cb4a65df42530fead2
-  data.tar.gz: aa9c2dc590a96dcd806dbfb442cb6c4e1a39b72d2374aebd598ad859a44783991de79b8628aecdb0bc5dabb4fe0d3bb2f23af9e2d95dc40c33f642ea631e0514
+  metadata.gz: 3e30412bc28b7e662d7a74afd3e8b1dc0f9a5853e302007d59fb92786c1146a09ba6fb371b549063f30fb80f220285fd98f3be90dbcf564cef05464322d52130
+  data.tar.gz: 333dfb9c82f53c3737f887692fdba2b560db75dc63c994fe429a488f3ac3abb181cc53c5d59ed8c6cae63d482d68637c324ad0ac76b40ac775dde44eb2d0cf6d

data/lib/fastlane/plugin/sonarcloud_metric_kit/actions/sonarcloud_metric_kit_action.rb

@@ -13,9 +13,11 @@ module Fastlane
 
       def self.collect_metrics(params)
         metrics = {}
-        measures = measures(params)
+        measures = get_measures(params)
         metric_keys.each do |key|
           metric = measures.find { |m| m['metric'] == key.to_s }
+          next unless metric
+
           metrics[key.to_sym] =
             if metric['value']
               metric['value']
@@ -27,7 +29,7 @@ module Fastlane
         end
         return metrics unless params[:quality_gate]
 
-        quality_gate = quality_gate(params)
+        quality_gate = get_quality_gate(params)
         metrics[:quality_gate] = quality_gate
         if params[:period] && quality_gate['periods'].size > params[:period]
           metrics[:period_value] = quality_gate['periods'][params[:period]]['parameter']
@@ -35,16 +37,22 @@ module Fastlane
         metrics
       end
 
-      def self.measures(params)
-        queries = "componentKey=#{params[:project_key]}&metricKeys=#{metric_keys.join(',')}"
-        url = URI("#{api_url}/measures/component?#{queries}")
-        response = request(url, token: params[:sonar_token])
-        json_parse(response.read_body)['component']['measures']
+      def self.get_measures(params)
+        queries = ["componentKey=#{params[:project_key]}", "metricKeys=#{metric_keys.join(',')}"]
+        queries << "branch=#{params[:branch]}" if params[:branch]
+        url = URI("#{api_url}/measures/component?#{queries.join('&')}")
+        response = json_parse(request(url, token: params[:sonar_token]).read_body)
+        UI.user_error!(response) unless response['component']
+        response['component']['measures']
       end
 
-      def self.quality_gate(params)
-        url = URI("#{api_url}/qualitygates/project_status?projectKey=#{params[:project_key]}")
-        JSON.parse(request(url, token: params[:sonar_token]).read_body)['projectStatus']
+      def self.get_quality_gate(params)
+        queries = ["projectKey=#{params[:project_key]}"]
+        queries << "branch=#{params[:branch]}" if params[:branch]
+        url = URI("#{api_url}/qualitygates/project_status?#{queries.join('&')}")
+        response = json_parse(request(url, token: params[:sonar_token]).read_body)
+        UI.user_error!(response) unless response['projectStatus']
+        response['projectStatus']
       end
 
       def self.request(url, token:)
@@ -136,7 +144,7 @@ module Fastlane
       #####################################################
 
       def self.description
-        'Generates a report from SonarCloud'
+        'Collects metrics from SonarCloud'
       end
 
       def self.available_options
@@ -166,6 +174,12 @@ module Fastlane
             is_string: false,
             optional: true,
             default_value: false
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :branch,
+            description: 'Git branch to use for collecting metrics',
+            is_string: true,
+            optional: true
           )
         ]
       end

data/lib/fastlane/plugin/sonarcloud_metric_kit/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module SonarcloudMetricKit
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sonarcloud_metric_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - alteral
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler