trollolo 0.1.1 → 0.2.0

data/lib/column.rb

@@ -15,21 +15,22 @@
 #  To contact SUSE about this file by physical or electronic mail,
 #  you may find current contact information at www.suse.com
 class Column
-  def initialize(board_data, list_id)
+  def initialize(board_data, list_id, settings = nil)
     @board_data = board_data
-    @list_data = @board_data["lists"].find{|l| l["id"] == list_id}
+    @settings = settings
+    @list_data = @board_data['lists'].find{|l| l['id'] == list_id}
   end
 
   def name
-    @list_data["name"]
+    @list_data['name']
   end
 
   def estimated_cards
-    cards.select{|x| x.estimated? }
+    cards.select(&:estimated?)
   end
 
   def sum
-    estimated_cards.map{|x| x.story_points}.sum
+    estimated_cards.map(&:story_points).sum
   end
 
   def tasks
@@ -41,11 +42,11 @@ class Column
   end
 
   def extra_cards
-    cards.select{|c| c.extra?}
+    cards.select(&:extra?)
   end
 
   def unplanned_cards
-    cards.select{|c| c.unplanned?}
+    cards.select(&:unplanned?)
   end
 
   def committed_cards
@@ -53,13 +54,13 @@ class Column
   end
 
   def fast_lane_cards
-    cards.select{|c| c.fast_lane?}
+    cards.select(&:fast_lane?)
   end
 
   def cards
     return @cards if @cards
 
-    cards = @board_data["cards"].select{|c| c["idList"] == @list_data["id"]}
-    @cards = cards.map{|c| Card.new(@board_data, c["id"])}
+    cards = @board_data['cards'].select{|c| c['idList'] == @list_data['id']}
+    @cards = cards.map{|c| Card.new(@board_data, c['id'], @settings)}
   end
 end

data/lib/empty_column.rb

@@ -1,5 +1,5 @@
 class EmptyColumn < Column
-  def initialize
-    super({"lists" => [], "cards" => []}, nil)
+  def initialize(settings = nil)
+    super({'lists' => [], 'cards' => []}, nil, settings)
   end
 end

data/lib/scrum/backlog_mover.rb

@@ -12,10 +12,10 @@ module Scrum
 
     def setup(planning_board_id, sprint_board_id)
       @sprint_board = sprint_board(sprint_board_id)
-      fail "sprint board is missing #{@sprint_board.backlog_list_name} list" unless @sprint_board.backlog_list
+      raise "sprint board is missing #{@sprint_board.backlog_list_name} list" unless @sprint_board.backlog_list
 
       @planning_board = planning_board(planning_board_id)
-      fail "backlog list not found on planning board" unless @planning_board.backlog_list
+      raise 'backlog list not found on planning board' unless @planning_board.backlog_list
 
       @waterline_card = @planning_board.waterline_card
       @seabed_card = @planning_board.seabed_card
@@ -27,7 +27,7 @@ module Scrum
           break
         elsif @waterline_card && card == @waterline_card
           @sprint_board.place_waterline(@waterline_card)
-          puts "under the waterline"
+          puts 'under the waterline'
         else
           move_sprint_card(card) unless @planning_board.sticky?(card)
         end

data/lib/scrum/card_type_detection.rb

@@ -1,7 +1,7 @@
 module Scrum
   module CardTypeDetection
     def sticky?(card)
-      card.labels.any? { |l| l.name == @settings.label_names["sticky"] }
+      card.labels.any? { |l| l.name == @settings.label_names['sticky'] }
     end
 
     def waterline?(card)

data/lib/scrum/creator.rb

@@ -13,17 +13,17 @@ module Scrum
     end
 
     def create_sprint_board
-      board = Trello::Board.create(name: @scrum.board_names["sprint"])
-      Trello::List.create(board_id: board.id, name: @scrum.list_names["sprint_backlog"])
-      Trello::List.create(board_id: board.id, name: @scrum.list_names["sprint_qa"])
-      Trello::List.create(board_id: board.id, name: @scrum.list_names["sprint_doing"])
+      board = Trello::Board.create(name: @scrum.board_names['sprint'])
+      Trello::List.create(board_id: board.id, name: @scrum.list_names['sprint_backlog'])
+      Trello::List.create(board_id: board.id, name: @scrum.list_names['sprint_qa'])
+      Trello::List.create(board_id: board.id, name: @scrum.list_names['sprint_doing'])
       create_labels(board.id)
     end
 
     def create_planning_board
-      board = Trello::Board.create(name: @scrum.board_names["planning"])
-      Trello::List.create(board_id: board.id, name: @scrum.list_names["planning_backlog"])
-      Trello::List.create(board_id: board.id, name: @scrum.list_names["planning_ready"])
+      board = Trello::Board.create(name: @scrum.board_names['planning'])
+      Trello::List.create(board_id: board.id, name: @scrum.list_names['planning_backlog'])
+      Trello::List.create(board_id: board.id, name: @scrum.list_names['planning_ready'])
       create_labels(board.id)
     end
   end

data/lib/scrum/prioritizer.rb

@@ -4,7 +4,7 @@ module Scrum
 
     def prioritize(board_id, list_name = nil)
       @board = planning_board(board_id, list_name)
-      fail "list named '#{@board.backlog_list_name}' not found on board" unless @board.backlog_list
+      raise "list named '#{@board.backlog_list_name}' not found on board" unless @board.backlog_list
       update_priorities
     end
 

data/lib/scrum/sprint_board.rb

@@ -14,7 +14,7 @@ module Scrum
     end
 
     def backlog_list_name
-      @settings.list_names["sprint_backlog"]
+      @settings.list_names['sprint_backlog']
     end
 
     def doing_list
@@ -74,15 +74,15 @@ module Scrum
     end
 
     def waterline_label_name
-      @settings.label_names["waterline"]
+      @settings.label_names['waterline']
     end
 
     def qa_list_name
-      @settings.list_names["sprint_qa"]
+      @settings.list_names['sprint_qa']
     end
 
     def doing_list_name
-      @settings.list_names["sprint_doing"]
+      @settings.list_names['sprint_doing']
     end
   end
 end

data/lib/scrum/sprint_cleaner.rb

@@ -4,9 +4,9 @@ module Scrum
 
     def cleanup(board_id, target_board_id)
       @board = sprint_board(board_id)
-      fail "backlog list '#{@board.backlog_list_name}' not found on sprint board" unless @board.backlog_list
+      raise "backlog list '#{@board.backlog_list_name}' not found on sprint board" unless @board.backlog_list
       @target_board = Trello::Board.find(target_board_id)
-      fail "ready list '#{@settings.scrum.list_names["planning_ready"]}' not found on planning board" unless target_list
+      raise "ready list '#{@settings.scrum.list_names['planning_ready']}' not found on planning board" unless target_list
 
       gen_burndown
 
@@ -18,7 +18,7 @@ module Scrum
     private
 
     def target_list
-      @target_list ||= @target_board.lists.find { |l| l.name == @settings.scrum.list_names["planning_ready"] }
+      @target_list ||= @target_board.lists.find { |l| l.name == @settings.scrum.list_names['planning_ready'] }
     end
 
     def waterline_label(card)

data/lib/scrum/sprint_planning_board.rb

@@ -6,15 +6,13 @@ module Scrum
 
     def initialize(settings)
       @settings = settings
-      @backlog_list_name = settings.list_names["planning_backlog"]
+      @backlog_list_name = settings.list_names['planning_backlog']
     end
 
     attr_accessor :backlog_list
 
     def setup(id, list_name = nil)
-      if list_name
-        @backlog_list_name = list_name
-      end
+      @backlog_list_name = list_name if list_name
       @board, @backlog_list = TrelloService.find_list(id, @backlog_list_name)
       self
     end

data/lib/scrum_board.rb

@@ -3,13 +3,13 @@ class ScrumBoard
   class DoneColumnNotFoundError < StandardError; end
   class AcceptedColumnNotFoundError < StandardError; end
 
-  def initialize(board_data, settings)
+  def initialize(board_data, settings = nil)
     @settings = settings
     @board_data = board_data
   end
 
   def columns
-    @columns ||= @board_data["lists"].map{|x| Column.new(@board_data, x["id"])}
+    @columns ||= @board_data['lists'].map{|x| Column.new(@board_data, x['id'], @settings)}
   end
 
   def done_column
@@ -138,7 +138,7 @@ class ScrumBoard
   end
 
   def id
-    @board_data["id"]
+    @board_data['id']
   end
 
   def cards

data/lib/settings.rb

@@ -19,23 +19,25 @@ class Settings
 
   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
+                :done_column_name_regex, :todo_column_name_regex, :scrum,
+                :no_task_checklists
 
-  def initialize config_file_path
+  def initialize(config_file_path)
     @config_file_path = config_file_path
     if File.exists? config_file_path
       @config = YAML.load_file(config_file_path)
 
       if @config
-        @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/
+        @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']
+        @no_task_checklists         = @config['no_task_checklists'].freeze || ['Feedback']
+        @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
@@ -47,10 +49,10 @@ class Settings
 
   def save_config
     @config = {}
-    @config["developer_public_key"] = @developer_public_key
-    @config["member_token"] = @member_token
+    @config['developer_public_key'] = @developer_public_key
+    @config['member_token'] = @member_token
 
-    File.open(@config_file_path, "w") do |f|
+    File.open(@config_file_path, 'w') do |f|
       f.write(@config.to_yaml)
     end
   end
