trollolo 0.0.9 → 0.0.10

data/lib/scrum_board.rb

@@ -1,6 +1,7 @@
 class ScrumBoard
 
   class DoneColumnNotFoundError < StandardError; end
+  class AcceptedColumnNotFoundError < StandardError; end
 
   def initialize(board_data, settings)
     @settings = settings
@@ -22,8 +23,17 @@ class ScrumBoard
     end
   end
 
+  def accepted_column
+    accepted_columns = columns.select{|c| c.name =~ @settings.accepted_column_name_regex }
+    if accepted_columns.empty?
+      EmptyColumn.new
+    else
+      accepted_columns.max_by{|c| c.name.match(@settings.accepted_column_name_regex).captures.first.to_i }
+    end
+  end
+
   def done_cards
-    done_column.committed_cards
+    done_column.committed_cards + accepted_column.committed_cards
   end
 
   def open_columns
@@ -56,11 +66,11 @@ class ScrumBoard
 
 
   def extra_cards
-    (done_column.extra_cards + open_columns.map(&:extra_cards)).flatten(1)
+    (done_column.extra_cards + accepted_column.extra_cards + open_columns.map(&:extra_cards)).flatten(1)
   end
 
   def extra_done_cards
-    done_column.extra_cards
+    done_column.extra_cards + accepted_column.extra_cards
   end
 
   def extra_done_story_points
@@ -85,11 +95,11 @@ class ScrumBoard
 
 
   def unplanned_cards
-    (done_column.unplanned_cards + open_columns.map(&:unplanned_cards)).flatten(1)
+    (done_column.unplanned_cards + accepted_column.unplanned_cards + open_columns.map(&:unplanned_cards)).flatten(1)
   end
 
   def unplanned_done_cards
-    done_column.unplanned_cards
+    done_column.unplanned_cards + accepted_column.unplanned_cards
   end
 
   def unplanned_done_story_points
@@ -118,11 +128,11 @@ class ScrumBoard
   end
 
   def done_fast_lane_cards_count
-    done_column.fast_lane_cards.count
+    done_column.fast_lane_cards.count + accepted_column.fast_lane_cards.count
   end
 
   def scrum_cards
-    open_columns.map(&:fast_lane_cards).flatten(1) + done_column.cards
+    open_columns.map(&:fast_lane_cards).flatten(1) + done_column.cards + accepted_column.cards
   end
 
   def meta_cards

data/lib/settings.rb

@@ -17,9 +17,9 @@
 
 class Settings
 
-  attr_accessor :developer_public_key, :member_token, :verbose, :raw,
-                :not_done_columns, :todo_column, :done_column_name_regex,
-                :todo_column_name_regex
+  attr_accessor :developer_public_key, :member_token, :board_aliases, :verbose,
+                :raw, :not_done_columns, :todo_column, :accepted_column_name_regex,
+                :done_column_name_regex, :todo_column_name_regex, :scrum
 
   def initialize config_file_path
     @config_file_path = config_file_path
@@ -27,17 +27,20 @@ class Settings
       @config = YAML.load_file(config_file_path)
 
       if @config
-        @developer_public_key   = @config["developer_public_key"]
-        @member_token           = @config["member_token"]
-        @not_done_columns       = @config["not_done_columns"].freeze || ["Sprint Backlog", "Doing"]
-        @todo_column            = @config["todo_column"].freeze
-        @done_column_name_regex = @config["done_column_name_regex"].freeze || /\ADone/
-        @todo_column_name_regex = @config["todo_column_name_regex"].freeze || /\ATo Do\Z/
+        @developer_public_key       = @config["developer_public_key"]
+        @member_token               = @config["member_token"]
+        @board_aliases              = @config["board_aliases"] || {}
+        @scrum                      = OpenStruct.new(@config["scrum"] || scrum_defaults)
+        @not_done_columns           = @config["not_done_columns"].freeze || ["Sprint Backlog", "Doing"]
+        @todo_column                = @config["todo_column"].freeze
+        @done_column_name_regex     = @config["done_column_name_regex"].freeze || /\ADone/
+        @accepted_column_name_regex = @config["accepted_column_name_regex"].freeze || /\AAccepted/
+        @todo_column_name_regex     = @config["todo_column_name_regex"].freeze || /\ATo Do\Z/
       else
         raise "Couldn't read config data from '#{config_file_path}'"
       end
     end
-    
+
     @verbose = false
     @raw = false
   end
@@ -46,14 +49,35 @@ class Settings
     @config = {}
     @config["developer_public_key"] = @developer_public_key
     @config["member_token"] = @member_token
-    
+
     File.open(@config_file_path,"w") do |f|
       f.write(@config.to_yaml)
     end
   end
-  
+
   def version
     Trollolo::VERSION
   end
 
+  private
+
+  def scrum_defaults
+    {
+      "board_names" => {
+        "planning" => "Planning Board",
+        "sprint" => "Sprint Board"
+      },
+      "label_names" => {
+        "sticky" => "Sticky",
+        "waterline" => "Under waterline"
+      },
+      "list_names" => {
+        "sprint_backlog" => "Sprint Backlog",
+        "sprint_qa" => "QA",
+        "sprint_doing" => "Doing",
+        "planning_backlog" => "Backlog",
+        "planning_ready" => "Ready for Estimation"
+      },
+    }.freeze
+  end
 end

data/lib/trello_service.rb

@@ -0,0 +1,22 @@
+class TrelloService
+  attr_reader :settings
+  
+  def initialize(settings)
+    @settings = settings
+    init_trello
+  end
+
+  def self.find_list(board_id, name)
+    board = Trello::Board.find(board_id)
+    return board, board.lists.find { |l| l.name == name }
+  end
+
+  protected
+
+  def init_trello
+    Trello.configure do |config|
+      config.developer_public_key = @settings.developer_public_key
+      config.member_token         = @settings.member_token
+    end
+  end
+end

data/lib/trello_wrapper.rb

@@ -16,34 +16,24 @@
 #  you may find current contact information at www.suse.com
 require 'trello'
 
-class TrelloWrapper
-
-  attr_accessor :board
-
-  def initialize(settings)
-    @settings = settings
-    init_trello
+class TrelloWrapper < TrelloService
+  def board(board_id)
+    @board ||= ScrumBoard.new(retrieve_board_data(board_id), @settings)
   end
 
   def client
-    Trello::Client.new(
+    @client ||= Trello::Client.new(
       developer_public_key: @settings.developer_public_key,
       member_token: @settings.member_token
     )
   end
 
-  def board(board_id)
-    return @board if @board
-
-    @board = ScrumBoard.new(retrieve_board_data(board_id), @settings)
-  end
-
   def retrieve_board_data(board_id)
-    JSON.parse(client.get("/boards/#{board_id}?lists=open&cards=open&card_checklists=all"))
+    JSON.parse(get_board(board_id))
   end
 
   def backup(board_id)
-    client.get("/boards/#{board_id}?lists=open&cards=open&card_checklists=all")
+    get_board(board_id)
   end
 
   def organization(org_id)
@@ -88,13 +78,9 @@ class TrelloWrapper
     client.put("/cards/#{card_id}/name?value=#{name}")
   end
 
-  private
+  def get_board(board_id)
+    raise TrolloloError.new("Board id cannot be blank") if board_id.blank?
 
-  def init_trello
-    Trello.configure do |config|
-      config.developer_public_key = @settings.developer_public_key
-      config.member_token         = @settings.member_token
-    end
+    client.get("/boards/#{board_id}?lists=open&cards=open&card_checklists=all")
   end
-
 end

data/lib/trollolo.rb

@@ -27,13 +27,14 @@ require_relative 'settings'
 require_relative 'column'
 require_relative 'card'
 require_relative 'scrum_board'
+require_relative 'trello_service'
 require_relative 'trello_wrapper'
 require_relative 'burndown_chart'
 require_relative 'burndown_data'
 require_relative 'backup'
 require_relative 'checklist'
-require_relative 'prioritizer'
-require_relative 'sprint_cleanup'
+require_relative 'scrum'
+require_relative 'empty_column'
 
 class TrolloloError < StandardError
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Trollolo
 
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 
 end

data/man/trollolo.1.md

@@ -23,7 +23,10 @@ and cards and has functionality for extracting data for burndown charts.
 
   * `--board-id`:
     Most commands take a `board-id` parameter. This is the id of the Trello
-    board. It is the cryptic part of the URL of the Trello board.
+    board. It is the cryptic part of the URL of the Trello board. Since the
+    actual id is hard to remember, you can set an alias in the `.trollolorc`
+    file and use that instead of the actual id.
+    See [CONFIGURATION](#CONFIGURATION) section below.
 
   * `--raw`:
     Some of the commands take a `raw` option. If this is provided the commands
@@ -126,6 +129,24 @@ in the Trello API documentation.
 
 The board id is the cryptic string in the URL of your board.
 
+The `.trollolorc` file can also be used to set aliases for board ids. When set,
+you will be able to use the alias instead of the board-id in the various
+commands. E.g.
+
+With the following configuration
+
+```
+board_aliases:
+  MyTrelloBoard: 53186e8391ef8671265ebf9e
+
+```
+
+You can issue the command:
+
+```
+  trollolo get-cards --board-id=MyTrelloBoard
+```
+
 
 ## CONVENTIONS FOR SCRUM BOARDS
 

data/spec/data/board.json

@@ -18,7 +18,6 @@
     "cardAging": "regular",
     "calendarFeedEnabled": false,
     "background": "5319bb612fb0bcdf451401a8",
-    "backgroundColor": null,
     "backgroundImage": "https://trello-backgrounds.s3.amazonaws.com/4e727168cb2ac700002cf6b6/990df8f044b98679ccbef943beff54d6/4268316033_6d847a0219_b.jpg",
     "backgroundImageScaled": [
       {
@@ -44,9 +43,9 @@
     ],
     "backgroundTile": false,
     "backgroundBrightness": "light",
-    "canBePublic": false,
-    "canBeOrg": false,
-    "canBePrivate": false,
+    "canBePublic": true,
+    "canBeOrg": true,
+    "canBePrivate": true,
     "canInvite": true
   },
   "labelNames": {