checkoff 0.3.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b60fa3a74c9081153ae5c0f489da64684033ae6f675129d07aaf401dcc43170
-  data.tar.gz: a382e7ad7163e6465e561eb427f2ddc5c73c5039de45028d306aec082212995a
+  metadata.gz: 7c4947b2573662cc82bf0fd8652c9efc13169326fb70952e3794aecd3a071a1c
+  data.tar.gz: 97d4f7ec0a0781a62750462fc0a7428980f06a6d084c029b832897f854fd3d32
 SHA512:
-  metadata.gz: a3599189037cb4bc794f1acb098e927b8556d88bde21c49591e6e79b6cd203c74befad345c883a4c28e07edc73ca467601099a93f99b8b8abf4f28150df4aed6
-  data.tar.gz: 747a97c032b4e40ead6c6e2d76ec6e571b0b37e2ec7e66cf7ed706d95061ef90e0c2666f3d974199801b98c4f5083d772e76ddacd0460d549c326dcbb036b791
+  metadata.gz: 02e3a309b680887411309fa3f33d8f14a325889f1bfbf5c18790cec9ab20aa80a0e71ab38fdcfa7eefe523474dd2a56bf0443b3523fc0cb0bd90719dd380fcf9
+  data.tar.gz: 22f2339cda88ee9ee63d6009e945d29bf2a7d9b552b0eae3d2a39892bc1f85e3ce373afd341fde97d24719ad89fbf804250fd4450761a4920ab00bc0e17b465d

data/.rubocop.yml

@@ -67,9 +67,134 @@ Style/StringLiterals:
       - double_quotes
     ConsistentQuotesInMultiline: true
 
-AllCops:
-  TargetRubyVersion: 2.4
+Layout/BeginEndAlignment: # (new in 0.91)
+  Enabled: true
+Layout/EmptyLinesAroundAttributeAccessor: # (new in 0.83)
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator: # (new in 0.82)
+  Enabled: true
+Lint/BinaryOperatorWithIdenticalOperands: # (new in 0.89)
+  Enabled: true
+Lint/ConstantDefinitionInBlock: # (new in 0.91)
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant: # (new in 0.84)
+  Enabled: true
+Lint/DuplicateElsifCondition: # (new in 0.88)
+  Enabled: true
+Lint/DuplicateRequire: # (new in 0.90)
+  Enabled: true
+Lint/DuplicateRescueException: # (new in 0.89)
+  Enabled: true
+Lint/EmptyConditionalBody: # (new in 0.89)
+  Enabled: true
+Lint/EmptyFile: # (new in 0.90)
+  Enabled: true
+Lint/FloatComparison: # (new in 0.89)
+  Enabled: true
+Lint/IdentityComparison: # (new in 0.91)
+  Enabled: true
+Lint/MissingSuper: # (new in 0.89)
+  Enabled: true
+Lint/MixedRegexpCaptureTypes: # (new in 0.85)
+  Enabled: true
+Lint/OutOfRangeRegexpRef: # (new in 0.89)
+  Enabled: true
+Lint/RaiseException: # (new in 0.81)
+  Enabled: true
+Lint/SelfAssignment: # (new in 0.89)
+  Enabled: true
+Lint/StructNewOverride: # (new in 0.81)
+  Enabled: true
+Lint/TopLevelReturnWithArgument: # (new in 0.89)
+  Enabled: true
+Lint/TrailingCommaInAttributeDeclaration: # (new in 0.90)
+  Enabled: true
+Lint/UnreachableLoop: # (new in 0.89)
+  Enabled: true
+Lint/UselessMethodDefinition: # (new in 0.90)
+  Enabled: true
+Lint/UselessTimes: # (new in 0.91)
+  Enabled: true
+Style/AccessorGrouping: # (new in 0.87)
+  Enabled: true
+Style/BisectedAttrAccessor: # (new in 0.87)
+  Enabled: true
+Style/CaseLikeIf: # (new in 0.88)
+  Enabled: true
+Style/CombinableLoops: # (new in 0.90)
+  Enabled: true
+Style/ExplicitBlockArgument: # (new in 0.89)
+  Enabled: true
+Style/ExponentialNotation: # (new in 0.82)
+  Enabled: true
+Style/GlobalStdStream: # (new in 0.89)
+  Enabled: true
+Style/HashAsLastArrayItem: # (new in 0.88)
+  Enabled: true
+Style/HashEachMethods: # (new in 0.80)
+  Enabled: true
+Style/HashLikeCase: # (new in 0.88)
+  Enabled: true
+Style/HashTransformKeys: # (new in 0.80)
+  Enabled: true
+Style/HashTransformValues: # (new in 0.80)
+  Enabled: true
+Style/KeywordParametersOrder: # (new in 0.90)
+  Enabled: true
+Style/OptionalBooleanParameter: # (new in 0.89)
+  Enabled: true
+Style/RedundantAssignment: # (new in 0.87)
+  Enabled: true
+Style/RedundantFetchBlock: # (new in 0.86)
+  Enabled: true
+Style/RedundantFileExtensionInRequire: # (new in 0.88)
+  Enabled: true
+Style/RedundantRegexpCharacterClass: # (new in 0.85)
+  Enabled: true
+Style/RedundantRegexpEscape: # (new in 0.85)
+  Enabled: true
+Style/RedundantSelfAssignment: # (new in 0.90)
+  Enabled: true
+Style/SingleArgumentDig: # (new in 0.89)
+  Enabled: true
+Style/SlicingWithRange: # (new in 0.83)
+  Enabled: true
+Style/SoleNestedConditional: # (new in 0.89)
+  Enabled: true
+Style/StringConcatenation: # (new in 0.89)
+  Enabled: true
+Minitest/AssertInDelta: # (new in 0.10)
+  Enabled: true
+Minitest/AssertionInLifecycleHook: # (new in 0.10)
+  Enabled: true
+Minitest/AssertKindOf: # (new in 0.10)
+  Enabled: true
+Minitest/AssertOutput: # (new in 0.10)
+  Enabled: true
+Minitest/AssertPathExists: # (new in 0.10)
+  Enabled: true
+Minitest/AssertSilent: # (new in 0.10)
+  Enabled: true
+Minitest/LiteralAsActualArgument: # (new in 0.10)
+  Enabled: true
+Minitest/MultipleAssertions: # (new in 0.10)
+  Enabled: true
+Minitest/RefuteInDelta: # (new in 0.10)
+  Enabled: true
+Minitest/RefuteKindOf: # (new in 0.10)
+  Enabled: true
+Minitest/RefutePathExists: # (new in 0.10)
+  Enabled: true
+Minitest/TestMethodName: # (new in 0.10)
+  # This gives false positives when non-test methods exist...
+  Enabled: false
+Minitest/UnspecifiedException: # (new in 0.10)
+  Enabled: true
+RSpec/StubbedMock: # (new in 1.44)
+  Enabled: true
 
+AllCops:
+  TargetRubyVersion: 2.6
 
 require:
   - rubocop-rspec

data/checkoff.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |spec|
   spec.version       = Checkoff::VERSION
   spec.authors       = ['Vince Broz']
   spec.email         = ['vince@broz.cc']
-
   spec.summary       = 'Command-line and gem client for Asana (unofficial)'
   spec.homepage      = 'http://github.com/apiology/checkoff'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'exe'
@@ -23,14 +23,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'asana'
+  spec.add_runtime_dependency 'asana', '>0.10.0'
   spec.add_runtime_dependency 'cache_method'
   spec.add_runtime_dependency 'dalli'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest-profile'
   spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'quality', '~> 37'
+  spec.add_development_dependency 'quality', '~> 38'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '>=3.4'
   spec.add_development_dependency 'simplecov'

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 98.65
+    "covered_percent": 83.74
   }
 }

data/lib/checkoff.rb

@@ -4,4 +4,5 @@ require 'checkoff/version'
 require 'checkoff/workspaces'
 require 'checkoff/projects'
 require 'checkoff/sections'
+require 'checkoff/subtasks'
 require 'checkoff/tasks'

data/lib/checkoff/cli.rb

@@ -15,11 +15,13 @@ module Checkoff
   class CLI
     attr_reader :sections, :stderr
 
-    def initialize(workspaces: Checkoff::Workspaces.new,
-                   projects: Checkoff::Projects.new,
-                   sections: Checkoff::Sections.new(projects: projects),
-                   tasks: Checkoff::Tasks.new,
-                   stderr: STDERR,
+    def initialize(config: Checkoff::ConfigLoader.load(:asana),
+                   workspaces: Checkoff::Workspaces.new(config: config),
+                   projects: Checkoff::Projects.new(config: config),
+                   sections: Checkoff::Sections.new(config: config,
+                                                    projects: projects),
+                   tasks: Checkoff::Tasks.new(config: config),
+                   stderr: $stderr,
                    kernel: Kernel)
       @workspaces = workspaces
       @projects = projects
@@ -87,9 +89,10 @@ module Checkoff
     def parse_args(args)
       mode = args[0]
       subargs = OpenStruct.new
-      if mode == 'view'
+      case mode
+      when 'view'
         parse_view_args(subargs, args)
-      elsif mode == 'quickadd'
+      when 'quickadd'
         parse_quickadd_args(subargs, args)
       else
         raise
@@ -107,7 +110,7 @@ module Checkoff
     end
 
     def view(workspace_name, project_name, section_name)
-      project_name = project_name[1..-1].to_sym if project_name.start_with? ':'
+      project_name = project_name[1..].to_sym if project_name.start_with? ':'
       if section_name.nil?
         run_on_project(workspace_name, project_name)
       else
@@ -118,9 +121,10 @@ module Checkoff
     def run(args)
       validate_args!(args)
       command, subargs = parse_args(args)
-      if command == 'view'
+      case command
+      when 'view'
         view(subargs.workspace, subargs.project, subargs.section)
-      elsif command == 'quickadd'
+      when 'quickadd'
         quickadd(subargs.workspace, subargs.task_name)
       else
         raise

data/lib/checkoff/config_loader.rb

@@ -3,7 +3,6 @@
 require 'yaml'
 require 'active_support/core_ext/hash'
 
-# frozen_string_literal: true
 module Checkoff
   # Load configuration file
   class ConfigLoader

data/lib/checkoff/projects.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require_relative 'config_loader'
 
-# frozen_string_literal: true
 require 'cache_method'
 require 'asana'
 
@@ -25,7 +26,7 @@ module Checkoff
 
     def initialize(config: Checkoff::ConfigLoader.load(:asana),
                    asana_client: Asana::Client,
-                   workspaces: Checkoff::Workspaces.new)
+                   workspaces: Checkoff::Workspaces.new(config: config))
       @config = config
       @asana_client = asana_client
       @workspaces = workspaces
@@ -50,9 +51,7 @@ module Checkoff
     def my_tasks(workspace_name)
       my_tasks = @config[:my_tasks]
       gid = @config[:my_tasks][workspace_name] unless my_tasks.nil?
-      if my_tasks.nil? || gid.nil?
-        raise "Please define [:my_tasks][#{workspace_name}] in config file"
-      end
+      raise "Please define [:my_tasks][#{workspace_name}] in config file" if my_tasks.nil? || gid.nil?
 
       projects.find_by_id(gid)
     end
@@ -77,7 +76,8 @@ module Checkoff
       {
         per_page: 100,
         options: {
-          fields: %w[name completed_at due_at due_on assignee_status tags],
+          fields: %w[name completed_at due_at due_on assignee_status tags
+                     memberships.project.gid memberships.section.name],
         },
       }
     end
@@ -87,7 +87,7 @@ module Checkoff
       options[:completed_since] = '9999-12-01' if only_uncompleted
       options[:project] = project.gid
       options[:options][:fields] += extra_fields
-      client.tasks.find_all(options).to_a
+      client.tasks.find_all(**options).to_a
     end
     cache_method :tasks_from_project, SHORT_CACHE_TIME
   end

data/lib/checkoff/sections.rb

@@ -13,7 +13,8 @@ module Checkoff
 
     attr_reader :projects, :time
 
-    def initialize(projects: Checkoff::Projects.new,
+    def initialize(config: Checkoff::ConfigLoader.load(:asana),
+                   projects: Checkoff::Projects.new(config: config),
                    time: Time)
       @projects = projects
       @time = time
@@ -21,7 +22,32 @@ module Checkoff
 
     def_delegators :@projects, :client
 
-    def file_task_by_section(current_section, by_section, task)
+    def file_task_by_section(by_section, task, project_gid)
+      membership = task.memberships.find { |m| m.project.gid == project_gid }
+      raise "Could not find task in project_gid #{project_gid}: #{task}" if membership.nil?
+
+      current_section = membership.section.name
+      current_section = nil if current_section == '(no section)'
+      by_section[current_section] ||= []
+      by_section[current_section] << task
+    end
+
+    def by_section(tasks, project_gid)
+      by_section = {}
+      tasks.each do |task|
+        file_task_by_section(by_section, task, project_gid)
+      end
+      by_section
+    end
+    cache_method :by_section, LONG_CACHE_TIME
+
+    def tasks_by_section_for_project(project)
+      raw_tasks = projects.tasks_from_project(project)
+      active_tasks = projects.active_tasks(raw_tasks)
+      by_section(active_tasks, project.gid)
+    end
+
+    def legacy_file_task_by_section(current_section, by_section, task)
       if task.name =~ /:$/
         current_section = task.name
         by_section[current_section] = []
@@ -32,22 +58,15 @@ module Checkoff
       [current_section, by_section]
     end
 
-    def by_section(tasks)
+    def legacy_by_section(tasks)
       current_section = nil
       by_section = {}
       tasks.each do |task|
-        current_section, by_section = file_task_by_section(current_section,
-                                                           by_section, task)
+        current_section, by_section =
+          legacy_file_task_by_section(current_section, by_section, task)
       end
       by_section
     end
-    cache_method :by_section, LONG_CACHE_TIME
-
-    def tasks_by_section_for_project(project)
-      raw_tasks = projects.tasks_from_project(project)
-      active_tasks = projects.active_tasks(raw_tasks)
-      by_section(active_tasks)
-    end
 
     def tasks_by_section_for_project_and_assignee_status(project,
                                                          assignee_status)
@@ -56,7 +75,7 @@ module Checkoff
         projects.active_tasks(raw_tasks)
                 .group_by(&:assignee_status)
       active_tasks = by_assignee_status[assignee_status]
-      by_section(active_tasks)
+      legacy_by_section(active_tasks)
     end
 
     def project_or_raise(workspace_name, project_name)
@@ -70,11 +89,12 @@ module Checkoff
 
     def tasks_by_section(workspace_name, project_name)
       project = project_or_raise(workspace_name, project_name)
-      if project_name == :my_tasks_new
+      case project_name
+      when :my_tasks_new
         tasks_by_section_for_project_and_assignee_status(project, 'inbox')
-      elsif project_name == :my_tasks_today
+      when :my_tasks_today
         tasks_by_section_for_project_and_assignee_status(project, 'today')
-      elsif project_name == :my_tasks_upcoming
+      when :my_tasks_upcoming
         tasks_by_section_for_project_and_assignee_status(project, 'upcoming')
       else
         tasks_by_section_for_project(project)
@@ -100,12 +120,6 @@ module Checkoff
     end
     cache_method :section_task_names, SHORT_CACHE_TIME
 
-    # Returns all subtasks, including section headers
-    def raw_subtasks(task)
-      task.subtasks(projects.task_options)
-    end
-    cache_method :raw_subtasks, LONG_CACHE_TIME
-
     def task_due?(task)
       if task.due_at
         Time.parse(task.due_at) <= time.now

data/lib/checkoff/subtasks.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module Checkoff
+  # Query different subtasks of Asana tasks
+  class Subtasks
+    MINUTE = 60
+    LONG_CACHE_TIME = MINUTE * 15
+    SHORT_CACHE_TIME = MINUTE * 5
+
+    extend Forwardable
+
+    def file_task_by_section(current_section, by_section, task)
+      if task.name =~ /:$/
+        current_section = task.name
+        by_section[current_section] = []
+      else
+        by_section[current_section] ||= []
+        by_section[current_section] << task
+      end
+      [current_section, by_section]
+    end
+
+    def by_section(tasks)
+      current_section = nil
+      by_section = {}
+      tasks.each do |task|
+        current_section, by_section = file_task_by_section(current_section,
+                                                           by_section, task)
+      end
+      by_section
+    end
+
+    # Returns all subtasks, including section headers
+    def raw_subtasks(task)
+      task.subtasks(projects.task_options)
+    end
+    cache_method :raw_subtasks, LONG_CACHE_TIME
+  end
+end

data/lib/checkoff/tasks.rb

@@ -15,7 +15,7 @@ module Checkoff
     SHORT_CACHE_TIME = MINUTE * 5
 
     def initialize(config: Checkoff::ConfigLoader.load(:asana),
-                   sections: Checkoff::Sections.new,
+                   sections: Checkoff::Sections.new(config: config),
                    asana_task: Asana::Resources::Task)
       @config = config
       @sections = sections

data/lib/checkoff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Checkoff
-  VERSION = '0.3.2'
+  VERSION = '0.5.3'
 end

data/lib/tasks/quality.rake

@@ -3,7 +3,7 @@
 require 'quality/rake/task'
 
 Quality::Rake::Task.new do |task|
-  task.skip_tools = ['reek']
+  task.skip_tools = %w[reek cane eslint jscs pycodestyle rails_best_practices flake8]
   task.output_dir = 'metrics'
-  task.exclude_files = ['docs/example_project.png']
+  task.exclude_files = ['docs/example_project.png', '.rubocop.yml']
 end

data/metrics/bigfiles_high_water_mark

@@ -1 +1 @@
-457
+414

data/metrics/punchlist_high_water_mark

@@ -1 +1 @@
-10
+3

data/metrics/rubocop_high_water_mark

@@ -1 +1 @@
-2
+4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: asana
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: cache_method
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '37'
+        version: '38'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '37'
+        version: '38'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +194,7 @@ files:
 - lib/checkoff/config_loader.rb
 - lib/checkoff/projects.rb
 - lib/checkoff/sections.rb
+- lib/checkoff/subtasks.rb
 - lib/checkoff/tasks.rb
 - lib/checkoff/version.rb
 - lib/checkoff/workspaces.rb
@@ -234,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="