@@ -63,21 +65,21 @@ class Settings
 
   def scrum_defaults
     {
-      "board_names" => {
-        "planning" => "Planning Board",
-        "sprint" => "Sprint Board"
+      '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"
+      '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

@@ -8,7 +8,7 @@ class TrelloService
 
   def self.find_list(board_id, name)
     board = Trello::Board.find(board_id)
-    return board, board.lists.find { |l| l.name == name }
+    [board, board.lists.find { |l| l.name == name }]
   end
 
   protected

data/lib/trello_wrapper.rb

@@ -42,23 +42,23 @@ class TrelloWrapper < TrelloService
 
   def add_attachment(card_id, filename)
     card = Trello::Card.find(card_id)
-    card.add_attachment(File.open(filename, "rb"))
+    card.add_attachment(File.open(filename, 'rb'))
   end
 
   def make_cover(card_id, image_name)
     attachment_id = attachment_id_by_name(card_id, image_name)
-    raise("Error: The attachment with the name '#{image_name}' was not found") if !attachment_id
+    raise("Error: The attachment with the name '#{image_name}' was not found") unless attachment_id
+    make_cover_with_id(card_id, attachment_id)
+  end
+
+  def make_cover_with_id(card_id, attachment_id)
     client.put("/cards/#{card_id}/idAttachmentCover?value=#{attachment_id}")
   end
 
   def attachment_id_by_name(card_id, image_name)
     json = JSON.parse(client.get("/cards/#{card_id}/attachments?fields=name"))
-    attachment = json.find{ |e| e["name"] == image_name }
-    if attachment
-      attachment["id"]
-    else
-      nil
-    end
+    attachment = json.find{ |e| e['name'] == image_name }
+    attachment['id'] if attachment
   end
 
   def get_description(card_id)
@@ -79,7 +79,7 @@ class TrelloWrapper < TrelloService
   end
 
   def get_board(board_id)
-    raise TrolloloError.new("Board id cannot be blank") if board_id.blank?
+    raise TrolloloError, 'Board id cannot be blank' if board_id.blank?
 
     client.get("/boards/#{board_id}?lists=open&cards=open&card_checklists=all")
   end

data/lib/version.rb

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

data/spec/data/card.json

@@ -49,6 +49,25 @@
   "idChecklists": [
     "5319c04d592a9182153db831"
   ],
+  "checklists": [
+    { "id": "5319c052d86da6cb6fa2a9e0",
+      "name": "Tasks",
+      "checkItems": [
+        { "name": "Task 1", "state": "complete"},
+        { "name": "Task 2", "state": "incomplete"},
+        { "name": "Task 3", "state": "incomplete"}
+      ]
+    },
+    {
+      "id": "5319c0562fef3bc511c79279",
+      "name": "Definition of done",
+      "checkItems": [
+        { "name": "DoD 1", "state": "complete"},
+        { "name": "DoD 2", "state": "complete"},
+        { "name": "DoD 3", "state": "inmplete"}
+      ]
+    }
+  ],
   "idMembers": [
 
   ],

data/spec/data/trollolorc

@@ -5,6 +5,9 @@ not_done_columns:
   - Doing
   - In review
   - Sprint Backlog
+no_task_checklists:
+  - Definition of done
+  - Feedback
 scrum:
   board_names:
     planning: Planning Board

data/spec/integration/command_line_spec.rb

@@ -15,36 +15,36 @@ def credentials_input_wrapper
   File.expand_path('../wrapper/credentials_input_wrapper', __FILE__)
 end
 
-describe "command line" do
+describe 'command line' do
 
-  it "processes help option" do
-    result = run_command(args: ["-h"])
+  it 'processes help option' do
+    result = run_command(args: ['-h'])
     expect(result).to exit_with_success(/Commands:/)
-    expect(result.stdout).to match("trollolo help")
-    expect(result.stdout).to match("Options:")
+    expect(result.stdout).to match('trollolo help')
+    expect(result.stdout).to match('Options:')
   end
 
-  it "throws error on invalid command" do
-    result = run_command(cmd: trollolo_cmd, args: ["invalid_command"])
+  it 'throws error on invalid command' do
+    result = run_command(cmd: trollolo_cmd, args: ['invalid_command'])
     expect(result).to exit_with_error(1, "Could not find command \"invalid_command\".\n")
   end
 
-  it "asks for authorization data" do
-    expect(run_command(cmd: credentials_input_wrapper, args: ["get-cards", "--board-id=myboardid"])).to exit_with_success("")
+  it 'asks for authorization data' do
+    expect(run_command(cmd: credentials_input_wrapper, args: ['get-cards', '--board-id=myboardid'])).to exit_with_success('')
   end
 
-  describe "burndown chart" do
+  describe 'burndown chart' do
     use_given_filesystem
 
-    it "inits burndown directory" do
+    it 'inits burndown directory' do
       path = given_directory
-      result = run_command(cmd: trollolo_cmd, args: ["burndown-init", "-o", "#{path}", "--board-id=myboardid"])
+      result = run_command(cmd: trollolo_cmd, args: ['burndown-init', '-o', path.to_s, '--board-id=myboardid'])
       expect(result).to exit_with_success(/Preparing/)
     end
 
-    it "fails, if burndown data is not found" do
+    it 'fails, if burndown data is not found' do
       path = given_directory
-      result = run_command(cmd: trollolo_cmd, args: ["burndown", "-o", "#{path}"])
+      result = run_command(cmd: trollolo_cmd, args: ['burndown', '-o', path.to_s])
       expect(result).to exit_with_error(1, /burndown-data-01.yaml' not found/)
     end
   end