story_branch 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38912c524443c656acbd715b1658f27b945d33ae
-  data.tar.gz: f2a0ec101edf1445a7a64e808d198eff1dd41c9d
+  metadata.gz: 0b3a60904386aff18987e5417ec525b85300d962
+  data.tar.gz: 23e79de42834af29be24fdaea8892c30eb184742
 SHA512:
-  metadata.gz: 5ed462848686c73f0671f2414aa4860d693e9e687e14e9ae26a6843dcbebf0287232c9c2cd82807587a5dc4c5a4d53343cc8a2a32f30f4f6baf035319848717e
-  data.tar.gz: b71af1542d4fc784650acca311d2e87c709eb45f4312936192c188e4539835d6a5dd14a0fdcc6c63399484423143f58706a5e6bd9dfca46a818af02afe633c92
+  metadata.gz: 7791b6bde96724dfac853a9f84e4e0772638af3867c2bfd5a1030cc514a2c0e98544bb23b1c4d92156ddd567452e8328bed1590e6e3b997f92ca61135ed08eee
+  data.tar.gz: 9b44e870c1e5d67c984d130ea30a900641b7f88f56580976fd28a91bbde5a7a8d93c91b019a1c9263d3a2bfe476e1c999b0845ac5267ca4acb2ef216d23dd4e7

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    story_branch (0.5.1)
+    story_branch (0.5.2)
       blanket_wrapper (~> 3.0)
-      levenshtein-ffi (~> 1.0)
+      damerau-levenshtein (~> 1.3)
       thor (~> 0.20.0)
       tty-command (~> 0.8.2)
       tty-config (~> 0.2.0)
@@ -16,25 +16,23 @@ GEM
     blanket_wrapper (3.0.2)
       httparty
       recursive-open-struct
+    damerau-levenshtein (1.3.1)
     diff-lcs (1.3)
-    equatable (0.5.0)
+    equatable (0.6.0)
     fakefs (0.18.0)
-    ffi (1.10.0)
     git (1.5.0)
-    httparty (0.16.4)
+    httparty (0.17.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    levenshtein-ffi (1.1.0)
-      ffi (~> 1.9)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     multi_xml (0.6.0)
-    necromancer (0.4.0)
+    necromancer (0.5.0)
     ostruct (0.1.0)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
+    pastel (0.7.3)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
     rake (10.5.0)
     recursive-open-struct (1.1.0)
     rspec (3.8.0)
@@ -52,35 +50,32 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    strings (0.1.4)
-      strings-ansi (~> 0.1.0)
-      unicode-display_width (~> 1.4.0)
-      unicode_utils (~> 1.4.0)
+    strings (0.1.5)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
+      unicode_utils (~> 1.4)
     strings-ansi (0.1.0)
     thor (0.20.3)
-    timers (4.3.0)
-    tty-color (0.4.3)
+    tty-color (0.5.0)
     tty-command (0.8.2)
       pastel (~> 0.7.0)
     tty-config (0.2.0)
-    tty-cursor (0.6.1)
-    tty-pager (0.12.0)
+    tty-cursor (0.7.0)
+    tty-pager (0.12.1)
       strings (~> 0.1.4)
       tty-screen (~> 0.6)
       tty-which (~> 0.4)
-    tty-prompt (0.18.1)
-      necromancer (~> 0.4.0)
+    tty-prompt (0.19.0)
+      necromancer (~> 0.5.0)
       pastel (~> 0.7.0)
-      timers (~> 4.0)
-      tty-cursor (~> 0.6.0)
-      tty-reader (~> 0.5.0)
-    tty-reader (0.5.0)
-      tty-cursor (~> 0.6.0)
-      tty-screen (~> 0.6.4)
+      tty-reader (~> 0.6.0)
+    tty-reader (0.6.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.6.5)
-    tty-which (0.4.0)
-    unicode-display_width (1.4.1)
+    tty-screen (0.7.0)
+    tty-which (0.4.1)
+    unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     wisper (2.0.0)
 

data/lib/story_branch/git_utils.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'levenshtein'
+require 'damerau-levenshtein'
 require_relative './git_wrapper'
 
 module StoryBranch
@@ -9,13 +9,13 @@ module StoryBranch
   class GitUtils
     def self.existing_branch?(name)
       GitWrapper.branch_names.each do |n|
-        return true if Levenshtein.distance(n, name) < 3
+        return true if DamerauLevenshtein.distance(n, name) < 3
 
         branch_name_match = n.match(/(.*)(-[1-9]+[0-9]*$)/)
         next unless branch_name_match
 
-        levenshtein_distance = Levenshtein.distance branch_name_match[1], name
-        return true if levenshtein_distance < 3
+        distance = DamerauLevenshtein.distance branch_name_match[1], name
+        return true if distance < 3
       end
       false
     end

data/lib/story_branch/string_utils.rb

@@ -15,7 +15,7 @@ module StoryBranch
     end
 
     def self.dashed(text)
-      sanitize(text).tr(" _,./:;+&'\"?<>", '-').squeeze('-').gsub(/-$|^-/, '')
+      sanitize(text).gsub(/[^0-9a-z]/i, '-').squeeze('-').gsub(/-$|^-/, '')
     end
 
     def self.normalised_branch_name(text)

data/lib/story_branch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StoryBranch
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/story_branch.gemspec

@@ -53,7 +53,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'blanket_wrapper', '~> 3.0'
-  spec.add_runtime_dependency 'levenshtein-ffi', '~> 1.0'
+  spec.add_runtime_dependency 'damerau-levenshtein', '~> 1.3'
   spec.add_runtime_dependency 'thor', '~> 0.20.0'
   spec.add_runtime_dependency 'tty-command', '~> 0.8.2'
   spec.add_runtime_dependency 'tty-config', '~> 0.2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: story_branch
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Rui Baltazar
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blanket_wrapper
@@ -29,19 +29,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: levenshtein-ffi
+  name: damerau-levenshtein
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement