milkmaid 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/milkmaid

@@ -21,8 +21,8 @@ Main {
         milkmaid.incomplete_tasks.each_with_index do |taskseries, i|
           text = "#{i+1}: #{taskseries['name']}"
           text << "(R)" unless taskseries['rrule'].nil?
-          text << " #{Time.parse(taskseries['task']['due']).getlocal.strftime(
-          "%A %b %d, %Y %I:%M %p")}" unless taskseries['task']['due'].empty?
+          text << " #{Time.parse(taskseries['task'].as_array.last['due']).getlocal.strftime(
+          "%A %b %d, %Y %I:%M %p")}" unless taskseries['task'].as_array.last['due'].empty?
           color = {
             '1'=>[234, 82, 0], 
             '2'=>[0, 96, 191], 
@@ -30,14 +30,14 @@ Main {
             'N'=>:nothing
           }
           mode1 = mode2 = nil
-          case Date.today <=> Date.parse(taskseries['task']['due'])
+          case Date.today <=> Date.parse(taskseries['task'].as_array.last['due'])
           when 0
             mode1 = :bold
           when 1
             mode1 = :bold
             mode2 = :underline
-          end unless taskseries['task']['due'].empty?
-          puts Paint[text, color[taskseries['task']['priority']], mode1, mode2]
+          end unless taskseries['task'].as_array.last['due'].empty?
+          puts Paint[text, color[taskseries['task'].as_array.last['priority']], mode1, mode2]
         end
       rescue RTM::NoTokenException
         puts "Authentication token not found. Run `#{__FILE__} auth start`"

data/lib/milkmaid.rb

@@ -23,19 +23,21 @@ class Milkmaid
       if !items['taskseries'].nil?
         items['taskseries'].as_array.each do |taskseries|
           taskseries['list_id'] = list_id
-          entries << taskseries if taskseries['task']['completed'].empty?
+          entries << taskseries if taskseries['task'].as_array.last['completed'].empty?
         end
       end
     end
     entries.sort! do |a, b|
-      result = a['task']['priority'] <=> b['task']['priority']
+      taska = a['task'].as_array.last
+      taskb = b['task'].as_array.last
+      result = taska['priority'] <=> taskb['priority']
       if result == 0
-        if a['task']['due'].empty?
+        if taska['due'].empty?
           1
-        elsif b['task']['due'].empty?
+        elsif taskb['due'].empty?
           -1
         else
-          Time.parse(a['task']['due']) <=> Time.parse(b['task']['due'])
+          Time.parse(taska['due']) <=> Time.parse(taskb['due'])
         end
       else
         result
@@ -44,7 +46,7 @@ class Milkmaid
     entries.each_with_index do |taskseries, i|
       @config["#{i+1}list_id"] = taskseries['list_id']
       @config["#{i+1}taskseries_id"] = taskseries['id']
-      @config["#{i+1}task_id"] = taskseries['task']['id']
+      @config["#{i+1}task_id"] = taskseries['task'].as_array.last['id']
     end
     save_config
     entries

data/milkmaid.gemspec

@@ -0,0 +1,71 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "milkmaid"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Marius Grigoriu"]
+  s.date = "2011-10-03"
+  s.description = "Milkmaid is a command-line client for Remember the Milk"
+  s.email = "marius.grigoriu@live.com"
+  s.executables = ["milkmaid"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/milkmaid",
+    "lib/milkmaid.rb",
+    "milkmaid.gemspec",
+    "spec/milkmaid_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/mariusgrigoriu/milkmaid"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Milkmaid is a command-line client for Remember the Milk"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<main>, ["~> 4.7.7"])
+      s.add_runtime_dependency(%q<moocow>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<paint>, ["~> 0.8.3"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<ZenTest>, [">= 0"])
+    else
+      s.add_dependency(%q<main>, ["~> 4.7.7"])
+      s.add_dependency(%q<moocow>, ["~> 1.1.0"])
+      s.add_dependency(%q<paint>, ["~> 0.8.3"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<ZenTest>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<main>, ["~> 4.7.7"])
+    s.add_dependency(%q<moocow>, ["~> 1.1.0"])
+    s.add_dependency(%q<paint>, ["~> 0.8.3"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<ZenTest>, [">= 0"])
+  end
+end
+

data/spec/milkmaid_spec.rb

@@ -38,8 +38,11 @@ describe "Milkmaid" do
   describe "listing tasks" do
     let(:a) {{"name"=>"a", "id"=>"ats", "task"=>{"completed"=>"", "priority"=>"1", 
                                       "id"=>"at", "due"=>""}}}
-    let(:b) {{"name"=>"b", "id"=>"bts", "task"=>{"completed"=>"", "priority"=>"1",
-                                      "id"=>"bt", "due"=>"2011-10-02T02:52:58Z"}}}
+    let(:b) {{"name"=>"b", "id"=>"bts", "task"=>[
+                                      {"completed"=>"2009-10-01", "priority"=>"1",
+                                      "id"=>"bt", "due"=>"2011-10-02T02:52:58Z"},
+                                      {"completed"=>"", "priority"=>"1",
+                                      "id"=>"bt", "due"=>"2011-10-02T02:52:58Z"}]}}
     let(:c) {{"name"=>"c", "id"=>"cts", "task"=>{"completed"=>"", "priority"=>"N",
                                       "id"=>"ct", "due"=>"2012-10-02T02:52:58Z"}}}
     let(:d) {{"name"=>"d", "id"=>"dts", "task"=>{"completed"=>"", "priority"=>"N",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: milkmaid
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marius Grigoriu
@@ -141,6 +141,7 @@ files:
 - VERSION
 - bin/milkmaid
 - lib/milkmaid.rb
+- milkmaid.gemspec
 - spec/milkmaid_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mariusgrigoriu/milkmaid