github-pivotal-flow 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d93212c015bebe3e118fae331f0dbae4f0629b
-  data.tar.gz: 3a1c6280059635bac3eb3e88b5fcfe89ada37a80
+  metadata.gz: 6904bbb1190724ba6d161da9cb6f114b179cd078
+  data.tar.gz: fb2de40e641e806badc7488ec11f754d08258424
 SHA512:
-  metadata.gz: fdda8f5bae9595d3cfa1e78e436daa5dd8794b938fccb856e026072fc1cdc8f3a6504127d9255ba07fab38b326bb86ddce2f1853d70ab495cc955d3b6b21ce47
-  data.tar.gz: b2d8b5fa2d673009dca2d83171a918048c6b4257ddd6296c2902c47721e4e0f5fc74084b55197850531e9f35f7061250645196a18ccd8c2bbb4c90a10d31835c
+  metadata.gz: f6cac72bf0832ac52005c74e1763918aaa15e2b5bdbc6a13dc92b55fb61afd25d7543dbac00cbedbb4c10ae4b16dc79430bbc62743d5da6e966225ddccb267ff
+  data.tar.gz: 910860262d23343756f408e6f4a5d086d9bd50c2686eabf0a2e9a0ccc52051e356b13996eb6887a2bc6fecf7a42d71e83b8b171b70c133e5a60d6cea0f50c8f9

data/README.md

@@ -57,7 +57,8 @@ In order to take advantage of automatic issue completion, the [Pivotal Tracker S
 ## Commands
 
 ### `git start [ type | story-id ]`
-This command starts a story by creating a Git branch and changing the story's state to `started`.  This command can be run in three ways.  First it can be run specifying the id of the story that you want to start.
+This command starts a story by creating a Git branch, opening a pull-request on Github and changing the story's state to `started`.
+This command can be run in three ways.  First it can be run specifying the id of the story that you want to start.
 
 ```plain
 $ git start 12345678
@@ -96,10 +97,10 @@ $ git start 12345678
         Title: Lorem ipsum dolor sit amet, consectetur adipiscing elitattributes
   Description: Ut consequat sapien ut erat volutpat egestas. Integer venenatis lacinia facilisis.
 
-Enter branch name (12345678-<branch-name>):
+Enter branch name (feature/12345678-<branch-name>):
 ```
 
-The value entered here will be prepended with the story id such that the branch name is `<story-id>-<branch-name>`.  This branch is then created and checked out.
+The value entered here will be prepended with the story id such that the branch name is `<story-type-prefix>/<story-id>-<branch-name>`.  This branch is then created and checked out.
 
 If it doesn't exist already, a `prepare-commit-msg` commit hook is added to your repository.  This commit hook augments the existing commit messsage pattern by appending the story id to the message automatically.
 
@@ -117,67 +118,39 @@ If it doesn't exist already, a `prepare-commit-msg` commit hook is added to your
 ```
 
 ### `git finish [--no-complete]`
-This command finishes a story by merging and cleaning up its branch and then pushing the changes to a remote server.  This command can be run in two ways.  First it can be run without the `--no-complete` option.
+This command finishes a story by merging and cleaning up its branch and then pushing the changes to a remote server.
+This command can be run in two ways.  First it can be run without the `--no-complete` option.
 
 ```plain
 $ git finish
-Checking for trivial merge from 12345678-lorem-ipsum to master... OK
-Merging 12345678-lorem-ipsum to master... OK
-Deleting 12345678-lorem-ipsum... OK
-Pushing to origin... OK
+Checking for trivial merge from feature/63805340-sample_feature to development... OK
+Merging feature/63805340-sample_feature to development... OK
+Deleting feature/63805340-sample_feature... OK
 ```
 
-The command checks that it will be able to do a trivial merge from the development branch to the target branch before it does anything.  The check has the following constraints
+The command checks that it will be able to do a trivial merge from the development branch to the target branch before it does anything.
+The check has the following constraints
 
 1.  The local repository must be up to date with the remote repository (e.g. `origin`)
-2.  The local merge target branch (e.g. `master`) must be up to date with the remote merge target branch (e.g. `origin/master`)
-3.  The common ancestor (i.e. the branch point) of the development branch (e.g. `12345678-lorem-ipsum`) must be tip of the local merge target branch (e.g. `master`)
+2.  The local merge target branch (e.g. `development`) must be up to date with the remote merge target branch (e.g. `origin/development`)
+3.  The common ancestor (i.e. the branch point) of the development branch (e.g. `feature/12345678-lorem-ipsum`) must be tip of the local merge target branch (e.g. `development`)
 
 If all of these conditions are met, the development branch will be merged into the target branch with a message of:
 
 ```plain
-Merge 12345678-lorem-ipsum to master
+Merge feature/12345678-lorem-ipsum to development
 
 [Completes #12345678]
 ```
 
-The second way is with the `--no-complete` option specified. In this case `finish` performs the same actions except the `Completes`... statement in the commit message will be supressed.
+The second way is with the `--no-complete` option specified.
+In this case `finish` performs the same actions except the `Completes`... statement in the commit message will be supressed.
 
 ```plain
-Merge 12345678-lorem-ipsum to master
+Merge feature/12345678-lorem-ipsum to development
 
 [#12345678]
 ```
 
 After merging, the development branch is deleted and the changes are pushed to the remote repository.
 
-### `git release [story-id]`
-This command creates a release for a story.  It does this by updating the version string in the project and creating a tag.  This command can be run in two ways.  First it can be run specifying the release that you want to create.
-
-```plain
-$ git release 12345678
-```
-The other way the command can be run without specifying anything.  In this case, it will select the first release story (based on the backlog's order).
-
-```plain
-$ git release
-      Title: Lorem ipsum dolor sit amet, consectetur adipiscing elitattributes
-```
-
-Once a story has been selected by one of the two methods, the command then prompts for the release version and next development version.
-
-```plain
-$ git release
-      Title: Lorem ipsum dolor sit amet, consectetur adipiscing elitattributes
-
-Enter release version (current: 1.0.0.BUILD-SNAPSHOT): 1.0.0.M1
-Enter next development version (current: 1.0.0.BUILD-SNAPSHOT): 1.1.0.BUILD-SNAPSHOT
-Creating tag v1.0.0.M1... OK
-Pushing to origin... OK
-```
-
-Once these have been entered, the version string for the current project is updated to the release version and a tag is created.  Then the version string for the current project is updated to the next development version and a new commit along the original branch is created.  Finally the tag and changes are pushed to the remote sever.
-
-Version update is currently supported for the following kinds of projects.  If you do not see a project type that you would like supported, please open an issue or submit a pull request.
-
-* Gradle

data/lib/github_pivotal_flow/command.rb

@@ -14,7 +14,7 @@ module GithubPivotalFlow
     def initialize(*args)
       @options = {}
       args = parse_argv(*args)
-      @options[:args] = args
+      _, _, @options[:args] = args
 
       @repository_root = Git.repository_root
       @configuration = Configuration.new(@options)

data/lib/github_pivotal_flow/configuration.rb

@@ -73,8 +73,9 @@ module GithubPivotalFlow
       feature_prefix = Git.get_config KEY_FEATURE_PREFIX, :inherited
 
       if feature_prefix.empty?
-        feature_prefix = ask('Please enter your git-flow feature branch prefix: [feature]').strip
-        feature_prefix = 'feature' if feature_prefix.blank?
+        feature_prefix = ask('Please enter your git-flow feature branch prefix: [feature/]').strip
+        feature_prefix = 'feature/' if feature_prefix.blank?
+        feature_prefix = "#{feature_prefix}/" unless feature_prefix[-1,1] == '/'
         Git.set_config KEY_FEATURE_PREFIX, feature_prefix, :local
         puts
       end
@@ -86,8 +87,9 @@ module GithubPivotalFlow
       hotfix_prefix = Git.get_config KEY_HOTFIX_PREFIX, :inherited
 
       if hotfix_prefix.empty?
-        hotfix_prefix = ask('Please enter your git-flow hotfix branch prefix: [hotfix]').strip
-        hotfix_prefix = 'hotfix' if hotfix_prefix.blank?
+        hotfix_prefix = ask('Please enter your git-flow hotfix branch prefix: [hotfix/]').strip
+        hotfix_prefix = 'hotfix/' if hotfix_prefix.blank?
+        hotfix_prefix = "#{hotfix_prefix}/" unless hotfix_prefix[-1,1] == '/'
         Git.set_config KEY_HOTFIX_PREFIX, hotfix_prefix, :local
         puts
       end
@@ -99,8 +101,9 @@ module GithubPivotalFlow
       release_prefix = Git.get_config KEY_RELEASE_PREFIX, :inherited
 
       if release_prefix.empty?
-        release_prefix = ask('Please enter your git-flow release branch prefix: [release]').strip
+        release_prefix = ask('Please enter your git-flow release branch prefix: [release/]').strip
         release_prefix = 'release' if release_prefix.blank?
+        release_prefix = "#{release_prefix}/" unless release_prefix[-1,1] == '/'
         Git.set_config KEY_RELEASE_PREFIX, release_prefix, :local
         puts
       end

data/lib/github_pivotal_flow/start.rb

@@ -3,6 +3,7 @@ module GithubPivotalFlow
   class Start < GithubPivotalFlow::Command
     def run!
       filter = @options[:args]
+      puts "Filter: #{filter.inspect}"
       #TODO: Validate the format of the filter argument
       story = Story.select_story @project, filter
       Story.pretty_print story

data/lib/github_pivotal_flow/story.rb

@@ -145,9 +145,9 @@ module GithubPivotalFlow
     def branch_name_from(branch_prefix, story_id, branch_name)
       if story_type == 'release'
         # For release branches the format is release/5.0
-        "#{Git.get_config('gitflow.prefix.release', :inherited)}/#{branch_name}"
+        "#{Git.get_config('gitflow.prefix.release', :inherited)}#{branch_name}"
       else
-        n = "#{branch_prefix}/#{story_id}"
+        n = "#{branch_prefix}#{story_id}"
         n << "-#{branch_name}" unless branch_name.blank?
         n
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-pivotal-flow
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Donald Piret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline