trollolo 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c81c5e55feaec3e0be0ae73576597ab84a310037
-  data.tar.gz: 502a1150ba391df1bba717877667265cb986cfde
+  metadata.gz: 3d1e86a9dd1be0ff123b37a05416e21318de22f9
+  data.tar.gz: caaeb7842dd40a818ff85e567dc2a6871c420657
 SHA512:
-  metadata.gz: e8e73f18474d9cbcd72db9da626c031e29871a363c9d2d81d8be643662e1c402644ecb8471bde6a663d74d149b2db24a37d6dd010e9ad502f246cdaaa7d12d4f
-  data.tar.gz: d8c6391a08fe5580948940acfa577df331684985219fdb02deec3cd45e2643b32f92a6b599b75720c6ce1f0ab62d7cdd7023baf5dcd154a343728aafca8aa290
+  metadata.gz: '008b5b1b137be95287ca54d235a6ee4cb3a1a95dd3dfbb37eb47168a482155ca48a20a3ebf72cbe918ea15ac9140f14372f318fcf89bab53de15c35d2aabc9aa'
+  data.tar.gz: d513f80bf8f48e1c0de5059c2889d6acaa64cf474d703cab004abdc3b61662ab6a7f77d702907c3da189a6416c706b5d537e8edb7095fba2b0fe9f016fd71929

data/.rubocop.yml

@@ -1 +1,9 @@
-inherit_from: .rubocop_todo.yml  
+inherit_from: .rubocop_todo.yml
+
+#################### Metrics ###############################
+
+Metrics/AbcSize:
+  Enabled: false
+  
+Metrics/PerceivedComplexity:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-09-10 17:36:28 +0200 using RuboCop version 0.49.1.
+# on 2017-09-12 15:08:33 +0200 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -84,13 +84,12 @@ Layout/EmptyLinesAroundModuleBody:
   Exclude:
     - 'lib/version.rb'
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
   Exclude:
     - 'lib/scrum/backlog_mover.rb'
-    - 'lib/scrum/priority_name.rb'
     - 'spec/unit/scrum/prioritizer_spec.rb'
 
 # Offense count: 2
@@ -162,30 +161,6 @@ Layout/MultilineOperationIndentation:
     - 'lib/backup.rb'
     - 'lib/card.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/SpaceAfterNot:
-  Exclude:
-    - 'lib/cli.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: space, no_space
-Layout/SpaceAroundEqualsInParameterDefault:
-  Exclude:
-    - 'lib/cli.rb'
-
-# Offense count: 30
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/scrum/priority_name.rb'
-    - 'spec/unit/burndown_chart_spec.rb'
-    - 'spec/unit/cli_spec.rb'
-    - 'spec/unit/settings_spec.rb'
-    - 'spec/unit/trello_wrapper_spec.rb'
 
 # Offense count: 23
 # Cop supports --auto-correct.
@@ -266,13 +241,6 @@ Lint/AmbiguousRegexpLiteral:
     - 'spec/unit/cli_spec.rb'
     - 'spec/unit/scrum/sprint_cleaner_spec.rb'
 
-# Offense count: 2
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'lib/scrum/priority_name.rb'
-    - 'spec/unit/support/vcr.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Lint/DeprecatedClassMethods:
@@ -303,10 +271,6 @@ Lint/UselessAssignment:
   Exclude:
     - 'spec/unit/support/webmocks.rb'
 
-# Offense count: 16
-Metrics/AbcSize:
-  Max: 50
-
 # Offense count: 41
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
@@ -325,17 +289,13 @@ Metrics/CyclomaticComplexity:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 210
+  Max: 220
 
 # Offense count: 18
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 35
 
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 10
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Security/YAMLLoad:
@@ -348,14 +308,6 @@ Style/AccessorMethodName:
     - 'lib/burndown_data.rb'
     - 'lib/cli.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: always, conditionals
-Style/AndOr:
-  Exclude:
-    - 'spec/unit/support/update_webmock_data'
-
 # Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Trollolo Changelog
 
+## Master (unreleased)
+
+
+## Version 0.0.12
+
+* Find and remove 'Unplanned' labels on `cleanup-sprint`. Fixes #72.
+* Fix `trollolo burndown-init` and `trollolo backup`.
+* Remove Ruby 2.1 support. Closes #96.
+
 ## Version 0.0.11
 
 * Add in `trollolo burndown --new-sprint` command the `total_days` and

data/CONTRIBUTING.md

@@ -12,6 +12,8 @@ To contribute code please open pull requests.
 
 Ensure that rspec and rubocop pass locally before sending your PR and always that you add new changes.
 
