story_branch 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c19fcd7d504fbeb3426b609f1e038c1630183ad7
-  data.tar.gz: 5d293e2c5688da00ceb52f1fc7026946b34dcb4d
+  metadata.gz: 71eaa77737e5c7d0b0f33de5bd0f2bddea608b37
+  data.tar.gz: dd9ffd60e2981b7b29f9cc874100407f31d099f4
 SHA512:
-  metadata.gz: 583e333fbc8e2ef56982509ac0c7e87b99b6811e1611c2935ef55b26fc47613cbe288219b454267eaa76c1c6e32d0c4dd49ab671ea7e3c27b4e870e00ebab5b9
-  data.tar.gz: 870be743a9eccd5c936d38599089f15b58e40bf4443ced13fcae1e3690c12803ec6790fa8424f2af99221c626a24f04d2e858657640fa6a34aeea65061aca947
+  metadata.gz: 18501105780a33a97970652d34d906722362b7f60b791bee54c26da8cf511d5e28525f2022874fe9c450c4d55b33e45b575910d3da27a6e803987994aed817d0
+  data.tar.gz: ae49ac7b0c07187ab62aa622aa0c416d17e36f89a0ffb0989d778e44b1fa8a615238b9078304414c48f94f3b0af6e8562ea799f032595b9fd6c178bbdc720b0d

data/bin/git-story-unstart

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'story_branch'
+sb = StoryBranch::Main.new()
+sb.story_unstart

data/bin/git-unstart

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'story_branch'
+sb = StoryBranch::Main.new()
+sb.story_unstart

data/bin/story-unstart

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'story_branch'
+sb = StoryBranch::Main.new()
+sb.story_unstart

data/bin/story_unstart

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'story_branch'
+sb = StoryBranch::Main.new()
+sb.story_unstart

data/lib/story_branch.rb

@@ -5,7 +5,7 @@
 #          Dominic Wong <dominic.wong.617@gmail.com>
 #          Gabe Hollombe <gabe@neo.com>
 #
-# Version: 0.2.4
+# Version: 0.2.5
 #
 # ## Description
 #
@@ -191,7 +191,7 @@ module StoryBranch
         end
 
         puts "Use standard finishing commit message: [y/N]?"
-        commit_message = "[Finishes ##{GitUtils.current_branch_story_parts[:id]}] #{GitUtils.current_branch_story_parts[:description].StringUtils.undashed}"
+        commit_message = "[Finishes ##{GitUtils.current_branch_story_parts[:id]}] #{StringUtils.undashed GitUtils.current_branch_story_parts[:title]}"
         puts commit_message
 
         if gets.chomp!.downcase == "y"
@@ -228,11 +228,19 @@ module StoryBranch
   class StringUtils
 
     def self.dashed s
-      s.tr(' _,./:;', '-')
+      s.tr(' _,./:;+&', '-')
     end
 
     def self.simple_sanitize s
-      s.tr '\'"%!@#$(){}[]*\\?', ''
+      strip_newlines (s.tr '\'"%!@#$(){}[]*\\?', '')
+    end
+
+    def self.normalised_branch_name s
+      StringUtils.simple_sanitize((StringUtils.dashed s).downcase).squeeze("-")
+    end
+
+    def self.strip_newlines s
+      s.tr "\n", "-"
     end
 
     def self.undashed s
@@ -248,16 +256,31 @@ module StoryBranch
     end
 
     def self.is_existing_branch? name
-      # we don't use the Git gem's is_local_branch? because we want to
-      # ignore the id suffix while still avoiding name collisions
       branch_names.each do |n|
