fastlane-plugin-firebase 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9361331c59d149a7f719386d1c08c25c82a403f8
-  data.tar.gz: 2016b089727e3a4ee85587b44eeada1b4b174893
+  metadata.gz: 8709ae7cfc1e92170d2c4e18efe1960c26df6281
+  data.tar.gz: 96a0afe222d6010f35a450caa88edfc0d5056540
 SHA512:
-  metadata.gz: 7081d6fc6f890e1d0ae24d906113655e98e0f22b6a07aa061338923a688f789afb67d15397d36612e8297b7959cd20639eb84696a974463a7ffc9a0dbf7cfcae
-  data.tar.gz: 135af776a81c32012398322b829f7d810d28114ce2490e8da0dc7d42237255d09d43165eed4e2bed65886feaf0f8fa1f3017078d0ea3f59ba65ac3cb5ca4622b
+  metadata.gz: ccc8c899b5176e4cf535c01bd58f53423324724ec075b799a0fd7f9a487d60d5b0c8d87a5e518a6a88eb5d4393254c15b0438a29ea2a776cccff0319eede4d39
+  data.tar.gz: 6069a93a1ca51d2ce9211b410e81cac6e9af8b61e3ba04be6d3e7e41d8876b3822645b3a80eabed81741a23351328b35d2675f3de1fffe3f3ee265010ccb13c4

data/lib/fastlane/plugin/firebase/actions/firebase_add_client_action.rb

@@ -17,14 +17,28 @@ module Fastlane
         name = params[:name]
         appstore_id = params[:appstore_id]
 
+        begin
         # Add client
         client = api.add_client(project["projectNumber"], type, bundle_id, name, appstore_id)
-        
+        rescue Firebase::Api::BadRequestError => e 
+          if e.code == 409 then
+            client = project["clientSummary"].select { |client| client["clientId"] == "#{type}:#{bundle_id}" }.first
+            if client then
+              UI.success "Client already exists, skipping ..."
+            else
+              raise
+            end
+          else 
+            raise
+          end
+        end
+
+
         if params[:download_config] then
           #Download config
           config = api.download_config_file(project["projectNumber"], client["clientId"])
           path = File.join(params[:output_path], params[:output_name] || config.filename)
-          config.save(path)
+          config.save!(path)
 
           UI.success "Successfuly saved config at #{path}"
         end
@@ -62,6 +76,7 @@ module Fastlane
                                   env_name: "FIREBASE_DOWNLOAD_CONFIG",
                                description: "Should download config for created client",
                                   optional: false,
+                                  is_string: false,
                                   default_value: true),
           FastlaneCore::ConfigItem.new(key: :type,
                                   env_name: "FIREBASE_TYPE",

data/lib/fastlane/plugin/firebase/actions/firebase_download_config_action.rb

@@ -19,7 +19,7 @@ module Fastlane
         #Download
         config = api.download_config_file(project_number, client_id)
         path = File.join(params[:output_path], params[:output_name] || config.filename)
-        config.save(path)
+        config.save!(path)
 
         UI.success "Successfuly saved config at #{path}"
       end

data/lib/fastlane/plugin/firebase/actions/firebase_list_action.rb

@@ -10,8 +10,9 @@ module Fastlane
 
         # List projects
         projects = api.project_list()
+       
         projects.each_with_index { |p, i| 
-          UI.message "#{i+1}. #{p["displayName"]}" 
+          UI.message "#{i+1}. #{p["displayName"]} (#{p["projectNumber"]})" 
           p["clientSummary"].sort {|left, right| left["clientId"] <=> right["clientId"] }.each_with_index { |client, j|
             UI.message "  - #{client["clientId"]} (#{client["displayName"]})" 
           } 

data/lib/fastlane/plugin/firebase/actions/firebase_upload_certificate_action.rb

@@ -24,7 +24,7 @@ module Fastlane
         client_id = client["clientId"]
 
         #Select certificate type
-        type = UI.select("Select type:", [:development, :production])
+        type = params[:type].to_sym # || UI.select("Select type:", ["development", "production"])).to_sym
 
         #Base64 certificate
         certificate_value = Base64.encode64(File.open(p12_path, "rb").read).delete!("\n")
@@ -76,7 +76,10 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :p12_path,
                                   env_name: "FIREBASE_P12PATH",
                                description: "Path to certificate",
-                                  optional: false),
+                                  optional: false,
+                              verify_block: proc do |value|
+                                      UI.user_error! "Inserted value is not file - #{value}" unless File.exists? value
+                                  end),
           FastlaneCore::ConfigItem.new(key: :p12_password,
                                   env_name: "FIREBASE_PASSWORD",
                                description: "Password to the certicate",
@@ -88,7 +91,10 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :client_id,
                                   env_name: "FIREBASE_CLIENT_ID",
                                description: "Project client id",
-                                  optional: true)
+                                  optional: true),
+          FastlaneCore::ConfigItem.new(key: :type,
+                                  env_name: "FIREBASE_TYPE",
+                               description: "Type of certificate (development, production)")
         ]
       end
 

data/lib/fastlane/plugin/firebase/lib/api.rb

@@ -6,6 +6,11 @@ module Fastlane
 			end
 
 			class BadRequestError < StandardError
+				attr_reader :code
+ 				def initialize(msg, code)
+			    @code = code
+			    super(msg)
+			  end
 			end
 
 			require 'mechanize'
@@ -107,7 +112,7 @@ module Fastlane
 						code = e.response_code.to_i
 						if code >= 400 && code < 500 then
 							if body = JSON.parse(e.page.body) then
-								raise BadRequestError, body["error"]["message"]
+								raise BadRequestError.new(body["error"]["message"], code)
 							end
 						end
 						UI.crash! e.page.body

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Firebase
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tomas Kohout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler