trollolo 0.2.0 → 0.3.0

data/lib/scrum/creator.rb

@@ -9,7 +9,7 @@ module Scrum
     private
 
     def create_labels(board_id)
-      @scrum.label_names.each { |_, name| Trello::Label.create(name: name, board_id: board_id) }
+      @scrum.label_names.each_value { |name| Trello::Label.create(name: name, board_id: board_id) }
     end
 
     def create_sprint_board

data/lib/scrum_board.rb

@@ -12,6 +12,14 @@ class ScrumBoard
     @columns ||= @board_data['lists'].map{|x| Column.new(@board_data, x['id'], @settings)}
   end
 
+  def todo_columns
+    columns.select{|c| @settings.todo_columns.include?(c.name)}
+  end
+
+  def doing_columns
+    columns.select{|c| @settings.doing_columns.include?(c.name) }
+  end
+
   def done_column
     done_columns = columns.select{|c| c.name =~ @settings.done_column_name_regex }
     if done_columns.empty?
@@ -21,8 +29,11 @@ class ScrumBoard
     end
   end
 
+  def accepted_columns
+    columns.select{|c| c.name =~ @settings.accepted_column_name_regex }
+  end
+
   def accepted_column
-    accepted_columns = columns.select{|c| c.name =~ @settings.accepted_column_name_regex }
     if accepted_columns.empty?
       EmptyColumn.new
     else

data/lib/settings.rb

@@ -18,9 +18,9 @@
 class Settings
 
   attr_accessor :developer_public_key, :member_token, :board_aliases, :verbose,
-                :raw, :not_done_columns, :todo_column, :accepted_column_name_regex,
+                :raw, :not_done_columns, :todo_columns, :doing_columns, :accepted_column_name_regex,
                 :done_column_name_regex, :todo_column_name_regex, :scrum,
-                :no_task_checklists
+                :no_task_checklists, :swimlanes
 
   def initialize(config_file_path)
     @config_file_path = config_file_path
@@ -34,10 +34,12 @@ class Settings
         @scrum                      = OpenStruct.new(@config['scrum'] || scrum_defaults)
         @not_done_columns           = @config['not_done_columns'].freeze || ['Sprint Backlog', 'Doing']
         @no_task_checklists         = @config['no_task_checklists'].freeze || ['Feedback']
-        @todo_column                = @config['todo_column'].freeze
+        @todo_columns               = @config['todo_columns'].freeze || ['Sprint Backlog']
+        @doing_columns              = @config['doing_columns'].freeze || ['Doing']
         @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/
+        @swimlanes                  = @config['swimlanes'].freeze || []
       else
         raise "Couldn't read config data from '#{config_file_path}'"
       end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Trollolo
 
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 
 end

data/spec/data/burndown-data-with-doing-columns.yaml

@@ -0,0 +1,32 @@
+---
+meta:
+  board_id: myboardid
+  doing_columns:
+  - Doing
+  - QA
+  sprint: 2
+  total_days: 9
+  weekend_lines:
+  - 3.5
+  - 7.5
+days:
+- date: '2014-04-23'
+  updated_at: '2014-04-23T10:00:00+01:00'
+  story_points:
+    total: 30
+    open: 23
+  tasks:
+    total: 25
+    open: 21
+- date: '2014-04-24'
+  updated_at: '2014-04-24T19:00:00+01:00'
+  story_points:
+    total: 30
+    open: 21
+  tasks:
+    total: 26
+    open: 19
+  story_points_extra:
+    done: 3
+  tasks_extra:
+    done: 2

data/spec/data/burndown-data-with-swimlanes.yaml

@@ -0,0 +1,32 @@
+---
+meta:
+  board_id: myboardid
+  swimlanes:
+    - Swimlane One
+    - swimlanetwo
+  sprint: 2
+  total_days: 9
+  weekend_lines:
+  - 3.5
+  - 7.5
+days:
+- date: '2014-04-23'
+  updated_at: '2014-04-23T10:00:00+01:00'
+  story_points:
+    total: 30
+    open: 23
+  tasks:
+    total: 25
+    open: 21
+- date: '2014-04-24'
+  updated_at: '2014-04-24T19:00:00+01:00'
+  story_points:
+    total: 30
+    open: 21
+  tasks:
+    total: 26
+    open: 19
+  story_points_extra:
+    done: 3
+  tasks_extra:
+    done: 2

data/spec/data/burndown-data-with-todo-columns.yaml

@@ -0,0 +1,35 @@
+---
+meta:
+  board_id: myboardid
+  todo_columns:
+    - Swimlane Backlog
+    - Sprint Backlog
+  swimlanes:
+    - Swimlane One
+    - swimlanetwo
+  sprint: 2
+  total_days: 9
+  weekend_lines:
+  - 3.5
+  - 7.5
+days:
+- date: '2014-04-23'
+  updated_at: '2014-04-23T10:00:00+01:00'
+  story_points:
+    total: 30
+    open: 23
+  tasks:
+    total: 25
+    open: 21
+- date: '2014-04-24'
+  updated_at: '2014-04-24T19:00:00+01:00'
+  story_points:
+    total: 30
+    open: 21
+  tasks:
+    total: 26
+    open: 19
+  story_points_extra:
+    done: 3
+  tasks_extra:
+    done: 2

data/spec/integration/create_burndown_spec.rb

@@ -22,8 +22,8 @@ def compare_images_for_sprint(sprint_number, extra_args = [])
 
   result = run_helper(@working_dir, sprint_number, extra_args)
   expect(result).to exit_with_success('')
-  expect(File.join(@working_dir, "burndown-#{sprint_number}.png")).
-    to be_same_image_as("create_burndown_helper/burndown-#{sprint_number}.png")
+  expect(File.join(@working_dir, "burndown-#{sprint_number}.png"))
+    .to be_same_image_as("create_burndown_helper/burndown-#{sprint_number}.png")
 end
 
 describe 'create_burndown.py' do

data/spec/unit/board_mock_spec.rb

@@ -0,0 +1,96 @@
+require_relative 'spec_helper'
+
+describe BoardMock do
+  context 'one column' do
+    let :subject do
+      BoardMock.new
+        .list('One')
+    end
+
+    it 'has one column' do
+      expect(subject.columns.count).to eq(1)
+    end
+
+    it 'has no cards' do
+      expect(subject.cards.count).to eq(0)
+    end
+  end
+
+  context 'two columns' do
+    let :subject do
+      board = BoardMock.new
+      board.list('One')
+      board.list('Two')
+      board
+    end
+
+    it 'has two columns' do
+      expect(subject.columns.count).to eq(2)
+    end
+
+    it 'has no cards' do
+      expect(subject.cards.count).to eq(0)
+    end
+  end
+
+  context 'one column and two cards' do
+    let :subject do
+      board = BoardMock.new
+      list = board.list('One')
+      list.card('Red')
+      list.card('Green')
+      board
+    end
+
+    it 'has one column' do
+      expect(subject.columns.count).to eq(1)
+    end
+
+    it 'has two cards' do
+      expect(subject.cards.count).to eq(2)
+    end
+  end
+
+  context 'two columns and two cards each' do
+    let :subject do
+      BoardMock.new
+        .list('One')
+          .card('Red')
+          .card('Green')
+        .list('Two')
+          .card('Blue')
+          .card('Yellow')
+    end
+
+    it 'has two columns' do
+      expect(subject.columns.count).to eq(2)
+    end
+
+    it 'has four cards' do
+      expect(subject.cards.count).to eq(4)
+    end
+
+    it 'has two cards in each list' do
+      subject.columns.each do |column|
+        expect(column.cards.count).to eq(2)
+      end
+    end
+  end
+
+  context 'one card with one label' do
+    let :subject do
+      BoardMock.new
+        .list('One')
+          .card('Red')
+            .label('Cold')
+    end
+
+    it 'has one card' do
+      expect(subject.cards.count).to eq(1)
+    end
+
+    it 'card has one label' do
+      expect(subject.cards.first.label?('Cold'))
+    end
+  end
+end

data/spec/unit/burndown_chart_spec.rb

@@ -234,10 +234,25 @@ describe BurndownChart do
         expect(@chart.data['days']).to eq @raw_data
       end
 
+      it 'reads todo columns' do
+        @chart.read_data given_file('burndown-data.yaml', from: 'burndown-data-with-todo-columns.yaml')
+        expect(@settings.todo_columns).to eq ['Swimlane Backlog', 'Sprint Backlog']
+      end
+
+      it 'reads doing columns' do
+        @chart.read_data given_file('burndown-data.yaml', from: 'burndown-data-with-doing-columns.yaml')
+        expect(@settings.doing_columns).to eq ['Doing', 'QA']
+      end
+
       it 'reads not done columns' do
         @chart.read_data given_file('burndown-data.yaml', from: 'burndown-data-with-config.yaml')
         expect(@settings.not_done_columns).to eq ['Sprint Backlog', 'Doing', 'QA']
       end
+
+      it 'reads swimlanes' do
+        @chart.read_data given_file('burndown-data.yaml', from: 'burndown-data-with-swimlanes.yaml')
+        expect(@settings.swimlanes).to eq ['Swimlane One', 'swimlanetwo']
+      end
     end
 
     describe '#write_data' do

data/spec/unit/burndown_data_spec.rb

@@ -3,146 +3,205 @@ require_relative 'spec_helper'
 include GivenFilesystemSpecHelpers
 
 describe BurndownData do
-  before(:each) do
-    @burndown = BurndownData.new(dummy_settings)
-    @burndown.board_id = '53186e8391ef8671265eba9d'
-    full_board_mock
-  end
-
-  describe BurndownData::Result do
-    it 'calculates total' do
-      r = described_class.new
-      r.open = 7
-      r.done = 4
-
-      expect(r.total).to eq 11
-    end
-  end
-
-  describe 'setters' do
-    it 'sets open story points' do
-      @burndown.story_points.open = 13
-      expect(@burndown.story_points.open).to eq 13
+  context 'with full board mock' do
+    before(:each) do
+      @burndown = BurndownData.new(dummy_settings)
+      @burndown.board_id = '53186e8391ef8671265eba9d'
+      full_board_mock
     end
 
-    it 'sets open tasks' do
-      @burndown.tasks.open = 42
-      expect(@burndown.tasks.open).to eq 42
-    end
-  end
+    describe BurndownData::Result do
+      it 'calculates total' do
+        r = described_class.new
+        r.open = 7
+        r.done = 4
 
-  describe '#fetch' do
-    context 'with meta data on sprint card' do
-      before do
-        @burndown.fetch
+        expect(r.total).to eq 11
       end
+    end
 
-      it 'returns story points' do
-        expect( @burndown.story_points.total ).to eq 16
-        expect( @burndown.story_points.open ).to eq 13
-        expect( @burndown.story_points.done ).to eq 3
+    describe 'setters' do
+      it 'sets open story points' do
+        @burndown.story_points.open = 13
+        expect(@burndown.story_points.open).to eq 13
       end
 
-      it 'returns extra story points' do
-        expect( @burndown.extra_story_points.total ).to eq 8
-        expect( @burndown.extra_story_points.open ).to eq 8
-        expect( @burndown.extra_story_points.done ).to eq 0
+      it 'sets open tasks' do
+        @burndown.tasks.open = 42
+        expect(@burndown.tasks.open).to eq 42
       end
+    end
 
-      it 'returns unplanned story points' do
-        expect( @burndown.unplanned_story_points.total ).to eq 3
-        expect( @burndown.unplanned_story_points.open ).to eq 1
-        expect( @burndown.unplanned_story_points.done ).to eq 2
+    describe '#fetch' do
+      context 'with meta data on sprint card' do
+        before do
+          @burndown.fetch
+        end
+
+        it 'returns story points' do
+          expect( @burndown.story_points.total ).to eq 16
+          expect( @burndown.story_points.open ).to eq 13
+          expect( @burndown.story_points.done ).to eq 3
+        end
+
+        it 'returns extra story points' do
+          expect( @burndown.extra_story_points.total ).to eq 8
+          expect( @burndown.extra_story_points.open ).to eq 8
+          expect( @burndown.extra_story_points.done ).to eq 0
+        end
+
+        it 'returns unplanned story points' do
+          expect( @burndown.unplanned_story_points.total ).to eq 3
+          expect( @burndown.unplanned_story_points.open ).to eq 1
+          expect( @burndown.unplanned_story_points.done ).to eq 2
+        end
+
+        it 'returns tasks' do
+          expect( @burndown.tasks.total ).to eq 13
+          expect( @burndown.tasks.open ).to eq 9
+          expect( @burndown.tasks.done ).to eq 4
+        end
+
+        it 'returns extra tasks' do
+          expect( @burndown.extra_tasks.total ).to eq 1
+          expect( @burndown.extra_tasks.open ).to eq 1
+          expect( @burndown.extra_tasks.done ).to eq 0
+        end
+
+        it 'returns unplanned tasks' do
+          expect( @burndown.unplanned_tasks.total ).to eq 2
+          expect( @burndown.unplanned_tasks.open ).to eq 1
+          expect( @burndown.unplanned_tasks.done ).to eq 1
+        end
+
+        it 'returns meta data' do
+          expect( @burndown.meta ).to eq( 'sprint' => 10,
+                                          'total_days' => 18,
+                                          'weekend_lines' => [1.5, 6.5, 11.5, 16.5])
+        end
+
+        it 'saves date and time' do
+          expected_date_time = DateTime.parse('2015-01-12T13:57:16+01:00')
+          allow(DateTime).to receive(:now).and_return(expected_date_time)
+          @burndown.fetch
+          expect(@burndown.date_time).to eq(expected_date_time)
+        end
       end
 
-      it 'returns tasks' do
-        expect( @burndown.tasks.total ).to eq 13
-        expect( @burndown.tasks.open ).to eq 9
-        expect( @burndown.tasks.done ).to eq 4
-      end
+      context 'without meta data on sprint card' do
+        before do
+          allow(Card).to receive(:parse_yaml_from_description).and_return(nil)
+          @burndown.fetch
+        end
 
-      it 'returns extra tasks' do
-        expect( @burndown.extra_tasks.total ).to eq 1
-        expect( @burndown.extra_tasks.open ).to eq 1
-        expect( @burndown.extra_tasks.done ).to eq 0
-      end
-
-      it 'returns unplanned tasks' do
-        expect( @burndown.unplanned_tasks.total ).to eq 2
-        expect( @burndown.unplanned_tasks.open ).to eq 1
-        expect( @burndown.unplanned_tasks.done ).to eq 1
+        it 'does not fail' do
+          expect(@burndown.meta).to be(nil)
+        end
       end
+    end
 
-      it 'returns meta data' do
-        expect( @burndown.meta ).to eq( 'sprint' => 10,
-                                        'total_days' => 18,
-                                        'weekend_lines' => [1.5, 6.5, 11.5, 16.5])
-      end
+    describe '#to_hash' do
+      it 'converts to hash' do
+        @burndown.story_points.open = 1
+        @burndown.story_points.done = 2
+        @burndown.tasks.open = 3
+        @burndown.tasks.done = 4
+        @burndown.extra_story_points.open = 5
+        @burndown.extra_story_points.done = 6
+        @burndown.extra_tasks.open = 7
+        @burndown.extra_tasks.done = 8
+        @burndown.unplanned_story_points.open = 1
+        @burndown.unplanned_story_points.done = 2
+        @burndown.unplanned_tasks.open = 1
+        @burndown.unplanned_tasks.done = 1
+        @burndown.date_time = DateTime.parse('20150115')
+
+        expected_hash = {
+          'date' => '2015-01-15',
+          'updated_at' => '2015-01-15T00:00:00+00:00',
+          'story_points' => {
+            'total' => 3,
+            'open' => 1
+          },
+          'tasks' => {
+            'total' => 7,
+            'open' => 3
+          },
+          'story_points_extra' => {
+            'done' => 6
+          },
+          'tasks_extra' => {
+            'done' => 8
+          },
+          'unplanned_story_points' => {
+            'total' => 3,
+            'open' => 1
+          },
+          'unplanned_tasks' => {
+            'total' => 2,
+            'open' => 1
+          }
+        }
 
-      it 'saves date and time' do
-        expected_date_time = DateTime.parse('2015-01-12T13:57:16+01:00')
-        allow(DateTime).to receive(:now).and_return(expected_date_time)
-        @burndown.fetch
-        expect(@burndown.date_time).to eq(expected_date_time)
+        expect(@burndown.to_hash).to eq(expected_hash)
       end
     end
+  end
 
-    context 'without meta data on sprint card' do
-      before do
-        allow(Card).to receive(:parse_yaml_from_description).and_return(nil)
-        @burndown.fetch
-      end
+  context 'board with swimlanes' do
+    let :subject do
+      settings = dummy_settings
+      settings.todo_columns = ['Swimlane Backlog', 'Sprint Backlog']
+      settings.swimlanes = ['myswimlane']
+
+      mock_board = BoardMock.new(settings)
+        .list('Swimlane Backlog')
+          .card('(2) Three')
+            .label('myswimlane')
+        .list('Sprint Backlog')
+          .card('(3) One')
+          .card('(5) Two')
+        .list('Doing')
+          .card('(7) Two')
+            .label('myswimlane')
+        .list('Done')
+          .card('(11) Four')
+          .card('(13) Five')
+            .label('myswimlane')
+        .list('Accepted Sprint 2')
+          .card('(17) Six')
+            .label('myswimlane')
+        .list('Accepted Sprint 1')
+          .card('(21) Seven')
+            .label('myswimlane')
+
+      burndown = BurndownData.new(settings)
+      allow(burndown).to receive(:board).and_return mock_board
+      burndown.fetch
+      burndown
+    end
 
-      it 'does not fail' do
-        expect(@burndown.meta).to be(nil)
-      end
+    it 'ignores swimlane story points' do
+      expect(subject.story_points.open).to eq(8)
+      expect(subject.story_points.done).to eq(11)
     end
-  end
 
-  describe '#to_hash' do
-    it 'converts to hash' do
-      @burndown.story_points.open = 1
-      @burndown.story_points.done = 2
-      @burndown.tasks.open = 3
-      @burndown.tasks.done = 4
-      @burndown.extra_story_points.open = 5
-      @burndown.extra_story_points.done = 6
-      @burndown.extra_tasks.open = 7
-      @burndown.extra_tasks.done = 8
-      @burndown.unplanned_story_points.open = 1
-      @burndown.unplanned_story_points.done = 2
-      @burndown.unplanned_tasks.open = 1
-      @burndown.unplanned_tasks.done = 1
-      @burndown.date_time = DateTime.parse('20150115')
+    it 'records swimlane story points' do
+      expect(subject.swimlanes['myswimlane'].todo).to eq(2)
+      expect(subject.swimlanes['myswimlane'].doing).to eq(7)
+      expect(subject.swimlanes['myswimlane'].done).to eq(51)
+    end
 
+    it 'includes swimlane story points in hash' do
       expected_hash = {
-        'date' => '2015-01-15',
-        'updated_at' => '2015-01-15T00:00:00+00:00',
-        'story_points' => {
-          'total' => 3,
-          'open' => 1
-        },
-        'tasks' => {
-          'total' => 7,
-          'open' => 3
-        },
-        'story_points_extra' => {
-          'done' => 6
-        },
-        'tasks_extra' => {
-          'done' => 8
-        },
-        'unplanned_story_points' => {
-          'total' => 3,
-          'open' => 1
-        },
-        'unplanned_tasks' => {
-          'total' => 2,
-          'open' => 1
+        'myswimlane' => {
+          'todo' => 2,
+          'doing' => 7,
+          'done' => 51
         }
       }
-
-      expect(@burndown.to_hash).to eq(expected_hash)
+      expect(subject.to_hash.key?('swimlanes')).to be true
+      expect(subject.to_hash['swimlanes']).to eq(expected_hash)
     end
   end
 end