checkoff 0.19.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b199a642ccf75e4369caeffa5fc9cd5248164dc76f23674af38ce77dc2dfb3a
-  data.tar.gz: 70a1db49e52e64294d44b9e1b386464b5e9a9c8cf28497fab4493abc77932954
+  metadata.gz: d7c237ce35c02738d3170942d13d3d47d02d0fc0ed65eb78b836b7c444aed241
+  data.tar.gz: 8ab5d779ab9feadeeb66d12294e25f8b2baf0de32d8a917618f3adc26c77a4ea
 SHA512:
-  metadata.gz: '0088414917271dba3b10842d25cfe151188325582fd2fd07e7832f0ab849ccb6058c342d7b3c8fc754f54ce52f639db791562f549d509b2ecd5701b2dfd52e41'
-  data.tar.gz: b91b8209aa5b765723a742cf86e0490935667bfa06a0b16fd5a7269dd0a743d84608da35b2a8510951db4180a50ad252d4ea39c2130a98013d6e8bf160db4f93
+  metadata.gz: '078c32912450408243aea106d973047fabfb4db52c6267f2dd0030894a7f1b898a89acce8115da066e2b1fa2e45560286148a7aa6ccc0632d869797cf4b008aa'
+  data.tar.gz: 388f84ed37bc63dc68182e4b484e18fc5ab591625840c9f6a4f60fa385340cf6e7c4386cd56ee146100d3d5e99952f8d7c77e9c12c3ae9e47fbabc6b7e9e773e

data/.circleci/config.yml

@@ -37,9 +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-v1-{{ checksum "Gemfile.lock.deversioned" }}
+          key: gems-v2-{{ checksum "Gemfile.lock.deversioned" }}
       - restore_cache:
-          key: wheels-v1-{{ checksum "requirements_dev.txt" }}
+          key: wheels-v2-{{ checksum "requirements_dev.txt" }}
       - run:
           name: Initialize packages
           command: |
@@ -54,11 +54,11 @@ commands:
               exit 1
             fi
       - save_cache:
-          key: gems-v1-{{ checksum "Gemfile.lock.deversioned" }}
+          key: gems-v2-{{ checksum "Gemfile.lock.deversioned" }}
           paths:
             - "vendor/bundle"
       - save_cache:
-          key: wheels-v1-{{ checksum "requirements_dev.txt" }}
+          key: wheels-v2-{{ checksum "requirements_dev.txt" }}
           paths:
             - "/home/circleci/.cache/pip/wheels"
       - run:
@@ -104,13 +104,8 @@ jobs:
     steps:
       - set_up_environment
       - run_with_languages:
-          label: Test
-          command: |
-            bundle exec rake citest
-            # https://github.com/bluelabsio/records-mover/blob/master/Makefile#L25
-            git status --porcelain coverage/.last_run.json
-            git diff coverage/.last_run.json
-            test -z "$(git status --porcelain coverage/.last_run.json)"
+          label: test
+          command: make citest cicoverage
     # This seemed to shave 5ish% of the build time off when added
     resource_class: large
 

data/.gitignore

@@ -57,8 +57,4 @@ requirements_dev.txt.installed
 /pkg/
 /spec/reports/
 /tmp/
-/coverage/.resultset.json
-/coverage/.resultset.json.lock
-/coverage/assets/
-/coverage/index.html
-/coverage/lcov/
+/coverage/

data/.overcommit.yml

@@ -17,6 +17,15 @@
 # Uncomment the following lines to make the configuration take effect.
 
 PreCommit:
+  # Extend default config at https://github.com/sds/overcommit/blob/master/config/default.yml
+  BrokenSymlinks:
+    enabled: true
+    description: 'Check for broken symlinks'
+    quiet: true
+    exclude:
+      # This is a symlink to sibling checkout of vincelifedaily, used
+      # only in local development
+      - config/env.1p
   RuboCop:
     enabled: true
     on_warn: fail # Treat all warnings as failures
@@ -29,6 +38,10 @@ PreCommit:
       - '**/Gemfile'
       - '**/Rakefile'
       - 'bin/*'
+      - 'script/*'
+    exclude:
+      - db/migrate/*.rb
+      - db/schema.rb
   PythonFlake8:
     enabled: true
     on_warn: fail
@@ -37,6 +50,7 @@ PreCommit:
     on_warn: fail
     include:
       - '.envrc'
+      - '**/*.sh'
   YamlLint:
     enabled: true
     on_warn: fail
