Merge pull request #25 from joshdholtz/skip-html-upload-and-zip-fixes

Can skip HTML upload and zip source fixes
fastlane-community · May 19, 2017 · b2bfddb · b2bfddb
2 parents 61e521c + 4c7e645
commit b2bfddb
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -21,7 +21,9 @@ lane :ipa21 do
   aws_s3(
     bucket: 'fastlane-plugin-s3-ios',
     region: 'us-west-1',
-    ipa: './fastlane/ipa21/BanditTheCat.ipa'
+    ipa: './fastlane/ipa21/BanditTheCat.ipa',
+    source: './fastlane/ipa21/source',
+    skip_html_upload: true
   )
 end
 
@@ -38,7 +40,8 @@ lane :apk1 do
     bucket: 'fastlane-plugin-s3-android',
     region: 'us-west-1',
     apk: './fastlane/apk1/BanditTheCat.apk',
-    source: './fastlane/apk1/source'
+    source: './fastlane/apk1/source',
+    skip_html_upload: true
   )
 end
 

diff --git a/fastlane/ipa21/source/Something.h b/fastlane/ipa21/source/Something.h
@@ -0,0 +1,3 @@
+#
+# Header stuff
+#
diff --git a/fastlane/ipa21/source/Something2.swift b/fastlane/ipa21/source/Something2.swift
@@ -0,0 +1 @@
+print("Heyyyyy")
diff --git a/lib/fastlane/plugin/aws_s3/actions/aws_s3_action.rb b/lib/fastlane/plugin/aws_s3/actions/aws_s3_action.rb
@@ -37,6 +37,7 @@ def self.run(config)
         params[:plist_file_name] = config[:plist_file_name]
         params[:html_template_path] = config[:html_template_path]
         params[:html_file_name] = config[:html_file_name]
+        params[:skip_html_upload] = config[:skip_html_upload]
         params[:version_template_path] = config[:version_template_path]
         params[:version_file_name] = config[:version_file_name]
 
@@ -145,10 +146,8 @@ def self.upload_ipa(s3_client, params, s3_region, s3_access_key, s3_secret_acces
 
         # Creates plist from template
         if plist_template_path && File.exist?(plist_template_path)
-          puts "1 - #{plist_template_path}"
           plist_template = eth.load_from_path(plist_template_path)
         else
-          puts "2 - #{Helper.gem_path('fastlane-plugin-aws_s3')}"
           plist_template = eth.load("s3_ios_plist_template")
         end
         plist_render = eth.render(plist_template, {
@@ -203,21 +202,26 @@ def self.upload_ipa(s3_client, params, s3_region, s3_access_key, s3_secret_acces
         # html uploading
         #
         #####################################
-        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl)
+
+        skip_html = params[:skip_html_upload]
+
+        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl) unless skip_html
         version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_url
         ENV[SharedValues::S3_PLIST_OUTPUT_PATH.to_s] = plist_url
 
-        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url
-        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url
+        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url unless skip_html
+        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url unless skip_html
 
         Actions.lane_context[SharedValues::S3_VERSION_OUTPUT_PATH] = version_url
         ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_url
+
+        self.upload_source(s3_client, params, s3_bucket, params[:source], s3_path, acl)
 
         UI.success("Successfully uploaded ipa file to '#{Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH]}'")
-        UI.success("iOS app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'")
+        UI.success("iOS app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'") unless skip_html
       end
 
       def self.upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_access_key, s3_bucket, apk_file, s3_path, acl)
@@ -296,20 +300,22 @@ def self.upload_apk(s3_client, params, s3_region, s3_access_key, s3_secret_acces
         # html and plist uploading
         #
         #####################################
+
+        skip_html = params[:skip_html_upload]
 
-        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl)
+        html_url = self.upload_file(s3_client, s3_bucket, app_directory, html_file_name, html_render, acl) unless skip_html
         version_url = self.upload_file(s3_client, s3_bucket, app_directory, version_file_name, version_render, acl)
 
-        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url
-        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url
+        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url unless skip_html
+        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url unless skip_html
 
         Actions.lane_context[SharedValues::S3_VERSION_OUTPUT_PATH] = version_url
         ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_url
 
-        UI.success("Successfully uploaded apk file to '#{Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH]}'")
-        UI.success("Android app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'")
-
         self.upload_source(s3_client, params, s3_bucket, params[:source], s3_path, acl)
+
+        UI.success("Successfully uploaded apk file to '#{Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH]}'")
+        UI.success("Android app can be downloaded at '#{Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH]}'") unless skip_html
       end
 
       def self.upload_source(s3_client, params, s3_bucket, source_directory, s3_path, acl)
@@ -466,6 +472,12 @@ def self.available_options
                                        env_name: "",
                                        description: "uploaded html filename",
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :skip_html_upload,
+                                       env_name: "",
+                                       description: "skip html upload if true",
+                                       optional: true,
+                                       default_value: false,
+                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :version_template_path,
                                        env_name: "",
                                        description: "version erb template path",

diff --git a/lib/fastlane/plugin/aws_s3/version.rb b/lib/fastlane/plugin/aws_s3/version.rb
@@ -1,5 +1,5 @@
 module Fastlane
   module AwsS3
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end