checkoff 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9229d2827676a7888a6bb60059d06729ec2ba27912e029ac452827c6c2ce4e2
-  data.tar.gz: f15c045ba7aa21087c5c3b179866c17632757ef7a1923c7c9a1c4185d4828043
+  metadata.gz: d54f389a54d7a47d43ec3fb15e1281482d54b3d1fbfd7fe5622a75e2710ab8d9
+  data.tar.gz: c4696373fb23d4dd798803bafeb09c64eb04f7f68cf9c94edcf35ac37d60f02b
 SHA512:
-  metadata.gz: d711b94cb4ae8b0933ed9c0e20104123e7707b898616335ddcb73e0f30e09a2bd427889f554a6422b7071ebbf304c58832446783288f1b4d1171a1b31a61dd51
-  data.tar.gz: cc6e96a3371f0870777228394ca085db4a7786badf3173b49a864c79866af3ad4ca71a3482920b1de8f8e9f5b6683d9f846ffd7cd819bc81de20a01cfdc83a3c
+  metadata.gz: 87aefeff6e2b41c1aea50835e2552a6c44cbbdb3017f478a6f004de2052cc639d7bb887fb3613fecdf4429e1e87c541cbfa875d5ae4c008cf5ecd4d4fa90eb4f
+  data.tar.gz: 20de66650b388bc3f243a584efa2607637d46e8dfb51eb6ddd44b8bb15bafd9d71343e334c1a7af3f5417679d5da2d0a53f14cbf6221ead4b16cc3b89109f9c5

data/.circleci/config.yml

@@ -37,7 +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-v4-{{ checksum "Gemfile.lock.deversioned" }}
+          key: gems-v1-{{ checksum "Gemfile.lock.deversioned" }}
+      - restore_cache:
+          key: wheels-v1-{{ checksum "requirements_dev.txt" }}
       - run:
           name: Initialize packages
           command: |
@@ -52,9 +54,13 @@ commands:
               exit 1
             fi
       - save_cache:
-          key: gems-v4-{{ checksum "Gemfile.lock.deversioned" }}
+          key: gems-v1-{{ checksum "Gemfile.lock.deversioned" }}
           paths:
             - "vendor/bundle"
+      - save_cache:
+          key: wheels-v1-{{ checksum "requirements_dev.txt" }}
+          paths:
+            - "/home/circleci/.cache/pip/wheels"
       - run:
           name: Download new circleci tool
           command: |
@@ -78,7 +84,7 @@ commands:
 jobs:
   overcommit:
     docker:
-      - image: apiology/circleci:latest
+      - image: apiology/circleci-ruby:latest
     steps:
       - when:
           condition:
@@ -93,7 +99,7 @@ jobs:
   build:
     working_directory: ~/checkoff
     docker:
-      - image: apiology/circleci:latest
+      - image: apiology/circleci-ruby:latest
     steps:
       - set_up_environment
       - run_with_languages:
@@ -117,6 +123,7 @@ workflows:
                 - main
     jobs:
       - build
+      - overcommit
   overcommit:
     jobs:
       - overcommit

data/DEVELOPMENT.md

@@ -21,8 +21,10 @@ development.  See the `.envrc` file for detail.
 To publish new version as a maintainer:
 
 ```sh
+git checkout main && git pull
 git log "v$(bump current)..."
 # Set type_of_bump to patch, minor, or major
 bump --tag --tag-prefix=v ${type_of_bump:?}
 rake release
+git push
 ```

data/Gemfile

@@ -4,3 +4,16 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in checkoff.gemspec
 gemspec
+
+# ruby-asana gem is pending key bugfixes for checkoff as of
+# 2021-07-29:
+#
+# See
+#  https://github.com/Asana/ruby-asana/issues/109
+#  https://github.com/Asana/ruby-asana/issues/110
+#
+gem 'asana',
+    git: 'https://github.com/apiology/ruby-asana',
+    branch: 'checkoff_fixes'
+
+# gem 'asana', path: '/Users/broz/src/ruby-asana'

data/Gemfile.lock

@@ -1,7 +1,18 @@
+GIT
+  remote: https://github.com/apiology/ruby-asana
+  revision: 83732f040728a4ef1cfc9ed61f65878dbee6aa23
+  branch: checkoff_fixes
+  specs:
+    asana (0.10.4)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.0)
+      faraday_middleware-multi_json (~> 0.0)
+      oauth2 (~> 1.4)
+
 PATH
   remote: .
   specs:
-    checkoff (0.12.1)
+    checkoff (0.13.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -17,17 +28,13 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    asana (0.10.3)
-      faraday (~> 1.0)
-      faraday_middleware (~> 1.0)
-      faraday_middleware-multi_json (~> 0.0)
-      oauth2 (~> 1.4)
     ast (2.4.2)
     bump (0.10.0)
     cache (0.4.1)
     cache_method (0.2.7)
       cache (>= 0.2.1)
     childprocess (4.0.0)
+    coderay (1.1.3)
     concurrent-ruby (1.1.9)
     dalli (2.7.11)
     docile (1.4.0)
@@ -60,6 +67,7 @@ GEM
       parser (>= 2.5, != 2.5.1.1)
     iniparse (1.5.0)
     jwt (2.2.3)
+    method_source (1.0.0)
     minitest (5.14.4)
     minitest-profile (0.0.2)
     mocha (1.12.0)
@@ -79,6 +87,9 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.3)
@@ -125,17 +136,19 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  asana!
   bump
   bundler
   checkoff!
   minitest-profile
   mocha
   overcommit (>= 0.58.0)
+  pry
   rake (~> 13.0)
   rubocop
   rubocop-minitest
   rubocop-rake
-  simplecov
+  simplecov (>= 0.18.0)
   simplecov-lcov
   undercover
 

data/README.md

@@ -1,7 +1,4 @@
-Command-line and gem client for Asana (unofficial)
-
-[![Circle CI](https://circleci.com/gh/apiology/checkoff.svg?style=svg)](https://circleci.com/gh/apiology/checkoff)
-[![Travis CI](https://travis-ci.org/apiology/checkoff.svg?branch=main)](https://travis-ci.org/apiology/checkoff)
+[![CircleCI](https://circleci.com/gh/apiology/checkoff.svg?style=svg)](https://circleci.com/gh/apiology/checkoff)
 
 Command-line and gem client for Asana (unofficial)
 

data/checkoff.gemspec

@@ -15,8 +15,10 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT license'
   spec.required_ruby_version = '>= 2.6'
 
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -36,11 +38,13 @@ Gem::Specification.new do |spec|
   # 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 'rubocop-minitest'
   spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'simplecov'
+  # ensure version with branch coverage
+  spec.add_development_dependency 'simplecov', ['>=0.18.0']
   spec.add_development_dependency 'simplecov-lcov'
   spec.add_development_dependency 'undercover'
 end

data/coverage/.last_run.json

@@ -1,6 +1,6 @@
 {
   "result": {
-    "line": 97.56,
-    "branch": 85.71
+    "line": 98.57,
+    "branch": 91.66
   }
 }

data/fix.sh

@@ -95,7 +95,7 @@ ensure_ruby_build_requirements() {
 # been release here: https://www.ruby-lang.org/en/downloads/
 ensure_ruby_versions() {
   # You can find out which feature versions are still supported / have
-  # been release here: https://www.python.org/downloads/
+  # been release here: https://www.ruby-lang.org/en/downloads/
   ruby_versions="$(latest_ruby_version 2.6)"
 
   echo "Latest Ruby versions: ${ruby_versions}"
@@ -227,6 +227,8 @@ ensure_python_build_requirements() {
   ensure_dev_library openssl/ssl.h openssl libssl-dev
   ensure_dev_library ffi.h libffi libffi-dev
   ensure_dev_library sqlite3.h sqlite3 libsqlite3-dev
+  ensure_dev_library lzma.h xz liblzma-dev
+  ensure_dev_library readline.h readline libreadline-dev
 }
 
 # You can find out which feature versions are still supported / have
@@ -234,7 +236,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.9)"
+  python_versions="$(latest_python_version 3.10)"
 
   echo "Latest Python versions: ${python_versions}"
 
@@ -271,7 +273,7 @@ ensure_pyenv_virtualenvs() {
   pyenv local "${virtualenv_name}" ${python_versions} mylibs
 }
 
-ensure_pip() {
+ensure_pip_and_wheel() {
   # Make sure we have a pip with the 20.3 resolver, and after the
   # initial bugfix release
   major_pip_version=$(pip --version | cut -d' ' -f2 | cut -d '.' -f 1)
@@ -279,6 +281,8 @@ ensure_pip() {
   then
     pip install 'pip>=20.3.1'
   fi
+  # wheel is helpful for being able to cache long package builds
+  pip show wheel >/dev/null 2>&1 || pip install wheel
 }
 
 ensure_python_requirements() {
@@ -325,7 +329,7 @@ ensure_python_versions
 
 ensure_pyenv_virtualenvs
 
-ensure_pip
+ensure_pip_and_wheel
 
 ensure_python_requirements
 

data/lib/checkoff/cli.rb

@@ -12,6 +12,112 @@ require_relative 'tasks'
 require_relative 'sections'
 
 module Checkoff
+  # Move tasks from one place to another
+  class MvSubcommand
+    def validate_and_assign_from_location(from_workspace_arg, from_project_arg, from_section_arg)
+      if from_workspace_arg == :default_workspace
+        # Figure out what to do here - we accept a default
+        # workspace gid and default workspace_gid arguments elsewhere.
+        # however, there are undefaulted workspace_name arguments as
+        # well...
+        raise NotImplementedError, 'Not implemented: Teach me how to look up default workspace name'
+      end
+
+      @from_workspace_name = from_workspace_arg
+      @from_project_name = project_arg_to_name(from_project_arg)
+      @from_section_name = from_section_arg
+    end
+
+    def create_to_project_name(to_project_arg)
+      if to_project_arg == :source_project
+        from_project_name
+      else
+        project_arg_to_name(to_project_arg)
+      end
+    end
+
+    def create_to_section_name(to_section_arg)
+      if to_section_arg == :source_section
+        from_section_name
+      else
+        to_section_arg
+      end
+    end
+
+    def validate_and_assign_to_location(to_workspace_arg, to_project_arg, to_section_arg)
+      @to_workspace_name = to_workspace_arg
+      @to_workspace_name = from_workspace_name if to_workspace_arg == :source_workspace
+      @to_project_name = create_to_project_name(to_project_arg)
+      @to_section_name = create_to_section_name(to_section_arg)
+
+      return unless from_workspace_name != to_workspace_name
+
+      raise NotImplementedError, 'Not implemented: Teach me how to move tasks between workspaces'
+    end
+
+    def initialize(from_workspace_arg:,
+                   from_project_arg:,
+                   from_section_arg:,
+                   to_workspace_arg:,
+                   to_project_arg:,
+                   to_section_arg:,
+                   config: Checkoff::ConfigLoader.load(:asana),
+                   projects: Checkoff::Projects.new(config: config),
+                   sections: Checkoff::Sections.new(config: config),
+                   logger: $stderr)
+      validate_and_assign_from_location(from_workspace_arg, from_project_arg, from_section_arg)
+      validate_and_assign_to_location(to_workspace_arg, to_project_arg, to_section_arg)
+
+      @projects = projects
+      @sections = sections
+      @logger = logger
+    end
+
+    def move_tasks(tasks, to_project, to_section)
+      tasks.each do |task|
+        # a. check if already in correct project and section (TODO)
+        # b. if not, put it there
+        @logger.puts "Moving #{task.name} to #{to_section.name}..."
+        task.add_project(project: to_project.gid, section: to_section.gid)
+      end
+    end
+
+    def fetch_tasks(from_workspace_name, from_project_name, from_section_name)
+      if from_section_name == :all_sections
+        raise NotImplementedError, 'Not implemented: Teach me how to move all sections of a project'
+      end
+
+      sections.tasks(from_workspace_name, from_project_name, from_section_name)
+    end
+
+    def run
+      # 0. Look up project and section gids
+      to_project = projects.project_or_raise(to_workspace_name, to_project_name)
+      to_section = sections.section_or_raise(to_workspace_name, to_project_name, to_section_name)
+
+      # 1. Get list of tasks which match
+      tasks = fetch_tasks(from_workspace_name, from_project_name, from_section_name)
+      # 2. for each task,
+      move_tasks(tasks, to_project, to_section)
+      # 3. tell the user we're done'
+      @logger.puts 'Done moving tasks'
+    end
+
+    private
+
+    attr_reader :from_workspace_name, :from_project_name, :from_section_name,
+                :to_workspace_name, :to_project_name, :to_section_name,
+                :projects, :sections
+
+    def project_arg_to_name(project_arg)
+      if project_arg.start_with? ':'
+        project_arg[1..].to_sym
+      else
+        project_arg
+      end
+    end
+  end
+
   # CLI subcommand that shows tasks in JSON form
   class ViewSubcommand
     def initialize(workspace_name, project_name, section_name,
@@ -151,5 +257,50 @@ module Checkoff
         puts ViewSubcommand.new(workspace_name, project_name, section_name, task_name).run
       end
     end
+
+    desc 'Move tasks from one section to another within a project'
+
+    # rubocop:disable Metrics/BlockLength
+    command :mv do |c|
+      c.flag :from_workspace,
+             type: String,
+             default_value: :default_workspace,
+             desc: 'Workspace to move tasks from'
+      c.flag :from_project,
+             type: String,
+             required: true,
+             desc: 'Project to move tasks from'
+      c.flag :from_section,
+             type: String,
+             default_value: :all_sections,
+             desc: 'Section to move tasks from'
+      c.flag :to_workspace,
+             type: String,
+             default_value: :source_workspace,
+             desc: 'Workspace to move tasks to'
+      c.flag :to_project,
+             type: String,
+             default_value: :source_project,
+             desc: 'Section to move tasks to'
+      c.flag :to_section,
+             type: String,
+             default_value: :source_section,
+             desc: 'Section to move tasks to'
+      c.action do |_global_options, options, _args|
+        from_workspace = options.fetch('from_workspace')
+        from_project = options.fetch('from_project')
+        from_section = options.fetch('from_section')
+        to_workspace = options.fetch('to_workspace')
+        to_project = options.fetch('to_project')
+        to_section = options.fetch('to_section')
+        MvSubcommand.new(from_workspace_arg: from_workspace,
+                         from_project_arg: from_project,
+                         from_section_arg: from_section,
+                         to_workspace_arg: to_workspace,
+                         to_project_arg: to_project,
+                         to_section_arg: to_section).run
+      end
+    end
+    # rubocop:enable Metrics/BlockLength
   end
 end

data/lib/checkoff/projects.rb

@@ -59,6 +59,14 @@ module Checkoff
     end
     cache_method :project, LONG_CACHE_TIME
 
+    def project_or_raise(workspace_name, project_name)
+      project = project(workspace_name, project_name)
+      raise "Could not find project #{project_name} under workspace #{workspace_name}." if project.nil?
+
+      project
+    end
+    cache_method :project_or_raise, LONG_CACHE_TIME
+
     # find uncompleted tasks in a list
     def active_tasks(tasks)
       tasks.select { |task| task.completed_at.nil? }
@@ -95,5 +103,6 @@ module Checkoff
       gid = result.gid
       projects.find_by_id(gid)
     end
+    cache_method :my_tasks, LONG_CACHE_TIME
   end
 end

data/lib/checkoff/sections.rb

@@ -44,13 +44,10 @@ module Checkoff
               extra_fields: [])
       section = section_or_raise(workspace_name, project_name, section_name)
       options = projects.task_options
-      # asana-0.10.3 gem doesn't support per_page - not sure if API
-      # itself does
-      options.delete(:per_page)
       options[:options][:fields] += extra_fields
       options[:completed_since] = '9999-12-01' if only_uncompleted
-      client.tasks.get_tasks_for_section(section_gid: section.gid,
-                                         **options).to_a
+      client.tasks.get_tasks(section: section.gid,
+                             **options)
     end
     cache_method :tasks, SHORT_CACHE_TIME
 
@@ -61,6 +58,18 @@ module Checkoff
     end
     cache_method :section_task_names, SHORT_CACHE_TIME
 
+    def section_or_raise(workspace_name, project_name, section_name)
+      section = section(workspace_name, project_name, section_name)
+      if section.nil?
+        valid_sections = sections_or_raise(workspace_name, project_name).map(&:name)
+
+        raise "Could not find section #{section_name} under project #{project_name} " \
+              "under workspace #{workspace_name}.  Valid sections: #{valid_sections}"
+      end
+      section
+    end
+    cache_method :section_or_raise, LONG_CACHE_TIME
+
     private
 
     # Given a project object, pull all tasks, then provide a Hash of
@@ -106,16 +115,5 @@ module Checkoff
       sections = sections_or_raise(workspace_name, project_name)
       sections.find { |section| section.name.chomp(':') == section_name.chomp(':') }
     end
-
-    def section_or_raise(workspace_name, project_name, section_name)
-      section = section(workspace_name, project_name, section_name)
-      if section.nil?
-        valid_sections = sections_or_raise(workspace_name, project_name).map(&:name)
-
-        raise "Could not find section #{section_name} under project #{project_name} " \
-              "under workspace #{workspace_name}.  Valid sections: #{valid_sections}"
-      end
-      section
-    end
   end
 end

data/lib/checkoff/version.rb

@@ -2,5 +2,5 @@
 
 module Checkoff
   # Version of library
-  VERSION = '0.12.1'
+  VERSION = '0.13.0'
 end

data/rakelib/console.rake

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+desc 'Load up checkoff in pry'
+task :console do |_t|
+  exec 'pry -I lib -r checkoff'
+end

data/rakelib/default.rake

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+desc 'Standard build'
 task default: :localtest

data/rakelib/repl.rake

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+desc 'Load up checkoff in pry'
+task repl: [:console]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Vince Broz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.58.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +226,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -311,11 +325,13 @@ files:
 - metrics/shellcheck_high_water_mark
 - rakelib/citest.rake
 - rakelib/clear_metrics.rake
+- rakelib/console.rake
 - rakelib/default.rake
 - rakelib/gem_tasks.rake
 - rakelib/localtest.rake
 - rakelib/overcommit.rake
 - rakelib/quality.rake
+- rakelib/repl.rake
 - rakelib/test.rake
 - rakelib/undercover.rake
 - requirements_dev.txt