trello_flow 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8479d6897951ce3c0d4813c3480ea1b22d64162
-  data.tar.gz: 356b3eb31e43278518f8d192d65832ed55796595
+  metadata.gz: 25cffdf1ba58b120f8ac843494b1e10c928cf9c0
+  data.tar.gz: c5b25cf7d13abff425216edecddbb020c7f55248
 SHA512:
-  metadata.gz: bc3123f66076c39431d09c3f555972a24c17934c5d260e0a36ca21e7bb5d4d1a26eb83c486b6967709f56dd1508f3691a5a67c50b5db17bf1beff641fa60b5bd
-  data.tar.gz: a4fe9952c229e7b766d90e482db55af5867456aa7b4e82f6ddb8494fdeedc2c00fb1227f9c04ad4e9179088b519fd4a6c4327f884a373573259f7223df061787
+  metadata.gz: ed517dc500c33843ab1f7ea9802558f421c9dfb68653b3d79952d5cb702f5212901188aba15f23031e6737107ff9b49fb1b55219272310a7f83a5ec8d7d8fdc5
+  data.tar.gz: 1cf7c109ec40c83768ba1ffe90353484ba4759e509c8f9b6ee3a1dc2d3275e882b076f16569c2f08319be04f3da1922929ad94b06efe859af27d9a6cf34ffbdb

data/README.md

@@ -10,11 +10,11 @@ gem install trello_flow
 ## Usage
 
 ```bash
-git open # Open relevant card/all users card in browser
-git start # shows list of cards user is member of
-git start <card URL> # show checklist. Choosing items assigns self & creates branch
-git start "Do this" # picking a card/checklist adds and starts item
-git finish # checks off task, opens PR
+git open # Open relevant card/all user's cards in browser
+git start # Pick a board to see backlog
+git start <card URL> # Assigns self to card, moves to "started", and creates branch
+git start "Do this" # Picking a board creates card "Do this" and starts it
+git finish # Moves card to "in review" and opens PR
 git cleanup # cleans up merged card branches
 ```
 

data/lib/trello_flow/api/base.rb

@@ -6,10 +6,8 @@ module TrelloFlow
     class Base < Spyke::Base
       require "trello_flow/api/board"
       require "trello_flow/api/card"
-      require "trello_flow/api/checklist"
       require "trello_flow/api/list"
       require "trello_flow/api/member"
-      require "trello_flow/api/item"
 
       include_root_in_json false
       cattr_accessor :token

data/lib/trello_flow/api/card.rb

@@ -1,7 +1,7 @@
 module TrelloFlow
   module Api
     class Card < Base
-      has_many :checklists
+      belongs_to :board, foreign_key: "idBoard"
 
       def self.fields
         [:name]
@@ -12,8 +12,12 @@ module TrelloFlow
         find(id)
       end
 
-      def self.for(user)
-        with("members/:username/cards/open").where(username: user.username)
+      def start
+        move_to board.lists.started
+      end
+
+      def finish
+        move_to board.lists.finished
       end
 
       def add_member(user)
@@ -21,16 +25,20 @@ module TrelloFlow
         self.class.with("cards/:id/members").where(id: id, value: user.id).post
       end
 
-      def find_or_create_checklist
-        Table.pick(checklists) || Checklist.create(idCard: id, name: "To-Do")
-      end
-
       def url
         attributes[:shortUrl]
       end
 
+      def to_param
+        name.parameterize[0..50]
+      end
+
       private
 
+        def move_to(list)
+          self.class.with("cards/:id/idList").where(id: id, value: list.id).put
+        end
+
         def member_ids
           attributes["idMembers"] || []
         end

data/lib/trello_flow/api/list.rb

@@ -1,11 +1,27 @@
 module TrelloFlow
   module Api
     class List < Base
+      BACKLOG_INDEX = 0
+      STARTED_INDEX = 1
+      FINISHED_INDEX = 2
+
       has_many :cards
 
       def self.fields
         [:name]
       end
