fastlane-plugin-polidea 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c08636fe218a99dbaf41712ad4748f3b32c53fcf
-  data.tar.gz: 680e245635cf09c7f65b3f955170f11afac175b8
+  metadata.gz: ffdc81791469287fd4a7bc81cc21970d4ed2051b
+  data.tar.gz: cf2fceccb5f85159c1cdd2c717ed8f5cc0061379
 SHA512:
-  metadata.gz: 74400d922eef81993300ea6bff2bb0cabada514ec58facd7b911500ff26cd88e4ba860ab7006058778d8effdeb7254a175a4915937fbf4449cbaaf120bc34111
-  data.tar.gz: ed42408a0b81ff58a3a8f9f0c3dd3137b5983f4de439c79027019bbaef178c67abcae6f92a445115f7246a595ba65ac07a27c8f2f78983f727ddde58975d241c
+  metadata.gz: 7b41c73781e3583aaee9827f84c6b1d40ea3b952512f87bdb5e37f8e8a69a2e770450ceacfa04b53792e45ebc2b8ab2aad7290ee123cb07dfaedf54f85c214cd
+  data.tar.gz: 3f9684c12e1c1c5db099b08b4dcdbd9f0ae9807ece05e7b2b98ca42d9f7b0f9df62a96cff2bd88fd7d928960944195df4f98a960288ad264efb10a97d127ca84

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

@@ -52,6 +52,7 @@ module Fastlane
         params[:acl] = config[:acl]
         params[:installation_password] = config[:installation_password]
         params[:release_notes] = config[:release_notes]
+        params[:treat_bucket_as_domain_name] = config[:treat_bucket_as_domain_name]
 
         case platform
         when :ios
@@ -76,10 +77,13 @@ module Fastlane
         acl = params[:acl]
         installation_password = params[:installation_password]
         release_notes = params[:release_notes]
+        treat_bucket_as_domain_name = params[:treat_bucket_as_domain_name]
 
         validate(params)
         UI.user_error!("No IPA file path given, pass using `ipa: 'ipa path'`") unless ipa_file.to_s.length > 0
 
+        UI.message("Will transform S3 urls from https://s3.amazonaws.com/#{s3_bucket} to https://#{s3_bucket}") if treat_bucket_as_domain_name
+
         bucket = get_bucket(s3_access_key, s3_secret_access_key, s3_region, s3_bucket)
 
         # Gets info used for the plist
@@ -101,7 +105,7 @@ module Fastlane
         ipa_file_name = "#{url_part}#{ipa_file_basename}"
         ipa_file_data = File.open(ipa_file, 'rb')
 
-        ipa_url = self.upload_file(bucket, ipa_file_name, ipa_file_data, acl)
+        ipa_url = self.upload_file(bucket, ipa_file_name, ipa_file_data, acl, treat_bucket_as_domain_name)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH] = ipa_url
@@ -112,7 +116,7 @@ module Fastlane
           dsym_file_name = "#{url_part}#{dsym_file_basename}"
           dsym_file_data = File.open(dsym_file, 'rb')
 
-          dsym_url = self.upload_file(bucket, dsym_file_name, dsym_file_data, acl)
+          dsym_url = self.upload_file(bucket, dsym_file_name, dsym_file_data, acl, treat_bucket_as_domain_name)
 
           # Setting action and environment variables
           Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_url
@@ -157,7 +161,7 @@ module Fastlane
         })
 
         # Gets icon from ipa and uploads it
-        icon_url = self.upload_icon(icon_file, url_part, bucket, acl)
+        icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
         html_render = PageGenerator.generate({
@@ -192,10 +196,10 @@ module Fastlane
         #
         #####################################
 
-        plist_url = self.upload_file(bucket, plist_file_name, plist_render, acl)
-        html_url = self.upload_file(bucket, html_file_name, html_render, acl)
+        plist_url = self.upload_file(bucket, plist_file_name, plist_render, acl, treat_bucket_as_domain_name)
+        html_url = self.upload_file(bucket, html_file_name, html_render, acl, treat_bucket_as_domain_name)
         self.upload_directory(bucket, html_resources_name, "#{__dir__}/../templates/installation-page", acl)
-        version_url = self.upload_file(bucket, version_file_name, version_render, acl)
+        version_url = self.upload_file(bucket, version_file_name, version_render, acl, treat_bucket_as_domain_name)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_url
@@ -230,10 +234,13 @@ module Fastlane
         acl = params[:acl]
         installation_password = params[:installation_password]
         release_notes = params[:release_notes]
+        treat_bucket_as_domain_name = params[:treat_bucket_as_domain_name]
 
         validate(params)
         UI.user_error!("No APK file path given, pass using `apk: 'apk path'`") unless apk_file.to_s.length > 0
 
+        UI.message("Will transform S3 urls from https://s3.amazonaws.com/#{s3_bucket} to https://#{s3_bucket}") if treat_bucket_as_domain_name
+
         bucket = get_bucket(s3_access_key, s3_secret_access_key, s3_region, s3_bucket)
 
         # Gets info used from the apk manifest
@@ -250,7 +257,7 @@ module Fastlane
         apk_file_name = "#{url_part}#{apk_file_basename}"
         apk_file_data = File.open(apk_file, 'rb')
 
-        apk_url = self.upload_file(bucket, apk_file_name, apk_file_data, acl)
+        apk_url = self.upload_file(bucket, apk_file_name, apk_file_data, acl, treat_bucket_as_domain_name)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH] = apk_url
@@ -268,7 +275,7 @@ module Fastlane
         html_resources_name = "#{url_part}installation-page"
 
         # Gets icon from ipa and uploads it
-        icon_url = self.upload_icon(icon_file, url_part, bucket, acl)
+        icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
         html_render = PageGenerator.generate({
@@ -282,7 +289,7 @@ module Fastlane
           release_notes: release_notes
         })
 
-        html_url = self.upload_file(bucket, html_file_name, html_render, acl)
+        html_url = self.upload_file(bucket, html_file_name, html_render, acl, treat_bucket_as_domain_name)
         self.upload_directory(bucket, html_resources_name, "#{__dir__}/../templates/installation-page", acl)
 
         Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url
@@ -335,8 +342,7 @@ module Fastlane
         s3_client
       end
 
-      def self.upload_file(bucket, file_name, file_data, acl)
-        puts file_name, content_type_for_file(file_name)
+      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))
 
         # When you enable versioning on a S3 bucket,
@@ -347,8 +353,12 @@ module Fastlane
           obj = obj.object
         end
 
-        # Return public url
-        shorten_url(obj.public_url.to_s)
+        if treat_bucket_as_domain_name
+          # Return public url
+          shorten_url(obj.public_url.to_s)
+        else
+          obj.public_url.to_s
+        end
       end
 
       def self.upload_directory(bucket, directory_name, directory_path, acl)
@@ -420,12 +430,12 @@ module Fastlane
         return path
       end
 
-      def self.upload_icon(icon_path, url_part, bucket, acl)
+      def self.upload_icon(icon_path, url_part, bucket, acl, treat_bucket_as_domain_name)
         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}"
-        self.upload_file(bucket, icon_file_name, icon_file, acl)
+        self.upload_file(bucket, icon_file_name, icon_file, acl, treat_bucket_as_domain_name)
       end
 
       def self.shorten_url(url)
@@ -520,7 +530,12 @@ module Fastlane
                                       description: "Release notes",
                                       type: Array,
                                       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] ? Actions.lane_context[SharedValues::RELEASE_NOTES].split("\n") : nil),
+          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,
+                                      optional: true,
+                                      default_value: true)
         ]
       end
 

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

@@ -222,7 +222,7 @@ module Fastlane
         when Net::HTTPSuccess     then response
         when Net::HTTPRedirection then make_request(URI.parse(response['location']), request, limit - 1)
         else
-          UI.user_error! JSON.parse(response.body)['message']
+          UI.user_error! "#{response.code} #{response.body}"
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Polidea
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-polidea
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Piotrek Dubiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist