fastlane-plugin-firebase_app_distribution 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3316c560bc4c691d569deea229397668e8e3a00ca4201d332602acd112379639
-  data.tar.gz: 6fe95425b0f4a85d3492ec51ae8353979f3534b635655ee55349f12191c721ae
+  metadata.gz: 3322484a56333009e014da42a52738c805177e1343056767b59d6bf92752f511
+  data.tar.gz: d3544fef79f17bae724fa9ced433ab6d5f1b35d98548633c85c16cae9772a585
 SHA512:
-  metadata.gz: fc0f5ac7cd9081eb02e539cb6bc2f2116dcc51e04ac8b5685ca611469fd76f37470d35c4c5085bf267fa7d296a76d95ddbdc5714ab8fe2388cf249d51101740d
-  data.tar.gz: 5e8cc15580a5f98491f1d9318728600c751a807a8f5108df4844fe6f371e2725b5dcffb38af560b58de202dc20bb3ba3d77ec2155d065c4452f0b287f15728ec
+  metadata.gz: 39465b098a4d080ace440a5d73363d676497bc544f6563d57fde89e72cd37b8a9111d44ca98815ba633744d41045a13654c7e46c2f8f64e1b60669b7ad3944d4
+  data.tar.gz: 22079d114aa0558ecdb5e670c05eff74faa68b286b15a2ff5eafd5dabfc6837202b023ee93cfc73969c3961178ae404695c1ef031cb01885a878cae60a3c16ef

data/lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_action.rb

@@ -9,41 +9,34 @@ require_relative '../helper/firebase_app_distribution_helper'
 module Fastlane
   module Actions
     class FirebaseAppDistributionAction < Action
-
-      DEFAULT_FIREBASE_CLI_PATH = %x(which firebase).chomp
+      DEFAULT_FIREBASE_CLI_PATH = `which firebase`.chomp
       FIREBASECMD_ACTION = "appdistribution:distribute".freeze
-      
+
       extend Helper::FirebaseAppDistributionHelper
 
       def self.run(params)
         params.values # to validate all inputs before looking for the ipa/apk
-        
-        release_file = params[:release_notes_file]
-        if params[:release_notes].to_s != ""
-          release_file = file_for_contents(:release_notes, from: params)
-        end
-
-        groups_file = file_for_contents(:groups, from: params)
-        testers_file = file_for_contents(:testers, from: params)
 
         cmd = [params[:firebase_cli_path], FIREBASECMD_ACTION]
         cmd << Shellwords.escape(params[:ipa_path] || params[:apk_path])
         cmd << "--app #{params[:app]}"
-        cmd << "--groups-file #{groups_file}" if groups_file
-        cmd << "--testers-file #{testers_file}" if testers_file
-        cmd << "--release-notes-file #{release_file}" if release_file
 
-        result = Actions.sh_control_output(
-          cmd.join(" "),
+        cmd << groups_flag(params)
+        cmd << testers_flag(params)
+        cmd << release_notes_flag(params)
+
+        Actions.sh_control_output(
+          cmd.compact.join(" "),
           print_command: false,
           print_command_output: true
         )
-
+      # make sure we do this, even in the case of an error.
+      ensure
         cleanup_tempfiles
       end
 
       def self.description
-        "Release your beta builds to Firebase App Distro"
+        "Release your beta builds with Firebase App Distribution"
       end
 
       def self.authors
@@ -52,7 +45,7 @@ module Fastlane
 
       # supports markdown.
       def self.details
-        "Release your beta builds to Firebase App Distro"
+        "Release your beta builds with Firebase App Distribution"
       end
 
       def self.available_options
@@ -105,7 +98,7 @@ module Fastlane
                                          end
 
                                          unless is_firebasecmd_supported?(value)
-                                          UI.user_error!("firebase_cli_path: `#{value}` does not support the `#{FIREBASECMD_ACTION}` command. Please download (https://appdistro.page.link/firebase-cli-download) or specify the path to the correct version of firebse")
+                                           UI.user_error!("firebase_cli_path: `#{value}` does not support the `#{FIREBASECMD_ACTION}` command. Please download (https://appdistro.page.link/firebase-cli-download) or specify the path to the correct version of firebse")
                                          end
                                        end),
           FastlaneCore::ConfigItem.new(key: :groups,
@@ -139,7 +132,7 @@ module Fastlane
                                        env_name: "FIREBASEAPPDISTRO_RELEASE_NOTES_FILE",
                                        description: "Release notes file for this build",
                                        optional: true,
-                                       type: String),
+                                       type: String)
         ]
       end
 
@@ -162,8 +155,6 @@ module Fastlane
         ]
       end
 
-      private
-
       ## TODO: figure out if we can surpress color output.
       def self.is_firebasecmd_supported?(cmd)
         outerr, status = Open3.capture2e(cmd, "--non-interactive", FIREBASECMD_ACTION, "--help")

data/lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_helper.rb

@@ -5,35 +5,49 @@ module Fastlane
 
   module Helper
     module FirebaseAppDistributionHelper
-      ##
-      # always return a file for a given content
-      # TODO: explain this more.
-      def file_for_contents(parameter_name, from: nil, contents: nil)
-        if parameter_name.to_s.end_with?("_file")
-          return parameter_name
+      def testers_flag(params)
+        file_flag_if_supplied("--testers-file", "testers", params)
+      end
+
+      def groups_flag(params)
+        file_flag_if_supplied("--groups-file", "groups", params)
+      end
+
+      def release_notes_flag(params)
+        file_flag_if_supplied("--release-notes-file", "release_notes", params)
+      end
+
+      def file_flag_if_supplied(flag, param_name, params)
+        file = params["#{param_name}_file".to_sym]
+        file ||= file_for_contents(param_name.to_sym, params)
+
+        if file
+          return "--#{flag} #{file}"
         end
+      end
 
-        if @tempfiles == nil
+      ##
+      # always return a file for a given content
+      def file_for_contents(parameter_name, params)
+        if @tempfiles.nil?
           @tempfiles = []
         end
 
-        contents ||= from[parameter_name]
+        contents = params[parameter_name]
         return nil if contents.nil?
 
         file = Tempfile.new(parameter_name.to_s)
         file.write(contents)
         file.close
         @tempfiles << file
-        
+
         file.path
       end
 
       def cleanup_tempfiles
-        @tempfiles.each do |f|
-          f.unlink
-        end
+        return if @tempfiles.nil?
+        @tempfiles.each(&:unlink)
       end
-
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module FirebaseAppDistribution
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase_app_distribution
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Stefan Natchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-27 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry