metasmile/git-xcp

A git plugin for real-world xcode versioning workflow.

git-xcp

The most simplest, safe, and fully automatic git plugin for versioning workflow of real-world xcode projects. Current working or draft content(unstaged, untracked or uncommitted files) is safe from conflict or loss.

Install

$ git clone https://github.com/metasmile/git-xcp.git && cd git-xcp && sudo make install

Usage

git xcp <command> [option]

commands:
	beta <project target> [option]
						--same-build
						--revert
	submit <project target>
	archive <project target>
	new <project target> <version>

Commands

beta

Push to branch 'release-beta' with automatically increment build number, and create tag.(MyApp/beta/b{CFBundleVersion})

$ git xcp beta MyApp

Performs with same build number

$ git xcp beta MyApp --same-build

Remove already created tags, add a reverse commit.

$ git xcp beta MyApp --revert

submit

Create a tag '{scheme}/submit/{CFBundleShortVersionString}_b{CFBundleVersion}' from the lastest version(HEAD) automatically to manage for additional changes, And deploy as a "release-submit" branch. Maybe you should run this script after succesfully submitted to AppStore review team.

$ git xcp submit MyApp

archive

Squash merge, and push version of release onto 'master' branch via commit '[Release - MyApp - 1.0]', and creates a tag 'MyApp/1.0'"

$ git xcp archive MyApp

new

If your app succesfully released AppStore, Let's start with new CFBundleShortVersionString.

$ git xcp new MyApp 1.1 (from 1.0)

Make your own commands

Also, You can add your new subcommand. 'Makexcp' will automatically wrap general git tasks up. Let's create a source file to following path.

touch ./src/xcp-mycmd

edit 'xcp-mycmd'

# add your scripts here

And then,

$ ./Makexcp mycmd

It creates

./git-xcp-mycmd

And, you can contain it into git-xcp command. Open 'Makefile', and add following lines.

...
install:
	./Makexcp beta
	./Makexcp submit
	./Makexcp archive
	./Makexcp new
    ./Makexcp mycmd <- your command was added.
...

Finally, Install them.

$ make install

git-xcp's Issues

Support a option for signed commit(GPG)

Extension Support

If app project contains some extensions, (Especially iMessage Extensions) its build version must be same as parent app. (git xcp beta)

/usr/bin/xcrun xcodebuild -showBuildSettings -scheme Project | grep TARGET_NAME

all of xcp procedures must automatically revert when throws any errors.

• remove tags
• hard reset to starting HEAD
• stash pop (existed)

xcpd --submit

new tag + deploy to 'release-submit' branch

Move to python

https://github.com/gitpython-developers/GitPython

homebrew support (current audit problems)

==> audit problems
git-xcp:

• bottle modifier (line 13) should be put before depends_on (line 12)
• Stable: version 0.1.1 is redundant with version scanned from URL
• GitHub repository not notable enough (<20 forks, <20 watchers and <50 stars)
• GitHub repository too new (<30 days old)
• Please remove default template comments
• Please remove default template comments
• Please remove default template comments

Stashing/Restoring does not working before/after execute commands (git 2.9.0)

should fix it

move(or modify) submit point.

1.0_b145 <------ submitted to review team.
[ only metadata modified ! not binary. ]
1.0_b145 <------ same build number + move to submit tag

git xcp archive : commit of release can't add when any changes are not found in master branch.

Should fix when output following msg :

Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested

In this case, no more additional commits has not been added when any changes are not found in current working tree (in this case, master).
So then, handle like this:

git commit --allow-empty -m '[Release {TARGET}/{VERSION}]'

git extension support

$ git xcp command