checkoff 0.165.0 → 0.167.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f99bede3359ea38fb1343dabad531fa83df0890f301bfab723f5c65ffc9eb2d7
-  data.tar.gz: cf91f5f84ffdf059c37c1eddfad56e36af87562d63985c69760f0dbb7d54df3c
+  metadata.gz: 39ac47375577c961f420ca90fb137fcb53e45baba61ab6cf97c3892196792c09
+  data.tar.gz: 8880260934a2e1adee59cd74c391952d888480af4305a766b54053d1c135072d
 SHA512:
-  metadata.gz: d5ff068f85a90f941f7b60cdb938968e0a6311082ea2b95d0753ee2f6bd1da258c06297a105afe97a6e4b9c48f9b91937a07b592cbc76488b99e1588178d9844
-  data.tar.gz: 4d80c6ea635bfd686c09a6acf6fab8fb7a11d519223b1f80fd8b0e5e0cae58a4cbfe450b162c49044eca4e006cf96f8e6d8f12bc4aea56e972b463d72e27a875
+  metadata.gz: 4095ea667d2102b2ea7d0dc578f8dd6bb261a1823d7aa71621da1de9adfac7ced8c9c971e2f3deba2cf75c72a0667359ea64d1383152d54106675f5a9a89c66b
+  data.tar.gz: bb03d3a4b4aafb155a823d172cd164232c4890574c48e99b5b22e3b3b97aae95b04807e065d00b0d9997ccf7be7dcaf0209cfc60223f23b77997a0f69d106193

data/.circleci/config.yml

@@ -128,8 +128,6 @@ jobs:
             git config --global user.name "Test Test"
             bundle exec overcommit --sign
             bundle exec overcommit --sign pre-commit
-
-            git status
             bundle exec bump --commit-message ' [skip ci]' --tag --tag-prefix=v minor
             bundle install
             # bundle exec needed for overcommit hooks
@@ -138,6 +136,7 @@ jobs:
             # https://app.circleci.com/settings/project/github/apiology/checkoff/ssh
             # includes a read-write 'user key':
             bundle exec git push --set-upstream origin "${CIRCLE_BRANCH:?}"
+            git status
             bundle exec rake release trigger_next_builds
 
 workflows:

data/Gemfile

@@ -9,6 +9,7 @@ gem 'bump'
 gem 'bundler'
 gem 'fakeweb'
 gem 'mdl'
