checkoff 0.3.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7de05bff57b8bc1ccd37b878944a994b3bad1d08ddfc5bddbd3b95fcbcfef219
-  data.tar.gz: 1368a91a4848ef821ec1ea5d55c689d6a9a5e5d31854cd23b573f5034050b7f2
+  metadata.gz: cf801216d45c8e3b9c09e80e8d5f05d097dec4361f076f3d70efafd10a628ec5
+  data.tar.gz: 19e168d38d597f1ca0962f22d14d2e4326975b847334672337c879edf19d74bb
 SHA512:
-  metadata.gz: a75ed4380070000a5c1a598871f41d34e9fc5bf1e45d6964fd739a8f907e759770caebbfe84a59c01e98d50798eff93c01fc3b664f0c24e014098a2b928cd0b9
-  data.tar.gz: f23238f6b1aa52b41b3567b9246c9982a447f3300a881d15837d9691ea7942425da85b065ee898406b0a0c18a303d221cbe89b0568e7281f3bf10a792d0b9d82
+  metadata.gz: 11b63053e7902dad783ccc000990f211a0184a90a016f938fa354871bec3c101ff8fff4743e798998844405710b34e686cc18def737fd44b7956f179bdeb83df
+  data.tar.gz: 80577a035c94855fbdcb2ee0abbca795c41a426d8d1737c33f7c9250a86dc52e7699dc64b39c895930bd581fcebe8b90fafc50fb2671c3cfb1729c4074ba8487

data/.circleci/config.yml

@@ -6,6 +6,12 @@ jobs:
       - image: apiology/circleci-ruby:latest
     steps:
       - checkout
-      - run: bundle install
-      - run: bundle exec rake --jobs=4 test
-      - run: bundle exec rake --jobs=4 quality
+      - type: cache-restore
+        key: checkoff-{{ checksum "checkoff.gemspec" }}-{{ checksum "Gemfile" }}
+      - run: gem install --no-document bundler
+      - run: bundle install --path vendor/bundle --jobs=4
+      - type: cache-save
+        key: checkoff-{{ checksum "checkoff.gemspec" }}-{{ checksum "Gemfile" }}
+        paths:
+          - "vendor/bundle"
+      - run: bundle exec rake --jobs=4 ci

data/.rubocop.yml

@@ -1,30 +1,27 @@
-# I like trailing commas in maps.  They let me insert new elements and
+# I like trailing commas in hashes.  They let me insert new elements and
 # see them as one line in a diff, not two.
-Style/TrailingCommaInArrayLiteral:
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
-Style/TrailingCommaInHashLiteral:
+Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 
 # I use keyword arguments for a poor man's dependency injection to cut
 # down on the magic in my tests.
-ParameterLists:
+Metrics/ParameterLists:
   CountKeywordArgs: false
 
-# If i'm using one function name and returning the contents of an
+# If I'm using one function name and returning the contents of an
 # attribute, that's OK.  The alternative would be this, which I find
 # confusing and often not really what I mean:
 #
 # attr_reader :something_else
 # alias_method :something, :something_else
-TrivialAccessors:
+Style/TrivialAccessors:
    ExactNameMatch: true
 
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
 #
-# Add 'XXX' to the standard list
+# Add 'XX X' to the standard list
 #
 Style/CommentAnnotation:
    Keywords:
@@ -40,3 +37,41 @@ Style/CommentAnnotation:
        W"
     - "XX\
        X"
+
+# https://stackoverflow.com/questions/40934345/rubocop-25-line-block-size-and-rspec-tests
+Metrics/BlockLength:
+  # Exclude DSLs
+  Exclude:
+    - 'Rakefile'
+    - '*.gemspec'
+    - '**/*.rake'
+    - 'spec/**/*.rb'
+    - 'feature/**/*.rb'
+
+# http://www.betterspecs.org/#single
+#
+# > in tests that are not isolated (e.g. ones that integrate with a
+# > DB, an external webservice, or end-to-end-tests), you take a
+# > massive performance hit to do the same setup over and over again,
+# > just to set a different expectation in each test. In these sorts
+# > of slower tests, I think it's fine to specify more than one
+# > isolated behavior.
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'feature/**/*.rb'
+
+Style/StringLiterals:
+    EnforcedStyle: single_quotes
+    SupportedStyles:
+      - single_quotes
+      - double_quotes
+    ConsistentQuotesInMultiline: true
+
+AllCops:
+  TargetRubyVersion: 2.4
+
+
+require:
+  - rubocop-rspec
+  - rubocop-minitest
+  - rubocop-rake

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.6.6

data/.travis.yml

@@ -1,15 +1,17 @@
+language: ruby
+cache: bundler
 before_install:
+  # https://bundler.io/blog/2019/05/14/
+  #   solutions-for-cant-find-gem-bundler-with-executable-bundle.html
+  - gem update --system
   - gem install bundler
-language: ruby
 rvm:
-  - ruby-2.5.1
-  - ruby-2.4.4
-  - ruby-2.3.7
-  # - ruby-2.2.10 # no longer supported
-  #
-  # - jruby-head # JRuby not supported by dependencies
-  # - jruby-9.0  # see:
-  #    https://github.com/apiology/quality/issues/59
-  #    https://github.com/brianmario/charlock_holmes/issues/124
-  #
-  - ruby-head # Upstream bug - see https://travis-ci.org/apiology/checkoff/jobs/138626934
+  # JRuby error with native code build - possibly can be overcome?
+  # checking for main() in -lstdc++... RuntimeError: The compiler failed to generate
+  # https://travis-ci.com/apiology/pronto-punchlist/jobs/264907931
+  # - jruby-head
+  - ruby-head
+  - ruby-2.7
+  - ruby-2.6
+  - ruby-2.5
+  - ruby-2.4

data/Makefile

@@ -0,0 +1,27 @@
+.PHONY: spec feature
+
+all: localtest
+
+localtest:
+	@bundle exec rake localtest
+
+feature:
+	@bundle exec rake feature
+
+spec:
+	@bundle exec rake spec
+
+rubocop:
+	@bundle exec rake rubocop
+
+punchlist:
+	@bundle exec rake punchlist
+
+pronto:
+	@bundle exec rake pronto
+
+bigfiles:
+	@bundle exec rake bigfiles
+
+quality:
+	@bundle exec rake quality

data/checkoff.gemspec

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
 # coding: ascii
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'checkoff/version'
 
@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'cache_method'
   spec.add_runtime_dependency 'dalli'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'minitest-profile'
   spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'quality'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'quality', '~> 37'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '>=3.4'
   spec.add_development_dependency 'simplecov'
 end

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 98.65
+    "covered_percent": 83.74
   }
 }

data/lib/checkoff.rb

@@ -4,4 +4,5 @@ require 'checkoff/version'
 require 'checkoff/workspaces'
 require 'checkoff/projects'
 require 'checkoff/sections'
+require 'checkoff/subtasks'
 require 'checkoff/tasks'

data/lib/checkoff/cli.rb

@@ -103,7 +103,7 @@ module Checkoff
       stderr.puts "  #{$PROGRAM_NAME} quickadd workspace task_name"
       stderr.puts
       stderr.puts "'project' can be set to a project name, or :my_tasks, " \
-                  ':my_tasks_upcoming, :my_tasks_new, or :my_tasks_today'
+                  ":my_tasks_upcoming, :my_tasks_new, or :my_tasks_today"
     end
 
     def view(workspace_name, project_name, section_name)

data/lib/checkoff/config_loader.rb

@@ -10,7 +10,7 @@ module Checkoff
     def self.load(sym)
       file = "#{sym}.yml"
       YAML.load_file(File.expand_path("~/.#{file}"))
-        .with_indifferent_access
+          .with_indifferent_access
     end
   end
 end

data/lib/checkoff/projects.rb

@@ -43,6 +43,7 @@ module Checkoff
     def projects_by_workspace_name(workspace_name)
       workspace = @workspaces.workspace_by_name(workspace_name)
       raise "Could not find workspace named #{workspace_name}" unless workspace
+
       projects.find_by_workspace(workspace: workspace.gid)
     end
 
@@ -52,6 +53,7 @@ module Checkoff
       if my_tasks.nil? || gid.nil?
         raise "Please define [:my_tasks][#{workspace_name}] in config file"
       end
+
       projects.find_by_id(gid)
     end
 
@@ -75,7 +77,8 @@ module Checkoff
       {
         per_page: 100,
         options: {
-          fields: %w[name completed_at due_at due_on assignee_status tags],
+          fields: %w[name completed_at due_at due_on assignee_status tags
+                     memberships.project.gid memberships.section.name],
         },
       }
     end
@@ -85,8 +88,8 @@ module Checkoff
       options[:completed_since] = '9999-12-01' if only_uncompleted
       options[:project] = project.gid
       options[:options][:fields] += extra_fields
-      client.tasks.find_all(options).to_a
+      client.tasks.find_all(**options).to_a
     end
-    cache_method :tasks_from_project, LONG_CACHE_TIME
+    cache_method :tasks_from_project, SHORT_CACHE_TIME
   end
 end

data/lib/checkoff/sections.rb

@@ -21,7 +21,34 @@ module Checkoff
 
     def_delegators :@projects, :client
 