@@ -53,3 +67,10 @@ PrePush:
     include:
       - 'test/unit/**/test*.rb'
     enabled: true
+
+#PostCheckout:
+#  ALL: # Special hook name that customizes all hooks of this type
+#    quiet: true # Change all post-checkout hooks to only display output on failure
+#
+#  IndexTags:
+#    enabled: true # Generate a tags file with `ctags` each time HEAD changes

data/.rubocop.yml

@@ -98,7 +98,7 @@ Style/TrivialAccessors:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - 'bin/*'
     - 'vendor/**/*'

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.19.2)
+    checkoff (0.21.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -22,13 +22,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    ansi (1.5.0)
     ast (2.4.2)
+    builder (3.2.4)
     bump (0.10.0)
     cache (0.4.1)
     cache_method (0.2.7)
@@ -38,8 +41,12 @@ GEM
     childprocess (4.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
-    dalli (3.2.2)
+    crack (0.4.5)
+      rexml
+    dalli (3.2.3)
+    diff-lcs (1.5.0)
     docile (1.4.0)
+    fakeweb (1.3.0)
     faraday (1.5.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -63,17 +70,19 @@ GEM
       faraday_middleware
       multi_json
     gli (2.21.0)
+    hashdiff (1.0.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     imagen (0.1.8)
       parser (>= 2.5, != 2.5.1.1)
     iniparse (1.5.0)
+    json (2.6.2)
     jwt (2.2.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    mdl (0.11.0)
+    mdl (0.12.0)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       mixlib-cli (~> 2.1, >= 2.1.1)
@@ -82,12 +91,17 @@ GEM
     method_source (1.0.0)
     minitest (5.16.2)
     minitest-profile (0.0.2)
+    minitest-reporters (1.5.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-shellout (3.2.7)
       chef-utils
-    mocha (1.12.0)
+    mocha (2.0.0.alpha.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -101,35 +115,50 @@ GEM
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    public_suffix (5.0.0)
     rack (2.2.4)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rubocop (1.18.4)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.22.0)
+      parser (>= 3.1.1.0)
     rubocop-minitest (0.12.1)
       rubocop (>= 0.90, < 2.0)
     rubocop-rake (0.5.1)
       rubocop
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    rugged (1.1.0)
+    rugged (1.5.0.1)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -140,17 +169,21 @@ GEM
     tomlrb (2.0.3)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    undercover (0.4.3)
+    undercover (0.4.5)
       imagen (>= 0.1.8)
       rainbow (>= 2.1, < 4.0)
-      rugged (>= 0.27, < 1.2)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.6.0)
+      rugged (>= 0.27, < 1.6)
+    unicode-display_width (2.3.0)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
   x86_64-darwin-19
   x86_64-darwin-20
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -158,18 +191,22 @@ DEPENDENCIES
   bump
   bundler
   checkoff!
+  fakeweb
   mdl
   minitest-profile
-  mocha
+  minitest-reporters
+  mocha (~> 2.0.0.alpha.1)
   overcommit (>= 0.58.0)
   pry
   rake (~> 13.0)
-  rubocop
+  rspec (>= 3.4)
+  rubocop (~> 1.36)
   rubocop-minitest
   rubocop-rake
   simplecov (>= 0.18.0)
   simplecov-lcov
   undercover
+  webmock
 
 BUNDLED WITH
-   2.2.25
+   2.3.26

data/Makefile

@@ -15,7 +15,17 @@ export PRINT_HELP_PYSCRIPT
 help:
 	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
 
-default: localtest ## run default tests and quality
+default: clean-coverage test coverage clean-typecoverage typecheck typecoverage quality ## run default typechecking, tests and quality
+
+typecheck: ## validate types in code and configuration
+
+citypecheck: typecheck ## Run type check from CircleCI
+
+typecoverage: typecheck ## Run type checking and then ratchet coverage in metrics/
+
+clean-typecoverage: ## Clean out type-related coverage previous results to avoid flaky results
+
+citypecoverage: typecoverage ## Run type checking, ratchet coverage, and then complain if ratchet needs to be committed
 
 requirements_dev.txt.installed: requirements_dev.txt
 	pip install -q --disable-pip-version-check -r requirements_dev.txt
@@ -40,7 +50,7 @@ clear_metrics: ## remove or reset result artifacts created by tests and quality
 clean: clear_metrics ## remove all built artifacts
 
 
-typecheck: ## validate types in code and configuration
+citest: test ## Run unit tests from CircleCI
 
 overcommit: ## run precommit quality checks
 	bundle exec overcommit --run
@@ -56,6 +66,16 @@ localtest: ## run default local actions
 repl:  ## Load up checkoff in pry
 	@bundle exec rake repl
 
+clean-coverage:
+	@bundle exec rake clear_metrics
+
+coverage: test report-coverage ## check code coverage
+	@bundle exec rake undercover
+
+report-coverage: test ## Report summary of coverage to stdout, and generate HTML, XML coverage report
+
+cicoverage: coverage ## check code coverage
+
 update_from_cookiecutter: ## Bring in changes from template project used to create this repo
 	bundle exec overcommit --uninstall
 	IN_COOKIECUTTER_PROJECT_UPGRADER=1 cookiecutter_project_upgrader || true

data/checkoff.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Command-line and gem client for Asana (unofficial)'
   spec.homepage      = 'https://github.com/apiology/checkoff'
   spec.license       = 'MIT license'
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -32,20 +32,27 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bump'
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'fakeweb'
   spec.add_development_dependency 'mdl'
   spec.add_development_dependency 'minitest-profile'
-  spec.add_development_dependency 'mocha'
+  spec.add_development_dependency 'minitest-reporters'
+  spec.add_development_dependency 'mocha', ['~> 2.0.0.alpha.1']
   # 0.58.0 and 0.57.0 don't seem super compatible with signatures, and
   # 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 'rspec', '>=3.4'
+  spec.add_development_dependency 'rubocop', ['~> 1.36']
   spec.add_development_dependency 'rubocop-minitest'
   spec.add_development_dependency 'rubocop-rake'
   # ensure version with branch coverage
   spec.add_development_dependency 'simplecov', ['>=0.18.0']
   spec.add_development_dependency 'simplecov-lcov'
   spec.add_development_dependency 'undercover'
+  spec.add_development_dependency 'webmock'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true',
+  }
 end

data/fix.sh

@@ -69,7 +69,18 @@ ensure_rbenv() {
 
 latest_ruby_version() {
   major_minor=${1}
-  rbenv install --list 2>/dev/null | grep "^${major_minor}."
+
+  # Double check that this command doesn't error out under -e
+  rbenv install --list >/dev/null 2>&1
+
+  # not sure why, but 'rbenv install --list' below exits with error code
+  # 1...after providing the same output the previous line gave when it
+  # exited with error code 0.
+  #
+  # https://github.com/rbenv/rbenv/issues/1441
+  set +e
+  rbenv install --list 2>/dev/null | cat | grep "^${major_minor}."
+  set -e
 }
 
 ensure_dev_library() {
@@ -91,12 +102,20 @@ ensure_ruby_build_requirements() {
   ensure_dev_library openssl/ssl.h openssl libssl-dev
 }
 
+ensure_latest_ruby_build_definitions() {
+  ensure_rbenv
+
+  git -C "$(rbenv root)"/plugins/ruby-build pull
+}
+
 # You can find out which feature versions are still supported / have
 # been release here: https://www.ruby-lang.org/en/downloads/
 ensure_ruby_versions() {
+  ensure_latest_ruby_build_definitions
+
   # You can find out which feature versions are still supported / have
   # been release here: https://www.ruby-lang.org/en/downloads/
-  ruby_versions="$(latest_ruby_version 2.6)"
+  ruby_versions="$(latest_ruby_version 2.7)"
 
   echo "Latest Ruby versions: ${ruby_versions}"
 
@@ -169,7 +188,7 @@ ensure_bundle() {
   #
   # This affects nokogiri, which will try to reinstall itself in
   # Docker builds where it's already installed if this is not run.
-  for platform in x86_64-darwin-20 x86_64-linux
+  for platform in x86_64-darwin-21 x86_64-linux
   do
     grep "${platform:?}" Gemfile.lock >/dev/null 2>&1 || bundle lock --add-platform "${platform:?}"
   done

data/lib/checkoff/internal/config_loader.rb

@@ -18,7 +18,7 @@ module Checkoff
         config_value = @config[key]
         return config_value unless config_value.nil?
 
-        ENV[envvar_name(key)]
+        ENV.fetch(envvar_name(key), nil)
       end
 
       def fetch(key)

data/lib/checkoff/internal/search_url/custom_field_param_converter.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require_relative 'custom_field_variant'
+
+module Checkoff
+  module Internal
+    module SearchUrl
+      # Convert custom field parameters from an Asana search URL into
+      # API search arguments and Checkoff task selectors
+      class CustomFieldParamConverter
+        def initialize(custom_field_params:)
+          @custom_field_params = custom_field_params
+        end
+
+        def convert
+          args = {}
+          task_selector = []
+          by_custom_field.each do |gid, single_custom_field_params|
+            new_args, new_task_selector = convert_single_custom_field_params(gid,
+                                                                             single_custom_field_params)
+            args, task_selector = merge_args_and_task_selectors(args, new_args,
+                                                                task_selector, new_task_selector)
+          end
+          [args, task_selector]
+        end
+
+        private
+
+        def by_custom_field
+          custom_field_params.group_by do |key, _value|
+            gid_from_custom_field_key(key)
+          end.transform_values(&:to_h)
+        end
+
+        def merge_args_and_task_selectors(args, new_args, task_selector, new_task_selector)
+          args = args.merge(new_args)
+          return [args, task_selector] if new_task_selector == []
+
+          raise 'Teach me how to merge task selectors' unless task_selector == []
+
+          task_selector = new_task_selector
+
+          [args, task_selector]
+        end
+
+        VARIANTS = {
+          'is' => CustomFieldVariant::Is,
+          'no_value' => CustomFieldVariant::NoValue,
+          'is_not' => CustomFieldVariant::IsNot,
+          'less_than' => CustomFieldVariant::LessThan,
+        }.freeze
+
+        def convert_single_custom_field_params(gid, single_custom_field_params)
+          variant_key = "custom_field_#{gid}.variant"
+          variant = single_custom_field_params.fetch(variant_key)
+          remaining_params = single_custom_field_params.reject { |k, _v| k == variant_key }
+          raise "Teach me how to handle #{variant_key} = #{variant}" unless variant.length == 1
+
+          variant_class = VARIANTS[variant[0]]
+          return variant_class.new(gid, remaining_params).convert unless variant_class.nil?
+
+          raise "Teach me how to handle #{variant_key} = #{variant}"
+        end
+
+        def gid_from_custom_field_key(key)
+          key.split('_')[2].split('.')[0]
+        end
+
+        attr_reader :custom_field_params
+      end
+    end
+  end
+end

data/lib/checkoff/internal/search_url/custom_field_variant.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module Checkoff
+  module Internal
+    module SearchUrl
+      module CustomFieldVariant
+        # base class for handling different custom_field_#{gid}.variant params
+        class CustomFieldVariant
+          def initialize(gid, remaining_params)
+            @gid = gid
+            @remaining_params = remaining_params
+          end
+
+          private
+
+          attr_reader :gid, :remaining_params
+        end
+
+        # custom_field_#{gid}.variant = 'less_than'
+        class LessThan < CustomFieldVariant
+          def convert
+            max_param = "custom_field_#{gid}.max"
+            case remaining_params.keys
+            when [max_param]
+              convert_single_custom_field_less_than_params_max_param(max_param)
+            else
+              raise "Teach me how to handle #{remaining_params}"
+            end
+          end
+
+          private
+
+          def convert_single_custom_field_less_than_params_max_param(max_param)
+            max_values = remaining_params.fetch(max_param)
+            unless max_values.length == 1
+              raise "Teach me how to handle these remaining keys for #{max_param}: #{remaining_params}"
+            end
+
+            max_value = max_values[0]
+            empty_task_selector = []
+            [{ "custom_fields.#{gid}.less_than" => max_value }, empty_task_selector]
+          end
+        end
+
+        # custom_field_#{gid}.variant = 'is_not'
+        class IsNot < CustomFieldVariant
+          def convert
+            case remaining_params.keys
+            when ["custom_field_#{gid}.selected_options"]
+              convert_single_custom_field_is_not_params_selected_options
+            else
+              raise "Teach me how to handle #{remaining_params}"
+            end
+          end
+
+          private
+
+          def convert_single_custom_field_is_not_params_selected_options
+            selected_options = remaining_params.fetch("custom_field_#{gid}.selected_options")
+            raise "Teach me how to handle #{remaining_params}" unless selected_options.length == 1
+
+            [{ "custom_fields.#{gid}.is_set" => 'true' },
+             ['not',
+              ['custom_field_gid_value_contains_any_gid',
+               gid,
+               selected_options.fetch(0).split('~')]]]
+          end
+        end
+
+        # custom_field_#{gid}.variant = 'no_value'
+        class NoValue < CustomFieldVariant
+          def convert
+            unless remaining_params.length.zero?
+              raise "Teach me how to handle these remaining keys for #{variant_key}: #{remaining_params}"
+            end
+
+            empty_task_selector = []
+            [{ "custom_fields.#{gid}.is_set" => 'false' }, empty_task_selector]
+          end
+        end
+
+        # custom_field_#{gid}.variant = 'is'
+        class Is < CustomFieldVariant
+          def convert
+            unless remaining_params.length == 1
+              raise "Teach me how to handle these remaining keys for #{variant_key}: #{remaining_params}"
+            end
+
+            key, values = remaining_params.to_a[0]
+            convert_custom_field_is_arg(key, values)
+          end
+
+          private
+
+          def convert_custom_field_is_arg(key, values)
+            empty_task_selector = []
+
+            if key.end_with? '.selected_options'
+              raise "Too many values found for #{key}: #{values}" if values.length != 1
+
+              return [{ "custom_fields.#{gid}.value" => values[0] },
+                      empty_task_selector]
+            end
+
+            raise "Teach me how to handle #{key} = #{values}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/checkoff/internal/search_url/parser.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require_relative 'simple_param_converter'
+require_relative 'custom_field_param_converter'
+
+module Checkoff
+  module Internal
+    module SearchUrl
+      # Parse Asana search URLs into parameters suitable to pass into
+      # the /workspaces/{workspace_gid}/tasks/search endpoint
+      class Parser
+        def initialize(_deps = {})
+          # allow dependencies to be passed in by tests
+        end
+
+        def convert_params(url)
+          url_params = CGI.parse(URI.parse(url).query)
+          custom_field_params, simple_url_params = partition_url_params(url_params)
+          custom_field_args, task_selector = convert_custom_field_params(custom_field_params)
+          simple_url_args = convert_simple_params(simple_url_params)
+          [custom_field_args.merge(simple_url_args), task_selector]
+        end
+
+        private
+
+        def convert_simple_params(simple_url_params)
+          SimpleParamConverter.new(simple_url_params: simple_url_params).convert
+        end
+
+        def convert_custom_field_params(custom_field_params)
+          CustomFieldParamConverter.new(custom_field_params: custom_field_params).convert
+        end
+
+        def partition_url_params(url_params)
+          url_params.to_a.partition do |key, _values|
+            key.start_with? 'custom_field_'
+          end.map(&:to_h)
+        end
+      end
+    end
+  end
+end

data/lib/checkoff/internal/search_url/simple_param_converter.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require_relative 'custom_field_param_converter'
+
+module Checkoff
+  module Internal
+    module SearchUrl
+      module SimpleParam
+        # base class for handling different types of search url params
+        class SimpleParam
+          def initialize(values:)
+            @values = values
+          end
+
+          private
+
+          attr_reader :values
+        end
+
+        # Handle 'any_projects.ids' search url param
+        class AnyProjectsIds < SimpleParam
+          def convert
+            ['projects.any', values.join(',')]
+          end
+        end
+
+        # Handle 'completion' search url param
+        class Completion < SimpleParam
+          def convert
+            raise "Teach me how to handle #{key} = #{values}" if values.length != 1
+
+            value = values.fetch(0)
+            raise "Teach me how to handle #{key} = #{values}" if value != 'incomplete'
+
+            ['completed', false]
+          end
+        end
+
+        # Handle 'not_tags.ids' search url param
+        class NotTagsIds < SimpleParam
+          def convert
+            raise "Teach me how to handle #{key} = #{values}" if values.length != 1
+
+            value = values.fetch(0)
+            tag_ids = value.split('~')
+            ['tags.not', tag_ids.join(',')]
+          end
+        end
+      end
+
+      # Convert simple parameters - ones where the param name itself
+      # doesn't encode any parameters'
+      class SimpleParamConverter
+        def initialize(simple_url_params:)
+          @simple_url_params = simple_url_params
+        end
+
+        def convert
+          simple_url_params.to_a.to_h do |key, values|
+            convert_arg(key, values)
+          end
+        end
+
+        private
+
+        ARGS = {
+          'any_projects.ids' => SimpleParam::AnyProjectsIds,
+          'completion' => SimpleParam::Completion,
+          'not_tags.ids' => SimpleParam::NotTagsIds,
+        }.freeze
+
+        # https://developers.asana.com/docs/search-tasks-in-a-workspace
+        def convert_arg(key, values)
+          clazz = ARGS.fetch(key)
+          clazz.new(values: values).convert
+        end
+
+        attr_reader :simple_url_params
+      end
+    end
+  end
+end

data/lib/checkoff/internal/search_url.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'search_url/parser'

data/lib/checkoff/sections.rb

@@ -110,7 +110,8 @@ module Checkoff
       raise "Could not find task in project_gid #{project_gid}: #{task}" if membership.nil?
 
       current_section = membership['section']['name']
-      current_section = nil if ['(no section)', 'Untitled section'].include?(current_section)
+      inbox_section_names = ['(no section)', 'Untitled section', 'Inbox']
+      current_section = nil if inbox_section_names.include?(current_section)
       by_section[current_section] ||= []
       by_section[current_section] << task
     end

data/lib/checkoff/subtasks.rb

@@ -41,7 +41,7 @@ module Checkoff
     def raw_subtasks(task)
       task_options = projects.task_options
       task_options[:options][:fields] << 'is_rendered_as_separator'
-      task.subtasks(task_options)
+      task.subtasks(**task_options)
     end
     cache_method :raw_subtasks, SHORT_CACHE_TIME
 

data/lib/checkoff/task_searches.rb

@@ -12,7 +12,7 @@ require_relative 'task_selectors'
 require 'asana/resource_includes/collection'
 require 'asana/resource_includes/response_helper'
 
-require 'checkoff/internal/search_url_parser'
+require 'checkoff/internal/search_url'
 
 # https://developers.asana.com/docs/task-searches
 module Checkoff
@@ -33,7 +33,7 @@ module Checkoff
                    projects: Checkoff::Projects.new(config: config),
                    clients: Checkoff::Clients.new(config: config),
                    client: clients.client,
-                   search_url_parser: Checkoff::Internal::SearchUrlParser.new,
+                   search_url_parser: Checkoff::Internal::SearchUrl::Parser.new,
                    asana_resources_collection_class: Asana::Resources::Collection)
       @workspaces = workspaces
       @task_selectors = task_selectors

data/lib/checkoff/version.rb

@@ -3,5 +3,5 @@
 # Command-line and gem client for Asana (unofficial)
 module Checkoff
   # Version of library
-  VERSION = '0.19.2'
+  VERSION = '0.21.0'
 end

data/rakelib/clear_metrics.rake

@@ -3,15 +3,7 @@
 desc 'Ensure that any locally ratcheted coverage metrics are cleared back ' \
      'to git baseline'
 task :clear_metrics do |_t|
-  ret =
-    system('git checkout coverage/.last_run.json')
-  raise unless ret
-
   # Without this old lines which are removed are still counted,
   # leading to inconsistent coverage percentages between runs.
-  #
-  # need to save coverage/.last_run.json
-  ret =
-    system('rm -fr coverage/assets coverage/.*.json.lock coverage/lcov/* coverage/index.html coverage/.resultset.json')
-  raise unless ret
+  raise unless system('rm -fr coverage/')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.21.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-24 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  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: mdl
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.alpha.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.alpha.1
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +221,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.36'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.36'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +318,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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'
 description:
 email:
 - vince@broz.cc
@@ -310,7 +366,6 @@ files:
 - bin/rake
 - bin/setup
 - checkoff.gemspec
-- coverage/.last_run.json
 - docs/cookiecutter_input.json
 - docs/example_project.png
 - exe/checkoff
@@ -322,7 +377,11 @@ files:
 - lib/checkoff/custom_fields.rb
 - lib/checkoff/internal/config_loader.rb
 - lib/checkoff/internal/create-class.sh
-- lib/checkoff/internal/search_url_parser.rb
+- lib/checkoff/internal/search_url.rb
+- lib/checkoff/internal/search_url/custom_field_param_converter.rb
+- lib/checkoff/internal/search_url/custom_field_variant.rb
+- lib/checkoff/internal/search_url/parser.rb
+- lib/checkoff/internal/search_url/simple_param_converter.rb
 - lib/checkoff/internal/task_selector_evaluator.rb
 - lib/checkoff/my_tasks.rb
 - lib/checkoff/projects.rb
@@ -366,7 +425,8 @@ files:
 homepage: https://github.com/apiology/checkoff
 licenses:
 - MIT license
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -375,14 +435,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Command-line and gem client for Asana (unofficial)

data/coverage/.last_run.json

@@ -1,6 +0,0 @@
-{
-  "result": {
-    "line": 99.56,
-    "branch": 86.11
-  }
-}

data/lib/checkoff/internal/search_url_parser.rb

@@ -1,228 +0,0 @@
-#!/usr/bin/env ruby
-
-# frozen_string_literal: true
-
-module Checkoff
-  module Internal
-    # base class for handling different custom_field_#{gid}.variant params
-    class CustomFieldVariant
-      def initialize(gid, remaining_params)
-        @gid = gid
-        @remaining_params = remaining_params
-      end
-
-      private
-
-      attr_reader :gid, :remaining_params
-    end
-
-    # custom_field_#{gid}.variant = 'less_than'
-    class LessThanCustomFieldVariant < CustomFieldVariant
-      def convert
-        max_param = "custom_field_#{gid}.max"
-        case remaining_params.keys
-        when [max_param]
-          convert_single_custom_field_less_than_params_max_param(max_param)
-        else
-          raise "Teach me how to handle #{remaining_params}"
-        end
-      end
-
-      private
-
-      def convert_single_custom_field_less_than_params_max_param(max_param)
-        max_values = remaining_params.fetch(max_param)
-        unless max_values.length == 1
-          raise "Teach me how to handle these remaining keys for #{max_param}: #{remaining_params}"
-        end
-
-        max_value = max_values[0]
-        empty_task_selector = []
-        [{ "custom_fields.#{gid}.less_than" => max_value }, empty_task_selector]
-      end
-    end
-
-    # custom_field_#{gid}.variant = 'is_not'
-    class IsNotCustomFieldVariant < CustomFieldVariant
-      def convert
-        case remaining_params.keys
-        when ["custom_field_#{gid}.selected_options"]
-          convert_single_custom_field_is_not_params_selected_options
-        else
-          raise "Teach me how to handle #{remaining_params}"
-        end
-      end
-
-      private
-
-      def convert_single_custom_field_is_not_params_selected_options
-        selected_options = remaining_params.fetch("custom_field_#{gid}.selected_options")
-        raise "Teach me how to handle #{remaining_params}" unless selected_options.length == 1
-
-        [{ "custom_fields.#{gid}.is_set" => 'true' },
-         ['not',
-          ['custom_field_gid_value_contains_any_gid',
-           gid,
-           selected_options.fetch(0).split('~')]]]
-      end
-    end
-
-    # custom_field_#{gid}.variant = 'no_value'
-    class NoValueCustomFieldVariant < CustomFieldVariant
-      def convert
-        unless remaining_params.length.zero?
-          raise "Teach me how to handle these remaining keys for #{variant_key}: #{remaining_params}"
-        end
-
-        empty_task_selector = []
-        [{ "custom_fields.#{gid}.is_set" => 'false' }, empty_task_selector]
-      end
-    end
-
-    # custom_field_#{gid}.variant = 'is'
-    class IsCustomFieldVariant < CustomFieldVariant
-      def convert
-        unless remaining_params.length == 1
-          raise "Teach me how to handle these remaining keys for #{variant_key}: #{remaining_params}"
-        end
-
-        key, values = remaining_params.to_a[0]
-        convert_custom_field_is_arg(key, values)
-      end
-
-      private
-
-      def convert_custom_field_is_arg(key, values)
-        empty_task_selector = []
-
-        if key.end_with? '.selected_options'
-          raise "Too many values found for #{key}: #{values}" if values.length != 1
-
-          return [{ "custom_fields.#{gid}.value" => values[0] },
-                  empty_task_selector]
-        end
-
-        raise "Teach me how to handle #{key} = #{values}"
-      end
-    end
-
-    # Convert custom field parameters from an Asana search URL into
-    # API search arguments and Checkoff task selectors
-    class CustomFieldParamConverter
-      def initialize(custom_field_params:)
-        @custom_field_params = custom_field_params
-      end
-
-      def convert
-        args = {}
-        task_selector = []
-        by_custom_field.each do |gid, single_custom_field_params|
-          new_args, new_task_selector = convert_single_custom_field_params(gid,
-                                                                           single_custom_field_params)
-          args, task_selector = merge_args_and_task_selectors(args, new_args,
-                                                              task_selector, new_task_selector)
-        end
-        [args, task_selector]
-      end
-
-      private
-
-      def by_custom_field
-        custom_field_params.group_by do |key, _value|
-          gid_from_custom_field_key(key)
-        end.transform_values(&:to_h)
-      end
-
-      def merge_args_and_task_selectors(args, new_args, task_selector, new_task_selector)
-        args = args.merge(new_args)
-        return [args, task_selector] if new_task_selector == []
-
-        raise 'Teach me how to merge task selectors' unless task_selector == []
-
-        task_selector = new_task_selector
-
-        [args, task_selector]
-      end
-
-      VARIANTS = {
-        'is' => IsCustomFieldVariant,
-        'no_value' => NoValueCustomFieldVariant,
-        'is_not' => IsNotCustomFieldVariant,
-        'less_than' => LessThanCustomFieldVariant,
-      }.freeze
-
-      def convert_single_custom_field_params(gid, single_custom_field_params)
-        variant_key = "custom_field_#{gid}.variant"
-        variant = single_custom_field_params.fetch(variant_key)
-        remaining_params = single_custom_field_params.reject { |k, _v| k == variant_key }
-        raise "Teach me how to handle #{variant_key} = #{variant}" unless variant.length == 1
-
-        variant_class = VARIANTS[variant[0]]
-        return variant_class.new(gid, remaining_params).convert unless variant_class.nil?
-
-        raise "Teach me how to handle #{variant_key} = #{variant}"
-      end
-
-      def gid_from_custom_field_key(key)
-        key.split('_')[2].split('.')[0]
-      end
-
-      attr_reader :custom_field_params
-    end
-
-    # Parse Asana search URLs into parameters suitable to pass into
-    # the /workspaces/{workspace_gid}/tasks/search endpoint
-    class SearchUrlParser
-      def initialize(_deps = {}); end
-
-      def convert_params(url)
-        url_params = CGI.parse(URI.parse(url).query)
-        custom_field_params, regular_url_params = partition_url_params(url_params)
-        custom_field_args, task_selector = convert_custom_field_params(custom_field_params)
-        regular_url_args = convert_regular_params(regular_url_params)
-        [custom_field_args.merge(regular_url_args), task_selector]
-      end
-
-      private
-
-      def convert_regular_params(regular_url_params)
-        regular_url_params.to_a.map do |key, values|
-          convert_arg(key, values)
-        end.to_h
-      end
-
-      def convert_custom_field_params(custom_field_params)
-        CustomFieldParamConverter.new(custom_field_params: custom_field_params).convert
-      end
-
-      def partition_url_params(url_params)
-        url_params.to_a.partition do |key, _values|
-          key.start_with? 'custom_field_'
-        end.map(&:to_h)
-      end
-
-      # https://developers.asana.com/docs/search-tasks-in-a-workspace
-      def convert_arg(key, values)
-        case key
-        when 'any_projects.ids'
-          ['projects.any', values.join(',')]
-        when 'completion'
-          raise "Teach me how to handle #{key} = #{values}" if values.length != 1
-
-          value = values.fetch(0)
-          raise "Teach me how to handle #{key} = #{values}" if value != 'incomplete'
-
-          ['completed', false]
-        when 'not_tags.ids'
-          raise "Teach me how to handle #{key} = #{values}" if values.length != 1
-
-          value = values.fetch(0)
-          tag_ids = value.split('~')
-          ['tags.not', tag_ids.join(',')]
-        else
-          raise "Teach me how to handle #{key} = #{values}"
-        end
-      end
-    end
-  end
-end