+gem 'mime-types', ['=3.5.1']
 gem 'minitest-profile'
 gem 'minitest-reporters'
 gem 'mocha', ['>= 2']

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.165.0)
+    checkoff (0.167.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -180,8 +180,9 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.33.0)
+    rubocop-minitest (0.34.4)
       rubocop (>= 1.39, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
@@ -216,10 +217,11 @@ GEM
     tomlrb (2.0.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    undercover (0.4.6)
+    undercover (0.5.0)
+      bigdecimal
       imagen (>= 0.1.8)
       rainbow (>= 2.1, < 4.0)
-      rugged (>= 0.27, < 1.7)
+      rugged (>= 0.27, < 1.8)
     unicode-display_width (2.5.0)
     webmock (3.19.1)
       addressable (>= 2.8.0)
@@ -240,6 +242,7 @@ DEPENDENCIES
   checkoff!
   fakeweb
   mdl
+  mime-types (= 3.5.1)
   minitest-profile
   minitest-reporters
   mocha (>= 2)

data/lib/checkoff/internal/project_selector_evaluator.rb

@@ -10,12 +10,18 @@ module Checkoff
     # @param project [Asana::Resources::Project]
     # @param projects [Checkoff::Projects]
     # @param custom_fields [Checkoff::CustomFields]
+    # @param workspaces [Checkoff::Workspaces]
+    # @param portfolios [Checkoff::Portfolios]
     def initialize(project:,
                    projects: Checkoff::Projects.new,
-                   custom_fields: Checkoff::CustomFields.new)
+                   custom_fields: Checkoff::CustomFields.new,
+                   workspaces: Checkoff::Workspaces.new,
+                   portfolios: Checkoff::Portfolios.new)
       @item = project
       @projects = projects
       @custom_fields = custom_fields
+      @workspaces = workspaces
+      @portfolios = portfolios
       super()
     end
 
@@ -38,7 +44,10 @@ module Checkoff
 
     # @return [Hash]
     def initializer_kwargs
-      { projects: projects, custom_fields: custom_fields }
+      {
+        projects: projects, custom_fields: custom_fields,
+        workspaces: workspaces, portfolios: portfolios
+      }
     end
 
     # @return [Asana::Resources::Project]
@@ -47,5 +56,9 @@ module Checkoff
     attr_reader :projects
     # @return [Checkoff::CustomFields]
     attr_reader :custom_fields
+    # @return [Checkoff::Workspaces]
+    attr_reader :workspaces
+    # @return [Checkoff::Portfolios]
+    attr_reader :portfolios
   end
 end

data/lib/checkoff/internal/selector_classes/function_evaluator.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require 'checkoff/internal/logging'
+
 module Checkoff
   module SelectorClasses
     # Base class to evaluate types of selector functions
     class FunctionEvaluator
+      include Logging
+
       # @sg-ignore
       # @param _index [Integer]
       def evaluate_arg?(_index)

data/lib/checkoff/internal/selector_classes/project/function_evaluator.rb

@@ -9,11 +9,17 @@ module Checkoff
       class FunctionEvaluator < ::Checkoff::SelectorClasses::FunctionEvaluator
         # @param selector [Array<(Symbol, Array)>,String]
         # @param projects [Checkoff::Projects]
+        # @param portfolios [Checkoff::Portfolios]
+        # @param workspaces [Checkoff::Workspaces]
         def initialize(selector:,
                        projects:,
+                       portfolios:,
+                       workspaces:,
                        **_kwargs)
           @selector = selector
           @projects = projects
+          @portfolios = portfolios
+          @workspaces = workspaces
           super()
         end
 

data/lib/checkoff/internal/selector_classes/project.rb

@@ -36,6 +36,29 @@ module Checkoff
           @projects.project_ready?(project, period: period)
         end
       end
+
+      # :in_portfolio_named? function
+      class InPortfolioNamedPFunctionEvaluator < FunctionEvaluator
+        FUNCTION_NAME = :in_portfolio_named?
+
+        def matches?
+          fn?(selector, FUNCTION_NAME)
+        end
+
+        # @param project [Asana::Resources::Project]
+        # @param portfolio_name [String]
+        # @param workspace_name [String, nil]
+        # @param extra_project_fields [Array<String>]
+        #
+        # @return [Boolean]
+        def evaluate(project, portfolio_name, workspace_name: nil, extra_project_fields: [])
+          workspace_name ||= project.workspace&.name
+          workspace_name ||= @workspaces.default_workspace.name
+          projects = @portfolios.projects_in_portfolio(workspace_name, portfolio_name,
+                                                       extra_project_fields: extra_project_fields)
+          projects.any? { |p| p.name == project.name }
+        end
+      end
     end
   end
 end

data/lib/checkoff/internal/task_timing.rb

@@ -34,7 +34,7 @@ module Checkoff
       # @sg-ignore
       # @return [Date, Time, nil]
       def start_date_or_time(task)
-        return @time_class.parse(task.start_at) unless task.start_at.nil?
+        return @time_class.parse(task.start_at).localtime unless task.start_at.nil?
 
         return @date_class.parse(task.start_on) unless task.start_on.nil?
 
@@ -47,7 +47,7 @@ module Checkoff
       # @sg-ignore
       # @return [Date, Time, nil]
       def due_date_or_time(task)
-        return @time_class.parse(task.due_at) unless task.due_at.nil?
+        return @time_class.parse(task.due_at).localtime unless task.due_at.nil?
 
         return @date_class.parse(task.due_on) unless task.due_on.nil?
 
@@ -58,7 +58,7 @@ module Checkoff
       #
       # @return [Time, nil]
       def modified_time(task)
-        @time_class.parse(task.modified_at) unless task.modified_at.nil?
+        @time_class.parse(task.modified_at).localtime unless task.modified_at.nil?
       end
 
       # @param task [Asana::Resources::Task]

data/lib/checkoff/project_selectors.rb

@@ -23,17 +23,20 @@ module Checkoff
     # @param workspaces [Checkoff::Workspaces]
     # @param projects [Checkoff::Projects]
     # @param custom_fields [Checkoff::CustomFields]
+    # @param portfolios [Checkoff::Portfolios]
     # @param clients [Checkoff::Clients]
     # @param client [Asana::Client]
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
                    workspaces: Checkoff::Workspaces.new(config: config),
                    projects: Checkoff::Projects.new(config: config),
                    custom_fields: Checkoff::CustomFields.new(config: config),
+                   portfolios: Checkoff::Portfolios.new(config: config),
                    clients: Checkoff::Clients.new(config: config),
                    client: clients.client)
       @workspaces = workspaces
       @projects = projects
       @custom_fields = custom_fields
