match 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6192d691a4bbeefccf3383ef2a7433c07dea0bdc
-  data.tar.gz: e26aef069f511bfc8fdd509bfc4b9893b8449677
+  metadata.gz: 9c0f9786bd1163d37e0f4ee1f96b2597d839ec5d
+  data.tar.gz: 2d41389a1fe003263e6a53d71f290e70d3bf134d
 SHA512:
-  metadata.gz: 0767ba699e955533e3cae999eb93f17752bdf4e9cb029e15fa7aae447e8974e84fffbff4db5d2189d55cf9bdd94dc7c8c77cc24c1fcd913904016968e2d43905
-  data.tar.gz: 48718165b644e304d29c3917d57034166b0c6bff867f3165d0adeea9bb8d09bfa9b8b6b5de860075d624cb3de035cfe0bd6b2afc852b35b0d2ba35c0ba59e2e5
+  metadata.gz: d225f09935f20e35d143086b6598aa90edb29bbb38cbe84548ff203d89827f40f0dad50309922c500d77bdf2b7afd8a360f98d0031d11ff4575b43def3aa39fd
+  data.tar.gz: 794d25bfeec94e8c1804dc9ec5526d5e785efeacb94a5cf14919640c9d731ec5898242d247eced944b99528961f4eb58aee170ffe867924b05a34025cce0db90

data/README.md

@@ -157,6 +157,15 @@ For a list of all available options run
 match --help
 ```
 
+#### Handle multiple targets
+
+If you have several targets with different bundle identifiers, call `match` for each of them:
+
+```
+match appstore -a tools.fastlane.app
+match appstore -a tools.fastlane.app.watchkitapp
+```
+
 #### Passphrase
 
 When running `match` for the first time on a new machine, it will ask you for the passphrase for the Git repository. This is an additional layer of security: each of the files will be encrypted using `openssl`.Make sure to remember the password, as you'll need it when you run match on a different machine
@@ -257,7 +266,7 @@ e.g. `$(sigh_tools.fastlane.app_development)`
 
 This is useful when installing your application on your device using the Development profile. 
 
-You can statically select the right provisioning profile in your Xcode project (the name will be `tools.fastlane.app Development`).
+You can statically select the right provisioning profile in your Xcode project (the name will be `match Development tools.fastlane.app`).
 
 ### Nuke
 
@@ -274,6 +283,16 @@ match nuke distribution
 
 You'll have to confirm a list of profiles / certificates that will be deleted.
 
+### Change Password
+
+To change the password of your repo and therefore decrypting and encrypting all files run
+
+```
+match change_password
+```
+
+You'll be asked for the new password on all your machines on the next run.
+
 ## Is this secure?
 
 Both your keys and provisioning profiles are encrypted using OpenSSL using a passphrase.

data/bin/match

@@ -9,8 +9,10 @@ HighLine.track_eof = false
 
 class MatchApplication
   include Commander::Methods
+  UI = FastlaneCore::UI
 
   # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize
   def run
     program :version, Match::VERSION
     program :description, Match::DESCRIPTION
@@ -68,6 +70,18 @@ class MatchApplication
       end
     end
 
+    command :change_password do |c|
+      c.syntax = 'match change_password'
+      c.description = 'Re-encrypt all files with a different password'
+      c.action do |args, options|
+        params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+        params.load_configuration_file("Matchfile")
+
+        Match::ChangePassword.update(params: params)
+        UI.success "Successfully changed the password. Make sure to update the password on all your clients and servers"
+      end
+    end
+
     command "nuke" do |c|
       # We have this empty command here, since otherwise the normal `match` command will be executed
       c.syntax = "match nuke"
@@ -94,6 +108,7 @@ class MatchApplication
     run!
   end
   # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 end
 
 begin

data/lib/match.rb

@@ -9,6 +9,7 @@ require 'match/generator'
 require 'match/setup'
 require 'match/encrypt'
 require 'match/spaceship_ensure'
+require 'match/change_password'
 
 require 'fastlane_core'
 require 'terminal-table'

data/lib/match/change_password.rb

@@ -0,0 +1,14 @@
+module Match
+  class ChangePassword
+    def self.update(params: nil, from: nil, to: nil)
+      to ||= UI.password("New password: ")
+      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"
+      GitHelper.commit_changes(workspace, message, params[:git_url])
+    end
+  end
+end

data/lib/match/encrypt.rb

@@ -7,7 +7,7 @@ module Match
     end
 
     def password(git_url)
-      password ||= ENV["MATCH_PASSWORD"]
+      password = ENV["MATCH_PASSWORD"]
       unless password
         item = Security::InternetPassword.find(server: server_name(git_url))
         password = item.password if item
@@ -20,10 +20,14 @@ module Match
         while password.to_s.length == 0
           password = ask("Passphrase for Git Repo: ".yellow) { |q| q.echo = "*" }
         end
-        Security::InternetPassword.add(server_name(git_url), "", password)
+        store_password(git_url, password)
       end
 
-      return @password
+      return password
+    end
+
+    def store_password(git_url, password)
+      Security::InternetPassword.add(server_name(git_url), "", password)
     end
 
     # removes the password from the keychain again
@@ -35,20 +39,21 @@ module Match
       iterate(path) do |current|
         crypt(path: current,
           password: password(git_url),
-            encrypt: true)
+           encrypt: true)
         UI.success "🔒  Encrypted '#{File.basename(current)}'" if $verbose
       end
       UI.success "🔒  Successfully encrypted certificates repo"
     end
 
-    def decrypt_repo(path: nil, git_url: nil)
+    def decrypt_repo(path: nil, git_url: nil, manual_password: nil)
       iterate(path) do |current|
         begin
           crypt(path: current,
-            password: password(git_url),
+            password: manual_password || password(git_url),
              encrypt: false)
         rescue
           UI.error "Couldn't decrypt the repo, please make sure you enter the right password!"
+          UI.user_error!("Invalid password passed via 'MATCH_PASSWORD'") if ENV["MATCH_PASSWORD"]
           clear_password(git_url)
           decrypt_repo(path: path, git_url: git_url)
           return
@@ -68,6 +73,10 @@ module Match
     end
 
     def crypt(path: nil, password: nil, encrypt: true)
+      if password.to_s.strip.length == 0
+        UI.user_error!("No password supplied")
+      end
+
       tmpfile = File.join(Dir.mktmpdir, "temporary")
       command = ["openssl aes-256-cbc"]
       command << "-k \"#{password}\""
@@ -77,6 +86,7 @@ module Match
       command << "-d" unless encrypt
       command << "&> /dev/null" unless $verbose # to show show an error message is something goes wrong
       success = system(command.join(' '))
+
       raise "Error decrypting '#{path}'" unless success
       FileUtils.mv(tmpfile, path)
     end

data/lib/match/git_helper.rb

@@ -1,10 +1,12 @@
 module Match
   class GitHelper
-    def self.clone(git_url)
+    def self.clone(git_url, shallow_clone, manual_password: nil)
       return @dir if @dir
 
       @dir = Dir.mktmpdir
-      command = "git clone '#{git_url}' '#{@dir}' --depth 1"
+      command = "git clone '#{git_url}' '#{@dir}'"
+      command << " --depth 1" if shallow_clone
+
       UI.message "Cloning remote git repo..."
       FastlaneCore::CommandExecutor.execute(command: command,
                                           print_all: $verbose,
@@ -13,7 +15,16 @@ module Match
       raise "Error cloning repo, make sure you have access to it '#{git_url}'".red unless File.directory?(@dir)
 
       copy_readme(@dir)
-      Encrypt.new.decrypt_repo(path: @dir, git_url: git_url)
+
+      if !Helper.test? and GitHelper.match_version(@dir).nil? and manual_password.nil?
+        UI.important "Migrating to new match..."
+        ChangePassword.update(params: { git_url: git_url,
+                                 shallow_clone: shallow_clone },
+                                          from: "",
+                                            to: Encrypt.new.password(git_url))
+        return self.clone(git_url, shallow_clone)
+      end
+      Encrypt.new.decrypt_repo(path: @dir, git_url: git_url, manual_password: manual_password)
 
       return @dir
     end
@@ -29,11 +40,19 @@ module Match
       ].join(" ")
     end
 
+    def self.match_version(workspace)
+      path = File.join(workspace, "match_version.txt")
+      if File.exist?(path)
+        Gem::Version.new(File.read(path))
+      end
+    end
+
     def self.commit_changes(path, message, git_url)
       Dir.chdir(path) do
         return if `git status`.include?("nothing to commit")
 
         Encrypt.new.encrypt_repo(path: path, git_url: git_url)
+        File.write("match_version.txt", Match::VERSION) # unencrypted
 
         commands = []
         commands << "git add -A"
@@ -48,6 +67,7 @@ module Match
                                           print_command: $verbose)
         end
       end
+      FileUtils.rm_rf(path)
       @dir = nil
     end
 

data/lib/match/options.rb

@@ -46,7 +46,7 @@ module Match
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :team_id,
                                      short_option: "-b",
-                                     env_name: "MATCH_TEAM_ID",
+                                     env_name: "FASTLANE_TEAM_ID",
                                      description: "The ID of your team if you're in multiple teams",
                                      optional: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_id),
@@ -55,7 +55,7 @@ module Match
                                      end),
         FastlaneCore::ConfigItem.new(key: :team_name,
                                      short_option: "-l",
-                                     env_name: "MATCH_TEAM_NAME",
+                                     env_name: "FASTLANE_TEAM_NAME",
                                      description: "The name of your team if you're in multiple teams",
                                      optional: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_name),
@@ -75,11 +75,20 @@ module Match
                                      description: "Renew the provisioning profiles every time you run match",
                                      is_string: false,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :shallow_clone,
+                                     env_name: "MATCH_SHALLOW_CLONE",
+                                     description: "Make a shallow clone of the repository (truncate the history to 1 revision)",
+                                     is_string: false,
+                                     default_value: true),
         FastlaneCore::ConfigItem.new(key: :workspace,
                                      description: nil,
                                      verify_block: proc do |value|
                                        unless Helper.test?
-                                         raise "Specify the `git_url` instead of the `path`".red unless value.start_with?("/var/folders")
+                                         if value.start_with?("/var/folders") or value.include?("tmp/") or value.include?("temp/")
+                                           # that's fine
+                                         else
+                                           raise "Specify the `git_url` instead of the `path`".red
+                                         end
                                        end
                                      end,
                                      optional: true)

data/lib/match/runner.rb

@@ -7,7 +7,7 @@ module Match
                                          hide_keys: [:workspace],
                                              title: "Summary for match #{Match::VERSION}")
 
-      params[:workspace] = GitHelper.clone(params[:git_url])
+      params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone])
       spaceship = SpaceshipEnsure.new(params[:username]) unless params[:readonly]
 
       # Verify the App ID (as we don't want 'match' to fail at a later point)

data/lib/match/version.rb

@@ -1,4 +1,4 @@
 module Match
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
   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.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.31.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.31.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -264,6 +264,7 @@ files:
 - lib/assets/MatchfileTemplate
 - lib/assets/READMETemplate.md
 - lib/match.rb
+- lib/match/change_password.rb
 - lib/match/encrypt.rb
 - lib/match/generator.rb
 - lib/match/git_helper.rb
@@ -295,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Easily sync your certificates and profiles across your team using git