fastlane-plugin-polidea 1.0.0.pre → 2.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24cb6b4990f9df96baf13a4d87042c29c0d58511
-  data.tar.gz: d821ae3f09c6f3a26aff561f0b1f96676fc5e6bb
+SHA256:
+  metadata.gz: 3a200dfe6c81fc0c43478b1092c96b60a4bb2d516128b8d6e3e82d244b0f0278
+  data.tar.gz: 9bfa26033bfbe2bdae07e37c2fcd3271f2e0eb897c6a586b4d12430f7922d192
 SHA512:
-  metadata.gz: bb90f970a5776ffd5ed4d73eacc46e5221c304b195af7060ecb3ad0f95590e18680dca39f0385d00aac31b9f4ec9385114c6d40076e803dd439a272acaf144d1
-  data.tar.gz: b6e8ce80330823d299e937e2fe78eee9722247fc182a0d7c2fb3a1c45c665772f5b319a83b7a64d9dc6093f52337063d021ae00d8d4d3790a57be3d4bae36465
+  metadata.gz: 2e1c8608894077d23abd728f70c020af492b2a83d0d1202e9374815336946694bb1b6b75308219258c4d99337b6c84839012ddfa06b5e9832845c53c055939f8
+  data.tar.gz: a15a41c923351da5092cd8c4bf1b8f32c537a159c3128317c569a87457b3e0c3c96bd778f757c0a756d798c58face121aa526e31eb6bcbef77e07b984a1d5117

data/README.md

@@ -1,6 +1,6 @@
 # fastlane-plugin-polidea
 
-[![build status](https://gitlab2.polidea.com/CI/fastlane-plugin-polidea/badges/master/build.svg)](https://gitlab2.polidea.com/CI/fastlane-plugin-polidea)
+[![build status](https://gitlab.polidea.com/CICD/fastlane-plugin-polidea/badges/master/pipeline.svg)](https://gitlab.polidea.com/CICD/fastlane-plugin-polidea/pipelines)
 [![Gem](https://img.shields.io/gem/v/fastlane-plugin-polidea.svg?style=flat)](http://rubygems.org/gems/fastlane-plugin-polidea)
 
 
@@ -21,7 +21,6 @@ Plugin contains following actions:
 - `get_binary_size`: Measures binary size in bytes
 - `s3`: Custom version of s3 action with Polidea's installation page
 - `fota_mail`: Custom version of mailgun action with Polidea's mail template
-- `polidea_store`: Notifies Polidea Store about new app version
 
 See more details [here](https://gitlab2.polidea.com/CI/fastlane-plugin-polidea/blob/master/docs/Actions.md).
 To list all available actions run:
@@ -39,7 +38,6 @@ lane :deploy do
   extract_version
   get_binary_size
   s3
-  polidea_store
   fota_mail(
     to: "piotr.dubiel@polidea.com"
   )

data/lib/fastlane/plugin/polidea.rb

@@ -1,4 +1,5 @@
 require 'fastlane/plugin/polidea/version'
+require 'fastlane/plugin/polidea/helper/analytics'
 
 module Fastlane
   module Polidea
@@ -6,6 +7,12 @@ module Fastlane
     def self.all_classes
       Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]
     end
+
+    def self.session
+      require 'securerandom'
+      @session_id ||= SecureRandom.uuid
+      @session ||= Analytics.new(@session_id)
+    end
   end
 end
 

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

@@ -8,6 +8,8 @@ module Fastlane
 
     class AddPrefixSchemaAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("add_prefix_schema", config)
+
         prefix_schema = generate_url_scheme
 
         info_plists = Dir.glob(File.join(config[:path], "**/*.plist"))
@@ -18,6 +20,7 @@ module Fastlane
 
         Actions.lane_context[SharedValues::PREFIX_SCHEMA] = prefix_schema
 
+        Fastlane::Polidea.session.action_completed("add_prefix_schema")
         prefix_schema
       end
 

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

@@ -10,6 +10,8 @@ module Fastlane
 
     class ExtractAppIconAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_app_icon", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
         icon_output_path = config[:icon_output_path]
 
@@ -24,6 +26,8 @@ module Fastlane
         else
           UI.important("No icon found.")
         end
+
+        Fastlane::Polidea.session.action_completed("extract_app_icon")
       end
 
       def self.extract_icon(platform, config)

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

@@ -15,6 +15,8 @@ module Fastlane
 
     class ExtractAppInfoAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_app_info", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         icon_output_path = config[:icon_output_path]
@@ -34,6 +36,8 @@ module Fastlane
           SharedValues::APP_VERSION => app_version,
           SharedValues::BUILD_NUMBER => build_number
         )
+
+        Fastlane::Polidea.session.action_completed("extract_app_info")
       end
 
       def self.validate(platform, config)
@@ -133,7 +137,7 @@ module Fastlane
         info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(ipa_file)
         icon_files = ipa_icon_files(info)
         return if icon_files.empty?
-        icon_file_name = icon_files.first
+        icon_file_name = icon_files.sort.last
         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
@@ -145,13 +149,12 @@ module Fastlane
       end
 
       def self.ipa_icon_files(info)
-        icons = info['CFBundleIcons']
-        unless icons.nil?
-          primary_icon = icons['CFBundlePrimaryIcon']
-          unless primary_icon.nil?
-            return primary_icon['CFBundleIconFiles']
-          end
-        end
+        # try iPhone
+        icons = info.dig('CFBundleIcons', 'CFBundlePrimaryIcon', 'CFBundleIconFiles')
+        return icons unless icons.nil?
+        # try iPad
+        icons = info.dig('CFBundleIcons~ipad', 'CFBundlePrimaryIcon', 'CFBundleIconFiles')
+        return icons unless icons.nil?
         []
       end
 

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

@@ -10,6 +10,8 @@ module Fastlane
 
     class ExtractAppNameAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_app_name", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         # Gets name from ipa/apk
@@ -20,6 +22,7 @@ module Fastlane
 
         UI.success("Successfully extracted app name: '#{Actions.lane_context[SharedValues::APP_NAME]}'")
 
+        Fastlane::Polidea.session.action_completed("extract_app_name")
         app_name
       end
 

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

@@ -11,6 +11,8 @@ module Fastlane
 
     class ExtractVersionAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_version", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         # Gets version from ipa/apk
@@ -24,6 +26,8 @@ module Fastlane
 
         UI.success("Successfully extracted app version: '#{Actions.lane_context[SharedValues::APP_VERSION]}', build number: #{Actions.lane_context[SharedValues::BUILD_NUMBER]}")
 
+        Fastlane::Polidea.session.action_completed("extract_version")
+
         return app_version, build_number
       end
 

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

@@ -1,4 +1,5 @@
 # rubocop:disable Metrics/MethodLength
+require 'redcarpet'
 require 'fastlane/erb_template_helper'
 
 module Fastlane
@@ -9,10 +10,14 @@ module Fastlane
       end
 
       def self.run(options)
+        Fastlane::Polidea.session.action_launched("fota_mail", options)
+
         Actions.verify_gem!('premailer')
         require 'premailer'
         inline_images(options)
         mailgunit(options)
+
+        Fastlane::Polidea.session.action_completed("fota_mail")
         UI.success "Mail sent!"
       end
 
@@ -105,24 +110,15 @@ module Fastlane
       end
 
       def self.inline_images(options)
-        base_path = "#{__dir__}/../templates/images"
         options[:inline] = [
           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",
-          "polidea-logo.png",
-          "polidea-twitter-icon.png"
-        ]
-        images << "icon-placeholder.png" unless options[:app_icon]
-        options[:inline].concat(images.map { |image| File.new("#{base_path}/#{image}") })
       end
 
       def self.qr_code(installation_link)
         qr_code_path = "/tmp/qr_code.png"
-        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(103, 103, 103)).generate(qr_code_path)
+        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(21, 18, 126)).generate(qr_code_path)
         File.new(qr_code_path)
       end
 
@@ -150,25 +146,27 @@ module Fastlane
           app_version: options[:app_version],
           build_number: options[:build_number],
           installation_link: options[:installation_link],
-          release_notes: (options[:release_notes] || "").split("\n"),
+          release_notes: options[:release_notes],
           platform: options[:platform],
           release_date: DateTime.now.strftime('%b %d, %Y'),
-          binary_size: (options[:binary_size] / 1024.0 / 1024.0).round(2).to_s
+          binary_size: (options[:binary_size] / 1024.0 / 1024.0).round(2).to_s,
+          qr_code: "qr_code.png"
         }
         hash[:success] = options[:success]
         hash[:ci_build_link] = options[:ci_build_link]
 
-        # grabs module
-        eth = Fastlane::ErbTemplateHelper
         # create html from template
         html_template_path = options[:template_path]
         if html_template_path && File.exist?(html_template_path)
+          eth = Fastlane::ErbTemplateHelper
           html_template = eth.load_from_path(html_template_path)
+          mail_html = eth.render(html_template, hash)
         else
-          html_template = eth.load_from_path("#{__dir__}/../templates/mailgun_template.erb")
+          mail_html = PageGenerator.mail(hash)
         end
+
         premailer = Premailer.new(
-          eth.render(html_template, hash),
+          mail_html,
           { warn_level: Premailer::Warnings::SAFE, with_html_string: true }
         )
         premailer.to_inline_css

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

@@ -30,6 +30,8 @@ module Fastlane
 
     class FotaS3Action < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("fota_s3", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         # Calling fetch on config so that default values will be used
@@ -61,6 +63,7 @@ module Fastlane
           upload_android(params)
         end
 
+        Fastlane::Polidea.session.action_completed("fota_s3")
         return true
       end
 
@@ -164,7 +167,7 @@ module Fastlane
         icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
-        html_render = PageGenerator.generate({
+        html_render = PageGenerator.installation_page({
           url: "itms-services://?action=download-manifest&url=#{URI.encode_www_form_component(plist_url)}",
           installation_password: installation_password,
           app_version: bundle_version,
@@ -278,7 +281,7 @@ module Fastlane
         icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
-        html_render = PageGenerator.generate({
+        html_render = PageGenerator.installation_page({
           url: apk_url,
           installation_password: installation_password,
           app_version: app_version,
@@ -321,20 +324,21 @@ module Fastlane
       end
 
       def self.get_bucket(s3_access_key, s3_secret_access_key, s3_region, s3_bucket)
-        self.s3_client(s3_access_key, s3_secret_access_key, s3_region).buckets[s3_bucket]
+        self.s3_client(s3_access_key, s3_secret_access_key, s3_region).bucket(s3_bucket)
       end
 
       def self.s3_client(s3_access_key, s3_secret_access_key, s3_region)
-        Actions.verify_gem!('aws-sdk')
-        require 'aws-sdk'
+        Actions.verify_gem!('aws-sdk-s3')
+        require 'aws-sdk-s3'
+
         if s3_region
-          s3_client = AWS::S3.new(
+          s3_client = Aws::S3::Resource.new(
             access_key_id: s3_access_key,
             secret_access_key: s3_secret_access_key,
             region: s3_region
           )
         else
-          s3_client = AWS::S3.new(
+          s3_client = Aws::S3::Resource.new(
             access_key_id: s3_access_key,
             secret_access_key: s3_secret_access_key
           )
@@ -343,13 +347,18 @@ module Fastlane
       end
 
       def self.upload_file(bucket, file_name, file_data, acl, treat_bucket_as_domain_name)
-        obj = bucket.objects.create(file_name, file_data, acl: acl, content_type: content_type_for_file(file_name))
+        obj = bucket.put_object({
+          key: file_name,
+          body: file_data,
+          acl: acl,
+          content_type: Mime.content_type_for_file(file_name)
+        })
 
         # When you enable versioning on a S3 bucket,
         # writing to an object will create an object version
         # instead of replacing the existing object.
         # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/ObjectVersion.html
-        if obj.kind_of? AWS::S3::ObjectVersion
+        if obj.kind_of? Aws::S3::ObjectVersion
           obj = obj.object
         end
 
@@ -367,8 +376,13 @@ module Fastlane
         files.each do |file|
           local_path = directory_path + file
           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")
+
+          bucket.put_object({
+            key: s3_path,
+            body: File.open(local_path),
+            acl: acl,
+            content_type: Mime.content_type_for_file(local_path)
+          })
         end
       end
 
@@ -388,25 +402,6 @@ module Fastlane
         return files
       end
 
-      def self.content_type_for_file(file)
-        file_extension = File.extname(file)
-        extensions_to_type = {
-          ".html" => "text/html",
-          ".png"  => "image/png",
-          ".jpg"  => "text/jpeg",
-          ".gif"  => "image/gif",
-          ".svg"  => "image/svg+xml",
-          ".log"  => "text/plain",
-          ".css"  => "text/css",
-          ".js"   => "application/javascript"
-        }
-        if extensions_to_type[file_extension].nil?
-          "application/octet-stream"
-        else
-          extensions_to_type[file_extension]
-        end
-      end
-
       #
       # NOT a fan of this as this was taken straight from Shenzhen
       # https://github.com/nomad/shenzhen/blob/986792db5d4d16a80c865a2748ee96ba63644821/lib/shenzhen/plugins/s3.rb#L32
@@ -519,7 +514,7 @@ module Fastlane
                                        env_name: "S3_ACL",
                                        description: "Uploaded object permissions e.g public_read (default), private, public_read_write, authenticated_read ",
                                        optional: true,
-                                       default_value: "public_read"),
+                                       default_value: "public-read"),
           FastlaneCore::ConfigItem.new(key: :installation_password,
                                        env_name: "INSTALLATION_PASSWORD",
                                        description: "Password for installation page",
@@ -528,9 +523,9 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :release_notes,
                                       env_name: "S3_RELEASE_NOTES",
                                       description: "Release notes",
-                                      type: Array,
+                                      type: String,
                                       optional: true,
-                                      default_value: Actions.lane_context[SharedValues::RELEASE_NOTES] ? Actions.lane_context[SharedValues::RELEASE_NOTES].split("\n") : nil),
+                                      default_value: Actions.lane_context[SharedValues::RELEASE_NOTES]),
           FastlaneCore::ConfigItem.new(key: :treat_bucket_as_domain_name,
                                       description: "If it's true, it transforms all urls from https://s3.amazonaws.com/BUCKET_NAME to https://BUCKET_NAME",
                                       is_string: false,

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

@@ -6,6 +6,8 @@ module Fastlane
 
     class GetBinarySizeAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("get_binary_size", config)
+
         binary_file = config[:binary]
 
         UI.user_error!("No IPA or APK file path given, pass using `binary: 'ipa or apk path'`") unless binary_file.to_s.length > 0
@@ -18,6 +20,8 @@ module Fastlane
 
         UI.success("Size of #{binary_file} is #{binary_size_in_mb} MB (#{binary_size} bytes)")
 
+        Fastlane::Polidea.session.action_completed("get_binary_size")
+
         binary_size
       end
 

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

@@ -2,6 +2,8 @@ module Fastlane
   module Actions
     class ImportProvisioningAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("import_provisioning", config)
+
         path = config[:path]
         profiles = Dir.glob File.join(path, "*.mobileprovision")
 
@@ -10,6 +12,9 @@ module Fastlane
           FastlaneCore::ProvisioningProfile.install(profile)
         end
         UI.success "Successfully imported:\n#{profiles.join("\n")}"
+
+        Fastlane::Polidea.session.action_completed("import_provisioning")
+
         true
       end
 

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

@@ -6,12 +6,17 @@ module Fastlane
 
     class ReleaseNotesAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("release_notes", config)
+
         current_tag = sh "git describe --exact-match --tags HEAD"
         tag_info = sh "git cat-file -p #{current_tag}"
         release_notes = tag_info.split("\n").drop(5).join("\n")
         UI.success "Extracted release notes:\n#{release_notes}"
         Actions.lane_context[SharedValues::RELEASE_NOTES] = release_notes
         ENV[SharedValues::RELEASE_NOTES.to_s] = release_notes
+
+        Fastlane::Polidea.session.action_completed("release_notes")
+
         release_notes
       end