checkoff 0.29.4 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a73a81aadb4e180a59baf5eac5184070a677d791ead8d608f894e71950e03125
-  data.tar.gz: '0590cbfeefb9b56600dfd2450e3731ea8472d4efa21b1b8e6adf4719e949425f'
+  metadata.gz: 9098d5cbdef080b54a70384a623e904981f3c9b395a445c2d30c0c6ce734c4f7
+  data.tar.gz: 59b28f88a8f4bb7f6c9bd5cc03f28dda3232032670f08aa304bdcf6c7d824290
 SHA512:
-  metadata.gz: 2459b37ea4a58cc8198ad0d6fa43f772d70e3278ec77254d35471d299b06c5afe00c901f7992e305d3ad392727c35977ac80b977f11dddbb1f1f0c1e4e148804
-  data.tar.gz: 90c1d606f7d2babcf8056e3464aa84d5f7994a1adab568f156468462d46acbccd8b52e0119e7a522a8c4b9083f8e9a17a55f05ec333c567223e50b4b8fb92dba
+  metadata.gz: bab2cdcbb4aad51cdb444d108a47cc13a1cff97567db5455894364b010cdb851f9c66bcd420d1add74e0b64e3e5358d64ba7873d5f25cb074595e7edbe805f1a
+  data.tar.gz: 3d579e7e952155057addede0bd1c7877986a3900cd77f341eaf9d09b0f80604fae1105d6ba1f247694f5ec52fa50fb6d830c083a2a75f4a56845874772b0df5a

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.29.4)
+    checkoff (0.31.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -38,7 +38,7 @@ GEM
       cache (>= 0.2.1)
     chef-utils (17.10.0)
       concurrent-ruby
-    childprocess (4.0.0)
+    childprocess (4.1.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crack (0.4.5)
@@ -111,7 +111,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    overcommit (0.58.0)
+    overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
@@ -185,6 +185,7 @@ PLATFORMS
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-linux
+  x86_64-linux-musl
 
 DEPENDENCIES
   asana!
@@ -196,11 +197,11 @@ DEPENDENCIES
   minitest-profile
   minitest-reporters
   mocha (~> 2.0.0.alpha.1)
-  overcommit (>= 0.58.0)
+  overcommit (>= 0.60.0, < 0.61.0)
   pry
   rake (~> 13.0)
   rspec (>= 3.4)
-  rubocop (~> 1.36)
+  rubocop (~> 1.36, < 1.44)
   rubocop-minitest
   rubocop-rake
   simplecov (>= 0.18.0)

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2022, Vince Broz
+Copyright (c) 2016-2023, Vince Broz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/rubocop

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/checkoff.gemspec

@@ -40,11 +40,13 @@ Gem::Specification.new do |spec|
   # 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 'overcommit', ['>=0.60.0', '<0.61.0']
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '>=3.4'
-  spec.add_development_dependency 'rubocop', ['~> 1.36']
+  # I haven't adapted things to Gemspec/DevelopmentDependencies yet,
+  # which arrives in 1.44
+  spec.add_development_dependency 'rubocop', ['~> 1.36', '<1.44']
   spec.add_development_dependency 'rubocop-minitest'
   spec.add_development_dependency 'rubocop-rake'
   # ensure version with branch coverage

data/docs/cookiecutter_input.json

@@ -1,4 +1,5 @@
 {
+    "_output_dir": "/Users/broz/src/checkoff/.git/cookiecutter",
     "_template": "https://github.com/apiology/cookiecutter-gem",
     "email": "vince@broz.cc",
     "full_name": "Vince Broz",

data/fix.sh

@@ -100,6 +100,7 @@ ensure_ruby_build_requirements() {
   ensure_dev_library readline/readline.h readline libreadline-dev
   ensure_dev_library zlib.h zlib zlib1g-dev
   ensure_dev_library openssl/ssl.h openssl libssl-dev
+  ensure_dev_library yaml.h libyaml libyaml-dev
 }
 
 ensure_latest_ruby_build_definitions() {
@@ -188,7 +189,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-21 x86_64-linux
+  for platform in x86_64-darwin-21 x86_64-linux x86_64-linux-musl
   do
     grep "${platform:?}" Gemfile.lock >/dev/null 2>&1 || bundle lock --add-platform "${platform:?}"
   done
@@ -284,7 +285,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.10)"
+  python_versions="$(latest_python_version 3.11)"
 
   echo "Latest Python versions: ${python_versions}"
 

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

@@ -55,6 +55,7 @@ module Checkoff
           'greater_than' => CustomFieldVariant::GreaterThan,
           'doesnt_contain_any' => CustomFieldVariant::DoesntContainAny,
           'contains_any' => CustomFieldVariant::ContainsAny,
+          'contains_all' => CustomFieldVariant::ContainsAll,
         }.freeze
 
         def convert_single_custom_field_params(gid, single_custom_field_params)

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

@@ -99,6 +99,20 @@ module Checkoff
           end
         end
 
+        # This is used in the UI for multi-select fields
+        #
+        # custom_field_#{gid}.variant = 'contains_all'
+        class ContainsAll < CustomFieldVariant
+          def convert
+            selected_options = fetch_solo_param("custom_field_#{gid}.selected_options").split('~')
+
+            [{ "custom_fields.#{gid}.is_set" => 'true' },
+             ['custom_field_gid_value_contains_all_gids',
+              gid,
+              selected_options]]
+          end
+        end
+
         # custom_field_#{gid}.variant = 'no_value'
         class NoValue < CustomFieldVariant
           def convert

data/lib/checkoff/internal/task_selector_evaluator.rb

@@ -35,6 +35,35 @@ module Checkoff
     end
 
     attr_reader :task_selector
+
+    def pull_enum_values(custom_field)
+      resource_subtype = custom_field.fetch('resource_subtype')
+      case resource_subtype
+      when 'enum'
+        [custom_field.fetch('enum_value')]
+      when 'multi_enum'
+        custom_field.fetch('multi_enum_values')
+      else
+        raise "Teach me how to handle resource_subtype #{resource_subtype}"
+      end
+    end
+
+    def find_gids(custom_field, enum_value)
+      if enum_value.nil?
+        []
+      else
+        raise "Unexpected enabled value on custom field: #{custom_field}" if enum_value.fetch('enabled') == false
+
+        [enum_value.fetch('gid')]
+      end
+    end
+
+    def pull_custom_field_values_gids(task, custom_field_gid)
+      custom_field = pull_custom_field_or_raise(task, custom_field_gid)
+      pull_enum_values(custom_field).flat_map do |enum_value|
+        find_gids(custom_field, enum_value)
+      end
+    end
   end
 
   # :and function
@@ -96,6 +125,17 @@ module Checkoff
     end
   end
 
+  # :due_date_set function
+  class DueDateSetPFunctionEvaluator < FunctionEvaluator
+    def matches?
+      fn?(task_selector, :due_date_set)
+    end
+
+    def evaluate(task)
+      !task.due_at.nil? || !task.due_on.nil?
+    end
+  end
+
   # :custom_field_value function
   class CustomFieldValueFunctionEvaluator < FunctionEvaluator
     def matches?
@@ -152,35 +192,23 @@ module Checkoff
         custom_field_values_gids.include?(custom_field_value)
       end
     end
+  end
 
-    private
-
-    def pull_enum_values(custom_field)
-      resource_subtype = custom_field.fetch('resource_subtype')
-      case resource_subtype
-      when 'enum'
-        [custom_field.fetch('enum_value')]
-      when 'multi_enum'
-        custom_field.fetch('multi_enum_values')
-      else
-        raise "Teach me how to handle resource_subtype #{resource_subtype}"
-      end
+  # :custom_field_gid_value_contains_all_gids function
+  class CustomFieldGidValueContainsAllGidsFunctionEvaluator < FunctionEvaluator
+    def matches?
+      fn?(task_selector, :custom_field_gid_value_contains_all_gids)
     end
 
-    def find_gids(custom_field, enum_value)
-      if enum_value.nil?
-        []
-      else
-        raise "Unexpected enabled value on custom field: #{custom_field}" if enum_value.fetch('enabled') == false
-
-        [enum_value.fetch('gid')]
-      end
+    def evaluate_arg?(_index)
+      false
     end
 
-    def pull_custom_field_values_gids(task, custom_field_gid)
-      custom_field = pull_custom_field_or_raise(task, custom_field_gid)
-      pull_enum_values(custom_field).flat_map do |enum_value|
-        find_gids(custom_field, enum_value)
+    def evaluate(task, custom_field_gid, custom_field_values_gids)
+      actual_custom_field_values_gids = pull_custom_field_values_gids(task, custom_field_gid)
+
+      custom_field_values_gids.all? do |custom_field_value|
+        actual_custom_field_values_gids.include?(custom_field_value)
       end
     end
   end
@@ -200,8 +228,10 @@ module Checkoff
       CustomFieldValueFunctionEvaluator,
       CustomFieldGidValueFunctionEvaluator,
       CustomFieldGidValueContainsAnyGidFunctionEvaluator,
+      CustomFieldGidValueContainsAllGidsFunctionEvaluator,
       AndFunctionEvaluator,
       DuePFunctionEvaluator,
+      DueDateSetPFunctionEvaluator,
     ].freeze
 
     def evaluate(task_selector)

data/lib/checkoff/version.rb

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

data/requirements_dev.txt

@@ -1,2 +1,2 @@
-pip==21.1
-yamllint==1.26.0
+pip==21.1.3
+yamllint==1.29.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.29.4
+  version: 0.31.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,14 +184,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.60.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.61.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.60.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.61.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +247,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.36'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.44'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -248,6 +257,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.36'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.44'
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -363,6 +375,7 @@ files:
 - bin/console
 - bin/overcommit
 - bin/rake
+- bin/rubocop
 - bin/setup
 - checkoff.gemspec
 - docs/cookiecutter_input.json