omnifocus 1.4.0 → 1.5.0

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.5.0 / 2011-08-11
+
+* 2 minor enhancements:
+
+  * Rewrote all the task accesses to be a single fetch.
+  * Updated mechanize and rb-appscript deps.
+
+* 2 bug fixes:
+
+  * Fixed a bug with rb-appscript caused by ruby 1.9. :( (turadg)
+  * Project names with '.' in them were being ignored by my regexp
+
 === 1.4.0 / 2011-07-20
 
 * 1 minor enhancement:

data/Rakefile

@@ -4,13 +4,14 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.plugin :seattlerb
+Hoe.plugin :isolate
 
 Hoe.spec "omnifocus" do
   developer "aja", "kushali@rubyforge.org"
   developer "Ryan Davis", "ryand-ruby@zenspider.com"
 
-  dependency "rb-appscript", "~> 0.5.3"
-  dependency "mechanize",    "~> 1.0.0"
+  dependency "rb-appscript", "~> 0.6.1"
+  dependency "mechanize",    "~> 2.0.0"
 
   self.rubyforge_name = "seattlerb"
 

data/bin/omnifocus_new

@@ -7,12 +7,17 @@ require 'appscript'
 project_name = ARGV.shift
 title = ($stdin.tty? ? ARGV.join(" ") : $stdin.read).strip
 
-abort "need project and title" unless project_name && ! title.empty?
-
 include Appscript
 
 omnifocus = app('OmniFocus').documents[1]
 
+unless project_name && ! title.empty? then
+  cmd = File.basename $0
+  projects = omnifocus.sections.projects.name.get.flatten.sort
+
+  abort "usage: #{cmd} project title\n\nprojects = #{projects.join ", "}"
+end
+
 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}

data/lib/omnifocus.rb

@@ -1,7 +1,19 @@
 require 'rubygems'
-require 'mechanize'
 require 'appscript'
 
+class Appscript::Reference # :nodoc:
+  # HACK: There is apparently a bug in ruby 1.9 where if you have
+  # method_missing defined and do some action that calls to_ary, then
+  # to_ary will be called on your instance REGARDLESS of whether
+  # respond_to_(:to_ary) returns true or not.
+  #
+  # http://tenderlovemaking.com/2011/06/28/til-its-ok-to-return-nil-from-to_ary/
+
+  def to_ary # :nodoc:
+    nil
+  end
+end if RUBY_VERSION >= "1.9"
+
 ##
 # Synchronizes bug tracking systems to omnifocus.
 #
@@ -12,7 +24,7 @@ require 'appscript'
 # bts_id: a string uniquely identifying a task: SYSTEM(-projectname)?#id
 
 class OmniFocus
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 
   ##
   # bug_db = {
@@ -66,38 +78,13 @@ class OmniFocus
 
   def omnifocus
     unless defined? @omnifocus then
-      @omnifocus = Appscript.app('OmniFocus').documents[1]
+      @omnifocus = Appscript.app('OmniFocus').default_document
     end
     @omnifocus
   end
 
-  def walk_queue_deep queue, msg
-    result = []
-
-    until queue.empty? do
-      item = queue.shift
-      result << item
-      subitems = item.send(msg).get
-      queue.push(*subitems)
-    end
-
-    result
-  end
-
-  def all_folders
-    queue = omnifocus.folders.get
-
-    walk_queue_deep queue, :folders
-  end
-
-  def all_projects
-    all_folders.map { |folder| folder.projects }
-  end
-
   def all_tasks
-    queue = all_projects.map { |project| project.tasks.get }.flatten
-
-    walk_queue_deep queue, :tasks
+    omnifocus.flattened_projects[its.status.eq(:active)].tasks.get.flatten
   end
 
   ##
@@ -130,19 +117,19 @@ class OmniFocus
 
   def prepopulate_existing_tasks
     prefixen = self.class.plugins.map { |klass| klass::PREFIX rescue nil }
+    of_tasks = nil
 
-    of_tasks =
-      if prefixen.all? then
-        all_tasks.find_all { |task|
-        task.name.get =~ /^(#{Regexp.union prefixen}(?:-[\w-]+)?\#\d+)/
+    if prefixen.all? then
+      of_tasks = all_tasks.find_all { |task|
+        task.name.get =~ /^(#{Regexp.union prefixen}(?:-[\w.-]+)?\#\d+)/
       }
-      else
-        warn "WA"+"RN: Older plugins installed. Falling back to The Old Ways"
+    else
+      warn "WA"+"RN: Older plugins installed. Falling back to The Old Ways"
 
-        all_tasks.find_all { |task|
+      of_tasks = all_tasks.find_all { |task|
         task.name.get =~ /^([A-Z]+(?:-[\w-]+)?\#\d+)/
       }
-      end
+    end
 
     of_tasks.each do |of_task|
       ticket_id = of_task.name.get[/^([A-Z]+(?:-[\w-]+)?\#\d+)/, 1]
@@ -156,6 +143,7 @@ class OmniFocus
   # Returns the mechanize agent
 
   def mechanize
+    require 'mechanize'
     @mechanize ||= Mechanize.new
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omnifocus
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - aja
@@ -37,7 +37,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-07-20 00:00:00 Z
+date: 2011-08-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rb-appscript
@@ -47,12 +47,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 5
         segments: 
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        - 6
+        - 1
+        version: 0.6.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,12 +63,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
-        - 1
+        - 2
         - 0
         - 0
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -77,14 +77,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 5
         segments: 
         - 2
         - 3
-        - 1
-        version: 2.3.1
+        version: "2.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -156,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Synchronizes bug tracking systems to omnifocus.