+
+      def self.backlog
+        all[BACKLOG_INDEX]
+      end
+
+      def self.started
+        all[STARTED_INDEX]
+      end
+
+      def self.finished
+        all[FINISHED_INDEX]
+      end
     end
   end
 end

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_item(item)
-      new("#{current.target}.#{item.to_param}.#{item.checklist_id}-#{item.id}")
+    def self.from_card(card)
+      new("#{current.target}.#{card.to_param}.#{card.id}")
     end
 
     def checkout
@@ -24,16 +24,16 @@ module TrelloFlow
     end
 
     def open_pull_request
-      PullRequest.new(current_item, from: name, target: target).open
+      PullRequest.new(current_card, from: name, target: target).open
     end
 
-    def complete_current_item
-      current_item.complete
+    def finish_current_card
+      current_card.finish
     end
 
     def open_trello(user)
-      if current_item
-        Cli.open_url current_item.card.url
+      if current_card
+        Cli.open_url current_card.url
       else
         Cli.open_url "https://trello.com/#{user.username}/cards"
       end
@@ -47,20 +47,12 @@ module TrelloFlow
 
       attr_reader :name
 
-      def ids
-        name.split(".").last.split("-")
+      def current_card
+        @_current_card ||= Api::Card.find(card_id) if card_id
       end
 
-      def checklist_id
-        ids.first
-      end
-
-      def item_id
-        ids.last if ids.size == 2
-      end
-
-      def current_item
-        @_current_item ||= Api::Item.find(checklist_id, item_id) if item_id
+      def card_id
+        name.split(".").last
       end
   end
 end

data/lib/trello_flow/main.rb

@@ -5,17 +5,10 @@ module TrelloFlow
     end
 
     def start(name)
-      if name.to_s.start_with?("http")
-        card = Api::Card.find_by_url(name)
-        name = nil
-      else
-        card = find_or_create_card(name)
-      end
-
-      checklist = card.find_or_create_checklist
-      item = checklist.select_or_create_item(name)
-      item.assign(current_user)
-      Branch.from_item(item).checkout
+      card = create_or_pick_card(name)
+      card.add_member(current_user)
+      card.start
+      Branch.from_card(card).checkout
     end
 
     def open
@@ -26,7 +19,7 @@ module TrelloFlow
       branch = Branch.current
       branch.push
       branch.open_pull_request
-      branch.complete_current_item
+      branch.finish_current_card
     end
 
     def cleanup
@@ -35,8 +28,10 @@ module TrelloFlow
 
     private
 
-      def find_or_create_card(name)
-        if Cli.ask("(n)ew or (e)xisting card?") == "n"
+      def create_or_pick_card(name)
+        if name.to_s.start_with?("http")
+          Api::Card.find_by_url(name)
+        elsif name.present?
           create_new_card(name)
         else
           pick_existing_card
@@ -44,13 +39,13 @@ module TrelloFlow
       end
 
       def create_new_card(name)
-        board = Table.pick(Api::Member.current.boards.active)
-        list = Table.pick(board.lists)
-        list.cards.create name: Cli.ask("Input card title [#{name}]:").presence || name
+        board = Table.pick(current_user.boards.active)
+        board.lists.backlog.cards.create name: name
       end
 
       def pick_existing_card
-        Table.pick Api::Card.for(current_user)
+        board = Table.pick(current_user.boards.active)
+        Table.pick board.lists.backlog.cards
       end
 
       def current_user

data/lib/trello_flow/pull_request.rb

@@ -2,8 +2,8 @@ require "trello_flow/repo"
 
 module TrelloFlow
   class PullRequest
-    def initialize(item, from:, target:)
-      @item = item
+    def initialize(card, from:, target:)
+      @card = card
       @from = from
       @target = target
     end
@@ -14,18 +14,18 @@ module TrelloFlow
 
     private
 
-      attr_reader :item, :from, :target
+      attr_reader :card, :from, :target
 
       def url
         repo.url + "/compare/#{target}...#{from}?expand=1&title=#{escape title_with_prefixes}&body=#{escape body}"
       end
 
       def title
-        item.name_without_mentions.gsub('"',"'")
+        card.name.gsub('"',"'")
       end
 
       def body
-        "Trello: #{item.card.url}"
+        "Trello: #{card.url}"
       end
 
       def prefixes

data/lib/trello_flow/table.rb

@@ -11,18 +11,19 @@ module TrelloFlow
     end
 
     def pick(title = nil)
-      return if @records.none?
-      return @records.first if @records.one?
+      return if records.none?
       Cli.title title if title
       render_table
       index = Cli.ask("Pick one:", Integer)
-      @records[index - 1]
+      records[index - 1]
     end
 
     private
 
+      attr_reader :records
+
       def render_table
-        if @records.size > 0
+        if records.size > 0
           Cli.table rows
         else
           Cli.say "No records found"
@@ -30,7 +31,7 @@ module TrelloFlow
       end
 
       def rows
-        @records.each_with_index.map do |record, index|
+        records.each_with_index.map do |record, index|
           Row.new(record, index).to_h
         end
       end

data/lib/trello_flow/version.rb

@@ -1,3 +1,3 @@
 module TrelloFlow
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

data/lib/trello_flow.rb

@@ -1,5 +1,6 @@
 require "trello_flow/version"
 require "trello_flow/cli"
+require "trello_flow/table"
 require "trello_flow/config"
 require "trello_flow/branch"
 require "trello_flow/cleanup"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trello_flow
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -232,8 +232,6 @@ files:
 - lib/trello_flow/api/base.rb
 - lib/trello_flow/api/board.rb
 - lib/trello_flow/api/card.rb
-- lib/trello_flow/api/checklist.rb
-- lib/trello_flow/api/item.rb
 - lib/trello_flow/api/json_parser.rb
 - lib/trello_flow/api/list.rb
 - lib/trello_flow/api/member.rb

data/lib/trello_flow/api/checklist.rb

@@ -1,39 +0,0 @@
-require "trello_flow/table"
-
-module TrelloFlow
-  module Api
-    class Checklist < Base
-      belongs_to :card
-      #has_many :items, uri: "checklists/:checklist_id/checkItems"
-
-      def self.fields
-        [:name]
-      end
-
-      def select_or_create_item(item_name = nil)
-        if item_name.present? || items.none?
-          add_item (Cli.ask("Input to-do [#{card.name}]:").presence || card.name)
-        else
-          Table.pick(items, title: "#{card.name} (#{name})")
-        end
-      end
-
-      def items
-        attributes[:checkItems].map do |attr|
-          Item.new attr.merge(checklist_id: id)
-        end
-      end
-
-      def card_id
-        attributes[:idCard]
-      end
-
-      private
-
-        def add_item(name)
-          Item.with("checklists/:checklist_id/checkItems").where(checklist_id: id).create(name: name)
-          # items.create(name: name)
-        end
-    end
-  end
-end

data/lib/trello_flow/api/item.rb

@@ -1,71 +0,0 @@
-module TrelloFlow
-  module Api
-    class Item < Base
-      delegate :card, :card_id, to: :checklist
-
-      def self.fields
-        [:description, :owners]
-      end
-
-      def self.find(checklist_id, item_id)
-        with("checklists/#{checklist_id}/checkItems/#{item_id}").find_one
-      end
-
-      def description
-        if complete?
-          checkmark + name_without_mentions
-        else
-          name_without_mentions
-        end
-      end
-
-      def owners
-        mentions.join(", ")
-      end
-
-      def color
-        :green if complete?
-      end
-
-      def assign(owner)
-        return if mentions.include?(owner.username)
-        self.class.request :put, "cards/#{card_id}/checklist/#{checklist_id}/checkItem/#{id}/name", value: name_without_mentions + " @#{owner.username}"
-        card.add_member(owner)
-      end
-
-      def complete
-        self.class.request :put, "cards/#{card_id}/checklist/#{checklist_id}/checkItem/#{id}/state", value: "complete"
-      end
-
-      def to_param
-        name_without_mentions.parameterize[0..50]
-      end
-
-      def name_without_mentions
-        (name.split - mentions).join(" ").strip
-      end
-
-      private
-
-        def checklist
-          @_checklist ||= Checklist.find checklist_id
-        end
-
-        def checklist_id
-          attributes[:idChecklist]
-        end
-
-        def mentions
-          name.scan(/(@\S+)/).flatten
-        end
-
-        def checkmark
-          "\u2713 "
-        end
-
-        def complete?
-          state == "complete"
-        end
-    end
-  end
-end