fastlane-plugin-polidea 2.1.1.pre → 2.1.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9389415ea79485df9f60db8fb7d36dc00f3722a0c659132f35e4744e89ab8c09
-  data.tar.gz: 455e97b59e28db63b05988617ab20453d49d281f8f18a987e58e12157168affe
+  metadata.gz: 66de788d11a57914464a2cc03070b31fd1440612177d90c170f7a855182a542e
+  data.tar.gz: b120d6021ec61cfaa6d812f0e53301ff357702873f3cbcd5c8dd60558ba1c724
 SHA512:
-  metadata.gz: 6f8900858b70301309e2a41b474200a95fe0af1214a969e0a0fab853859e36fbb4e2717cd9d24240c5ea0e080f35abe7d6be5dfc8a55a2ec2198f593746c946d
-  data.tar.gz: edcb2e87e4381fbb62797dc9e7c5cde32db6578a315254c45c1ee0c85996024c6827d9c8a2453c184a9d57f53ea71c28b897272f65355182fe4f0948e6aefcb3
+  metadata.gz: 05b363ecac70721218e61d37c184612e23d863d5d39e6325f6732a955e989cd08456297e68bf2cd4d1f21caef3435dd84d7141a862598f2663d3d60a07b87547
+  data.tar.gz: 03e217698b3819fe1dd5ed3f5aecdca121448a6d1a9cdfbfa276e0736292760da20bbd2d67bea7a0826af1b0a22b179d07991a7902e795acbed1c6731ec09ed9

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)
 
 

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)

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

@@ -10,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
 

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
 

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
 

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

@@ -6,6 +6,7 @@ module Fastlane
   module Actions
     class ShuttleAction < Action
       def self.run(params)
+        Fastlane::Polidea.session.action_launched("shuttle", params)
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
         options = {
           api_token: params[:api_token],
@@ -25,6 +26,8 @@ module Fastlane
         notify(platform, config)
 
         UI.success("Successfully uploaded to #{params[:app_identifier]} #{params[:app_version]}.#{params[:build_number]} to Shuttle")
+
+        Fastlane::Polidea.session.action_completed("shuttle")
       end
 
       #####################################################
@@ -154,8 +157,6 @@ module Fastlane
       end
 
       def self.notify(platform, params)
-        uri = URI.parse(url(params[:environment], platform, params[:app_identifier]))
-
         build = {
           href: params[:href],
           version: params[:app_version],
@@ -167,17 +168,11 @@ module Fastlane
         build[:prefixSchema] = params[:prefix_schema] if platform == :ios
         build[:versionCode] = params[:build_number] if platform == :android
 
-        UI.verbose("POST #{uri}\n#{JSON.pretty_generate({ build: build })}")
-        make_request(uri, create_request(uri, params[:api_token], {
-          build: build
-        }))
-      end
-      private_class_method :notify
+        client = Shuttle::Client.new(base_url(params[:environment]), params[:api_token])
 
-      def self.url(environment, platform, app_identifier)
-        "#{base_url(environment)}/cd/apps/#{platform}/#{app_identifier}/builds"
+        client.create_build(platform, params[:app_identifier], build)
       end
-      private_class_method :url
+      private_class_method :notify
 
       def self.base_url(environment)
         case environment
@@ -189,14 +184,6 @@ module Fastlane
       end
       private_class_method :base_url
 
-      def self.create_request(uri, access_token, params)
-        req = Net::HTTP::Post.new(uri.request_uri)
-        req['Content-Type'] = 'application/json'
-        req['Access-Token'] = access_token
-        req.body = JSON.generate(params)
-        req
-      end
-
       def self.itms_href(plist_url)
         "itms-services://?action=download-manifest&url=#{URI.encode_www_form_component(plist_url)}"
       end
@@ -206,25 +193,6 @@ module Fastlane
         sh("git --no-pager show -s --format='%ae'", print_command: false, print_command_output: false).strip
       end
       private_class_method :commit_author
-
-      def self.make_request(uri, request, limit = 10)
-        raise ArgumentError, 'HTTP redirect too deep' if limit.zero?
-
-        http = Net::HTTP.new(uri.host, uri.port)
-
-        if uri.instance_of?(URI::HTTPS)
-          http.use_ssl = true
-        end
-
-        response = http.request(request)
-        UI.verbose(response.body)
-        case response
-        when Net::HTTPSuccess     then response
-        when Net::HTTPRedirection then make_request(URI.parse(response['location']), request, limit - 1)
-        else
-          UI.user_error! "#{response.code} #{response.body}"
-        end
-      end
     end
   end
 end

data/lib/fastlane/plugin/polidea/helper/analytics.rb

@@ -0,0 +1,43 @@
+module Fastlane
+  module Polidea
+    class Analytics
+      GA_TRACKING = "UA-165836496-1"
+      private_constant :GA_TRACKING
+
+      attr_accessor :session_id
+      attr_accessor :client
+
+      def initialize(session_id)
+        @session_id = session_id
+        @client = FastlaneCore::AnalyticsIngesterClient.new(GA_TRACKING)
+        @client_id = "fastlane-plugin-polidea@#{Fastlane::Polidea::VERSION}"
+      end
+
+      def action_launched(action_name, config)
+        client.post_request({
+          client_id: @session_id,
+          category: @client_id,
+          action: action_name,
+          label: "launched"
+        })
+        config.values.filter { |k, v| !v.nil? }.keys.each do |param|
+          client.post_request({
+            client_id: @session_id,
+            category: @client_id,
+            action: "#{action_name}::#{param}",
+            label: "param"
+          })
+        end
+      end
+
+      def action_completed(action_name)
+        client.post_request({
+          client_id: @session_id,
+          category: @client_id,
+          action: action_name,
+          label: "completed"
+        })
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/polidea/helper/shuttle.rb

@@ -0,0 +1,37 @@
+require 'faraday'
+require 'json'
+
+module Fastlane
+  module Shuttle
+    class Client
+      def initialize(base_url, access_token)
+        retry_options = {
+          max: 2,
+          interval: 0.05,
+          interval_randomness: 0.5,
+          backoff_factor: 2
+        }
+
+        @conn = Faraday.new(
+          url: base_url,
+          headers: {
+            'Content-Type' => 'application/json',
+            'Access-Token' => access_token
+          }
+        ) do |conn|
+          conn.request :retry, retry_options
+          conn.request :multipart
+
+          conn.adapter :net_http
+        end
+      end
+
+      def create_build(platform, app_identifier, build)
+        @conn.post(
+          "cd/apps/#{platform}/#{app_identifier}/builds",
+          build.to_json
+        )
+      end
+    end
+  end
+end

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

@@ -309,7 +309,7 @@
                           </tr>
                           <tr>
                             <td align="left" style="font-size:0px;padding:0;word-break:break-word;">
-                              <div style="font-family:'Acumin', 'Helvetica', Arial;font-size:14px;line-height:20px;text-align:left;color:black;">Version: <%= app_version %> ( <%= build_number %>)</div>
+                              <div style="font-family:'Acumin', 'Helvetica', Arial;font-size:14px;line-height:20px;text-align:left;color:black;">Version: <%= app_version %> (<%= build_number %>)</div>
                             </td>
                           </tr>
                           <tr>

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Polidea
-    VERSION = "2.1.1.pre"
+    VERSION = "2.1.1.pre.1"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-polidea
 version: !ruby/object:Gem::Version
-  version: 2.1.1.pre
+  version: 2.1.1.pre.1
 platform: ruby
 authors:
 - Piotrek Dubiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -260,9 +274,11 @@ files:
 - lib/fastlane/plugin/polidea/actions/import_provisioning.rb
 - lib/fastlane/plugin/polidea/actions/release_notes.rb
 - lib/fastlane/plugin/polidea/actions/shuttle.rb
+- lib/fastlane/plugin/polidea/helper/analytics.rb
 - lib/fastlane/plugin/polidea/helper/mime.rb
 - lib/fastlane/plugin/polidea/helper/page_generator.rb
 - lib/fastlane/plugin/polidea/helper/qr_generator.rb
+- lib/fastlane/plugin/polidea/helper/shuttle.rb
 - lib/fastlane/plugin/polidea/templates/download.erb
 - lib/fastlane/plugin/polidea/templates/images/cover-shuttle.jpg
 - lib/fastlane/plugin/polidea/templates/images/icon-placeholder.png