-    def file_task_by_section(current_section, by_section, task)
+    def file_task_by_section(by_section, task, project_gid)
+      membership = task.memberships.find { |m| m.project.gid == project_gid }
+      if membership.nil?
+        raise "Could not find task in project_gid #{project_gid}: #{task}"
+      end
+
+      current_section = membership.section.name
+      current_section = nil if current_section == '(no section)'
+      by_section[current_section] ||= []
+      by_section[current_section] << task
+    end
+
+    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
+
+    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)
+    end
+
+    def legacy_file_task_by_section(current_section, by_section, task)
       if task.name =~ /:$/
         current_section = task.name
         by_section[current_section] = []
@@ -32,31 +59,24 @@ module Checkoff
       [current_section, by_section]
     end
 
-    def by_section(tasks)
+    def legacy_by_section(tasks)
       current_section = nil
       by_section = {}
       tasks.each do |task|
-        current_section, by_section = file_task_by_section(current_section,
-                                                           by_section, task)
+        current_section, by_section =
+          legacy_file_task_by_section(current_section, by_section, task)
       end
       by_section
     end
-    cache_method :by_section, LONG_CACHE_TIME
-
-    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)
-    end
 
     def 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)
+                .group_by(&:assignee_status)
       active_tasks = by_assignee_status[assignee_status]
-      by_section(active_tasks)
+      legacy_by_section(active_tasks)
     end
 
     def project_or_raise(workspace_name, project_name)
@@ -100,12 +120,6 @@ module Checkoff
     end
     cache_method :section_task_names, SHORT_CACHE_TIME
 
-    # Returns all subtasks, including section headers
-    def raw_subtasks(task)
-      task.subtasks(projects.task_options)
-    end
-    cache_method :raw_subtasks, LONG_CACHE_TIME
-
     def task_due?(task)
       if task.due_at
         Time.parse(task.due_at) <= time.now

data/lib/checkoff/subtasks.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module Checkoff
+  # Query different subtasks of Asana tasks
+  class Subtasks
+    MINUTE = 60
+    LONG_CACHE_TIME = MINUTE * 15
+    SHORT_CACHE_TIME = MINUTE * 5
+
+    extend Forwardable
+
+    def 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 by_section(tasks)
+      current_section = nil
+      by_section = {}
+      tasks.each do |task|
+        current_section, by_section = file_task_by_section(current_section,
+                                                           by_section, task)
+      end
+      by_section
+    end
+
+    # Returns all subtasks, including section headers
+    def raw_subtasks(task)
+      task.subtasks(projects.task_options)
+    end
+    cache_method :raw_subtasks, LONG_CACHE_TIME
+  end
+end

data/lib/checkoff/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Checkoff
-  VERSION = '0.3.1'
+  VERSION = '0.5.2'
 end

data/lib/checkoff/workspaces.rb

@@ -12,7 +12,7 @@ module Checkoff
     def client
       @client ||= @asana_client.new do |c|
         c.authentication :access_token, @config[:personal_access_token]
-        c.default_headers "asana-enable" => "string_ids,new_sections"
+        c.default_headers 'asana-enable' => 'string_ids,new_sections'
       end
     end
 

data/lib/tasks/ci.rake

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+desc 'Run tasks to be done during a continuous integration (CI) build'
 task ci: :localtest

data/lib/tasks/clear_metrics.rake

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+desc 'Rebaseline quality thresholds to last commit'
 task :clear_metrics do |_t|
   ret =
     system('git checkout coverage/.last_run.json metrics/*_high_water_mark')

data/lib/tasks/localtest.rake

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+desc 'Standard build when running on a workstation'
 task localtest: %i[clear_metrics test quality]

data/metrics/bigfiles_high_water_mark

@@ -1 +1 @@
-459
+410

data/metrics/punchlist_high_water_mark

@@ -1,2 +1 @@
-11
-
+3

data/metrics/rubocop_high_water_mark

@@ -1 +1 @@
-2
+1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Vince Broz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-profile
   requirement: !ruby/object:Gem::Requirement
@@ -112,30 +112,30 @@ dependencies:
   name: quality
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '37'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '37'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - vince@broz.cc
 executables:
@@ -180,6 +180,7 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/console
@@ -193,6 +194,7 @@ files:
 - lib/checkoff/config_loader.rb
 - lib/checkoff/projects.rb
 - lib/checkoff/sections.rb
+- lib/checkoff/subtasks.rb
 - lib/checkoff/tasks.rb
 - lib/checkoff/version.rb
 - lib/checkoff/workspaces.rb
@@ -225,7 +227,7 @@ homepage: http://github.com/apiology/checkoff
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -241,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Command-line and gem client for Asana (unofficial)
 test_files: []