match 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3331622bdfb12e51b9a0108c54d6c3447daafe7
-  data.tar.gz: 436dc1400d5ba67b84b6f809e970bfafd190b464
+  metadata.gz: 72a69112e9b7d60968bf6ad15e377d17d4b817cb
+  data.tar.gz: 5024ebfeb8af33d9c669b2c22138be0fd8c638a5
 SHA512:
-  metadata.gz: bd0ec61a08238e00d7740ae0fedaa3641f69f89522de04d317d00fcccb62277741f0b7445bc33f7c0a1ef3a479e8e1b716837f62384069bf022009b8bb487a40
-  data.tar.gz: 462bcc66bad561c3c4f79878791d36f4db9ec72e752c8caf3b1c8bb4c6ced2227f499f70c8723fef691e9d63bfa2fc352ea860bc71aa26285002dd643089123e
+  metadata.gz: c97d430de5290209b29ebac27a657586866979d53c0f32f73bbcb3d7ebe6d0bed85c24c8e22e183b1785940bf143cad2a01645fc4656b38c09f18aa58c95dba1
+  data.tar.gz: 82741376245582fa2387127368a0c1f5cbcedca124a60e4c924d652cd917d808c46e964bb15ecb9f0b926c9d08ceef20e113ae029c178d512e24cc2dfe3cff44

data/README.md

@@ -49,7 +49,7 @@ A new approach to iOS code signing: Share one code signing identity across your
 
 -------
 
-<h5 align="center"><code>match</code> is part of <a href="https://fastlane.tools">fastlane</a>: connect all deployment tools into one streamlined workflow.</h5>
+<h5 align="center"><code>match</code> is part of <a href="https://fastlane.tools">fastlane</a>: The easiest way to automate building and releasing your iOS and Android apps.</h5>
 
 ## Why match?
 
@@ -128,9 +128,9 @@ app_identifier "tools.fastlane.app"
 username "user@fastlane.tools"
 ```
 
-#### Important: Use one git repo per team
+#### Important: Use one git branch per team
 
-`match` was designed to have one git repository per Apple account. If you work in multiple teams, please create one repo for each of them. More information on [codesigning.guide](https://codesigning.guide)
+`match` was designed to use a separate git branch per Apple account. If you work in multiple teams, make sure to set the `git_branch` parameter to a unique value per team. From there, `match` will automatically create and use the specified branch for you. More information on [codesigning.guide](https://codesigning.guide)
 
 ### Run
 
@@ -373,7 +373,7 @@ Because of the potentially dangerous nature of In-House profiles we decided to n
 
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
-- [`fastlane`](https://fastlane.tools): Connect all deployment tools into one streamlined workflow
+- [`fastlane`](https://fastlane.tools): The easiest way to automate building and releasing your iOS and Android apps
 - [`deliver`](https://github.com/fastlane/fastlane/tree/master/deliver): Upload screenshots, metadata and your app to the App Store
 - [`snapshot`](https://github.com/fastlane/fastlane/tree/master/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`frameit`](https://github.com/fastlane/fastlane/tree/master/frameit): Quickly put your screenshots into the right device frames

data/bin/match

@@ -1,129 +1,6 @@
 #!/usr/bin/env ruby
-
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'match'
-require 'commander'
-
-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
-    program :help, 'Author', 'Felix Krause <match@krausefx.com>'
-    program :help, 'Website', 'https://fastlane.tools'
-    program :help, 'GitHub', 'https://github.com/fastlane/match'
-    program :help_formatter, :compact
-
-    global_option('--verbose') { $verbose = true }
-
-    FastlaneCore::CommanderGenerator.new.generate(Match::Options.available_options)
-
-    command :run do |c|
-      c.syntax = 'match'
-      c.description = Match::DESCRIPTION
-
-      c.action do |args, options|
-        if args.count > 0
-          FastlaneCore::UI.user_error!("Please run `match [type]`, allowed values: development, adhoc or appstore")
-        end
-
-        params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
-        params.load_configuration_file("Matchfile")
-        Match::Runner.new.run(params)
-      end
-    end
-
-    Match.environments.each do |type|
-      command type do |c|
-        c.syntax = "match #{type}"
-        c.description = "Run match for a #{type} provisioning profile"
-
-        c.action do |args, options|
-          params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
-          params.load_configuration_file("Matchfile") # this has to be done *before* overwriting the value
-          params[:type] = type.to_s
-          Match::Runner.new.run(params)
-        end
-      end
-    end
-
-    command :init do |c|
-      c.syntax = 'match init'
-      c.description = 'Create the Matchfile for you'
-      c.action do |args, options|
-        containing = (File.directory?("fastlane") ? 'fastlane' : '.')
-        path = File.join(containing, "Matchfile")
-
-        if File.exist?(path)
-          FastlaneCore::UI.user_error!("You already got a Matchfile in this directory")
-          return 0
-        end
-
-        Match::Setup.new.run(path)
-      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 :decrypt do |c|
-      c.syntax = "match decrypt"
-      c.description = "Decrypts the repository and keeps it on the filesystem"
-      c.action do |args, options|
-        params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
-        params.load_configuration_file("Matchfile")
-        decrypted_repo = Match::GitHelper.clone(params[:git_url], params[:shallow_clone])
-        UI.success "Repo is at: '#{decrypted_repo}'"
-      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"
-      c.description = "Delete all certificates and provisioning profiles from the Apple Dev Portal"
-      c.action do |args, options|
-        FastlaneCore::UI.user_error!("Please run `match nuke [type], allowed values: distribution and development")
-      end
-    end
-
-    ["development", "distribution"].each do |type|
-      command "nuke #{type}" do |c|
-        c.syntax = "match nuke #{type}"
-        c.description = "Delete all certificates and provisioning profiles from the Apple Dev Portal of the type #{type}"
-        c.action do |args, options|
-          params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
-          params.load_configuration_file("Matchfile")
-          Match::Nuke.new.run(params, type: type.to_s)
-        end
-      end
-    end
-
-    default_command :run
-
-    run!
-  end
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/AbcSize
-end
-
-begin
-  FastlaneCore::UpdateChecker.start_looking_for_update('match')
-  MatchApplication.new.run
-ensure
-  FastlaneCore::UpdateChecker.show_update_status('match', Match::VERSION)
-end
+require 'match/commands_generator'
+Match::CommandsGenerator.start

data/lib/assets/READMETemplate.md

@@ -1,4 +1,4 @@
-## [fastlane match](https://github.com/fastlane/fastlane/tree/master/match)
+## [fastlane match](https://github.com/fastlane/fastlane/tree/master/match#readme)
 
 This repository contains all your certificates and provisioning profiles needed to build and sign your applications. They are encrypted using OpenSSL via a passphrase.
 
@@ -6,7 +6,7 @@ This repository contains all your certificates and provisioning profiles needed
 
 Do not modify this file, as it gets overwritten every time you run `match`.
 
-### Install [fastlane match](https://github.com/fastlane/fastlane/tree/master/match)
+### Install [fastlane match](https://github.com/fastlane/fastlane/tree/master/match#readme)
 
 ```
 sudo gem install match
@@ -32,7 +32,7 @@ match adhoc
 match development
 ```
 
-For more information open [fastlane match git repo](https://github.com/fastlane/fastlane/tree/master/match)
+For more information open [fastlane match git repo](https://github.com/fastlane/fastlane/tree/master/match#readme)
 
 ### Content
 
@@ -46,4 +46,4 @@ This directory contains all provisioning profiles
 
 ------------------------------------
 
-For more information open [fastlane match git repo](https://github.com/fastlane/fastlane/tree/master/match)
+For more information open [fastlane match git repo](https://github.com/fastlane/fastlane/tree/master/match#readme)

data/lib/match/change_password.rb

@@ -4,12 +4,12 @@ module Match
       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, skip_docs: params[:skip_docs])
+      workspace = GitHelper.clone(params[:git_url], params[:shallow_clone], manual_password: from, skip_docs: params[:skip_docs], branch: params[:git_branch])
       Encrypt.new.clear_password(params[:git_url])
       Encrypt.new.store_password(params[:git_url], to)
 
       message = "[fastlane] Changed passphrase"
-      GitHelper.commit_changes(workspace, message, params[:git_url])
+      GitHelper.commit_changes(workspace, message, params[:git_url], params[:git_branch])
     end
 
     def self.ask_password(message: "Passphrase for Git Repo: ", confirm: true)

data/lib/match/commands_generator.rb

@@ -0,0 +1,126 @@
+require 'commander'
+
+HighLine.track_eof = false
+
+module Match
+  class CommandsGenerator
+    include Commander::Methods
+    UI = FastlaneCore::UI
+
+    def self.start
+      FastlaneCore::UpdateChecker.start_looking_for_update('match')
+      self.new.run
+    ensure
+      FastlaneCore::UpdateChecker.show_update_status('match', Match::VERSION)
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
+    def run
+      program :version, Match::VERSION
+      program :description, Match::DESCRIPTION
+      program :help, 'Author', 'Felix Krause <match@krausefx.com>'
+      program :help, 'Website', 'https://fastlane.tools'
+      program :help, 'GitHub', 'https://github.com/fastlane/match'
+      program :help_formatter, :compact
+
+      global_option('--verbose') { $verbose = true }
+
+      FastlaneCore::CommanderGenerator.new.generate(Match::Options.available_options)
+
+      command :run do |c|
+        c.syntax = 'match'
+        c.description = Match::DESCRIPTION
+
+        c.action do |args, options|
+          if args.count > 0
+            FastlaneCore::UI.user_error!("Please run `match [type]`, allowed values: development, adhoc or appstore")
+          end
+
+          params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+          params.load_configuration_file("Matchfile")
+          Match::Runner.new.run(params)
+        end
+      end
+
+      Match.environments.each do |type|
+        command type do |c|
+          c.syntax = "match #{type}"
+          c.description = "Run match for a #{type} provisioning profile"
+
+          c.action do |args, options|
+            params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+            params.load_configuration_file("Matchfile") # this has to be done *before* overwriting the value
+            params[:type] = type.to_s
+            Match::Runner.new.run(params)
+          end
+        end
+      end
+
+      command :init do |c|
+        c.syntax = 'match init'
+        c.description = 'Create the Matchfile for you'
+        c.action do |args, options|
+          containing = (File.directory?("fastlane") ? 'fastlane' : '.')
+          path = File.join(containing, "Matchfile")
+
+          if File.exist?(path)
+            FastlaneCore::UI.user_error!("You already got a Matchfile in this directory")
+            return 0
+          end
+
+          Match::Setup.new.run(path)
+        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 :decrypt do |c|
+        c.syntax = "match decrypt"
+        c.description = "Decrypts the repository and keeps it on the filesystem"
+        c.action do |args, options|
+          params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+          params.load_configuration_file("Matchfile")
+          decrypted_repo = Match::GitHelper.clone(params[:git_url], params[:shallow_clone], branch: params[:git_branch])
+          UI.success "Repo is at: '#{decrypted_repo}'"
+        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"
+        c.description = "Delete all certificates and provisioning profiles from the Apple Dev Portal"
+        c.action do |args, options|
+          FastlaneCore::UI.user_error!("Please run `match nuke [type], allowed values: distribution and development. For the 'adhoc' type, please use 'distribution' instead.")
+        end
+      end
+
+      ["development", "distribution"].each do |type|
+        command "nuke #{type}" do |c|
+          c.syntax = "match nuke #{type}"
+          c.description = "Delete all certificates and provisioning profiles from the Apple Dev Portal of the type #{type}"
+          c.action do |args, options|
+            params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+            params.load_configuration_file("Matchfile")
+            Match::Nuke.new.run(params, type: type.to_s)
+          end
+        end
+      end
+
+      default_command :run
+
+      run!
+    end
+    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize
+  end
+end

data/lib/match/git_helper.rb

@@ -1,6 +1,6 @@
 module Match
   class GitHelper
-    def self.clone(git_url, shallow_clone, manual_password: nil, skip_docs: false)
+    def self.clone(git_url, shallow_clone, manual_password: nil, skip_docs: false, branch: "master")
       return @dir if @dir
 
       @dir = Dir.mktmpdir
@@ -14,6 +14,8 @@ module Match
 
       UI.user_error!("Error cloning repo, make sure you have access to it '#{git_url}'") unless File.directory?(@dir)
 
+      checkout_branch(branch) unless branch == "master"
+
       if !Helper.test? and GitHelper.match_version(@dir).nil? and manual_password.nil? and File.exist?(File.join(@dir, "README.md"))
         UI.important "Migrating to new match..."
         ChangePassword.update(params: { git_url: git_url,
@@ -47,7 +49,7 @@ module Match
       end
     end
 
-    def self.commit_changes(path, message, git_url)
+    def self.commit_changes(path, message, git_url, branch = "master")
       Dir.chdir(path) do
         return if `git status`.include?("nothing to commit")
 
@@ -56,8 +58,8 @@ module Match
 
         commands = []
         commands << "git add -A"
-        commands << "git commit -m '#{message}'"
-        commands << "git push origin master"
+        commands << "git commit -m #{message.shellescape}"
+        commands << "git push origin #{branch.shellescape}"
 
         UI.message "Pushing changes to remote git repo..."
 
@@ -79,6 +81,44 @@ module Match
       @dir = nil
     end
 
+    # Create and checkout an specific branch in the git repo
+    def self.checkout_branch(branch)
+      return unless @dir
+
+      commands = []
+      if branch_exists?(branch)
+        # Checkout the branch if it already exists
+        commands << "git checkout #{branch.shellescape}"
+      else
+        # If a new branch is being created, we create it as an 'orphan' to not inherit changes from the master branch.
+        commands << "git checkout --orphan #{branch.shellescape}"
+        # We also need to reset the working directory to not transfer any uncommitted changes to the new branch.
+        commands << "git reset --hard"
+      end
+
+      UI.message "Checking out branch #{branch}..."
+
+      Dir.chdir(@dir) do
+        commands.each do |command|
+          FastlaneCore::CommandExecutor.execute(command: command,
+                                                print_all: $verbose,
+                                                print_command: $verbose)
+        end
+      end
+    end
+
+    # Checks if a specific branch exists in the git repo
+    def self.branch_exists?(branch)
+      return unless @dir
+
+      result = Dir.chdir(@dir) do
+        FastlaneCore::CommandExecutor.execute(command: "git branch --list origin/#{branch.shellescape} --no-color -r",
+                                              print_all: $verbose,
+                                              print_command: $verbose)
+      end
+      return !result.empty?
+    end
+
     # Copies the README.md into the git repo
     def self.copy_readme(directory)
       template = File.read("#{Helper.gem_path('match')}/lib/assets/READMETemplate.md")

data/lib/match/nuke.rb

@@ -11,7 +11,7 @@ module Match
       self.params = params
       self.type = type
 
-      params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone], skip_docs: params[:skip_docs])
+      params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone], skip_docs: params[:skip_docs], branch: params[:git_branch])
 
       had_app_identifier = self.params[:app_identifier]
       self.params[:app_identifier] = '' # we don't really need a value here
@@ -142,7 +142,7 @@ module Match
 
       # Now we need to commit and push all this too
       message = ["[fastlane]", "Nuked", "files", "for", type.to_s].join(" ")
-      GitHelper.commit_changes(params[:workspace], message, self.params[:git_url])
+      GitHelper.commit_changes(params[:workspace], message, self.params[:git_url], params[:git_branch])
     end
 
     private

data/lib/match/options.rb

@@ -13,6 +13,10 @@ module Match
                                      description: "URL to the git repo containing all the certificates",
                                      optional: false,
                                      short_option: "-r"),
+        FastlaneCore::ConfigItem.new(key: :git_branch,
+                                     env_name: "MATCH_GIT_BRANCH",
+                                     description: "Specific git branch to use",
+                                     default_value: 'master'),
         FastlaneCore::ConfigItem.new(key: :type,
                                      env_name: "MATCH_TYPE",
                                      description: "Create a development certificate instead of a distribution one",

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[:shallow_clone], skip_docs: params[:skip_docs])
+      params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone], skip_docs: params[:skip_docs], branch: params[:git_branch])
       spaceship = SpaceshipEnsure.new(params[:username]) unless params[:readonly]
 
       # Verify the App ID (as we don't want 'match' to fail at a later point)
@@ -25,7 +25,7 @@ module Match
       # Done
       if self.changes_to_commit and !params[:readonly]
         message = GitHelper.generate_commit_message(params)
-        GitHelper.commit_changes(params[:workspace], message, params[:git_url])
+        GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch])
       end
 
       TablePrinter.print_summary(params, uuid)

data/lib/match/version.rb

@@ -1,4 +1,4 @@
 module Match
-  VERSION = "0.5.0"
+  VERSION = "0.6.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.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security
@@ -279,6 +279,7 @@ files:
 - lib/assets/READMETemplate.md
 - lib/match.rb
 - lib/match/change_password.rb
+- lib/match/commands_generator.rb
 - lib/match/encrypt.rb
 - lib/match/generator.rb
 - lib/match/git_helper.rb
@@ -310,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Easily sync your certificates and profiles across your team using git