Workflow with git-flow

[Jeehut]

I just tried to find the right workflow using Jeweler in combination with git-flow for my db_clustering project. In git-flow I'm used to start a release branch (e.g. release/1.1.2), do my release there so run rake version:bump:patch and rake release and merge the release branch with the git-flow scripts (which will merge it to master and develop and checkout the develop branch).

The problem is that rake release automatically creates a .gemspec file and uses the master branch (instead of the current branch) to do the release – which is not what I was expecting since I was in a different branch. This leads to the re-release of the old master branch code under the new version tag. Also simply doing the gem version:bump:patch in the release branch and running rake release after merging it to the master branch didn't seem right since this will prevent the .gemspec file from being updated within the develop branch and I have to manually prevent the merging to the master branch in git-flow from creating a 1.1.2 flag.

For now I have stopped using git-flow within that library until I'm sure how to do it the right way. Are there any thoughts on how to use git-flow alongside jeweler?

Thanks in advance for any help.

[technicalpickles]

Did a quick code search for master, and found

jeweler/lib/jeweler/tasks.rb

Line 74 in 922fcd5

args[:branch] = ENV['BRANCH']

So, you might be able to specify BRANCH=whatever rake release to use a different branch.

[Jeehut]

Thank you @technicalpickles so far. If I understand correctly to start the release branch `release/1.1.2' I need to run the following in order to release the gem:

BRANCH=release/1.1.2 rake release

This way I can't run the same command on each release but have to use the current git release branchs name. Now I have two questions remaining to make this work really well with jeweler:

1. How can I tell jeweler to use the current branch to prevent changing the command on each release
2. How can I prevent jeweler from automatically tagging the specified branch (git-flow does this itself on the master branch when merging the release branch)

[flajann2]

If this is still a needed feature, please let me know, else I will be closing this issue soon.

[Jeehut]

Well, I moved away from jeweler a long time ago because of this issue. Therefore I don't need it anymore personally.

[flajann2]

I imagine others will need this feature, so I'll keep it on the list anyway.