fastlane-plugin-waldo 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38abd1a8b884b3bdd003f0a47c67ee37c095cc45
-  data.tar.gz: 5e9efe73fa5af9e54c7a79ff5a0d9d23b8da4878
+  metadata.gz: 492c9eb9162ea8139607f50235e4b3b5217a987f
+  data.tar.gz: 8a7498a90dd0cb95ffc381a45429ecd2d0984c3b
 SHA512:
-  metadata.gz: 3967b095cfdc94934e33a5e50d99fe04627713fcf5525ece4cbe2f87bc9178151de361b2fde7af01cf0b8c2975eef44d0618524999999818c872f5d0c8ca5f40
-  data.tar.gz: af042c5e7bf2d08f643543311b035a438660eed2d464c0a74af1a0e927e93352ef22c2c85c33c8003ac78c04ce658218fc839dbe66a4bae98d4ebf3787ef04bd
+  metadata.gz: 2a0d57834d04efcbbfbea86b3deb60c3e6cac4fb05899436c13f977c3c0783b4bbe6e8cd32f6eacc7d867ada18425830a0dc3a057a3b9e078099e922a70e1f73
+  data.tar.gz: 84a74df421289964d788a8fad629fc1041bb7100241b728cd8a7fe5390f69b649282539e435e447ffdfb35f54449f68a436e4bb8058b33f3bb68399f78c5aeb8

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Amolo Atelier, Inc.
+© 2018 Amolo Atelier, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -19,8 +19,8 @@ which allows you to upload an iOS or Android build to Waldo for processing.
 
 ## Usage
 
-To get started, first obtain an API key and an application ID from Waldo for
-your app. These are used to authenticate with the Waldo backend on each call.
+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
 
@@ -29,19 +29,17 @@ your IPA, `waldo` will automatically find and upload the generated IPA.
 
 ```ruby
 gym
-waldo(api_key: '0123456789abcdef0123456789abcdef',
-      application_id: 'app-0123456789abcdef')
+waldo(upload_token: '0123456789abcdef0123456789abcdef')
 ```
 
-> **Note:** You _must_ specify the Waldo API key and application ID key.
+> **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`:
 
 ```ruby
 waldo(ipa_path: '/path/to/YourApp.ipa',
-      api_key: '0123456789abcdef0123456789abcdef',
-      application_id: 'app-0123456789abcdef')
+      upload_token: '0123456789abcdef0123456789abcdef')
 ```
 
 ### Uploading an Android Build
@@ -52,19 +50,17 @@ will automatically find and upload the generated APK.
 ```ruby
 gradle(task: 'assemble',
        build_type: 'Release')
-waldo(api_key: '0123456789abcdef0123456789abcdef',
-      application_id: 'app-0123456789abcdef')
+waldo(upload_token: '0123456789abcdef0123456789abcdef')
 ```
 
-> **Note:** You _must_ specify the Waldo API key and application ID key.
+> **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`:
 
 ```ruby
 waldo(apk_path: '/path/to/YourApp.apk',
-      api_key: '0123456789abcdef0123456789abcdef',
-      application_id: 'app-0123456789abcdef')
+      upload_token: '0123456789abcdef0123456789abcdef')
 ```
 
 ## Issues and Feedback

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

@@ -12,8 +12,7 @@ module Fastlane
           UI.user_error!("You must pass an IPA path to the Waldo action") unless params[:ipa_path]
         end
 
-        UI.user_error!("You must pass an API key to the Waldo action") unless params[:api_key]
-        UI.user_error!("You must pass an application ID to the Waldo action") unless params[:application_id]
+        UI.user_error!("You must pass an upload token to the Waldo action") unless params[:upload_token]
 
         FastlaneCore::PrintTable.print_values(config: params,
                                               title: "Summary for waldo #{Fastlane::Waldo::VERSION.to_s}")
@@ -56,21 +55,21 @@ module Fastlane
                                          UI.user_error!("Unable to find APK file at path '#{value.to_s}'") unless File.exist?(value)
                                        end),
           # General
-          FastlaneCore::ConfigItem.new(key: :api_key,
-                                       env_name: "WALDO_API_KEY",
-                                       description: "Waldo API key",
+          FastlaneCore::ConfigItem.new(key: :upload_token,
+                                       env_name: "WALDO_UPLOAD_TOKEN",
+                                       description: "Waldo upload token",
                                        optional: true,
                                        sensitive: true,
                                        verify_block: proc do |value|
-                                         UI.user_error!("No API key for Waldo given, pass using `api_key: 'key'`") unless value && !value.empty?
+                                         UI.user_error!("No upload token for Waldo given, pass using `upload_token: 'value'`") unless value && !value.empty?
                                        end),
-          FastlaneCore::ConfigItem.new(key: :application_id,
-                                       env_name: "WALDO_APPLICATION_ID",
-                                       description: "Waldo application ID",
+          FastlaneCore::ConfigItem.new(key: :variant_name,
+                                       env_name: "WALDO_VARIANT_NAME",
+                                       description: "Waldo variant name",
                                        optional: true,
                                        sensitive: true,
                                        verify_block: proc do |value|
-                                         UI.user_error!("No application ID for Waldo given, pass using `application_id: 'id'`") unless value && !value.empty?
+                                         UI.user_error!("No variant name for Waldo given, pass using `variant_name: 'value'`") unless value && !value.empty?
                                        end)
         ]
       end
@@ -87,18 +86,15 @@ module Fastlane
         [
           'waldo',
           'waldo(
-            api_key: "...",
-            application_id: "..."
+            upload_token: "..."
           )',
           'waldo(
-            apk_path: "./MyApp.apk",
-            api_key: "...",
-            application_id: "..."
+            apk_path: "./YourApp.apk",
+            upload_token: "..."
           )',
           'waldo(
-            ipa_path: "./MyApp.ipa",
-            api_key: "...",
-            application_id: "..."
+            ipa_path: "./YourApp.ipa",
+            upload_token: "..."
           )'
         ]
       end

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

@@ -7,7 +7,7 @@ module Fastlane
         UI.success('Uploading the build to Waldo. This could take a while…')
 
         begin
-          variant_name = Actions.lane_context[Actions::SharedValues::GRADLE_BUILD_TYPE]
+          variant_name = params[:variant_name] || Actions.lane_context[Actions::SharedValues::GRADLE_BUILD_TYPE]
           uri_string = 'https://api.waldo.io/versions'
 
           uri_string += "?variantName=#{variant_name}" if variant_name
@@ -45,7 +45,7 @@ module Fastlane
 
         request = Net::HTTP::Post.new(uri.request_uri)
 
-        request['Authorization'] = "Upload-Token #{params[:api_key]}"
+        request['Authorization'] = "Upload-Token #{params[:upload_token]}"
         request['Transfer-Encoding'] = 'chunked'
         request['User-Agent'] = "Waldo fastlane/#{flavor} v#{Fastlane::Waldo::VERSION}"
 
@@ -84,7 +84,7 @@ module Fastlane
         when 200..299
           UI.success('Build successfully uploaded to Waldo!')
         when 401
-          UI.user_error!("API key is invalid or missing!")
+          UI.user_error!("Upload token is invalid or missing!")
         else
           UI.user_error!("Build failed to upload to Waldo: #{response.code} #{response.message}")
         end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Waldo
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-waldo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - J. G. Pusey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler