trello_flow 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fe9047aa6ce66f555bd2fe9fbbddaeafbfc749c
-  data.tar.gz: 067ba97e25dd2fa79b9dbbd6b3606c2cd575293a
+  metadata.gz: a0616f6846753dffe0c73a6e08926f5b7ab7a1a8
+  data.tar.gz: 985fcdf1d7bad05ea11cd2858c4a6a58eaef3afe
 SHA512:
-  metadata.gz: ccfabd20b63e46d91b15503f5cd6851f0991f76d99405732b6a11f0cf2ac358f3b991f433a79940789ca2355f977cede249fc69f24de3cf2e86529948fd21191
-  data.tar.gz: 8d92a4760ca7cb4399a7d0933dee421cb6516423ff03d029b2ec37de1756cb75207360cfef3bfb5f1e665f9a80091d8e4652dc5400ffa6a4177de979aa642953
+  metadata.gz: 95c22b4aeb7f688cafc149fb20c630c2bab5795eb753a172db6a1f013bccb40f089b0bc822ba1037cd3bee2c1cb3882ae513e589ccf81ca0c8229a08c4c2d513
+  data.tar.gz: fe2901bcb364f8ba8773c28642b8457c8d7b10256a1ebf752da9b50fcc3848dccb9db20c5600e1dc1664831e01c9a0100417972e01719becb6bb049c22161025

data/lib/trello_flow/api/card.rb

@@ -45,10 +45,6 @@ module TrelloFlow
         attributes[:shortUrl]
       end
 
-      def to_param
-        name.parameterize[0..50]
-      end
-
       private
 
         def move_to(list)

data/lib/trello_flow/branch.rb

@@ -1,5 +1,6 @@
 require "active_support/core_ext/string/inflections"
 require "trello_flow/pull_request"
+require "trello_flow/branch_name"
 
 module TrelloFlow
   class Branch
@@ -12,7 +13,7 @@ module TrelloFlow
     end
 
     def self.from_card(user:, card:)
-      new("#{user.initials.downcase}.#{card.to_param}.#{current.target}.#{card.short_link}")
+      new BranchName.new(user: user, target: current.target, card: card).to_s
     end
 
     def checkout
@@ -24,10 +25,11 @@ module TrelloFlow
     end
 
     def open_pull_request(options = {})
-      PullRequest.new(current_card, options.merge(from: name, target: target)).open
+      pr = PullRequest.new options.merge(card: current_card, from: name, target: target)
+      pr.open
     end
 
-    def open_trello(user:, config:)
+    def open_trello(config)
       if current_card
         Cli.open_url current_card.url
       else
@@ -36,11 +38,7 @@ module TrelloFlow
     end
 
     def target
-      if legacy_naming?
-        name_parts.first
-      else
-        name_parts[-2] || name
-      end
+      name_parts[2] || name
     end
 
     private
@@ -52,11 +50,7 @@ module TrelloFlow
       end
 
       def card_short_link
-        name[/\.(\w+)$/, 1]
-      end
-
-      def legacy_naming?
-        name_parts.size == 3
+        name_parts[3]
       end
 
       def name_parts

data/lib/trello_flow/branch_name.rb

@@ -0,0 +1,30 @@
+module TrelloFlow
+  class BranchName
+    def initialize(user:, target:, card:)
+      @user = user
+      @target = target
+      @card = card
+    end
+
+    def to_s
+      parts.join(".")
+    end
+
+    private
+
+      attr_reader :user, :target, :card
+
+      def parts
+        parts = []
+        parts << user.initials.downcase
+        parts << title
+        parts << target
+        parts << card.short_link
+        parts
+      end
+
+      def title
+        card.name.parameterize[0..50]
+      end
+  end
+end

data/lib/trello_flow/cli.rb

@@ -1,5 +1,5 @@
 require "colored"
-require "forwardable"
+require "active_support/core_ext/module/delegation"
 require "highline"
 require "hirb-colors"
 require "hirb"
@@ -7,12 +7,11 @@ require "hirb"
 module TrelloFlow
   class Cli
     class << self
-      extend Forwardable
-      def_delegators :client, :table, :open_url, :say, :success, :ask, :title, :error, :run, :read
+      delegate :table, :open_url, :say, :success, :ask, :title, :error, :run, :read, to: :client
       attr_accessor :client
     end
 
-    self.client = Cli.new
+    self.client = new
 
     def table(items)
       puts Hirb::Helpers::AutoTable.render(items, unicode: true)

data/lib/trello_flow/main.rb

@@ -20,7 +20,7 @@ module TrelloFlow
     end
 
     def open
-      Branch.current.open_trello(user: current_user, config: local_config)
+      Branch.current.open_trello(local_config)
     end
 
     def finish(options = {})

data/lib/trello_flow/pull_request.rb

@@ -2,7 +2,7 @@ require "trello_flow/repo"
 
 module TrelloFlow
   class PullRequest
-    def initialize(card, from:, target:, **options)
+    def initialize(from:, target:, card: nil, **options)
       @card = card
       @from = from
       @target = target
@@ -22,6 +22,7 @@ module TrelloFlow
       end
 
       def title
+        return unless card
         card_name + " [Delivers ##{card.short_link}]"
       end
 
@@ -30,6 +31,7 @@ module TrelloFlow
       end
 
       def body
+        return unless card
         body = "Trello: #{card.short_url}"
         body << release_note unless release_branch?
         body
@@ -55,7 +57,7 @@ module TrelloFlow
       end
 
       def escape(text)
-        URI.escape text.strip
+        URI.escape text.to_s.strip
       end
 
       def repo

data/lib/trello_flow/version.rb

@@ -1,5 +1,5 @@
 module TrelloFlow
-  VERSION = "3.7.1"
+  VERSION = "3.8.0"
 
   class Version
     def self.latest?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trello_flow
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -281,6 +281,7 @@ files:
 - lib/trello_flow/api/list.rb
 - lib/trello_flow/api/member.rb
 - lib/trello_flow/branch.rb
+- lib/trello_flow/branch_name.rb
 - lib/trello_flow/cleanup.rb
 - lib/trello_flow/cli.rb
 - lib/trello_flow/config_store.rb