+      @portfolios = portfolios
       @client = client
     end
 
@@ -42,7 +45,8 @@ module Checkoff
     #        project details.  Examples: [:tag, 'foo'] [:not, [:tag, 'foo']] [:tag, 'foo']
     # @return [Boolean]
     def filter_via_project_selector(project, project_selector)
-      evaluator = ProjectSelectorEvaluator.new(project: project, projects: projects, custom_fields: custom_fields)
+      evaluator = ProjectSelectorEvaluator.new(project: project, projects: projects, custom_fields: custom_fields,
+                                               workspaces: workspaces, portfolios: portfolios)
       evaluator.evaluate(project_selector)
     end
 
@@ -57,6 +61,9 @@ module Checkoff
     # @return [Checkoff::CustomFields]
     attr_reader :custom_fields
 
+    # @return [Checkoff::Portfolios]
+    attr_reader :portfolios
+
     # @return [Asana::Client]
     attr_reader :client
 

data/lib/checkoff/projects.rb

@@ -126,7 +126,6 @@ module Checkoff
                              only_uncompleted: only_uncompleted,
                              extra_fields: extra_fields)
     end
-    cache_method :tasks_from_project, SHORT_CACHE_TIME
 
     # Pull task objects from a project identified by a gid
     #
@@ -144,7 +143,7 @@ module Checkoff
       options[:options][:fields] += extra_fields
       client.tasks.find_all(**options)
     end
-    cache_method :tasks_from_project_gid, SHORT_CACHE_TIME
+    cache_method :tasks_from_project_gid, REALLY_LONG_CACHE_TIME
 
     # @param [String] workspace_name
     # @param [Array<String>] extra_fields

data/lib/checkoff/sections.rb

@@ -13,6 +13,8 @@ module Checkoff
     #   extend CacheMethod::ClassMethods
 
     MINUTE = 60
+    HOUR = MINUTE * 60
+    REALLY_LONG_CACHE_TIME = HOUR * 1
     LONG_CACHE_TIME = MINUTE * 15
     SHORT_CACHE_TIME = MINUTE * 5
 
@@ -130,7 +132,7 @@ module Checkoff
       client.tasks.get_tasks(section: section.gid,
                              **options)
     end
-    cache_method :tasks, SHORT_CACHE_TIME
+    cache_method :tasks, REALLY_LONG_CACHE_TIME
 
     # Pulls just names of tasks from a given section.
     # @param workspace_name [String]

data/lib/checkoff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.165.0
+  version: 0.167.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport