fastlane-plugin-waldo 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba2bb5686d5a74c4a856c533c326a8550cba523
-  data.tar.gz: b5ea441237beddfbd90892e601f94f8690822463
+  metadata.gz: f32ec479ee63b1ab4f8927cb26ee7b49562c5ea8
+  data.tar.gz: 42c8849320d5ff492788e542866c71b45a9b3773
 SHA512:
-  metadata.gz: 6dce40cab56b6c39ac0a9766e4a801f04645906de4c83edfe6fe4529b87def11866a5086d13a0c5472f8261c28820304482741a0fbe2623a74d63e6ceb76a782
-  data.tar.gz: a618956f16648d7d61b285db7a9d3565d4c549b779e93a3b0fbaac250916f16d4bf4b1fe1de219f4515d4ca80b3c64852fc6519a3b155ef8387d1b9de047ee20
+  metadata.gz: 49ea9aef680aa191a35d3b3a6a0bdf2f9ce809ffc4ce69e373e2b0d8ca2462547b1a806a92ca0669528a3c9ff4c565251f81d688ebb8c1ec6592339368d0a361
+  data.tar.gz: 2bd510d3f86f923f9ac982b26e90032e678f4aaed3bff69f4f9413c3f628cdaca7c2c4898224dbaf0cf31382d23465b482b9097637354b8a17465537f79762e4

data/README.md

@@ -22,26 +22,56 @@ which allows you to upload an iOS or Android build to Waldo for processing.
 To get started, first obtain an upload token from Waldo for your app. These are
 used to authenticate with the Waldo backend on each call.
 
-### Uploading an iOS Build
+### Uploading an iOS Device Build
 
 Build a new IPA for your app. If you use `gym` (aka `build_ios_app`) to build
 your IPA, `waldo` will automatically find and upload the generated IPA.
 
 ```ruby
-gym
+gym(export_method: 'development')                       # or 'ad-hoc'
 waldo(upload_token: '0123456789abcdef0123456789abcdef')
 ```
 
 > **Note:** You _must_ specify the Waldo upload token.
 
-If for some reason you do _not_ use `gym` to build your IPA, you will need to
-explicitly specify the IPA path to `waldo`:
+If you do _not_ use `gym` to build your IPA, you will need to explicitly
+specify the IPA path to `waldo`:
 
 ```ruby
 waldo(ipa_path: '/path/to/YourApp.ipa',
       upload_token: '0123456789abcdef0123456789abcdef')
 ```
 
+### Uploading an iOS Simulator Build
+
+Create a new simulator build for your app.
+
+You can use `gym` (aka `build_ios_app`) to build your app provided that you
+supply several parameters in order to convince Xcode to _both_ build for the
+simulator _and_ not attempt to generate an IPA:
+
+```ruby
+gym(configuration: 'Release',
+    derived_data_path: '/path/to/derivedData',
+    skip_package_ipa: true,
+    skip_archive: true,
+    destination: 'generic/platform=iOS Simulator')
+```
+
+You can then find your app relative to the derived data path in the
+`./Build/Products/Release-iphonesimulator` directory.
+
+Regardless of how you create the actual simulator build for your app, the
+upload itself is very simple:
+
+```ruby
+waldo(app_path: '/path/to/YourApp.app',
+      upload_token: '0123456789abcdef0123456789abcdef')
+```
+
+> **Note:** You _must_ specify _both_ the path of the `.app` _and_ the Waldo
+> upload token.
+
 ### Uploading an Android Build
 
 Build a new APK for your app. If you use `gradle` to build your APK, `waldo`
@@ -55,8 +85,8 @@ waldo(upload_token: '0123456789abcdef0123456789abcdef')
 
 > **Note:** You _must_ specify the Waldo upload token.
 
-If for some reason you do _not_ use `gradle` to build your APK, you will need
-to explicitly specify the APK path to `waldo`:
+If you do _not_ use `gradle` to build your APK, you will need to explicitly
+specify the APK path to `waldo`:
 
 ```ruby
 waldo(apk_path: '/path/to/YourApp.apk',

data/lib/fastlane/plugin/waldo/actions/waldo_action.rb

@@ -9,7 +9,7 @@ module Fastlane
         if platform == :android
           UI.error("You must pass an APK path to the Waldo action") and return unless params[:apk_path]
         elsif platform == :ios || platform.nil?
-          UI.error("You must pass an IPA path to the Waldo action") and return unless params[:ipa_path]
+          UI.error("You must pass an IPA or app path to the Waldo action") and return unless params[:ipa_path] || params[:app_path]
         end
 
         UI.error("You must pass an upload token to the Waldo action") and return unless params[:upload_token]
@@ -30,14 +30,24 @@ module Fastlane
         if platform == :android
           apk_path_default = Dir["*.apk"].last || Dir[File.join("app", "build", "outputs", "apk", "app-release.apk")].last
         elsif platform == :ios || platform.nil?
+          app_path_default = Dir["*.app"].sort_by { |x| File.mtime(x) }.last
           ipa_path_default = Dir["*.ipa"].sort_by { |x| File.mtime(x) }.last
         end
 
         [
           # iOS-specific
+          FastlaneCore::ConfigItem.new(key: :app_path,
+                                       env_name: "WALDO_APP_PATH",
+                                       description: "Path to your app file",
+                                       default_value: app_path_default,
+                                       default_value_dynamic: true,
+                                       optional: true,
+                                       verify_block: proc do |value|
+                                         UI.error("Unable to find app file at path '#{value.to_s}'") unless File.exist?(value)
+                                       end),
           FastlaneCore::ConfigItem.new(key: :ipa_path,
                                        env_name: "WALDO_IPA_PATH",
-                                       description: "Path to your IPA file. Optional if you use the _gym_ or _xcodebuild_ action",
+                                       description: "Path to your IPA file (optional if you use the _gym_ or _xcodebuild_ action)",
                                        default_value: Actions.lane_context[Actions::SharedValues::IPA_OUTPUT_PATH] || ipa_path_default,
                                        default_value_dynamic: true,
                                        optional: true,
@@ -47,7 +57,7 @@ module Fastlane
           # Android-specific
           FastlaneCore::ConfigItem.new(key: :apk_path,
                                        env_name: "WALDO_APK_PATH",
-                                       description: "Path to your APK file. Optional if you use the _gradle_ action",
+                                       description: "Path to your APK file (optional if you use the _gradle_ action)",
                                        default_value: Actions.lane_context[Actions::SharedValues::GRADLE_APK_OUTPUT_PATH] || apk_path_default,
                                        default_value_dynamic: true,
                                        optional: true,
@@ -95,6 +105,10 @@ module Fastlane
           'waldo(
             ipa_path: "./YourApp.ipa",
             upload_token: "..."
+          )',
+          'waldo(
+            app_path: "./YourApp.app",
+            upload_token: "..."
           )'
         ]
       end

data/lib/fastlane/plugin/waldo/helper/waldo_helper.rb

@@ -39,7 +39,15 @@ module Fastlane
           body_path = params[:apk_path]
           flavor = "Android"
         elsif platform == :ios || platform.nil?
-          body_path = params[:ipa_path]
+          if params[:app_path]
+            app_dir_path = File.dirname(params[:app_path])
+            app_name = File.basename(params[:app_path])
+            body_path = File.join(Dir.tmpdir, "#{app_name}.zip")
+
+            Actions.sh(%(cd "#{app_dir_path}" && zip -qry "#{body_path}" "#{app_name}"))
+          else
+            body_path = params[:ipa_path]
+          end
           flavor = "iOS"
         end
 
@@ -50,7 +58,12 @@ module Fastlane
         request['User-Agent'] = "Waldo fastlane/#{flavor} v#{Fastlane::Waldo::VERSION}"
 
         request.body_stream = WaldoReadIO.new(body_path)
-        request.content_type = 'application/octet-stream'
+
+        if params[:app_path]
+          request.content_type = 'application/zip'
+        else
+          request.content_type = 'application/octet-stream'
+        end
 
         request
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Waldo
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,95 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-waldo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - J. G. Pusey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.95'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.95.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.95'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.95.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 description: 
 email: john@waldo.io
 executables: []