match 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3191630b2d913ab97297fed63a6ea84d4888c47
-  data.tar.gz: 9bdac85feac579c4f7b92a640c478bdf5f18ab19
+  metadata.gz: b5be00b2f40c0abbfb617e63df232a870ccf4420
+  data.tar.gz: 2dea3eceaf91c17fc1e8931009496b7b17ca7fd4
 SHA512:
-  metadata.gz: 253cbe0a08b1933bcc25bb3d7aeaa8f594c05ff4aa4d9701fca6082ca7f322039598781041d44761db1e22745e3c6988a57030efc863488cafa3d2c4dd569215
-  data.tar.gz: f6f61a1d063ba1720913dbee0ae9da63541d8df99bf77a94f69ecf213c63d7d0dde1ff3f31ea59ea123f657db9179deb1bc24fcf0565327341a9c72ed8361218
+  metadata.gz: b5931858fa62b8028032a6ca65da006bdbd8a1aac566d092575523a4ce125f9c47c9f743bb90d5cd5656361382f5b9c0e85460d7d5e25239732c8065065f8bdd
+  data.tar.gz: e0d4c5432fa521c39d887f698969252070a1f036083cf9b0989a22563074385abc328e0c4ed9a65b0043916e0432d236d18896e216a3f9c174b5f03452536083

data/lib/match/change_password.rb

@@ -1,14 +1,30 @@
 module Match
   class ChangePassword
     def self.update(params: nil, from: nil, to: nil)
-      to ||= UI.password("New password: ")
+      to ||= ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: false)
+      from ||= ChangePassword.ask_password(message: "Old passphrase for Git Repo: ", confirm: true)
       GitHelper.clear_changes
       workspace = GitHelper.clone(params[:git_url], params[:shallow_clone], manual_password: from)
       Encrypt.new.clear_password(params[:git_url])
       Encrypt.new.store_password(params[:git_url], to)
 
-      message = "[fastlane] Changed password"
+      message = "[fastlane] Changed passphrase"
       GitHelper.commit_changes(workspace, message, params[:git_url])
     end
+
+    def self.ask_password(message: "Passphrase for Git Repo: ", confirm: true)
+      loop do
+        password = ask(message.yellow) { |q| q.echo = "*" }
+        if confirm
+          password2 = ask("Type passphrase again: ".yellow) { |q| q.echo = "*" }
+          if password == password2
+            return password
+          end
+        else
+          return password
+        end
+        UI.error("Passhprases differ. Try again")
+      end
+    end
   end
 end

data/lib/match/encrypt.rb

@@ -17,9 +17,7 @@ module Match
         UI.important "Enter the passphrase that should be used to encrypt/decrypt your certificates"
         UI.important "This passphrase is specific per repository and will be stored in your local keychain"
         UI.important "Make sure to remember the password, as you'll need it when you run match on a different machine"
-        while password.to_s.length == 0
-          password = ask("Passphrase for Git Repo: ".yellow) { |q| q.echo = "*" }
-        end
+        password = ChangePassword.ask_password(confirm: true)
         store_password(git_url, password)
       end
 
@@ -73,7 +71,7 @@ module Match
     end
 
     def crypt(path: nil, password: nil, encrypt: true)
-      if password.to_s.strip.length == 0
+      if password.to_s.strip.length == 0 && encrypt
         UI.user_error!("No password supplied")
       end
 

data/lib/match/nuke.rb

@@ -31,7 +31,7 @@ module Match
         UI.error "Are you sure you want to completely delete and revoke all the"
         UI.error "certificates and provisioning profiles listed above? (y/n)"
         UI.error "Warning: By nuking distribution, both App Store and Ad Hoc profiles will be deleted" if type == "distribution"
-        UI.error "Warning: The :app_identifier value will be ignored - this will all delete profiles for all your apps!" if had_app_identifier
+        UI.error "Warning: The :app_identifier value will be ignored - this will delete all profiles for all your apps!" if had_app_identifier
         UI.error "---"
         if agree("(y/n)", true)
           nuke_it_now!

data/lib/match/version.rb

@@ -1,4 +1,4 @@
 module Match
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
   DESCRIPTION = "Easily sync your certificates and profiles across your team using git"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: match
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security