fastlane-plugin-upload_folder_to_s3 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3b15dcd527355a74f64597e9a82642f0839defb
-  data.tar.gz: 38210d0c8ff16851e61fb5c994ba6ff1f9be091a
+  metadata.gz: 90799f5edd3fa0faa69a9cc2b5a8bf221c7946c7
+  data.tar.gz: 07d6642a72d84c6bd13333235685c87ca3b46eb1
 SHA512:
-  metadata.gz: b918ba4ae14da7334936cc5712cbe675adb88994247690089c6e707934aaa84c7e61069f6669956632661d37c601fcd8db4037868e30f2260b57784c4abbdac4
-  data.tar.gz: 297aff6f7deefbd91c805a9b082de6766641c11dcb8870ed02d714a4e9ad6f07300b6f403b72f2d6b1543509f30606f1f99ba6163e27c854a11a3ae56f17a943
+  metadata.gz: 800c3c8e912fdb58a3b93cc722f289a7a7f6153e56258ce8b06a6047c5e87c024c0bbb4317707df15a9c94124bd9171e66b23c3d9976d82ee36b2c217ca52eb0
+  data.tar.gz: 7e08ec95d53e6ef293d7d8511fd1799d43e583304c0db0a2758fb6f0d0150fff2a94b1ae42dcfb088637e2c913dc7b0d5106fe358ccd041caae9b494c1929bd3

data/lib/fastlane/plugin/upload_folder_to_s3/actions/upload_folder_to_s3_action.rb

@@ -66,8 +66,14 @@ module Fastlane
       end
 
       def self.valid_s3(awscreds, s3_bucket)
-        Actions.verify_gem!('aws-sdk')
-        require 'aws-sdk'
+        loaded_original_gem = load_from_original_gem_name
+
+        if !loaded_original_gem || !v1_sdk_module_present?
+          load_from_v1_gem_name
+          UI.verbose("Loaded AWS SDK v1.x from the `aws-sdk-v1` gem")
+        else
+          UI.verbose("Loaded AWS SDK v1.x from the `aws-sdk` gem")
+        end
 
         s3 = AWS::S3.new(awscreds)
 
@@ -78,6 +84,37 @@ module Fastlane
         s3
       end
 
+      def self.load_from_original_gem_name
+        begin
+          Gem::Specification.find_by_name('aws-sdk')
+          require 'aws-sdk'
+        rescue Gem::LoadError => e
+          UI.verbose("The 'aws-sdk' gem is not present")
+          return false
+        end
+        
+        UI.verbose("The 'aws-sdk' gem is present")
+        true
+      end
+
+      def self.load_from_v1_gem_name
+        Actions.verify_gem!('aws-sdk-v1')
+        require 'aws-sdk-v1'
+      end
+
+      def self.v1_sdk_module_present?
+        begin
+          # Here we'll make sure that the `AWS` module is defined. If it is, the gem is the v1.x API.
+          Object.const_get("AWS")
+        rescue NameError
+          UI.verbose("Couldn't find the needed `AWS` module in the 'aws-sdk' gem")
+          return false
+        end
+
+        UI.verbose("Found the needed `AWS` module in the 'aws-sdk' gem")
+        true
+      end
+
       def self.valid_bucket(awscreds, s3_bucket)
         s3 = valid_s3 awscreds, s3_bucket
         s3.buckets[s3_bucket]

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

@@ -1,5 +1,5 @@
 module Fastlane
   module UploadFolderToS3
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-upload_folder_to_s3
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - teriiehina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.66'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.66'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -126,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Upload a folder to S3
 test_files: []
-has_rdoc: