git_er_done 0.4.0 → 0.5.0

data/features/cli.feature

@@ -14,6 +14,19 @@ Feature: CLI
     Then the output should contain "Git-Er-Done"
     And should display the current version
 
+  Scenario: Complete a Bug
+    Given I am working on a git project
+    And I run `gd bug fix_100`
+    And I commit a new file
+    When I run `gd done`
+    Then the output should contain "Deleted branch bugs/fix_100"
+    Then the output should contain "Switched to branch 'master'"
+
+  Scenario: Start a Bug
+    Given I am working on a git project
+    When I run `gd bug fix_100`
+    Then the output should contain "Switched to a new branch 'bugs/fix_100'"
+
   Scenario: Start a New Feature
     Given I am working on a git project
     When I run `gd feature new_widget`
@@ -27,6 +40,19 @@ Feature: CLI
     And the output should contain "Switched to branch 'features/new_widget"
     And the output should contain "Current branch features/new_widget is up to date"
 
+  Scenario: Shouldn't be able to sync a non-feature branch
+    Given I am working on a git project
+    And I have been working in the "staging" branch
+    When I run `gd sync`
+    Then the script should exit with a warning
+
+  Scenario: Syncing from staging
+    Given I am working on a git project
+    And I have been working in the "staging" branch
+    Then I am working on the "features/new_widget" branch
+    When I run `gd sync`
+    Then the output should not contain "Switched to branch 'master'"
+
   Scenario: Inception of a branch
     Given I am working on a git project
     And I run `git checkout -b staging`
@@ -80,4 +106,4 @@ Feature: CLI
     And I commit a new file
     And I run `gd done` interactively
     And I type "3"
-    Then the program should fail using Thor's erroneous exit codes
+    Then the script should fail and exit

data/features/step_definitions/cli_steps.rb

@@ -46,11 +46,20 @@ When /^I have been working in the "([^"]*)" branch$/ do |branch_name|
   run_simple "git commit -m 'First commit for #{branch_name}'"
 end
 
-Then /^the program should fail using Thor's erroneous exit codes$/ do
-  # This really should be 1, but thor doesn't seem to respect error statuses
+Then /^the script should fail and exit$/ do
+  # The exit code eally should be 1, but thor doesn't seem to respect error statuses
   # See http://stackoverflow.com/questions/17241932/ruby-thor-exit-status-in-case-of-an-error
   steps %Q{
       Then the exit status should be 0
       And the output should contain "Error!"
   }
+end
+
+Then /^the script should exit with a warning$/ do
+  # The exit code eally should be 1, but thor doesn't seem to respect error statuses
+  # See http://stackoverflow.com/questions/17241932/ruby-thor-exit-status-in-case-of-an-error
+  steps %Q{
+      Then the exit status should be 0
+      And the output should contain "Warning!"
+  }
 end

data/lib/git_er_done/app.rb

@@ -11,6 +11,7 @@ module Git
         include Git::Er::Done::Actions
 
         FEATURES_PATH = "features/"
+        BUG_PATH = "bugs/"
 
         desc 'feature [NAME]', 'Start a new feature using a branch.'
         def feature(name)
@@ -18,6 +19,12 @@ module Git
           git :checkout => "-b #{feature_branch(name)}"
         end
 
+        desc 'bug [NAME]', 'Start a new bug in a separate branch.'
+        def bug(name)
+          puts "Creating a new bug called #{bug_branch(name)}."
+          git :checkout => "-b #{bug_branch(name)}"
+        end
+
         desc 'inception', 'Find the branch(es) that the current branch was originally created from.'
         def inception
           # Find the first commit that matches one of the heads.
@@ -35,16 +42,16 @@ module Git
                              Recommend calling sync before doing this.'
         def done(name=nil)
           unless name
-            name = current_feature
+            name, type = current_feature
           end
-          puts "Completing a feature called #{feature_branch(name)}"
+          say "Completing a #{type} called #{full_branch_name(name, type)}"
           git :add=>"."
           git :commit
           squash
           # Should we also sync with master first?
           git :checkout => inception_branch_name
-          git :merge => feature_branch(name)
-          git :branch => "-d #{feature_branch(name)}"
+          git :merge => full_branch_name(name, type)
+          git :branch => "-d #{full_branch_name(name, type)}"
         end
 
         desc 'squash', 'Squash all commits from the current branch into a single commit (since inception).'
@@ -64,13 +71,18 @@ module Git
           puts "There are #{commits.size} new commits for #{current_branch_name}"
         end
 
-        desc 'sync', 'Update your branch with the latest from master.'
+        desc 'sync', 'Update your feature branch with the latest from the inception branch.'
         def sync
+          if long_running_branch?(current_branch)
+            say "Warning! The current branch ''#{current_branch.name}' is probably a long running branch. It probably has a remote that shouldn't be rebased.' "
+            exit
+          end
+
           return_to_branch = current_branch_name
-          git :checkout => :master
+          git :checkout => inception_branch_name
           git :pull
           git :checkout => return_to_branch
-          git :rebase => :master
+          git :rebase => inception_branch_name
         end
 
         desc 'version', 'Show the Git-Er-Done version and quit. (gd -v works too)'
@@ -119,9 +131,12 @@ module Git
         #
         # @return [Array<Grit::Head>]
         def long_running_branches
-          repo.heads.select { |head| !head.name.include?('features') }
+          repo.heads.select { |head| long_running_branch?(head) }
         end
 
+        def long_running_branch?(branch)
+          !branch.name.include?('features/') && !branch.name.include?('bugs/')
+        end
         # Returns a list of all commits for the current branch since it was forked from master.
         def commits_in_feature_branch
           repo.commits_between(inception_branch_name, current_branch.name)
@@ -132,7 +147,9 @@ module Git
         def current_feature
           b = current_branch_name
           if b.start_with?(FEATURES_PATH)
-            return b[FEATURES_PATH.length, b.length]
+            return [b[FEATURES_PATH.length, b.length], :feature]
+          elsif b.start_with?(BUG_PATH)
+            return [b[BUG_PATH.length, b.length], :bug]
           end
           return ""
         end
@@ -156,9 +173,23 @@ module Git
           raise "No branch named 'master' found."
         end
 
+        # @param [String] short_branch_name i.e. fix_issue_100
+        # @param [Symbol] type :bug or :feature
+        def full_branch_name(short_branch_name, type)
+          if type == :feature
+            feature_branch(short_branch_name)
+          else
+            bug_branch(short_branch_name)
+          end
+        end
+
         def feature_branch(name)
           "#{FEATURES_PATH}#{name}"
         end
+
+        def bug_branch(name)
+          "#{BUG_PATH}#{name}"
+        end
       end
     end
   end

data/lib/git_er_done/version.rb

@@ -1,7 +1,7 @@
 module Git
   module Er
     module Done
-      VERSION = "0.4.0"
+      VERSION = "0.5.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_er_done
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000Z
+date: 2013-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70323278285920 !ruby/object:Gem::Requirement
+  requirement: &70103372264780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70323278285920
+  version_requirements: *70103372264780
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70323278285460 !ruby/object:Gem::Requirement
+  requirement: &70103372264320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70323278285460
+  version_requirements: *70103372264320
 description: A gem to assist with git workflow, similar to git-flow.
 email:
 - peakpg@gmail.com