-        normalised_branch_name = StringUtils.simple_sanitize(StringUtils.dashed(n.match(/(^.*)(-[1-9][0-9]+$)?/)[1]))
-        levenshtein_distance = Levenshtein.distance normalised_branch_name, name
-        if levenshtein_distance < 2
-          return levenshtein_distance
+        if Levenshtein.distance(n, name) < 3
+          return true
+        end
+        existing_branch_name = n.match(/(.*)(-[1-9][0-9]+$)/)
+        if existing_branch_name
+          levenshtein_distance = Levenshtein.distance existing_branch_name[1], name
+          if levenshtein_distance < 3
+            return true
+          end
+        end
+      end
+      return false
+    end
+
+    def self.is_existing_story? id
+      branch_names.each do |n|
+        branch_id = n.match(/-[1-9][0-9]+$/)
+        if branch_id
+          if branch_id.to_s == "-#{id}"
+            return true
+          end
         end
       end
-      return -1
+      false
     end
 
     def self.branch_names
@@ -275,7 +298,7 @@ module StoryBranch
     def self.current_branch_story_parts
       matches = current_branch.match(/(.*)-(\d+$)/)
       if matches.length == 3
-        { description: matches[1], id: matches[2] }
+        { title: matches[1], id: matches[2] }
       else
         nil
       end
@@ -395,7 +418,7 @@ module StoryBranch
     end
 
     def create_feature_branch story
-      dashed_story_name = StringUtils.simple_sanitize((StringUtils.dashed story.name).downcase).squeeze("-")
+      dashed_story_name = StringUtils.normalised_branch_name story.name
       feature_branch_name = nil
       puts "You are checked out at: #{GitUtils.current_branch}"
       while feature_branch_name == nil or feature_branch_name == ""
@@ -403,29 +426,28 @@ module StoryBranch
         feature_branch_name = readline("Name of feature branch: ", [dashed_story_name])
       end
       feature_branch_name.chomp!
-      validate_branch_name feature_branch_name
-      feature_branch_name_with_story_id = "#{feature_branch_name}-#{story.id}"
-      puts "Creating: #{feature_branch_name_with_story_id} with #{GitUtils.current_branch} as parent"
-      GitUtils.create_branch feature_branch_name_with_story_id
+      if validate_branch_name feature_branch_name, story.id
+        feature_branch_name_with_story_id = "#{feature_branch_name}-#{story.id}"
+        puts "Creating: #{feature_branch_name_with_story_id} with #{GitUtils.current_branch} as parent"
+        GitUtils.create_branch feature_branch_name_with_story_id
+      end
     end
 
     # Branch name validation
-    def validate_branch_name name
+    def validate_branch_name name, id
+      if GitUtils.is_existing_story? id
+        puts "Error: An existing branch has the same story id: #{id}"
+        return false
+      end
+      if GitUtils.is_existing_branch? name
+        puts "Error: This name is very similar to an existing branch. Avoid confusion and use a more unique name."
+        return false
+      end
       unless valid_branch_name? name
         puts "Error: #{name}\nis an invalid name."
         return false
       end
-      existing_name_score = GitUtils.is_existing_branch?(name)
-      unless existing_name_score == -1
-        puts <<-EOD.strip_heredoc
-        Name Collision Error:
-
-        #{name}
-
-        This is too similar to the name of an existing
-        branch, a more unique name is required
-      EOD
-      end
+      true
     end
 
     def valid_branch_name? name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jason Milkins
@@ -96,6 +96,10 @@ executables:
 - story-start
 - git-start
 - git-story-start
+- story_unstart
+- story-unstart
+- git-unstart
+- git-story-unstart
 - story_branch
 - story-branch
 - git-story
@@ -117,12 +121,16 @@ files:
 - bin/git-story-branch
 - bin/git-story-finish
 - bin/git-story-start
+- bin/git-story-unstart
+- bin/git-unstart
 - bin/story-branch
 - bin/story-finish
 - bin/story-start
+- bin/story-unstart
 - bin/story_branch
 - bin/story_finish
 - bin/story_start
+- bin/story_unstart
 - lib/story_branch.rb
 homepage: https://github.com/jasonm23/story_branch
 licenses: