fastlane 2.132.0.beta.20190920200012 → 2.132.0.beta.20190921200021

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3247e4c5b3c80c88baa6b716a4f7650dc61a4e8a
-  data.tar.gz: 001e2c7f0b92be7c892bf4e5647b0a6071a07f09
+  metadata.gz: a9a1370c917620f6b6c1343a7c77d36be8f56b48
+  data.tar.gz: 6b12512f2c5a89b7a44f7d488f9a76924603ebcf
 SHA512:
-  metadata.gz: 4121debd22ce939ebcafcde83bb556ed5f85ec7bbc801013fd3eb49ec0980253e94f8c40f04654d802bdafb9ecd123b21cbd7e4cfb20726f97866308d9e6ab21
-  data.tar.gz: d4f8079fb3a28209abc6ba9eb8c122d04b8430aff9bbb62558c5244003420fe59958a78c6d4e76aaaee2605f73f253d75924a917535b93fc2da4485cec9d9610
+  metadata.gz: cb7b0fbdcfc4223bedb37c6cebba6e6df517f200bcf26089e2ce7af8a470975ad8ff7b9465738b683c5051a2cf6b3711dbcdd08a72da240c2169d256629c12b3
+  data.tar.gz: 017fdafd04e914ffc94f1572a30bd2b7c0f0c8077de032f80f8d7697e9fddb491bce20d4e0f14e6767280bb12925235720afc5fa6bd8d436ee5a45f47c21b001

data/fastlane/lib/fastlane/actions/ensure_env_vars.rb

@@ -0,0 +1,58 @@
+module Fastlane
+  module Actions
+    class EnsureEnvVarsAction < Action
+      def self.run(params)
+        variables = params[:env_vars]
+
+        variables.each do |variable|
+          next unless ENV[variable].to_s.strip.empty?
+
+          UI.user_error!("Missing environment variable '#{variable}'")
+        end
+
+        is_one = variables.length == 1
+
+        UI.success("Environment variable#{is_one ? '' : 's'} '#{variables.join('\', \'')}' #{is_one ? 'is' : 'are'} set!")
+      end
+
+      def self.description
+        'Raises an exception if the specified env vars are not set'
+      end
+
+      def self.details
+        'This action will check if some environment variables are set.'
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :env_vars,
+                                       description: 'The environment variables names that should be checked',
+                                       type: Array,
+                                       verify_block: proc do |value|
+                                         UI.user_error!('Specify at least one environment variable name') if value.empty?
+                                       end)
+        ]
+      end
+
+      def self.authors
+        ['revolter']
+      end
+
+      def self.example_code
+        [
+          'ensure_env_vars(
+            env_vars: [\'GITHUB_USER_NAME\', \'GITHUB_API_TOKEN\']
+          )'
+        ]
+      end
+
+      def self.category
+        :misc
+      end
+
+      def self.is_supported?(platform)
+        true
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/onesignal.rb

@@ -11,15 +11,26 @@ module Fastlane
         require 'uri'
         require 'base64'
 
-        UI.message("Parameter App name: #{params[:app_name]}")
+        app_id = params[:app_id].to_s.strip
         auth_token = params[:auth_token]
-        app_name = params[:app_name]
+        app_name = params[:app_name].to_s
         apns_p12_password = params[:apns_p12_password]
         android_token = params[:android_token]
         android_gcm_sender_id = params[:android_gcm_sender_id]
 
+        has_app_id = !app_id.empty?
+        has_app_name = !app_name.empty?
+
+        is_update = has_app_id
+
+        UI.user_error!('Please specify the `app_id` or the `app_name` parameters!') if !has_app_id && !has_app_name
+
+        UI.message("Parameter App ID: #{app_id}") if has_app_id
+        UI.message("Parameter App name: #{app_name}") if has_app_name
+
         payload = {}
-        payload['name'] = app_name
+
+        payload['name'] = app_name if has_app_name
 
         unless params[:apns_p12].nil?
           data = File.read(params[:apns_p12])
@@ -33,61 +44,70 @@ module Fastlane
         payload["gcm_key"] = android_token unless android_token.nil?
         payload["android_gcm_sender_id"] = android_gcm_sender_id unless android_gcm_sender_id.nil?
 
-        # here's the actual lifting - POST to OneSignal
+        # here's the actual lifting - POST or PUT to OneSignal
 
         json_headers = { 'Content-Type' => 'application/json', 'Authorization' => "Basic #{auth_token}" }
-        uri = URI.parse('https://onesignal.com/api/v1/apps')
+        url = +'https://onesignal.com/api/v1/apps'
+        url << '/' + app_id if is_update
+        uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
-        response = http.post(uri.path, payload.to_json, json_headers)
+
+        if is_update
+          response = http.put(uri.path, payload.to_json, json_headers)
+        else
+          response = http.post(uri.path, payload.to_json, json_headers)
+        end
+
         response_body = JSON.parse(response.body)
 
         Actions.lane_context[SharedValues::ONE_SIGNAL_APP_ID] = response_body["id"]
         Actions.lane_context[SharedValues::ONE_SIGNAL_APP_AUTH_KEY] = response_body["basic_auth_key"]
 
-        check_response_code(response)
+        check_response_code(response, is_update)
       end
 
-      def self.check_response_code(response)
+      def self.check_response_code(response, is_update)
         case response.code.to_i
         when 200, 204
-          puts("Successfully created new OneSignal app".green)
+          UI.success("Successfully #{is_update ? 'updated' : 'created new'} OneSignal app")
         else
           UI.user_error!("Unexpected #{response.code} with response: #{response.body}")
         end
       end
 
       def self.description
-        "Create a new [OneSignal](https://onesignal.com/) application"
+        "Create or update a new [OneSignal](https://onesignal.com/) application"
       end
 
       def self.details
-        "You can use this action to automatically create a OneSignal application. You can also upload a `.p12` with password, a GCM key, or both."
+        "You can use this action to automatically create or update a OneSignal application. You can also upload a `.p12` with password, a GCM key, or both."
       end
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :auth_token,
-                                      env_name: "ONE_SIGNAL_AUTH_KEY",
-                                      sensitive: true,
-                                      description: "OneSignal Authorization Key",
-                                      verify_block: proc do |value|
-                                        unless value.to_s.length > 0
-                                          UI.error("Please add 'ENV[\"ONE_SIGNAL_AUTH_KEY\"] = \"your token\"' to your Fastfile's `before_all` section.")
-                                          UI.user_error!("No ONE_SIGNAL_AUTH_KEY given.")
-                                        end
-                                      end),
+          FastlaneCore::ConfigItem.new(key: :app_id,
+                                       env_name: "ONE_SIGNAL_APP_ID",
+                                       sensitive: true,
+                                       description: "OneSignal App ID. Setting this updates an existing app",
+                                       optional: true),
 
-          FastlaneCore::ConfigItem.new(key: :app_name,
-                                       env_name: "ONE_SIGNAL_APP_NAME",
-                                       description: "OneSignal App Name",
+          FastlaneCore::ConfigItem.new(key: :auth_token,
+                                       env_name: "ONE_SIGNAL_AUTH_KEY",
+                                       sensitive: true,
+                                       description: "OneSignal Authorization Key",
                                        verify_block: proc do |value|
-                                         unless value.to_s.length > 0
-                                           UI.error("Please add 'ENV[\"ONE_SIGNAL_APP_NAME\"] = \"Your app name\"' to your Fastfile's `before_all` section.")
-                                           UI.user_error!("No ONE_SIGNAL_APP_NAME given.")
+                                         if value.to_s.empty?
+                                           UI.error("Please add 'ENV[\"ONE_SIGNAL_AUTH_KEY\"] = \"your token\"' to your Fastfile's `before_all` section.")
+                                           UI.user_error!("No ONE_SIGNAL_AUTH_KEY given.")
                                          end
                                        end),
 
+          FastlaneCore::ConfigItem.new(key: :app_name,
+                                       env_name: "ONE_SIGNAL_APP_NAME",
+                                       description: "OneSignal App Name. This is required when creating an app (in other words, when `:app_id` is not set, and optional when updating an app",
+                                       optional: true),
+
           FastlaneCore::ConfigItem.new(key: :android_token,
                                        env_name: "ANDROID_TOKEN",
                                        description: "ANDROID GCM KEY",
@@ -121,8 +141,8 @@ module Fastlane
 
       def self.output
         [
-          ['ONE_SIGNAL_APP_ID', 'The OneSignal app ID of the newly created app'],
-          ['ONE_SIGNAL_APP_AUTH_KEY', 'The auth token for the newly created OneSignal app']
+          ['ONE_SIGNAL_APP_ID', 'The app ID of the newly created or updated app'],
+          ['ONE_SIGNAL_APP_AUTH_KEY', 'The auth token for the newly created or updated app']
         ]
       end
 
@@ -144,6 +164,16 @@ module Fastlane
             apns_p12: "Path to Apple .p12 file (optional)",
             apns_p12_password: "Password for .p12 file (optional)",
             apns_env: "production/sandbox (defaults to production)"
+          )',
+          'onesignal(
+            app_id: "Your OneSignal App ID",
+            auth_token: "Your OneSignal Auth Token",
+            app_name: "New Name for OneSignal App",
+            android_token: "Your Android GCM key (optional)",
+            android_gcm_sender_id: "Your Android GCM Sender ID (optional)",
+            apns_p12: "Path to Apple .p12 file (optional)",
+            apns_p12_password: "Password for .p12 file (optional)",
+            apns_env: "production/sandbox (defaults to production)"
           )'
         ]
       end

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.132.0.beta.20190920200012'.freeze
+  VERSION = '2.132.0.beta.20190921200021'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.132.0.beta.20190920200012
+  version: 2.132.0.beta.20190921200021
 platform: ruby
 authors:
 - Andrew McBurney
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1060,6 +1060,7 @@ files:
 - fastlane/lib/fastlane/actions/dsym_zip.rb
 - fastlane/lib/fastlane/actions/echo.rb
 - fastlane/lib/fastlane/actions/ensure_bundle_exec.rb
+- fastlane/lib/fastlane/actions/ensure_env_vars.rb
 - fastlane/lib/fastlane/actions/ensure_git_branch.rb
 - fastlane/lib/fastlane/actions/ensure_git_status_clean.rb
 - fastlane/lib/fastlane/actions/ensure_no_debug_code.rb
@@ -1746,24 +1747,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- frameit/lib
-- sigh/lib
-- spaceship/lib
-- snapshot/lib
 - scan/lib
-- screengrab/lib
-- pilot/lib
-- pem/lib
+- deliver/lib
 - fastlane_core/lib
+- spaceship/lib
+- produce/lib
+- fastlane/lib
 - gym/lib
+- match/lib
+- sigh/lib
 - credentials_manager/lib
-- precheck/lib
-- fastlane/lib
 - cert/lib
-- deliver/lib
-- produce/lib
+- frameit/lib
+- pem/lib
 - supply/lib
-- match/lib
+- screengrab/lib
+- pilot/lib
+- precheck/lib
+- snapshot/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="