fastlane-plugin-waldo 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 056a17e44467bd00b33113d8cf52829a6b849c29
-  data.tar.gz: 38c5bdbe260672b4ad39c59fdcbc3498118350e5
+  metadata.gz: 1ed8c04c2045ecc72f5bae2886d924aa267dbf01
+  data.tar.gz: 56f47c14e035e955ca002a891648d4a96cfc1596
 SHA512:
-  metadata.gz: 58a2fc1db402ef97db5a7215fb23d5ee61ad017cbfb4d963e8c661ded128e4894da651ba783911f3fd5d0459a68a72f7ec5756d3a009111d460439d450aa3f08
-  data.tar.gz: bdb76754572891b23d5ad91a5627e1245ad9a0acae7eb157903c61e5873a1f9fbc70d01fae55c51dc538b5d55d9c2a3097df9e688c2bbedba2d3f20da1289fe8
+  metadata.gz: 9507565edfe335c48757bc2283057b7a5235e0cf712c94fd5e70d4fd26ad3ba3f9ee8c13fcbad1126cc8c29ca178e6a188ce27d5ea85ce0fe569fba7cc6efb07
+  data.tar.gz: 5a07ca19ae171dddb902bfb96677c40fa0b00ab5a42b201529d89c3708d6328689105db90a081e033daf0b1fe19ddbd466a78409169cbd54eb377a66459a4f9c

data/lib/fastlane/plugin/waldo/helper/waldo_helper.rb

@@ -1,8 +1,26 @@
+require 'base64'
 require 'net/http'
 
 module Fastlane
   module Helper
     class WaldoHelper
+      def self.convert_commit(sha)
+        puts "Entering convert_commit(#{sha})"
+
+        prefix = 'remotes/origin/'
+        pfxlen = prefix.length
+
+        full_name = get_git_commit_name(sha)
+
+        if full_name.start_with?(prefix)
+          abbr_name = full_name[pfxlen..-1]
+        else
+          abbr_name = "local:#{full_name}"
+        end
+
+        %("#{sha[0..7]}-#{abbr_name}")
+      end
+
       def self.dump_request(request)
         len = request.body ? request.body.length : 0
 
@@ -76,6 +94,38 @@ module Fastlane
         end
       end
 
+      def self.get_git_commit_name(sha)
+        cmd = %(git name-rev --exclude='tags/*' --name-only "#{sha}")
+
+        puts "Calling: #{cmd}" if FastlaneCore::Globals.verbose?
+
+        result = Actions.sh(cmd, log: false).chomp
+
+        puts "#{cmd} => #{result}" if FastlaneCore::Globals.verbose?
+
+        result
+      end
+
+      def self.get_git_commits
+        cmd = %(git log --format=%H -50)
+
+        result = Actions.sh(cmd, log: false).chomp
+
+        puts "#{cmd} => #{result}" if FastlaneCore::Globals.verbose?
+
+        result.split(' ')
+      end
+
+      def self.get_history
+        history = get_git_commits
+
+        return '' unless !history.empty?
+
+        history = history.map { |sha| convert_commit(sha) }
+
+        Base64.strict_encode64("[#{history.join(',')}]")
+      end
+
       def self.get_platform
         Actions.lane_context[Actions::SharedValues::PLATFORM_NAME] || :ios
       end
@@ -92,6 +142,31 @@ module Fastlane
         upload_error(message) if @upload_token
       end
 
+      def self.has_git_command?
+        cmd = %(which git)
+
+        result = Actions.sh(cmd, log: false).chomp
+
+        puts "#{cmd} => #{result}" if FastlaneCore::Globals.verbose?
+
+        !result.empty?
+      end
+
+      def self.is_git_repository?
+        cmd = %(git rev-parse)
+
+        result = true
+
+        Actions.sh(cmd,
+                   log: false,
+                   error_callback: ->(ignore) { result = false }
+                  ).chomp
+
+        puts "#{cmd} => #{result}" if FastlaneCore::Globals.verbose?
+
+        result
+      end
+
       def self.make_build_request(uri)
         if @apk_path
           body_path = @apk_path
@@ -128,9 +203,27 @@ module Fastlane
       end
 
       def self.make_build_uri
+        if !has_git_command?
+          history_error = "noGitCommandFound"
+        elsif !is_git_repository?
+          history_error = "notGitRepository"
+        else
+          history = get_history
+        end
+
+        query = ''
+
+        if history
+          query += "&history=#{history}"
+        elsif history_error
+          query += "&historyError=#{history_error}"
+        end
+
+        query += "&variantName=#{@variant_name}" if @variant_name
+
         uri_string = 'https://api.waldo.io/versions'
 
-        uri_string += "?variantName=#{@variant_name}" if @variant_name
+        uri_string += "?#{query[1..-1]}" if !query.empty?
 
         URI(uri_string)
       end
@@ -316,7 +409,13 @@ module Fastlane
         end
 
         FileUtils.cd(cd_path) do
-          unless Actions.sh(%(zip -qry "#{zip_path}" "#{src_path}")).empty?
+          cmd = %(zip -qry "#{zip_path}" "#{src_path}")
+
+          result = Actions.sh(cmd, log: false)
+
+          puts "#{cmd} => #{result}" if FastlaneCore::Globals.verbose?
+
+          unless result.empty?
             handle_error("Unable to zip app at path '#{src_path.to_s}' into '#{zip_path.to_s}'")
 
             return false

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Waldo
-    VERSION = "1.2.2"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-waldo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - J. G. Pusey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler