trello_flow 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37b50f1be3df52fcb343f599dde3b4b284e2714
-  data.tar.gz: 84503911b11e5c12dc5a78874b7aa1347fe0f33d
+  metadata.gz: 19a0bf9f2105eb2217b4419e6ccef937dea8a9d5
+  data.tar.gz: c11eabeccf68b1f9a9bd100755f302f8db907f22
 SHA512:
-  metadata.gz: 295f1a0a9614746441851cd36e7e30fee9364f1b56f997fef514dad7e1b8a4c0107afd5e8987810c0589ecad2caf190222e0253d98f972f43e250151c580d2ef
-  data.tar.gz: 4479e1ed48797ac5efe7aa21de6c6ab4e0f9ddfdf3dcaf7a072fb6fb94fe0da458b64152416444d98d702793fb95888055520db363364f57fe442464b503ba1b
+  metadata.gz: cf6bef0ee316d24f24ccf785207f59d936500ca0bf63719548efe98489957e49e7380fe27875ba350a3ededea45b01d7a8ddeaef684452808ac249d067415642
+  data.tar.gz: e70cec90f67003397cd3ac86d5d0dc56c9d39625eeeee4d37b333ef635ea9a4185e6e28ac48fdc2465199d6ebd24851cb3f506a66deb8cb881d7d3f3dc2870c4

data/lib/trello_flow/branch.rb

@@ -11,8 +11,8 @@ module TrelloFlow
       new Cli.read("git rev-parse --abbrev-ref HEAD")
     end
 
-    def self.from_card(card)
-      new("#{current.target}.#{card.to_param}.#{card.short_link}")
+    def self.from_card(user:, card:)
+      new("#{user.initials.downcase}.#{card.to_param}.#{current.target}.#{card.short_link}")
     end
 
     def checkout
@@ -36,7 +36,11 @@ module TrelloFlow
     end
 
     def target
-      name.split('.').first
+      if legacy_naming?
+        name_parts.first
+      else
+        name_parts[-2] || name
+      end
     end
 
     private
@@ -50,5 +54,13 @@ module TrelloFlow
       def card_short_link
         name[/\.(\w+)$/, 1]
       end
+
+      def legacy_naming?
+        name_parts.size == 3
+      end
+
+      def name_parts
+        @_name_parts ||= name.split(".")
+      end
   end
 end

data/lib/trello_flow/cleanup.rb

@@ -30,7 +30,7 @@ module TrelloFlow
       end
 
       def filter
-        "^ *#{target}.\\+$"
+        "\\.#{target}\\."
       end
   end
 end

data/lib/trello_flow/main.rb

@@ -12,7 +12,7 @@ module TrelloFlow
       card = create_or_pick_card(name)
       card.add_member(current_user)
       card.start
-      Branch.from_card(card).checkout
+      Branch.from_card(user: current_user, card: card).checkout
     end
 
     def open

data/lib/trello_flow/version.rb

@@ -1,3 +1,3 @@
 module TrelloFlow
-  VERSION = "3.3.0"
+  VERSION = "3.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trello_flow
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler