omnifocus 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b9833398e1eddfa3eb8dbb9ac5e0c93090c18305bdc27541a6c34523a3e38c
-  data.tar.gz: 668b55a532430c19f0bc8f52df4dba3546dc19e8a91d8f05d2083ceb399657c8
+  metadata.gz: 3469a0eb4e6804a2821904b2a3caeb7c17969eb0d4ad4599e5735e1818189f4e
+  data.tar.gz: 14156e5f8b81b9d776bb596dccfbc3656fa0c682ac110b1c3fddfd7270cb9b66
 SHA512:
-  metadata.gz: e85e93e46a63f4aeba4578551035ad78d30a05c3295d387e95a0e398ce3d3c95dc8af8167cb08860a14738c62d5b8f768facd4b495786ee83319a6d231459956
-  data.tar.gz: bb1d077233e65bbbbdad8170f6a43a25c0e171b69c0a335d7354408cc185ffa056b96395355fb92555ad985bfdff328902aac6adb44d2bc95555fb5a923b6031
+  metadata.gz: 359141e95a1ef11921321333d58c05f347a1b9febb677d9cae0ba4d06b8979c58da5e7db1e75afb5333401a86ef6cf4f429a049865d4171aca4bac70538fa01f
+  data.tar.gz: 93e91a7d9e23b10591e8c42a5aac207cd99550a977c922eb276ceb6f68bad3ea77447df2caea181ad4a0b8fca23d8c9ed8e5d3dfd0b0f65836ab6fd50542d33e

data/{History.txt → History.rdoc}

@@ -1,3 +1,17 @@
+=== 2.5.0 / 2019-10-08
+
+* 5 minor enhancements:
+
+  * Extended _context to try tags first.
+  * Extended _flattened_contexts to try tags first.
+  * Extended reschedule subcommand to create missing release/triage tasks where needed.
+  * Refactored _context and _flattened_contexts methods.
+  * Refactored neww project sub-command to new_or_repair_project.
+
+* 1 bug fix:
+
+  * Fixed to work with omnifocus 3 (single context -> multiple tags)
+
 === 2.4.0 / 2019-01-02
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -1,7 +1,7 @@
 .autotest
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/of
 bin/omnifocus

data/Rakefile

@@ -34,6 +34,10 @@ task :fix => :isolate do
   omnifocus "resch"
 end
 
+task :rev => :isolate do
+  omnifocus "rev"
+end
+
 task :debug => :isolate do
   cmd = ENV["CMD"] || "sync github"
   d = ENV["D"] ? "-d" : nil

data/lib/omnifocus.rb

@@ -29,7 +29,7 @@ include Appscript
 # bts_id: a string uniquely identifying a task: SYSTEM(-projectname)?#id
 
 class OmniFocus
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 
   ##
   # bug_db = {
@@ -296,27 +296,10 @@ class OmniFocus
     when "nil" then
       omnifocus.make :new => :inbox_task, :with_properties => {:name => title}
     when "project" then
-      rep        = weekly
-      start_date = hour 0
-      due_date1  = hour 16
-      due_date2  = hour 16.5
-
-      cont = context("Releasing").thing
-      proj = make nerd_projects, :project, title, :review_interval => rep
-
-      props = {
-        :repetition => rep,
-        :context    => cont,
-        :defer_date => start_date
-      }
-
-      make proj, :task, "Release #{title}", props.merge(:due_date => due_date1)
-      make proj, :task, "Triage #{title}", props.merge(:due_date => due_date2)
+      new_or_repair_project title
     else
-      projects = omnifocus.sections.projects[its.name.eq(project_name)]
-      project = projects.get.flatten.grep(Appscript::Reference).first
-      project.make :new => :task, :with_properties => {:name => title}
-
+      project = omnifocus.flattened_projects[its.name.eq(project_name)].first.get
+      make project, :task, title
       puts "created task in #{project_name}: #{title}"
     end
   end
@@ -367,14 +350,14 @@ class OmniFocus
     filter = its.completed.eq(false).and(its.repetition.eq(:missing_value))
 
     h1 = Hash.new 0
-    omnifocus.flattened_contexts.get.each do |context|
+    _flattened_contexts.each do |context|
       context.tasks[filter].get.each do |task|
         h1[[task.containing_project.name.get, context.name.get].join(": ")] += 1
       end
     end
 
     h2 = Hash.new 0
-    omnifocus.flattened_contexts.get.each do |context|
+    _flattened_contexts.each do |context|
       h2[context.name.get] += context.tasks[filter].count
     end
 
@@ -508,6 +491,61 @@ class OmniFocus
     return rels, tasks, projs
   end
 
+  def new_or_repair_project name
+    warn "project #{name}"
+
+    rep          = weekly
+    start_date   = hour 0
+    rel_due_date = hour 16
+    tri_due_date = hour 16.5
+    props = {
+      :repetition        => rep,
+      :defer_date        => start_date,
+      :estimated_minutes => 10,
+    }
+
+    min30 = 30 * 60
+
+    rel_q = its.completed.eq(false).and(its.name.begins_with("Release"))
+    tri_q = its.completed.eq(false).and(its.name.begins_with("Triage"))
+
+    rel_tag = context("Releasing").thing
+    tri_tag = context("Triaging").thing
+
+    proj = nerd_projects.projects[name].get rescue nil
+
+    unless proj then
+      warn "creating #{name} project"
+      proj = make nerd_projects, :project, name, :review_interval => rep
+
+      make proj, :task, "Release #{name}", props.merge(:due_date => rel_due_date,
+                                                       :primary_tag => rel_tag)
+      make proj, :task, "Triage #{name}",  props.merge(:due_date => tri_due_date,
+                                                       :primary_tag => tri_tag)
+      return
+    end
+
+    rel_task = proj.tasks[rel_q].first.get rescue nil
+    tri_task = proj.tasks[tri_q].first.get rescue nil
+
+    new_task_from proj, tri_task, "Release #{name}", rel_tag, -min30 unless rel_task
+    new_task_from proj, rel_task, "Triage #{name}",  tri_tag, +min30 unless tri_task
+  end
+
+  def new_task_from proj, task, name, tag, offset
+    warn "  + #{name} task"
+
+    props = {
+      :estimated_minutes => 10,
+      :due_date          => task.due_date.get + offset,
+      :defer_date        => task.defer_date.get,
+      :repetition        => task.repetition.get,
+      :primary_tag       => tag,
+    }
+
+    make proj, :task, name, props
+  end
+
   def fix_project_review_intervals rels, skip
     rels.tasks.each do |task|
       begin
@@ -594,6 +632,31 @@ class OmniFocus
     end
   end
 
+  def fix_missing_tasks skip
+    q_rel = its.completed.eq(false).and(its.name.begins_with("Release"))
+    q_tri = its.completed.eq(false).and(its.name.begins_with("Triage"))
+
+    nerd_projects.projects.get.each do |proj|
+      name = proj.name.get
+
+      rel = proj.tasks[q_rel].first.get rescue nil
+      tri = proj.tasks[q_tri].first.get rescue nil
+
+      case [!!rel, !!tri]
+      when [true, true] then
+        # do nothing
+      when [false, false] then
+        # do nothing?
+      when [true, false] then # create triage
+        warn "  Repairing triage for #{name}"
+        new_or_repair_project name unless skip
+      when [false, true] then # create release
+        warn "  Repairing release for #{name}"
+        new_or_repair_project name unless skip
+      end
+    end
+  end
+
   def cmd_reschedule args
     skip = ARGV.first == "-n"
 
@@ -608,6 +671,9 @@ class OmniFocus
 
       warn "Checking releasing task schedules"
       fix_release_task_schedule projs, tasks, skip
+
+      warn "Repairing any missing release or triage tasks"
+      fix_missing_tasks skip
     end
   end
 
@@ -640,7 +706,7 @@ class OmniFocus
     end
 
     def method_missing m, *a
-      warn [m,*a].inspect
+      warn "%s#method_missing(%s)" % [self.class.name, [m,*a].inspect[1..-2]]
       thing.send m, *a
     end
 
@@ -838,14 +904,26 @@ class OmniFocus
     }
   end
 
+  def _flattened_contexts
+    contexts   = self.omnifocus.flattened_tags.get     rescue nil
+    contexts ||= self.omnifocus.flattened_contexts.get rescue nil
+    contexts
+  end
+
+  def _context name
+    context   = self.omnifocus.flattened_tags[name].get     rescue nil
+    context ||= self.omnifocus.flattened_contexts[name].get rescue nil
+    context
+  end
+
   def all_contexts
-    self.omnifocus.flattened_contexts.get.map { |c|
+    _flattened_contexts.map { |c|
       Context.new omnifocus, c
     }
   end
 
   def context name
-    context = self.omnifocus.flattened_contexts[name].get rescue nil
+    context = _context name
     Context.new omnifocus, context if context
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnifocus
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
   UfBugfLD19bu3nvL+zTAGx/U
   -----END CERTIFICATE-----
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-scpt
@@ -60,6 +60,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '3.18'
 description: Synchronizes bug tracking systems to omnifocus.
 email:
 - ryand-ruby@zenspider.com
@@ -104,14 +118,14 @@ executables:
 - omnifocus_new
 extensions: []
 extra_rdoc_files:
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 files:
 - ".autotest"
-- History.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/of
 - bin/omnifocus
@@ -124,7 +138,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.txt
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -138,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Synchronizes bug tracking systems to omnifocus.