fastlane-plugin-aws_s3 1.1.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fcc69803ced2ff28803e66247d27c4da02eae9a
-  data.tar.gz: 10a950c014047044367c46fb6fe93f1c15a14eb5
+  metadata.gz: a63c90d33759731e791a4ea1896a666b157a6fc6
+  data.tar.gz: 47c38a853a9af3e88d3fb5ae30f167a49b7d1a01
 SHA512:
-  metadata.gz: 37bae18ce15c6e3d8aa3a40c278479315847ebd0f367728b943fd780ada7c02bc5976dbd0828d15fadd8a0e0dce598be407b0cbd6c37ac8f0797735584f99269
-  data.tar.gz: b2047e37eb9818efa09c7e627e6e7fdb474e54640f80f801b27963b691719d88043adf5eaac4b92ecfaf6a35336de3af85441b3032b84eb67b257a10872bd792
+  metadata.gz: 9945bedf3f4fa8a7c905fddfdd42f450d2deaec314eeaeef885fa861136b6ef94ff5bd6c7ccd05afb23c14ce9b01b4f20941b2c43df89f88bfd86ba57303cc58
+  data.tar.gz: 99462a92926e3e0b167713541560c0b4530d9d1aa62fa283eb32854684faf3c17934812164191d1067e3a5c54fda28d791e921cbeb13efccec1df765d08957f9

data/lib/fastlane/plugin/aws_s3/actions/aws_s3_action.rb

@@ -4,6 +4,7 @@ include ERB::Util
 require 'ostruct'
 require 'cgi'
 require 'mime-types'
+require 'pathname'
 
 module Fastlane
   module Actions
@@ -15,6 +16,9 @@ module Fastlane
       S3_HTML_OUTPUT_PATH ||= :S3_HTML_OUTPUT_PATH
       S3_VERSION_OUTPUT_PATH ||= :S3_VERSION_OUTPUT_PATH
       S3_SOURCE_OUTPUT_PATH ||= :S3_SOURCE_OUTPUT_PATH
+      S3_XCARCHIVE_OUTPUT_PATH ||= :S3_XCARCHIVE_OUTPUT_PATH
+      S3_FILES_OUTPUT_PATHS ||= :S3_FILES_OUTPUT_PATHS
+      S3_FOLDER_OUTPUT_PATH ||= :S3_FOLDER_OUTPUT_PATH
     end
 
     class AwsS3Action < Action
@@ -23,6 +27,7 @@ module Fastlane
         params = {}
         params[:apk] = config[:apk]
         params[:ipa] = config[:ipa]
+        params[:xcarchive] = config[:xcarchive]
         params[:dsym] = config[:dsym]
         params[:access_key] = config[:access_key]
         params[:secret_access_key] = config[:secret_access_key]
@@ -45,7 +50,10 @@ module Fastlane
         params[:html_in_folder] = config[:html_in_folder]
         params[:version_template_path] = config[:version_template_path]
         params[:version_file_name] = config[:version_file_name]
+        params[:version_template_params] = config[:version_template_params]
         params[:override_file_name] = config[:override_file_name]
+        params[:files] = config[:files]
+        params[:folder] = config[:folder]
 
         # Pulling parameters for other uses
         s3_region = params[:region]
@@ -56,6 +64,9 @@ module Fastlane
         s3_endpoint = params[:endpoint]
         apk_file = params[:apk]
         ipa_file = params[:ipa]
+        xcarchive_file = params[:xcarchive]
+        files = params[:files]
+        folder = params[:folder]
         dsym_file = params[:dsym]
         s3_path = params[:path]
         acl     = params[:acl].to_sym
@@ -66,7 +77,7 @@ module Fastlane
           UI.user_error!("No S3 secret access key given, pass using `secret_access_key: 'secret key'` (or use `aws_profile: 'profile'`)") unless s3_secret_access_key.to_s.length > 0
         end
         UI.user_error!("No S3 bucket given, pass using `bucket: 'bucket'`") unless s3_bucket.to_s.length > 0
-        UI.user_error!("No IPA or APK file path given, pass using `ipa: 'ipa path'` or `apk: 'apk path'`") if ipa_file.to_s.length == 0 && apk_file.to_s.length == 0
+        UI.user_error!("No IPA, APK file, folder or files paths given, pass using `ipa: 'ipa path'` or `apk: 'apk path'` or `folder: 'folder path' or files: [`file path1`, `file path 2`]") if ipa_file.to_s.length == 0 && apk_file.to_s.length == 0 && files.to_a.count == 0 && folder.to_s.length == 0
         UI.user_error!("Please only give IPA path or APK path (not both)") if ipa_file.to_s.length > 0 && apk_file.to_s.length > 0
 
         require 'aws-sdk'
@@ -76,18 +87,21 @@ module Fastlane
           creds = Aws::Credentials.new(s3_access_key, s3_secret_access_key)
         end
         Aws.config.update({
-          region: s3_region,
-          credentials: creds
+                            region: s3_region,
+                            credentials: creds
         })
 
         s3_client = if s3_endpoint
-                      Aws::S3::Client.new(endpoint: s3_endpoint)
-                    else
-                      Aws::S3::Client.new
-                    end
+          Aws::S3::Client.new(endpoint: s3_endpoint)
+        else
+          Aws::S3::Client.new
+        end
 
         upload_ipa(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, dsym_file, s3_path, acl, server_side_encryption) if ipa_file.to_s.length > 0
         upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl, server_side_encryption) if apk_file.to_s.length > 0
+        upload_xcarchive(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, xcarchive_file, s3_path, acl, server_side_encryption) if xcarchive_file.to_s.length > 0
+        upload_files(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, files, s3_path, acl, server_side_encryption) if files.to_a.count > 0
+        upload_folder(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, folder, s3_path, acl, server_side_encryption) if folder.to_s.length > 0
 
         return true
       end
@@ -105,6 +119,7 @@ module Fastlane
         html_file_name = params[:html_file_name]
         generate_html_in_folder = params[:html_in_folder]
         version_template_path = params[:version_template_path]
+        version_template_params = params[:version_template_params] || {}
         version_file_name = params[:version_file_name]
         override_file_name = params[:override_file_name]
 
@@ -149,7 +164,7 @@ module Fastlane
         build_num = info['CFBundleVersion']
         bundle_id = info['CFBundleIdentifier']
         bundle_version = info['CFBundleShortVersionString']
-        title = CGI.escapeHTML(info['CFBundleName'])
+        title = CGI.escapeHTML(info['CFBundleDisplayName'])
         full_version = "#{bundle_version}.#{build_num}"
 
         # Creating plist and html names
@@ -213,7 +228,7 @@ module Fastlane
           build_num: build_num,
           bundle_version: bundle_version,
           full_version: full_version
-        })
+        }.merge(version_template_params))
 
         #####################################
         #
@@ -242,6 +257,29 @@ module Fastlane
         UI.success("iOS app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'") unless skip_html
       end
 
+      def self.upload_xcarchive(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, ipa_file, archive, s3_path, acl, server_side_encryption)
+
+        s3_path = "v{CFBundleShortVersionString}_b{CFBundleVersion}/" unless s3_path
+
+        app_directory = params[:app_directory]
+
+        url_part = self.expand_path_with_substitutions_from_ipa_plist(ipa_file, s3_path)
+
+        archive_name = archive.gsub(' ','_')
+        archive_zip = "#{archive_name}.zip"
+        archive_zip_name = File.basename(archive_zip)
+        sh "zip -r #{archive_zip} \'#{archive}\'"
+        full_archive_zip_name = "#{url_part}#{archive_zip_name}"
+        archive_zip_data = File.open(archive_zip, 'rb')
+
+        archive_url = self.upload_file(s3_client, s3_bucket, app_directory, full_archive_zip_name, archive_zip_data, acl, server_side_encryption)
+
+        Actions.lane_context[SharedValues::S3_XCARCHIVE_OUTPUT_PATH] = archive_url
+        ENV[SharedValues::S3_XCARCHIVE_OUTPUT_PATH.to_s] = archive_url
+
+        UI.success("Successfully uploaded archive file to '#{Actions.lane_context[SharedValues::S3_XCARCHIVE_OUTPUT_PATH]}'")
+      end
+
       def self.upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl, server_side_encryption)
         version = get_apk_version(apk_file)
 
@@ -258,6 +296,7 @@ module Fastlane
         html_file_name = params[:html_file_name]
         generate_html_in_folder = params[:html_in_folder]
         version_template_path = params[:version_template_path]
+        version_template_params = params[:version_template_params] || {}
         version_file_name = params[:version_file_name]
         override_file_name = params[:override_file_name]
 
@@ -314,7 +353,7 @@ module Fastlane
           version_code: version_code,
           version_name: version_name,
           full_version: "#{version_code}_#{version_name}"
-        })
+        }.merge(version_template_params))
 
         #####################################
         #
@@ -402,6 +441,51 @@ module Fastlane
         [versionCode, versionName, name]
       end
 
+      def self.upload_files(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, files, s3_path, acl, server_side_encryption)
+
+        s3_path = "files" unless s3_path
+
+        app_directory = params[:app_directory]
+        url_part = s3_path
+
+        Actions.lane_context[SharedValues::S3_FILES_OUTPUT_PATHS] = []
+        files.each do |file|
+          file_basename = File.basename(file)
+          file_data = File.open(file, 'rb')
+          file_name = url_part + '/' + file_basename
+
+          file_url = self.upload_file(s3_client, s3_bucket, app_directory, file_name, file_data, acl, server_side_encryption)
+
+          # Setting action and environment variables
+          Actions.lane_context[SharedValues::S3_FILES_OUTPUT_PATHS] << file_url
+        end
+      end
+
+      def self.upload_folder(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, folder, s3_path, acl, server_side_encryption)
+
+        s3_path = "files" unless s3_path
+
+        s3_path = s3_path.to_s + '/' + File.basename(folder)
+        url_part = s3_path
+        app_directory = params[:app_directory]
+
+        unless File.directory?(folder)
+          UI.user_error!("Invalid folder parameter. `#{File.expand_path(folder)} is not a directory!")
+        end
+
+        Dir.glob("#{folder}/**/*") do |file|
+          next if File.directory?(file)
+          file_data = File.open(file, 'rb')
+          file_relative_path_to_folder = Pathname.new(File.expand_path(file)).relative_path_from(Pathname.new(File.expand_path(folder))).to_s
+          file_name = url_part + '/' + file_relative_path_to_folder
+
+          file_url = self.upload_file(s3_client, s3_bucket, app_directory, file_name, file_data, acl, server_side_encryption)
+          Actions.lane_context[SharedValues::S3_FOLDER_OUTPUT_PATH] = file_url.gsub('/' + file_relative_path_to_folder, '')
+        end
+      end
+
+
+
       def self.upload_file(s3_client, bucket_name, app_directory, file_name, file_data, acl, server_side_encryption)
 
         if app_directory
@@ -469,6 +553,11 @@ module Fastlane
                                        description: ".ipa file for the build ",
                                        optional: true,
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]),
+          FastlaneCore::ConfigItem.new(key: :xcarchive,
+                                       env_name: "",
+                                       description: ".xcarchive file for the build ",
+                                       optional: true,
+                                       default_value: Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]),
           FastlaneCore::ConfigItem.new(key: :dsym,
                                        env_name: "",
                                        description: "zipped .dsym package for the build ",
@@ -517,6 +606,11 @@ module Fastlane
                                        env_name: "",
                                        description: "version erb template path",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :version_template_params,
+                                       env_name: "",
+                                       description: "additional params for use in the version template",
+                                       optional: true,
+                                       type: Hash),
           FastlaneCore::ConfigItem.new(key: :version_file_name,
                                        env_name: "",
                                        description: "uploaded version filename",
@@ -578,17 +672,33 @@ module Fastlane
                                        description: "Optional override ipa/apk uploaded file name",
                                        optional: true,
                                        default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :files,
+                                       env_name: "",
+                                       description: "Collection: Allows you to simply upload any files to s3. Ex: ['filename1', filename2]",
+                                       is_string: false,
+                                       optional: true,
+                                       default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :folder,
+                                       env_name: "",
+                                       description: "Path to the folder you want to upload",
+                                       is_string: true,
+                                       optional: true,
+                                       default_value: nil),
         ]
       end
 
       def self.output
         [
+          ['S3_APK_OUTPUT_PATH', 'Direct HTTP link to the uploaded apk file'],
           ['S3_IPA_OUTPUT_PATH', 'Direct HTTP link to the uploaded ipa file'],
+          ['S3_XCARCHIVE_OUTPUT_PATH', 'Direct HTTP link to the uploaded xcarchive file '],
           ['S3_DSYM_OUTPUT_PATH', 'Direct HTTP link to the uploaded dsym file'],
           ['S3_PLIST_OUTPUT_PATH', 'Direct HTTP link to the uploaded plist file'],
           ['S3_HTML_OUTPUT_PATH', 'Direct HTTP link to the uploaded HTML file'],
           ['S3_VERSION_OUTPUT_PATH', 'Direct HTTP link to the uploaded Version file'],
-          ['S3_SOURCE_OUTPUT_PATH', 'Direct HTTP link to the uploaded source ']
+          ['S3_SOURCE_OUTPUT_PATH', 'Direct HTTP link to the uploaded source '],
+          ['S3_FILES_OUTPUT_PATHS', 'Collection of HTTP links to the uploaded files'],
+          ['S3_FOLDER_OUTPUT_PATH', 'Direct HTTP link to the uploaded folder']
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AwsS3
-    VERSION = "1.1.1"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-aws_s3
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -145,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Upload IPA and APK to S3
 test_files: []
-has_rdoc: