fastlane-plugin-polidea 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b52156dd8f28402ee8ab8bf276798d433d62203
-  data.tar.gz: b711cd901d7ef1541c98e9c8774cb2a9151764ea
+  metadata.gz: df273bd2009b658356ce8c168af3878aa2b8c3eb
+  data.tar.gz: e376f516c6cf5024956475318aec84a33bbc89af
 SHA512:
-  metadata.gz: 5aa57de038b20e8366e57314d25cf81c715f63df760618f28cb13c1a2e1438121ba1f912583e7cc72763d79a4d7efd576f598f2b925d6554e5314cb2fb0d5110
-  data.tar.gz: 019642974acafd0e6f993fed275f6c4136ad0c0df045d58e46c4607d228d773803b07489e68f15eb51c4bf4bbf7155b6c76de0fda2c30b5f9dd5a998a0aedbf9
+  metadata.gz: e03c849c68e5f0334dc19766d1dd53d3da65878c693bba87714aa5de504303769107274e8c90e7d73b52eb8cec4641df134c0e2c4a0c881aaceb8882a43f2fe8
+  data.tar.gz: 9c9779c71ab126f7b6f9cbedcb7a6e0251183248dd5cc400cc8e552eb2806106e8f66a0c22e4cef08a28c792af0be820ce90a82be56f60e69165cbd4259135d0

data/lib/fastlane/plugin/polidea/actions/extract_app_icon.rb

@@ -14,12 +14,14 @@ module Fastlane
         # Gets icon from ipa/apk
         icon_file = extract_icon(platform, config)
 
-        Actions.lane_context[SharedValues::ICON_OUTPUT_PATH] = icon_output_path
-        ENV[SharedValues::ICON_OUTPUT_PATH.to_s] = icon_output_path
-
-        UI.success("Successfully extracted app icon file to '#{Actions.lane_context[SharedValues::ICON_OUTPUT_PATH]}'")
-
-        icon_file
+        if icon_file
+          Actions.lane_context[SharedValues::ICON_OUTPUT_PATH] = icon_output_path
+          ENV[SharedValues::ICON_OUTPUT_PATH.to_s] = icon_output_path
+          UI.success("Successfully extracted app icon file to '#{Actions.lane_context[SharedValues::ICON_OUTPUT_PATH]}'")
+          icon_file
+        else
+          UI.important("No icon found.")
+        end
       end
 
       def self.extract_icon(platform, config)
@@ -41,7 +43,9 @@ module Fastlane
 
       def self.extract_icon_from_ipa(ipa_file, icon_output_path)
         info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(ipa_file)
-        icon_file_name = ipa_icon_files(info).first
+        icon_files = ipa_icon_files(info)
+        return if icon_files.empty?
+        icon_file_name = icon_files.first
         Zip::File.open(ipa_file) do |zipfile|
           icon_file = self.largest_ios_icon(zipfile.glob("**/Payload/**/#{icon_file_name}*.png"))
           return nil unless icon_file
@@ -60,7 +64,7 @@ module Fastlane
             return primary_icon['CFBundleIconFiles']
           end
         end
-        nil
+        []
       end
 
       def self.largest_ios_icon(icons)
@@ -84,6 +88,7 @@ module Fastlane
       def self.extract_icon_from_apk(apk_file, icon_output_path)
         apk = Android::Apk.new(apk_file)
         icon = largest_android_icon(apk)
+        return unless icon
         icon_file = File.open(icon_output_path, 'wb')
         icon_file.write icon[:data]
         icon_file
@@ -104,6 +109,8 @@ module Fastlane
           end
         end
         { name: selected_icon[0], data: selected_icon[1] } if selected_icon
+      rescue
+        nil
       end
 
       ######## common

data/lib/fastlane/plugin/polidea/actions/mailgun.rb

@@ -103,9 +103,9 @@ module Fastlane
       def self.inline_images(options)
         base_path = "#{__dir__}/../templates/images"
         options[:inline] = [
-          qr_code(options[:installation_link]),
-          File.new(options[:app_icon])
+          qr_code(options[:installation_link])
         ]
+        options[:inline] << File.new(options[:app_icon]) if options[:app_icon]
         images = [
           "polidea-facebook-icon.png",
           "polidea-github-icon.png",
@@ -139,7 +139,7 @@ module Fastlane
           author: Actions.git_author_email,
           last_commit: Actions.last_git_commit_message,
           is_android: Actions.lane_context[Actions::SharedValues::PLATFORM_NAME] == :android,
-          app_icon: File.basename(options[:app_icon]),
+          app_icon: options[:app_icon] ? File.basename(options[:app_icon]) : nil,
           app_name: options[:app_name],
           app_version: options[:app_version],
           build_number: options[:build_number],

data/lib/fastlane/plugin/polidea/actions/polidea_store.rb

@@ -144,7 +144,7 @@ module Fastlane
           app_name = params[:app_name] || info['CFBundleName']
           app_identifier = params[:bundle_id] || info['CFBundleIdentifier']
           version = params[:bundle_version] || info['CFBundleShortVersionString']
-          href = "itms-services://?action=download-manifest&url=#{CGI.escape(params[:plist_url])}"
+          href = itms_href(params[:plist_url])
           url_scheme = get_url_scheme(info)
         when :android
           manifest = Android::Apk.new(params[:apk]).manifest
@@ -225,7 +225,7 @@ module Fastlane
       private_class_method :create_request
 
       def self.itms_href(plist_url)
-        "itms-services://?action=download-manifest&url=#{plist_url}"
+        "itms-services://?action=download-manifest&url=#{CGI.escape(plist_url)}"
       end
       private_class_method :itms_href
 

data/lib/fastlane/plugin/polidea/actions/s3.rb

@@ -358,12 +358,6 @@ module Fastlane
           s3_path = directory_name + file
           obj = bucket.objects[s3_path]
           obj.write(file: local_path, content_type: content_type_for_file(local_path), acl: "public_read")
-          if obj.exists?
-            next
-          end
-
-          result = "Error while uploading file #{local_path}"
-          return result
         end
       end
 
@@ -426,6 +420,7 @@ module Fastlane
       end
 
       def self.upload_icon(icon_path, url_part, bucket, acl)
+        return unless icon_path
         icon_file_basename = File.basename(icon_path)
         icon_file = File.open(icon_path)
         icon_file_name = "#{url_part}#{icon_file_basename}"

data/lib/fastlane/plugin/polidea/templates/installation_template.erb

@@ -20,7 +20,7 @@
       <div class="installation-panel">
         <div class="row">
           <div class="small-2 medium-2 columns inner-element">
-            <% if app_icon != nil %>
+            <% if app_icon %>
             <img src="<%= app_icon %>" class="no-resize icon-margin"/>
             <% else %>
             <object type="image/svg+xml" data="installation-page/img/logo_square.svg"

data/lib/fastlane/plugin/polidea/templates/mailgun_template.erb

@@ -1018,7 +1018,7 @@ img.polidea-logo {
             <table class="two columns">
               <tr>
                 <td>
-                    <% if app_icon != nil %>
+                    <% if app_icon %>
                     <img src="cid:<%= app_icon %>" class="app-icon"/>
                     <% else %>
                     <img src="cid:icon-placeholder.png" class="app-icon logo-decoration"/>

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Polidea
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-polidea
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Piotrek Dubiel