checkoff 0.185.0 → 0.187.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c144884f931d0a839d66654dbb1ce02487d6024bbd32ca3a56ed749dfb650fa
-  data.tar.gz: fbce0b5063ca8dbec172cc2f3d062a266daae30af1d70d090586cb8eee485b03
+  metadata.gz: 662bb742d6b627b5b1e95d376e0565392ecc56ea54d4dea8f76c5e5198093d6d
+  data.tar.gz: '01859381f83d92867afc1319a0d43fc860a6505970cce641c76565b5a99e5d13'
 SHA512:
-  metadata.gz: c77b6170bf7eaa08e532eb38013ff25ae581d7363543128516a98d1cf354bc5137e6caa24e8f99d5d2ec52747ed300fc3e9ab279a3a209e89eee5a64b5900b10
-  data.tar.gz: 928dba035f252897d2a400b1b55ba05bf98dc91f676818395a6d070f14ed0f179a8e09421f4580f9c7c3bff15d1570eee7b7561d0a4d01b0d3dfcd68d0f6ab83
+  metadata.gz: 5f6a49cf14421028d42869e8436b5cc917e584aee545b0645487efc64fcda10ee35db189890970c9fb71349ad8498d4fe7ad548b177f140c4feb82edf3bc1df3
+  data.tar.gz: 26763f804929cbbcfb4af6faaed2ff14d01dd9736b465c830a5e9e9479c8428c8d14114e12b7fa6fda9e7cc9aa3fb6896d043fcea099b1678d60849b12b6420f

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.185.0)
+    checkoff (0.187.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -180,7 +180,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.34.4)
+    rubocop-minitest (0.34.5)
       rubocop (>= 1.39, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
@@ -262,4 +262,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.22
+   2.5.5

data/config/definitions.rb

@@ -50,6 +50,8 @@
 #         def due_at; end
 #         # @return [String,nil]
 #         def due_on; end
+#         # @return [String,nil]
+#         def name; end
 #         # @return [Hash<String, String>, nil]
 #         def assignee; end
 #         # @return [String, nil]
@@ -61,8 +63,14 @@
 #           def create(client, assignee:, workspace:, name:); end
 #         end
 #       end
+#       class Section
+#         # @return [String,nil]
+#         def name; end
+#       end
 #       class Project
 #         # @return [String,nil]
+#         def name; end
+#         # @return [String,nil]
 #         def due_date; end
 #       end
 #       class Portfolio
@@ -70,6 +78,9 @@
 #         def get_items(options = {}); end
 #       end
 #     end
+#     module Errors
+#       class NotFound < StandardError; end
+#     end
 #     module Resources
 #       class Workspace
 #         # @return [String, nil]

data/fix.sh

@@ -152,22 +152,29 @@ ensure_bundle() {
     need_better_bundler=true
   elif [ "${bundler_version_major}" -eq 2 ]
   then
-    if [ "${bundler_version_minor}" -lt 2 ]
+    if [ "${bundler_version_minor}" -lt 5 ]
     then
       need_better_bundler=true
-    elif [ "${bundler_version_minor}" -eq 2 ]
+    elif [ "${bundler_version_minor}" -eq 5 ]
     then
-      if [ "${bundler_version_patch}" -lt 23 ]
+      if [ "${bundler_version_patch}" -lt 5 ]
       then
         need_better_bundler=true
       fi
     fi
   fi
+  echo "Bundler version: ${bundler_version}"
+  echo "Need better bundler: ${need_better_bundler}"
   if [ "${need_better_bundler}" = true ]
   then
     # need to do this first before 'bundle update --bundler' will work
     make bundle_install
+    set -x
     bundle update --bundler
+    gem install bundler:2.5.5
+    set +x
+    echo "After updating bundler:"
+    echo "Bundler version: ${bundler_version}"
     # ensure next step installs fresh bundle
     rm -f Gemfile.lock.installed
   fi

data/lib/checkoff/attachments.rb

@@ -75,25 +75,23 @@ module Checkoff
     # not succesful
     #
     # @param uri [URI]
+    # @param verify_mode [OpenSSL::SSL::VERIFY_NONE,OpenSSL::SSL::VERIFY_PEER]
     #
     # @return [Object]
     # @sg-ignore
-    def download_uri(uri, &block)
+    def download_uri(uri, verify_mode: OpenSSL::SSL::VERIFY_PEER, &block)
       out = nil
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https', verify_mode: verify_mode) do |http|
         # @sg-ignore
-        request = Net::HTTP::Get.new(uri)
-        http.request(request) do |response|
-          # use a block to ensure the file is closed after we're done with it
+        http.request(Net::HTTP::Get.new(uri)) do |response|
           raise("Unexpected response code: #{response.code}") unless response.code == '200'
 
-          write_tempfile_from_response(response) do |tempfile|
-            out = block.yield tempfile
-          end
+          write_tempfile_from_response(response) { |tempfile| out = block.yield tempfile }
         end
       end
       out
     rescue StandardError => e
+      debug { e }
       raise "Error downloading #{uri}: #{e}"
     end
 

data/lib/checkoff/events.rb

@@ -7,6 +7,7 @@ require 'cache_method'
 require_relative 'internal/config_loader'
 require_relative 'internal/logging'
 require_relative 'internal/asana_event_filter'
+require_relative 'internal/asana_event_enrichment'
 require_relative 'workspaces'
 require_relative 'clients'
 
@@ -34,19 +35,28 @@ module Checkoff
     # @param config [Hash]
     # @param workspaces [Checkoff::Workspaces]
     # @param tasks [Checkoff::Tasks]
+    # @param sections [Checkoff::Sections]
+    # @param projects [Checkoff::Projects]
     # @param clients [Checkoff::Clients]
     # @param client [Asana::Client]
     # @param asana_event_filter_class [Class<Checkoff::Internal::AsanaEventFilter>]
+    # @param asana_event_enrichment [Checkoff::Internal::AsanaEventEnrichment]
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
                    workspaces: Checkoff::Workspaces.new(config: config),
                    tasks: Checkoff::Tasks.new(config: config),
+                   sections: Checkoff::Sections.new(config: config),
+                   projects: Checkoff::Projects.new(config: config),
                    clients: Checkoff::Clients.new(config: config),
                    client: clients.client,
-                   asana_event_filter_class: Checkoff::Internal::AsanaEventFilter)
+                   asana_event_filter_class: Checkoff::Internal::AsanaEventFilter,
+                   asana_event_enrichment: Checkoff::Internal::AsanaEventEnrichment.new)
       @workspaces = workspaces
       @tasks = tasks
+      @sections = sections
+      @projects = projects
       @client = client
       @asana_event_filter_class = asana_event_filter_class
+      @asana_event_enrichment = asana_event_enrichment
     end
 
     # @param filters [Array<Hash>, nil] The filters to match against
@@ -65,34 +75,35 @@ module Checkoff
     #
     # @return [Hash]
     def enrich_event(asana_event)
-      finer { "Enriching event: #{asana_event}" }
-      asana_event = asana_event.dup
-      enrich_event_resource!(asana_event)
-      asana_event
+      asana_event_enrichment.enrich_event(asana_event)
     end
 
-    private
+    # @param filter [Hash<String,[String,Array<String>]>]
+    #
+    # @return [Hash<String,[String,Array<String>]>]
+    def enrich_filter(filter)
+      asana_event_enrichment.enrich_filter(filter)
+    end
 
-    # @param asana_event [Hash{'resource' => Hash}]
+    # @param webhook_subscription [Hash] Hash of the request made to
+    #   webhook POST endpoint - https://app.asana.com/api/1.0/webhooks
+    #   https://developers.asana.com/reference/createwebhook
     #
     # @return [void]
-    def enrich_event_resource!(asana_event)
-      # @type [Hash{String => String }]
-      resource = asana_event['resource']
-      # @type [String]
-      resource_type = resource.fetch('resource_type')
-      # @type [String]
-      gid = resource.fetch('gid')
-
-      if resource_type == 'task'
-        task = tasks.task_by_gid(gid, only_uncompleted: false)
-        resource['checkoff:name'] = task.name if task
-      end
-      nil
+    def enrich_webhook_subscription!(webhook_subscription)
+      asana_event_enrichment.enrich_webhook_subscription!(webhook_subscription)
     end
 
+    private
+
     include Logging
 
+    # @return [Checkoff::Projects]
+    attr_reader :projects
+
+    # @return [Checkoff::Sections]
+    attr_reader :sections
+
     # @return [Checkoff::Tasks]
     attr_reader :tasks
 
@@ -102,6 +113,9 @@ module Checkoff
     # @return [Asana::Client]
     attr_reader :client
 
+    # @return [Checkoff::Internal::AsanaEventEnrichment]
+    attr_reader :asana_event_enrichment
+
     # bundle exec ./events.rb
     # :nocov:
     class << self

data/lib/checkoff/internal/asana_event_enrichment.rb

@@ -0,0 +1,215 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+require 'cache_method'
+require 'checkoff/internal/config_loader'
+require 'checkoff/internal/logging'
+require 'checkoff/internal/asana_event_enrichment'
+require 'checkoff/workspaces'
+require 'checkoff/clients'
+
+module Checkoff
+  module Internal
+    # Add useful info (like resource task names) into an Asana
+    # event/event filters/webhook subscription for human consumption
+    class AsanaEventEnrichment
+      # @param config [Hash]
+      # @param workspaces [Checkoff::Workspaces]
+      # @param tasks [Checkoff::Tasks]
+      # @param sections [Checkoff::Sections]
+      # @param projects [Checkoff::Projects]
+      # @param clients [Checkoff::Clients]
+      # @param client [Asana::Client]
+      # @param asana_event_enrichment [Checkoff::Internal::AsanaEventEnrichment]
+      def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
+                     workspaces: Checkoff::Workspaces.new(config: config),
+                     tasks: Checkoff::Tasks.new(config: config),
+                     sections: Checkoff::Sections.new(config: config),
+                     projects: Checkoff::Projects.new(config: config),
+                     clients: Checkoff::Clients.new(config: config),
+                     client: clients.client)
+        @workspaces = workspaces
+        @tasks = tasks
+        @sections = sections
+        @projects = projects
+        @client = client
+      end
+
+      # Add useful info (like resource task names) into an event for
+      # human consumption
+      #
+      # @param asana_event [Hash]
+      #
+      # @return [Hash]
+      def enrich_event(asana_event)
+        finer { "Enriching event: #{asana_event}" }
+        asana_event = asana_event.dup
+        enrich_event_resource!(asana_event)
+        enrich_event_parent!(asana_event)
+        asana_event
+      end
+
+      # @param filter [Hash<String,[String,Array<String>]>]
+      #
+      # @return [Hash<String,[String,Array<String>]>]
+      def enrich_filter(filter)
+        filter = filter.dup
+        enrich_filter_section!(filter)
+        enrich_filter_resource!(filter)
+        enrich_filter_parent_gid!(filter)
+        filter
+      end
+
+      # @param webhook_subscription [Hash] Hash of the request made to
+      #   webhook POST endpoint - https://app.asana.com/api/1.0/webhooks
+      #   https://developers.asana.com/reference/createwebhook
+      #
+      # @return [void]
+      def enrich_webhook_subscription!(webhook_subscription)
+        webhook_subscription&.fetch('filters', nil)&.map! do |filter|
+          enrich_filter(filter)
+        end
+        resource = webhook_subscription&.fetch('resource', nil)
+        # @sg-ignore
+        name, resource_type = enrich_gid(resource) if resource
+        webhook_subscription['checkoff:enriched:name'] = name if name
+        webhook_subscription['checkoff:enriched:resource_type'] = resource_type if resource_type
+      end
+
+      private
+
+      # Attempt to look up a GID in situations where we don't have a
+      # resource type provided, and returns the name of the resource.
+      #
+      # @param gid [String]
+      # @param resource_type [String,nil]
+      #
+      # @return [Array<([String, nil], [String,nil])>]
+      def enrich_gid(gid, resource_type: nil)
+        %w[task section project].each do |resource_type_to_try|
+          next unless [resource_type_to_try, nil].include?(resource_type)
+
+          name = method(:"enrich_#{resource_type_to_try}_gid").call(gid)
+          return [name, resource_type_to_try] if name
+        end
+        [nil, nil]
+      end
+
+      # @param filter [Hash{String => String}]
+      #
+      # @return [String, nil]
+      def enrich_filter_parent_gid!(filter)
+        parent_gid = filter['checkoff:parent.gid']
+        return unless parent_gid
+
+        # @sg-ignore
+        name, resource_type = enrich_gid(parent_gid)
+        filter['checkoff:enriched:parent.name'] = name if name
+        filter['checkoff:enriched:parent.resource_type'] = resource_type if resource_type
+      end
+
+      # @param gid [String]
+      #
+      # @return [String, nil]
+      def enrich_task_gid(gid)
+        task = tasks.task_by_gid(gid, only_uncompleted: false)
+        task&.name
+      end
+
+      # @param section_gid [String]
+      #
+      # @return [String, nil]
+      def enrich_section_gid(section_gid)
+        section = sections.section_by_gid(section_gid)
+        section&.name
+      end
+
+      # @param project_gid [String]
+      #
+      # @return [String, nil]
+      def enrich_project_gid(project_gid)
+        project = projects.project_by_gid(project_gid)
+        project&.name
+      end
+
+      # @param filter [Hash{String => String}]
+      #
+      # @return [void]
+      def enrich_filter_resource!(filter)
+        resource_gid = filter['checkoff:resource.gid']
+
+        return unless resource_gid
+
+        task = tasks.task_by_gid(resource_gid)
+        filter['checkoff:enriched:resource.name'] = task.name if task
+      end
+
+      # @param filter [Hash{String => [String,Array<String>]}]
+      #
+      # @return [void]
+      def enrich_filter_section!(filter)
+        section_gid = filter['checkoff:fetched.section.gid']
+        return unless section_gid
+
+        name = enrich_section_gid(section_gid)
+        filter['checkoff:enriched:fetched.section.name'] = name if name
+      end
+
+      # @param asana_event [Hash{'resource' => Hash}]
+      #
+      # @return [void]
+      def enrich_event_parent!(asana_event)
+        # @type [Hash{String => String }]
+        parent = asana_event['parent']
+
+        return unless parent
+
+        # @type [String]
+        resource_type = parent.fetch('resource_type')
+        # @type [String]
+        gid = parent.fetch('gid')
+        # @sg-ignore
+        name, _resource_type = enrich_gid(gid, resource_type: resource_type)
+        parent['checkoff:enriched:name'] = name if name
+
+        nil
+      end
+
+      # @param asana_event [Hash{'resource' => Hash}]
+      #
+      # @return [void]
+      def enrich_event_resource!(asana_event)
+        # @type [Hash{String => String }]
+        resource = asana_event['resource']
+        # @type [String]
+        resource_type = resource.fetch('resource_type')
+
+        # @type [String]
+        gid = resource.fetch('gid')
+
+        # @sg-ignore
+        name, _resource_type = enrich_gid(gid, resource_type: resource_type)
+        resource['checkoff:enriched:name'] = name if name
+
+        nil
+      end
+
+      include Logging
+
+      # @return [Checkoff::Projects]
+      attr_reader :projects
+
+      # @return [Checkoff::Sections]
+      attr_reader :sections
+
+      # @return [Checkoff::Tasks]
+      attr_reader :tasks
+
+      # @return [Checkoff::Workspaces]
+      attr_reader :workspaces
+
+      # @return [Asana::Client]
+      attr_reader :client
+    end
+  end
+end

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

@@ -100,6 +100,26 @@ module Checkoff
         end
       end
 
+      # :in_portfolio_more_than_once? function
+      class InPortfolioMoreThanOncePFunctionEvaluator < FunctionEvaluator
+        def matches?
+          fn?(selector, :in_portfolio_more_than_once?)
+        end
+
+        # @param _index [Integer]
+        def evaluate_arg?(_index)
+          false
+        end
+
+        # @sg-ignore
+        # @param task [Asana::Resources::Task]
+        # @param portfolio_name [String]
+        # @return [Boolean]
+        def evaluate(task, portfolio_name)
+          @tasks.in_portfolio_more_than_once?(task, portfolio_name)
+        end
+      end
+
       # :tag? function
       class TagPFunctionEvaluator < FunctionEvaluator
         def matches?

data/lib/checkoff/projects.rb

@@ -3,6 +3,7 @@
 require_relative 'internal/config_loader'
 require_relative 'internal/project_hashes'
 require_relative 'internal/project_timing'
+require_relative 'internal/logging'
 require_relative 'workspaces'
 require_relative 'clients'
 require_relative 'timing'
@@ -99,9 +100,12 @@ module Checkoff
     # @param gid [String]
     # @param [Array<String>] extra_fields
     #
-    # @return [Asana::Resources::Project]
+    # @return [Asana::Resources::Project,nil]
     def project_by_gid(gid, extra_fields: [])
       projects.find_by_id(gid, options: { fields: %w[name] + extra_fields })
+    rescue Asana::Errors::NotFound => e
+      debug e
+      nil
     end
     cache_method :project_by_gid, REALLY_LONG_CACHE_TIME
 
@@ -192,8 +196,15 @@ module Checkoff
       timing.in_period?(project_date, period)
     end
 
+    # @return [Hash]
+    def as_cache_key
+      {}
+    end
+
     private
 
+    include Logging
+
     # @return [Checkoff::Timing]
     attr_reader :timing
 

data/lib/checkoff/sections.rb

@@ -5,6 +5,7 @@ require_relative 'projects'
 require_relative 'workspaces'
 require_relative 'clients'
 require_relative 'my_tasks'
+require_relative 'internal/logging'
 
 module Checkoff
   # Query different sections of Asana projects
@@ -197,15 +198,26 @@ module Checkoff
 
     # @param gid [String]
     #
-    # @return [Asana::Resources::Section]
+    # @return [Asana::Resources::Section, nil]
     def section_by_gid(gid)
       options = {}
       Asana::Resources::Section.new(parse(client.get("/sections/#{gid}", options: options)).first,
                                     client: client)
+    rescue Asana::Errors::NotFound => e
+      debug e
+      nil
+    end
+    cache_method :section_by_gid, SHORT_CACHE_TIME
+
+    # @return [Hash]
+    def as_cache_key
+      {}
     end
 
     private
 
+    include Logging
+
     # https://github.com/Asana/ruby-asana/blob/master/lib/asana/resource_includes/response_helper.rb#L7
     # @param response [Faraday::Response]
     #

data/lib/checkoff/tasks.rb

@@ -161,6 +161,9 @@ module Checkoff
       options[:fields] += extra_fields
       options[:completed_since] = '9999-12-01' if only_uncompleted
       client.tasks.find_by_id(task_gid, options: options)
+    rescue Asana::Errors::NotFound => e
+      debug e
+      nil
     end
     cache_method :task_by_gid, SHORT_CACHE_TIME
 
@@ -289,6 +292,27 @@ module Checkoff
       end
     end
 
+    # True if the task is in a project which is in the given portfolio
+    #
+    # @param task [Asana::Resources::Task]
+    # @param portfolio_name [String]
+    # @param workspace_name [String]
+    def in_portfolio_more_than_once?(task,
+                                     portfolio_name,
+                                     workspace_name: @workspaces.default_workspace.name)
+      portfolio_projects = @portfolios.projects_in_portfolio(workspace_name, portfolio_name)
+      portfolio_project_gids = portfolio_projects.map(&:gid)
+      seen = false
+      task.memberships.each do |membership|
+        project_gid = membership.fetch('project').fetch('gid')
+        next unless portfolio_project_gids.include?(project_gid)
+        return true if seen
+
+        seen = true
+      end
+      false
+    end
+
     # @return [Hash]
     def as_cache_key
       {}

data/lib/checkoff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.185.0
+  version: 0.187.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,6 +149,7 @@ files:
 - lib/checkoff/create-entity.sh
 - lib/checkoff/custom_fields.rb
 - lib/checkoff/events.rb
+- lib/checkoff/internal/asana_event_enrichment.rb
 - lib/checkoff/internal/asana_event_filter.rb
 - lib/checkoff/internal/config_loader.rb
 - lib/checkoff/internal/create-class.sh