checkoff 0.11.1 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4eeb7148c4b835088d3fedc674bf3195b92c9889bfe935a745b50e0b7228c65
-  data.tar.gz: 2a48471aae38c5ed10bed024968bb51ccd772f1e1efe3acd70b7a4c92bbb59ae
+  metadata.gz: 8a996aad5215c1625924296ca8c851cb3293968c74e6bc3da78dce7996fa8041
+  data.tar.gz: 574da8911c1c542f6334ed2baa670dd69a3e09828ec6a76d3d3fe78b5c3e9d7a
 SHA512:
-  metadata.gz: cf4c95afee408b7937ea09c543c21e50b2855eba0393d9ac542e8d67f4eeb9c02c67b82cb23b7b00a81ca09f9678fafbe294baf947d3fcf1418ecd0208947298
-  data.tar.gz: 3ec3e6ef6b0a6c1583a96326cd0fa545b500f61e21ddc97624aeab31dadcd9125928d2bc78bbb8e7ec2827837d700ab651d5bb26a201ddf2a14acb862c246777
+  metadata.gz: 04d3b2b21b3409665f86035caf13ea1f6662c233f698c88df09cdfc7672abdc797945ba66dcc09076b79fc02e15523aab872b90ce116501cab4f23901427bd63
+  data.tar.gz: 8f34cc1b54f99aadae356a5be75871ccb8c2e0307c0d40bcc9c496f6b4103a7666e2daaff5db2dfdff3103939dd36cc3810692707f43263da64c94e3488c2842

data/.circleci/config.yml

@@ -37,7 +37,9 @@ commands:
           sed -E -e 's/checkoff \([[:digit:]]+.[[:digit:]]+.[[:digit:]]+\)/checkoff (0.1.0)/g' \
           Gemfile.lock > Gemfile.lock.deversioned
       - restore_cache:
-          key: gems-v4-{{ checksum "Gemfile.lock.deversioned" }}
+          key: gems-v1-{{ checksum "Gemfile.lock.deversioned" }}
+      - restore_cache:
+          key: wheels-v1-{{ checksum "requirements_dev.txt" }}
       - run:
           name: Initialize packages
           command: |
@@ -52,9 +54,13 @@ commands:
               exit 1
             fi
       - save_cache:
-          key: gems-v4-{{ checksum "Gemfile.lock.deversioned" }}
+          key: gems-v1-{{ checksum "Gemfile.lock.deversioned" }}
           paths:
             - "vendor/bundle"
+      - save_cache:
+          key: wheels-v1-{{ checksum "requirements_dev.txt" }}
+          paths:
+            - "/home/circleci/.cache/pip/wheels"
       - run:
           name: Download new circleci tool
           command: |
@@ -78,7 +84,7 @@ commands:
 jobs:
   overcommit:
     docker:
-      - image: apiology/circleci:latest
+      - image: apiology/circleci-ruby:latest
     steps:
       - when:
           condition:
@@ -93,7 +99,7 @@ jobs:
   build:
     working_directory: ~/checkoff
     docker:
-      - image: apiology/circleci:latest
+      - image: apiology/circleci-ruby:latest
     steps:
       - set_up_environment
       - run_with_languages:
@@ -117,6 +123,7 @@ workflows:
                 - main
     jobs:
       - build
+      - overcommit
   overcommit:
     jobs:
       - overcommit

data/DEVELOPMENT.md

@@ -21,8 +21,10 @@ development.  See the `.envrc` file for detail.
 To publish new version as a maintainer:
 
 ```sh
+git checkout main && git pull
 git log "v$(bump current)..."
 # Set type_of_bump to patch, minor, or major
 bump --tag --tag-prefix=v ${type_of_bump:?}
 rake release
+git push
 ```

data/Gemfile

@@ -4,3 +4,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in checkoff.gemspec
 gemspec
+
+# ruby-asana gem is pending key bugfixes for checkoff as of
+# 2021-07-29:
+#
+# See
+#  https://github.com/Asana/ruby-asana/issues/109
+#  https://github.com/Asana/ruby-asana/issues/110
+#
+gem 'asana',
+    git: 'https://github.com/apiology/ruby-asana',
+    branch: 'checkoff_fixes'
+
+# gem 'asana', path: '/Users/broz/src/ruby-asana'

data/Gemfile.lock

@@ -1,7 +1,18 @@
+GIT
+  remote: https://github.com/apiology/ruby-asana
+  revision: 83732f040728a4ef1cfc9ed61f65878dbee6aa23
+  branch: checkoff_fixes
+  specs:
+    asana (0.10.4)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
+      faraday_middleware-multi_json (~> 0.0)
+      oauth2 (~> 1.4)
+
 PATH
   remote: .
   specs:
-    checkoff (0.11.1)
+    checkoff (0.13.1)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -11,51 +22,52 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    asana (0.10.3)
-      faraday (~> 1.0)
-      faraday_middleware (~> 1.0)
-      faraday_middleware-multi_json (~> 0.0)
-      oauth2 (~> 1.4)
     ast (2.4.2)
     bump (0.10.0)
     cache (0.4.1)
     cache_method (0.2.7)
       cache (>= 0.2.1)
     childprocess (4.0.0)
+    coderay (1.1.3)
     concurrent-ruby (1.1.9)
     dalli (2.7.11)
     docile (1.4.0)
-    faraday (1.4.2)
+    faraday (1.5.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
-    gli (2.20.0)
+    gli (2.20.1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     imagen (0.1.8)
       parser (>= 2.5, != 2.5.1.1)
     iniparse (1.5.0)
     jwt (2.2.3)
+    method_source (1.0.0)
     minitest (5.14.4)
     minitest-profile (0.0.2)
     mocha (1.12.0)
@@ -75,6 +87,9 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.3)
@@ -96,7 +111,7 @@ GEM
     rubocop-rake (0.5.1)
       rubocop
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     rugged (1.1.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -121,19 +136,21 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  asana!
   bump
   bundler
   checkoff!
   minitest-profile
   mocha
   overcommit (>= 0.58.0)
+  pry
   rake (~> 13.0)
   rubocop
   rubocop-minitest
   rubocop-rake
-  simplecov
+  simplecov (>= 0.18.0)
   simplecov-lcov
   undercover
 
 BUNDLED WITH
-   2.2.19
+   2.2.24

data/README.md

@@ -1,7 +1,4 @@
-Command-line and gem client for Asana (unofficial)
-
-[![Circle CI](https://circleci.com/gh/apiology/checkoff.svg?style=svg)](https://circleci.com/gh/apiology/checkoff)
-[![Travis CI](https://travis-ci.org/apiology/checkoff.svg?branch=main)](https://travis-ci.org/apiology/checkoff)
+[![CircleCI](https://circleci.com/gh/apiology/checkoff.svg?style=svg)](https://circleci.com/gh/apiology/checkoff)
 
 Command-line and gem client for Asana (unofficial)
 
@@ -12,7 +9,7 @@ $ checkoff --help
 View tasks:
   checkoff view workspace project [section]
 
-'project' can be set to a project name, or :my_tasks, :my_tasks_upcoming, :my_tasks_new, or :my_tasks_today
+'project' can be set to a project name, or :my_tasks for your user task list.
 ```
 
 Let's say we have a project like this:

data/checkoff.gemspec

@@ -15,8 +15,10 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT license'
   spec.required_ruby_version = '>= 2.6'
 
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -36,11 +38,13 @@ Gem::Specification.new do |spec|
   # magit doesn't seem to want to use the bundled version at the moment,
   # so let's favor the more recent version...
   spec.add_development_dependency 'overcommit', ['>=0.58.0']
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-minitest'
   spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'simplecov'
+  # ensure version with branch coverage
+  spec.add_development_dependency 'simplecov', ['>=0.18.0']
   spec.add_development_dependency 'simplecov-lcov'
   spec.add_development_dependency 'undercover'
 end

data/coverage/.last_run.json

@@ -1,6 +1,6 @@
 {
   "result": {
-    "line": 94.61,
-    "branch": 71.42
+    "line": 98.69,
+    "branch": 91.66
   }
 }

data/fix.sh

@@ -95,7 +95,7 @@ ensure_ruby_build_requirements() {
 # been release here: https://www.ruby-lang.org/en/downloads/
 ensure_ruby_versions() {
   # You can find out which feature versions are still supported / have
-  # been release here: https://www.python.org/downloads/
+  # been release here: https://www.ruby-lang.org/en/downloads/
   ruby_versions="$(latest_ruby_version 2.6)"
 
   echo "Latest Ruby versions: ${ruby_versions}"
@@ -227,6 +227,8 @@ ensure_python_build_requirements() {
   ensure_dev_library openssl/ssl.h openssl libssl-dev
   ensure_dev_library ffi.h libffi libffi-dev
   ensure_dev_library sqlite3.h sqlite3 libsqlite3-dev
+  ensure_dev_library lzma.h xz liblzma-dev
+  ensure_dev_library readline.h readline libreadline-dev
 }
 
 # You can find out which feature versions are still supported / have
@@ -234,7 +236,7 @@ ensure_python_build_requirements() {
 ensure_python_versions() {
   # You can find out which feature versions are still supported / have
   # been release here: https://www.python.org/downloads/
-  python_versions="$(latest_python_version 3.9)"
+  python_versions="$(latest_python_version 3.10)"
 
   echo "Latest Python versions: ${python_versions}"
 
@@ -271,7 +273,7 @@ ensure_pyenv_virtualenvs() {
   pyenv local "${virtualenv_name}" ${python_versions} mylibs
 }
 
-ensure_pip() {
+ensure_pip_and_wheel() {
   # Make sure we have a pip with the 20.3 resolver, and after the
   # initial bugfix release
   major_pip_version=$(pip --version | cut -d' ' -f2 | cut -d '.' -f 1)
@@ -279,6 +281,8 @@ ensure_pip() {
   then
     pip install 'pip>=20.3.1'
   fi
+  # wheel is helpful for being able to cache long package builds
+  pip show wheel >/dev/null 2>&1 || pip install wheel
 }
 
 ensure_python_requirements() {
@@ -325,7 +329,7 @@ ensure_python_versions
 
 ensure_pyenv_virtualenvs
 
-ensure_pip
+ensure_pip_and_wheel
 
 ensure_python_requirements
 

data/lib/checkoff/cli.rb

@@ -12,6 +12,112 @@ require_relative 'tasks'
 require_relative 'sections'
 
 module Checkoff
+  # Move tasks from one place to another
+  class MvSubcommand
+    def validate_and_assign_from_location(from_workspace_arg, from_project_arg, from_section_arg)
+      if from_workspace_arg == :default_workspace
+        # Figure out what to do here - we accept a default
+        # workspace gid and default workspace_gid arguments elsewhere.
+        # however, there are undefaulted workspace_name arguments as
+        # well...
+        raise NotImplementedError, 'Not implemented: Teach me how to look up default workspace name'
+      end
+
+      @from_workspace_name = from_workspace_arg
+      @from_project_name = project_arg_to_name(from_project_arg)
+      @from_section_name = from_section_arg
+    end
+
+    def create_to_project_name(to_project_arg)
+      if to_project_arg == :source_project
+        from_project_name
+      else
+        project_arg_to_name(to_project_arg)
+      end
+    end
+
+    def create_to_section_name(to_section_arg)
+      if to_section_arg == :source_section
+        from_section_name
+      else
+        to_section_arg
+      end
+    end
+
+    def validate_and_assign_to_location(to_workspace_arg, to_project_arg, to_section_arg)
+      @to_workspace_name = to_workspace_arg
+      @to_workspace_name = from_workspace_name if to_workspace_arg == :source_workspace
+      @to_project_name = create_to_project_name(to_project_arg)
+      @to_section_name = create_to_section_name(to_section_arg)
+
+      return unless from_workspace_name != to_workspace_name
+
+      raise NotImplementedError, 'Not implemented: Teach me how to move tasks between workspaces'
+    end
+
+    def initialize(from_workspace_arg:,
+                   from_project_arg:,
+                   from_section_arg:,
+                   to_workspace_arg:,
+                   to_project_arg:,
+                   to_section_arg:,
+                   config: Checkoff::ConfigLoader.load(:asana),
+                   projects: Checkoff::Projects.new(config: config),
+                   sections: Checkoff::Sections.new(config: config),
+                   logger: $stderr)
+      validate_and_assign_from_location(from_workspace_arg, from_project_arg, from_section_arg)
+      validate_and_assign_to_location(to_workspace_arg, to_project_arg, to_section_arg)
+
+      @projects = projects
+      @sections = sections
+      @logger = logger
+    end
+
+    def move_tasks(tasks, to_project, to_section)
+      tasks.each do |task|
+        # a. check if already in correct project and section (TODO)
+        # b. if not, put it there
+        @logger.puts "Moving #{task.name} to #{to_section.name}..."
+        task.add_project(project: to_project.gid, section: to_section.gid)
+      end
+    end
+
+    def fetch_tasks(from_workspace_name, from_project_name, from_section_name)
+      if from_section_name == :all_sections
+        raise NotImplementedError, 'Not implemented: Teach me how to move all sections of a project'
+      end
+
+      sections.tasks(from_workspace_name, from_project_name, from_section_name)
+    end
+
+    def run
+      # 0. Look up project and section gids
+      to_project = projects.project_or_raise(to_workspace_name, to_project_name)
+      to_section = sections.section_or_raise(to_workspace_name, to_project_name, to_section_name)
+
+      # 1. Get list of tasks which match
+      tasks = fetch_tasks(from_workspace_name, from_project_name, from_section_name)
+      # 2. for each task,
+      move_tasks(tasks, to_project, to_section)
+      # 3. tell the user we're done'
+      @logger.puts 'Done moving tasks'
+    end
+
+    private
+
+    attr_reader :from_workspace_name, :from_project_name, :from_section_name,
+                :to_workspace_name, :to_project_name, :to_section_name,
+                :projects, :sections
+
+    def project_arg_to_name(project_arg)
+      if project_arg.start_with? ':'
+        project_arg[1..].to_sym
+      else
+        project_arg
+      end
+    end
+  end
+
   # CLI subcommand that shows tasks in JSON form
   class ViewSubcommand
     def initialize(workspace_name, project_name, section_name,
@@ -151,5 +257,50 @@ module Checkoff
         puts ViewSubcommand.new(workspace_name, project_name, section_name, task_name).run
       end
     end
+
+    desc 'Move tasks from one section to another within a project'
+
+    # rubocop:disable Metrics/BlockLength
+    command :mv do |c|
+      c.flag :from_workspace,
+             type: String,
+             default_value: :default_workspace,
+             desc: 'Workspace to move tasks from'
+      c.flag :from_project,
+             type: String,
+             required: true,
+             desc: 'Project to move tasks from'
+      c.flag :from_section,
+             type: String,
+             default_value: :all_sections,
+             desc: 'Section to move tasks from'
+      c.flag :to_workspace,
+             type: String,
+             default_value: :source_workspace,
+             desc: 'Workspace to move tasks to'
+      c.flag :to_project,
+             type: String,
+             default_value: :source_project,
+             desc: 'Section to move tasks to'
+      c.flag :to_section,
+             type: String,
+             default_value: :source_section,
+             desc: 'Section to move tasks to'
+      c.action do |_global_options, options, _args|
+        from_workspace = options.fetch('from_workspace')
+        from_project = options.fetch('from_project')
+        from_section = options.fetch('from_section')
+        to_workspace = options.fetch('to_workspace')
+        to_project = options.fetch('to_project')
+        to_section = options.fetch('to_section')
+        MvSubcommand.new(from_workspace_arg: from_workspace,
+                         from_project_arg: from_project,
+                         from_section_arg: from_section,
+                         to_workspace_arg: to_workspace,
+                         to_project_arg: to_project,
+                         to_section_arg: to_section).run
+      end
+    end
+    # rubocop:enable Metrics/BlockLength
   end
 end

data/lib/checkoff/projects.rb

@@ -35,6 +35,17 @@ module Checkoff
       @workspaces.client
     end
 
+    # Default options used in Asana API to pull taskso
+    def task_options
+      {
+        per_page: 100,
+        options: {
+          fields: %w[name completed_at due_at due_on tags
+                     memberships.project.gid memberships.section.name dependencies],
+        },
+      }
+    end
+
     # pulls an Asana API project class given a name
     def project(workspace_name, project_name)
       if project_name.is_a?(Symbol) && project_name.to_s.start_with?('my_tasks')
@@ -48,6 +59,14 @@ module Checkoff
     end
     cache_method :project, LONG_CACHE_TIME
 
+    def project_or_raise(workspace_name, project_name)
+      project = project(workspace_name, project_name)
+      raise "Could not find project #{project_name} under workspace #{workspace_name}." if project.nil?
+
+      project
+    end
+    cache_method :project_or_raise, LONG_CACHE_TIME
+
     # find uncompleted tasks in a list
     def active_tasks(tasks)
       tasks.select { |task| task.completed_at.nil? }
@@ -84,15 +103,6 @@ module Checkoff
       gid = result.gid
       projects.find_by_id(gid)
     end
-
-    def task_options
-      {
-        per_page: 100,
-        options: {
-          fields: %w[name completed_at due_at due_on assignee_status tags
-                     memberships.project.gid memberships.section.name dependencies],
-        },
-      }
-    end
+    cache_method :my_tasks, LONG_CACHE_TIME
   end
 end

data/lib/checkoff/sections.rb

@@ -4,7 +4,6 @@ require 'forwardable'
 
 module Checkoff
   # Query different sections of Asana projects
-  # rubocop:disable Metrics/ClassLength
   class Sections
     MINUTE = 60
     LONG_CACHE_TIME = MINUTE * 15
@@ -23,118 +22,84 @@ module Checkoff
       @time = time
     end
 
-    # Given a list of tasks, pull a Hash of tasks with section name -> task list
-    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
-
-    # Given a project object, pull all tasks, then provide a Hash of
-    # tasks with section name -> task list of the uncompleted tasks
-    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)
+    # Returns a list of Asana API section objects for a given project
+    def sections_or_raise(workspace_name, project_name)
+      project = project_or_raise(workspace_name, project_name)
+      client.sections.get_sections_for_project(project_gid: project.gid)
     end
 
     # Given a workspace name and project name, then provide a Hash of
     # tasks with section name -> task list of the uncompleted tasks
     def tasks_by_section(workspace_name, project_name)
       project = project_or_raise(workspace_name, project_name)
-      case project_name
-      when :my_tasks, :my_tasks_new, :my_tasks_today, :my_tasks_upcoming
-        user_task_list_by_section(workspace_name, project_name)
-      else
-        tasks_by_section_for_project(project)
-      end
+      tasks_by_section_for_project(project)
     end
     cache_method :tasks_by_section, SHORT_CACHE_TIME
 
     # XXX: Rename to section_tasks
     #
     # Pulls task objects from a specified section
-    def tasks(workspace_name, project_name, section_name)
-      tasks_by_section(workspace_name, project_name).fetch(section_name, [])
+    def tasks(workspace_name, project_name, section_name,
+              only_uncompleted: true,
+              extra_fields: [])
+      section = section_or_raise(workspace_name, project_name, section_name)
+      options = projects.task_options
+      options[:options][:fields] += extra_fields
+      options[:completed_since] = '9999-12-01' if only_uncompleted
+      client.tasks.get_tasks(section: section.gid,
+                             **options)
     end
     cache_method :tasks, SHORT_CACHE_TIME
 
     # Pulls just names of tasks from a given section.
     def section_task_names(workspace_name, project_name, section_name)
       tasks = tasks(workspace_name, project_name, section_name)
-      if tasks.nil?
-        by_section = tasks_by_section(workspace_name, project_name)
-        desc = "#{workspace_name} | #{project_name} | #{section_name}"
-        raise "Could not find task names for #{desc}.  " \
-              "Valid sections: #{by_section.keys}"
-      end
       tasks.map(&:name)
     end
     cache_method :section_task_names, SHORT_CACHE_TIME
 
-    # returns if a task's due field is at or before the current date/time
-    def task_due?(task)
-      if task.due_at
-        Time.parse(task.due_at) <= time.now
-      elsif task.due_on
-        Date.parse(task.due_on) <= time.today
-      else
-        true # set a due date if you don't want to do this now
+    def section_or_raise(workspace_name, project_name, section_name)
+      section = section(workspace_name, project_name, section_name)
+      if section.nil?
+        valid_sections = sections_or_raise(workspace_name, project_name).map(&:name)
+
+        raise "Could not find section #{section_name} under project #{project_name} " \
+              "under workspace #{workspace_name}.  Valid sections: #{valid_sections}"
       end
+      section
     end
+    cache_method :section_or_raise, LONG_CACHE_TIME
 
     private
 
-    def_delegators :@projects, :client
-
-    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 legacy_tasks_by_section_for_project(project)
+    # Given a project object, pull all tasks, then provide a Hash of
+    # tasks with section name -> task list of the uncompleted tasks
+    def tasks_by_section_for_project(project)
       raw_tasks = projects.tasks_from_project(project)
       active_tasks = projects.active_tasks(raw_tasks)
-      legacy_by_section(active_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] = []
-      else
-        by_section[current_section] ||= []
-        by_section[current_section] << task
-      end
-      [current_section, by_section]
-    end
+    def_delegators :@projects, :client
 
-    def legacy_by_section(tasks)
-      current_section = nil
+    # Given a list of tasks, pull a Hash of tasks with section name -> task list
+    def by_section(tasks, project_gid)
       by_section = {}
       tasks.each do |task|
-        current_section, by_section =
-          legacy_file_task_by_section(current_section, by_section, task)
+        file_task_by_section(by_section, task, project_gid)
       end
       by_section
     end
+    cache_method :by_section, LONG_CACHE_TIME
 
-    def legacy_tasks_by_section_for_project_and_assignee_status(project,
-                                                                assignee_status)
-      raw_tasks = projects.tasks_from_project(project)
-      by_assignee_status =
-        projects.active_tasks(raw_tasks)
-          .group_by(&:assignee_status)
-      active_tasks = by_assignee_status[assignee_status]
-      legacy_by_section(active_tasks)
+    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 project_or_raise(workspace_name, project_name)
@@ -146,49 +111,9 @@ module Checkoff
       project
     end
 
-    def verify_legacy_user_task_list!(workspace_name)
-      return unless user_task_list_migrated_to_real_sections?(workspace_name)
-
-      raise NotImplementedError, 'Section-based user task lists not yet supported'
-    end
-
-    ASSIGNEE_STATUS_BY_PROJECT_NAME = {
-      my_tasks_new: 'inbox',
-      my_tasks_today: 'today',
-      my_tasks_upcoming: 'upcoming',
-    }.freeze
-
-    def user_task_list_by_section(workspace_name, project_name)
-      verify_legacy_user_task_list!(workspace_name)
-
-      project = projects.project(workspace_name, project_name)
-      if project_name == :my_tasks
-        legacy_tasks_by_section_for_project(project)
-      else
-        legacy_tasks_by_section_for_project_and_assignee_status(project,
-                                                                ASSIGNEE_STATUS_BY_PROJECT_NAME.fetch(project_name))
-      end
-    end
-
-    def user_task_list_migrated_to_real_sections?(workspace_name)
-      workspace = workspaces.workspace_by_name(workspace_name)
-      result = client.user_task_lists.get_user_task_list_for_user(user_gid: 'me',
-                                                                  workspace: workspace.gid)
-      result.migration_status != 'not_migrated'
-    end
-
-    def project_task_names(workspace_name, project_name)
-      by_section = tasks_by_section(workspace_name, project_name)
-      by_section.flat_map do |section_name, tasks|
-        task_names = tasks.map(&:name)
-        if section_name.nil?
-          task_names
-        else
-          [section_name, task_names]
-        end
-      end
+    def section(workspace_name, project_name, section_name)
+      sections = sections_or_raise(workspace_name, project_name)
+      sections.find { |section| section.name.chomp(':') == section_name.chomp(':') }
     end
-    cache_method :project_task_names, SHORT_CACHE_TIME
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/lib/checkoff/subtasks.rb

@@ -11,6 +11,11 @@ module Checkoff
 
     extend Forwardable
 
+    def initialize(config: Checkoff::ConfigLoader.load(:asana),
+                   projects: Checkoff::Projects.new(config: config))
+      @projects = projects
+    end
+
     # pulls a Hash of subtasks broken out by section
     def by_section(tasks)
       current_section = nil
@@ -30,6 +35,8 @@ module Checkoff
 
     private
 
+    attr_reader :projects
+
     def file_task_by_section(current_section, by_section, task)
       if task.name =~ /:$/
         current_section = task.name

data/lib/checkoff/tasks.rb

@@ -31,7 +31,8 @@ module Checkoff
                 projects.tasks_from_project(project,
                                             only_uncompleted: only_uncompleted)
               else
-                @sections.tasks(workspace_name, project_name, section_name)
+                @sections.tasks(workspace_name, project_name, section_name,
+                                only_uncompleted: only_uncompleted)
               end
       tasks.find { |task| task.name == task_name }
     end
@@ -54,10 +55,6 @@ module Checkoff
       @projects ||= @sections.projects
     end
 
-    def tasks_minus_sections(tasks)
-      @sections.by_section(tasks).values.flatten
-    end
-
     def default_assignee_gid
       @config.fetch(:default_assignee_gid)
     end

data/lib/checkoff/version.rb

@@ -2,5 +2,5 @@
 
 module Checkoff
   # Version of library
-  VERSION = '0.11.1'
+  VERSION = '0.13.1'
 end

data/rakelib/console.rake

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+desc 'Load up checkoff in pry'
+task :console do |_t|
+  exec 'pry -I lib -r checkoff'
+end

data/rakelib/default.rake

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+desc 'Standard build'
 task default: :localtest

data/rakelib/repl.rake

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+desc 'Load up checkoff in pry'
+task repl: [:console]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.13.1
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.58.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +226,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -311,11 +325,13 @@ files:
 - metrics/shellcheck_high_water_mark
 - rakelib/citest.rake
 - rakelib/clear_metrics.rake
+- rakelib/console.rake
 - rakelib/default.rake
 - rakelib/gem_tasks.rake
 - rakelib/localtest.rake
 - rakelib/overcommit.rake
 - rakelib/quality.rake
+- rakelib/repl.rake
 - rakelib/test.rake
 - rakelib/undercover.rake
 - requirements_dev.txt