fastlane-plugin-polidea 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe77e5cb4d527ba8dc582f1b13e75f343f43f49
-  data.tar.gz: 0e6b5f1e73dbbf8c298fe0496a49ff4d6c2724f2
+  metadata.gz: 41e7f4035f341c048798dcd64a9c242e810fb9d0
+  data.tar.gz: 792f4e2c40045802eaf8260320334ce74e7a192b
 SHA512:
-  metadata.gz: 39fe93651ac41830ea83ad2dd589e231aeeefbbb1c4713be82e46a9be0df7ea626d357615c8a7fbc2fb7ba735c6720f5743afc0e26c1a5c77dec5aeb256d9ae6
-  data.tar.gz: 697bab3b78376bed22391234934ae70436404140d7da0d2f6c31e1836953e1b2c1fd2771103721534bb8e27bee6590e62113c205032965444fad6fbbb4a8590d
+  metadata.gz: 52d41e8bc47d3ca0d6839322aabd1d2b9207437a34a253524e9f10aed4c4cb2a72bffe6e0fb928299f1c474900bbcdc36926beb7064051084e2d8d5f747e3fa4
+  data.tar.gz: 103a5e1de80952e759192a70d7a75df6815c2704a4bc73e7895c77340d2992eceea3f33a2d6fbe25587c2db5f1c345f33e8ff3a7ed76aefd9359dce1ed11f3b5

data/README.md

@@ -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/actions/fota_s3.rb

@@ -321,20 +321,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 +344,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: 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 +373,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: content_type_for_file(local_path)
+          })
         end
       end
 
@@ -519,7 +530,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",

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

@@ -8,10 +8,10 @@ module Fastlane
       @dark_color = dark_color
 
       @margin = 20
-      @image = ::ChunkyPNG::Image.new(2 * @margin + @qr_code.module_count * 5, 2 * @margin + @qr_code.module_count * 5, ::ChunkyPNG::Color::WHITE)
+      @image = ::ChunkyPNG::Image.new(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5, ::ChunkyPNG::Color::WHITE)
 
       @logo = ::ChunkyPNG::Image.from_file("#{path_to_resources}/logo.png")
-      @logo = @logo.resize(2 * @margin + @qr_code.module_count * 5, 2 * @margin + @qr_code.module_count * 5)
+      @logo = @logo.resize(2 * @margin + @qr_code.qrcode.module_count * 5, 2 * @margin + @qr_code.qrcode.module_count * 5)
     end
 
     def generate(path)
@@ -25,11 +25,11 @@ module Fastlane
       end
 
       @qr_code.modules.each_index do |row|
-        @qr_code.modules.each_index do |column|
-          if @qr_code.is_dark(row, column)
-            print_symbol(dark_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.module_count - 8) || (column >= @qr_code.module_count - 8 && row < 8))
+        @qr_code.modules[row].each_index do |column|
+          if @qr_code.modules[row][column]
+            print_symbol(dark_color, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
           else
-            print_symbol(white, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.module_count - 8) || (column >= @qr_code.module_count - 8 && row < 8))
+            print_symbol(white, column, row, (column < 8 && row < 8) || (column < 8 && row >= @qr_code.qrcode.module_count - 8) || (column >= @qr_code.qrcode.module_count - 8 && row < 8))
           end
         end
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Polidea
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-polidea
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Piotrek Dubiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: premailer
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.7
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rqrcode_png
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +156,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +230,6 @@ files:
 - lib/fastlane/plugin/polidea/actions/fota_s3.rb
 - lib/fastlane/plugin/polidea/actions/get_binary_size.rb
 - lib/fastlane/plugin/polidea/actions/import_provisioning.rb
-- lib/fastlane/plugin/polidea/actions/polidea_store.rb
 - lib/fastlane/plugin/polidea/actions/release_notes.rb
 - lib/fastlane/plugin/polidea/actions/shuttle.rb
 - lib/fastlane/plugin/polidea/helper/page_generator.rb

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