+If your changes include important new features or bug fixes please add them to the [Master (unreleased) section fo the CHANGELOG.md](https://github.com/openSUSE/trollolo/blob/master/CHANGELOG.md#master-unreleased)
+
 ## To run rspec test
 
 To run all the rspec test:

data/lib/backup.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 class Backup
 
   attr_accessor :directory

data/lib/burndown_chart.rb

@@ -14,6 +14,8 @@
 #
 #  To contact SUSE about this file by physical or electronic mail,
 #  you may find current contact information at www.suse.com
+require 'fileutils'
+
 class BurndownChart
 
   attr_accessor :data

data/lib/cli.rb

@@ -144,7 +144,7 @@ EOT
         destdir = name
       end
       chart = BurndownChart.new @@settings
-      if ! File.directory?(destdir)
+      if !File.directory?(destdir)
         chart.setup(destdir, board["boardid"])
       end
       chart.update({'output' => destdir, plot: options[:plot]})
@@ -154,7 +154,7 @@ EOT
   desc "burndown-init", "Initialize burndown chart"
   option :output, :aliases => :o, :desc => "Output directory", :required => true
   option "board-id", :desc => "Id of Trello board", :required => true
-  def burndown_init command=nil
+  def burndown_init command = nil
     process_global_options options
     require_trello_credentials
 

data/lib/scrum/priority_name.rb

@@ -1,9 +1,9 @@
 module Scrum
   class PriorityName
-    PRIORITY_REGEX      = /^(?:\([\d.]+\) )?P(\d+): /
+    PRIORITY_REGEX = /^(?:\([\d.]+\) )?P(\d+): /
 
     def self.priority(name)
-      return unless m = name.match(PRIORITY_REGEX)
+      return unless (m = name.match(PRIORITY_REGEX))
       m.captures.first.to_i
     end
 

data/lib/scrum/sprint_board.rb

@@ -46,6 +46,12 @@ module Scrum
       end
     end
 
+    def find_unplanned_label(labels)
+      labels.find do |label|
+        label.name =~ /unplanned/i
+      end
+    end
+
     private
 
     def under_waterline_label

data/lib/scrum/sprint_cleaner.rb

@@ -28,12 +28,22 @@ module Scrum
       card.remove_label(label) if label
     end
 
+    def unplanned_label(card)
+      @board.find_unplanned_label(card.labels)
+    end
+
+    def remove_unplanned_label(card)
+      label = unplanned_label(card)
+      card.remove_label(label) if label
+    end
+
     def move_cards(source_list)
       source_list.cards.each do |card|
         next if @board.sticky?(card)
         puts %(moving card "#{card.name}" to list "#{target_list.name}")
         card.members.each { |member| card.remove_member(member) }
         remove_waterline_label(card)
+        remove_unplanned_label(card)
         card.move_to_board(@target_board, target_list)
       end
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Trollolo
 
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 
 end

data/scripts/burndowndata.py

@@ -155,6 +155,9 @@ class BurndownData:
     return
 
   def setScaleFactor(self, total_tasks, total_story_points):
-    self.scalefactor = float(total_tasks) / float(total_story_points)
+    if total_story_points <= 0.001:
+      self.scalefactor = 1
+    else:
+      self.scalefactor = float(total_tasks) / float(total_story_points)
     return
 

data/spec/unit/burndown_chart_spec.rb

@@ -383,15 +383,15 @@ EOT
               { "date" => "2015-08-28",
                 "updated_at" => "2015-08-28T11:04:52+02:00",
                 "story_points" =>
-                  { "total"=>24.0,
-                    "open"=>24.0
+                  { "total" => 24.0,
+                    "open" => 24.0
                   },
                 "tasks" =>
                   { "total" => 43,
                     "open" => 28
                   },
                 "story_points_extra" =>
-                  { "done"=>2.0
+                  { "done" => 2.0
                   },
                 "tasks_extra" =>
                   { "done" => 5

data/spec/unit/cli_spec.rb

@@ -134,9 +134,9 @@ EOT
       :get, "https://api.trello.com/1/cards/54ae8485221b1cc5b173e713?key=mykey&token=mytoken"
     ).with(
       :headers => {
-        'Accept'=>'*/*; q=0.5, application/xml',
-        'Accept-Encoding'=>'gzip, deflate',
-        'User-Agent'=>'Ruby'
+        'Accept' => '*/*; q=0.5, application/xml',
+        'Accept-Encoding' => 'gzip, deflate',
+        'User-Agent' => 'Ruby'
       }
     ).to_return(:status => 200, :body => body, :headers => {})
     @cli.options = {"card-id" => "54ae8485221b1cc5b173e713"}
@@ -152,11 +152,11 @@ EOT
       :put, "https://api.trello.com/1/cards/54ae8485221b1cc5b173e713/desc?key=mykey&token=mytoken&value=My%20description"
     ).with(
       :headers => {
-        'Accept'=>'*/*; q=0.5, application/xml',
-        'Accept-Encoding'=>'gzip, deflate',
-        'Content-Length'=>'0',
-        'Content-Type'=>'application/x-www-form-urlencoded',
-        'User-Agent'=>'Ruby'
+        'Accept' => '*/*; q=0.5, application/xml',
+        'Accept-Encoding' => 'gzip, deflate',
+        'Content-Length' => '0',
+        'Content-Type' => 'application/x-www-form-urlencoded',
+        'User-Agent' => 'Ruby'
       }
     ).to_return(:status => 200, :body => "", :headers => {})
     @cli.options = {"card-id" => "54ae8485221b1cc5b173e713"}

data/spec/unit/settings_spec.rb

@@ -24,7 +24,7 @@ describe Settings do
           @settings = Settings.new( File.expand_path('../../data/trollolorc_with_board_aliases', __FILE__) )
         end
         it "returns default settings" do
-          expect(@settings.scrum["board_names"]).to eq({"planning"=>"Planning Board", "sprint"=>"Sprint Board"})
+          expect(@settings.scrum["board_names"]).to eq({"planning" => "Planning Board", "sprint" => "Sprint Board"})
         end
       end
 

data/spec/unit/support/update_webmock_data

@@ -11,7 +11,7 @@ STDERR.puts "Updating web mock data"
 
 def scrub_file(file)
   json = JSON.parse(File.read(file))
-  if json.is_a?(Hash) and json.has_key?("cards")
+  if json.is_a?(Hash) && json.has_key?("cards")
     json["cards"].each do |card|
       if card.has_key?("email")
         card["email"] = "trello@example.com"

data/spec/unit/support/vcr.rb

@@ -39,7 +39,7 @@ end
 
 RSpec.configure do |c|
   c.around do |example|
-    if cassette = example.metadata[:vcr]
+    if (cassette = example.metadata[:vcr])
       fail "you need to use real_settings to re-record vcr data" if real_settings_needed?(example)
       VCR.use_cassette(cassette, record: vcr_record_mode(example)) do
         example.run

data/spec/unit/trello_wrapper_spec.rb

@@ -81,11 +81,11 @@ describe TrelloWrapper do
 EOT
 
       stub_request(:get, "https://api.trello.com/1/cards/123?key=mykey&token=mytoken").
-        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+        with(:headers => {'Accept' => '*/*; q=0.5, application/xml', 'Accept-Encoding' => 'gzip, deflate', 'User-Agent' => 'Ruby'}).
           to_return(:status => 200, :body => card_body, :headers => {})
 
       stub_request(:post, "https://api.trello.com/1/cards/123/attachments?key=mykey&token=mytoken").
-          with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'188', 'Content-Type'=>'multipart/form-data; boundary=470924', 'User-Agent'=>'Ruby'}).
+          with(:headers => {'Accept' => '*/*; q=0.5, application/xml', 'Accept-Encoding' => 'gzip, deflate', 'Content-Length' => '188', 'Content-Type' => 'multipart/form-data; boundary=470924', 'User-Agent' => 'Ruby'}).
             to_return(:status => 200, :body => "", :headers => {})
 
       path = given_file("attachment-data")
@@ -115,10 +115,10 @@ EOF
 
     before(:each) do
       stub_request(:get, "https://api.trello.com/1/cards/#{card_id}/attachments?fields=name&key=mykey&token=mytoken").
-        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+        with(:headers => {'Accept' => '*/*; q=0.5, application/xml', 'Accept-Encoding' => 'gzip, deflate', 'User-Agent' => 'Ruby'}).
           to_return(:status => 200, :body => card_attachments_body, :headers => {})
       stub_request(:put, "https://api.trello.com/1/cards/#{card_id}/idAttachmentCover?key=mykey&token=mytoken&value=#{image_id}").
-                 with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'0', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'})
+                 with(:headers => {'Accept' => '*/*; q=0.5, application/xml', 'Accept-Encoding' => 'gzip, deflate', 'Content-Length' => '0', 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => 'Ruby'})
     end
 
     it "make the attachment with the file name passed.jpg the cover" do

data/trollolo.gemspec

@@ -12,13 +12,12 @@ Gem::Specification.new do |s|
   s.summary     = 'Trello command line client'
   s.description = 'Trollolo is a command line tool to access Trello and support tasks like generation of burndown charts.'
 
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.2'
   s.required_rubygems_version = '>= 1.3.6'
   s.rubyforge_project         = 'trollolo'
 
   s.add_dependency 'thor', '~> 0.19'
   s.add_dependency 'ruby-trello', '~> 1.5.0'
-  s.add_dependency 'activesupport', '~> 4'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trollolo
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Cornelius Schumacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
 description: Trollolo is a command line tool to access Trello and support tasks like
   generation of burndown charts.
 email:
@@ -193,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="