@@ -1,255 +0,0 @@
-# rubocop:disable Metrics/MethodLength
-
-require 'net/http'
-require 'uri'
-require 'json'
-
-module Fastlane
-  module Actions
-    class PolideaStoreAction < Action
-      def self.run(params)
-        platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
-        validate(platform, params)
-        config = get_config(platform, params)
-        app_name, app_identifier, version = notify(platform, config)
-
-        UI.success("Successfully uploaded #{app_name} (#{app_identifier})")
-        UI.success("version: #{version}")
-        UI.success("using icon from #{params[:icon_url]}") if params[:icon_url]
-        UI.success("using plist from #{params[:plist_url]}") if platform == :ios
-        UI.success("with release notes: #{params[:release_notes]}") if params[:release_notes]
-      end
-
-      #####################################################
-      # @!group Documentation
-      #####################################################
-
-      def self.description
-        "Polidea Store upload action"
-      end
-
-      def self.details
-        "Notify Polidea Store about new app version"
-      end
-
-      def self.author
-        ["Piotrek Dubiel"]
-      end
-
-      def self.available_options
-        [
-          FastlaneCore::ConfigItem.new(key: :api_token,
-            env_name: "POLIDEA_STORE_API_TOKEN",
-            description: "API Token for Polidea Store",
-            verify_block: proc do |value|
-              UI.user_error!("No API token for Polidea Store given, pass using `api_token: 'token'`") unless value and !value.empty?
-            end),
-          FastlaneCore::ConfigItem.new(key: :ipa,
-            env_name: "",
-            description: ".ipa file for the build ",
-            optional: true,
-            default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]),
-          FastlaneCore::ConfigItem.new(key: :apk,
-            env_name: "",
-            description: ".apk file for the build ",
-            optional: true,
-            default_value: Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]),
-          FastlaneCore::ConfigItem.new(key: :plist_url,
-            env_name: "POLIDEA_STORE_PLIST_URL",
-            description: "Url to uploaded plist",
-            default_value: Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH],
-            verify_block: proc do |value|
-              UI.user_error!("No plist url given, pass using `plist_url: 'url'` or make sure s3 action succeded and exposed S3_PLIST_OUTPUT_PATH shared value") unless value and !value.empty?
-            end),
-          FastlaneCore::ConfigItem.new(key: :apk_url,
-            env_name: "POLIDEA_STORE_APK_URL",
-            description: "Url to uploaded apk",
-            default_value: Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH],
-            verify_block: proc do |value|
-              UI.user_error!("No apk url given, pass using `apk_url: 'url'` or make sure s3 action succeded and exposed S3_APK_OUTPUT_PATH shared value") unless value and !value.empty?
-            end),
-          FastlaneCore::ConfigItem.new(key: :icon_url,
-            env_name: "POLIDEA_STORE_ICON_URL",
-            description: "Url to uploaded app icon",
-            default_value: Actions.lane_context[SharedValues::S3_ICON_OUTPUT_PATH],
-            optional: true),
-          FastlaneCore::ConfigItem.new(key: :release_notes,
-            env_name: "",
-            description: "Release notes to be attached to uploaded version",
-            is_string: true,
-            optional: true,
-            default_value: Actions.lane_context[SharedValues::RELEASE_NOTES]),
-          FastlaneCore::ConfigItem.new(key: :app_name,
-            env_name: "",
-            description: "Application name (defaults to results of extract_app_name action)",
-            is_string: true,
-            optional: true),
-          FastlaneCore::ConfigItem.new(key: :bundle_id,
-            env_name: "",
-            description: "Bundle id, used if platform equals :ios",
-            is_string: true,
-            optional: true),
-          FastlaneCore::ConfigItem.new(key: :bundle_version,
-            env_name: "",
-            description: "Bundle version, used if platform equals :ios",
-            is_string: true,
-            optional: true),
-          FastlaneCore::ConfigItem.new(key: :package_name,
-            env_name: "",
-            description: "Package name, used if platform equals :android",
-            is_string: true,
-            optional: true),
-          FastlaneCore::ConfigItem.new(key: :version_name,
-            env_name: "",
-            description: "Version name, used if platform equals :android",
-            is_string: true,
-            optional: true),
-          FastlaneCore::ConfigItem.new(key: :version_code,
-            env_name: "",
-            description: "Version code, used if platform equals :android",
-            type: Integer,
-            optional: true),
-          FastlaneCore::ConfigItem.new(key: :binary_size,
-            env_name: "",
-            description: ".ipa/.apk binary size in bytes",
-            type: Integer,
-            optional: true)
-        ]
-      end
-
-      def self.is_supported?(platform)
-        [:ios, :android].include? platform
-      end
-
-      def self.category
-        :deprecated
-      end
-
-      def self.validate(platform, params)
-        binary_size = params[:binary_size] || Actions.lane_context[Actions::SharedValues::BINARY_SIZE]
-        UI.user_error!("No binary size given, pass using `binary_size: bytes` or make sure get_binary_size action succeded and exposed BINARY_SIZE shared value") unless binary_size and !binary_size.nil?
-
-        case platform
-        when :android
-          UI.user_error!("No .apk file given, pass using `apk: 'apk path'` or make sure gradle action succeded and exposed GRADLE_APK_OUTPUT_PATH shared value") unless params[:apk] and !params[:apk].empty?
-        when :ios
-          UI.user_error!("No .ipa file given, pass using `ipa: 'ipa path'` or make sure gym action succeded and exposed IPA_OUTPUT_PATH shared value") unless params[:ipa] and !params[:ipa].empty?
-        end
-      end
-
-      def self.get_config(platform, params)
-        binary_size = params[:binary_size] || Actions.lane_context[Actions::SharedValues::BINARY_SIZE]
-        api_token = params[:api_token]
-        icon_url = params[:icon_url]
-        release_notes = params[:release_notes]
-
-        case platform
-        when :ios
-          info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(params[:ipa])
-          app_name = params[:app_name] || info['CFBundleDisplayName'] || info['CFBundleName']
-          app_identifier = params[:bundle_id] || info['CFBundleIdentifier']
-          version = params[:bundle_version] || info['CFBundleShortVersionString']
-          href = itms_href(params[:plist_url])
-          url_scheme = get_url_scheme(info)
-          UI.user_error!("No prefix scheme found in Info.plist. Make sure `add_prefix_schema` action succeded before build action") if url_scheme.nil?
-        when :android
-          manifest = Android::Apk.new(params[:apk]).manifest
-          app_name = params[:app_name] || manifest.label
-          app_identifier = params[:package_name] || manifest.package_name
-          version = params[:version_name] || manifest.version_name
-          version_code = params[:version_code] || manifest.version_code
-          href = params[:apk_url]
-        end
-
-        config = {
-          api_token: api_token,
-          app_name: app_name,
-          app_identifier: app_identifier,
-          version: version,
-          version_code: version_code,
-          icon_url: icon_url,
-          href: href,
-          release_notes: release_notes,
-          binary_size: binary_size,
-          url_scheme: url_scheme
-        }
-
-        return config
-      end
-
-      def self.notify(platform, params)
-        uri = URI.parse(url(platform, params[:app_identifier]))
-
-        version = {
-          version: params[:version],
-          releaseNotes: params[:release_notes],
-          href: params[:href],
-          bytes: params[:binary_size]
-        }
-
-        version[:prefixSchema] = params[:url_scheme] if platform == :ios
-        version[:versionCode] = params[:version_code] if platform == :android
-
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-
-        req = create_request(uri, params[:api_token], {
-          name: params[:app_name],
-          icon: {
-            href: params[:icon_url]
-          },
-          versions: [version]
-        })
-
-        response = http.request(req)
-        unless response.code == "204"
-          UI.user_error! "Polidea Store backend responded with [#{response.code}] #{response.body}"
-        end
-
-        return params[:app_name], params[:app_identifier], params[:version]
-      end
-      private_class_method :notify
-
-      def self.url(platform, app_identifier)
-        "#{base_url}/#{platform}/apps/#{app_identifier}/versions"
-      end
-      private_class_method :url
-
-      def self.base_url
-        "https://polideastore.herokuapp.com"
-        # "https://polideastore-staging.herokuapp.com"
-      end
-      private_class_method :base_url
-
-      def self.create_request(uri, upload_token, params)
-        req = Net::HTTP::Post.new(uri.request_uri)
-        req['Content-Type'] = 'application/json'
-        req['Upload-Token'] = upload_token
-        req.body = JSON.generate(params)
-        req
-      end
-      private_class_method :create_request
-
-      def self.itms_href(plist_url)
-        "itms-services://?action=download-manifest&url=#{URI.encode_www_form_component(plist_url)}"
-      end
-      private_class_method :itms_href
-
-      def self.get_url_scheme(plist)
-        url_scheme = nil
-        url_types = plist['CFBundleURLTypes']
-        unless url_types.nil?
-          url_type = url_types[0]
-          url_schemes = url_type['CFBundleURLSchemes']
-          unless url_schemes.nil?
-            url_scheme = url_schemes[0]
-          end
-        end
-        url_scheme
-      end
-      private_class_method :get_url_scheme
-    end
-  end
-end
-
-# rubocop:enable Metrics/MethodLength