sculd 0.1.2 → 0.1.3

data/lib/sculd/plan/deadline.rb

@@ -9,35 +9,37 @@
 #
 class Sculd::Plan::Deadline < Sculd::Plan
 
-  SYMBOL_CHAR = "!"
-  DEFAULT_OPTION = 7
+    SYMBOL_CHAR = "!"
+    DEFAULT_OPTION = 7
 
-  def priority(today)
-    #pp @option
-    #@option = 1 if @option < 1
-    option = (@option || DEFAULT_OPTION)
-    beginning = @datetime - option
-    #pp beginning
-    if today < beginning
-      return 0
-    elsif today <= @datetime
-      rp = Sculd::Plan::REMINDER_PRIORITY
-      dp = Sculd::Plan::DEADLINE_PRIORITY
-      return (rp + (dp - rp) * (today - beginning)/(option.to_f)).to_i
-    else
-      return Sculd::Plan::DEADLINE_PRIORITY
+    def priority(today)
+        #pp @option
+        #@option = 1 if @option < 1
+        option = (@option || DEFAULT_OPTION)
+        beginning = @datetime - option
+        #pp beginning
+        if today < beginning
+            return 0
+        elsif today == @datetime
+            return Sculd::Plan::DEADLINE_PRIORITY
+        elsif today <= @datetime
+            rp = Sculd::Plan::REMINDER_PRIORITY
+            dp = Sculd::Plan::DEADLINE_PRIORITY
+            return (rp + (dp - rp) * (today - beginning)/(option.to_f)).to_i
+        else
+            return Sculd::Plan::DEADLINE_PRIORITY
+        end
     end
-  end
 
-  def event_dates
-    #@option ||= DEFAULT_OPTION
+    def event_dates
+        #@option ||= DEFAULT_OPTION
 
-    results = []
-    results << @datetime - (@option || DEFAULT_OPTION)
-    results << @datetime
-    results.map do |datetime|
-      Date.new(datetime.year, datetime.month, datetime.day)
+        results = []
+        results << @datetime - (@option || DEFAULT_OPTION) unless @option == 0
+        results << @datetime
+        results.map do |datetime|
+            Date.new(datetime.year, datetime.month, datetime.day)
+        end
     end
-  end
 end
 

data/lib/sculd/plan/reminder.rb

@@ -9,20 +9,20 @@
 #
 class Sculd::Plan::Reminder < Sculd::Plan
 
-  SYMBOL_CHAR = "-"
+    SYMBOL_CHAR = "-"
 
-  # value of @option does not work
-  def priority(today = Date.now)
-    if today < @datetime
-      return 0
-    else
-      #@option = 1 if @option < 1
-      return Sculd::Plan::REMINDER_PRIORITY - (today - @datetime) #/@option
+    # value of @option does not work
+    def priority(today = Date.now)
+        if today < @datetime
+            return 0
+        else
+            #@option = 1 if @option < 1
+            return Sculd::Plan::REMINDER_PRIORITY - (today - @datetime) #/@option
+        end
     end
-  end
 
-  def event_dates
-    [Date.new(@datetime.year, @datetime.month, @datetime.day)]
-  end
+    def event_dates
+        [Date.new(@datetime.year, @datetime.month, @datetime.day)]
+    end
 end
 

data/lib/sculd/plan/schedule.rb

@@ -8,15 +8,15 @@
 #
 class Sculd::Plan::Schedule < Sculd::Plan
 
-  SYMBOL_CHAR = "@"
+    SYMBOL_CHAR = "@"
 
-  #
-  def priority(today = Date.new)
-    return 0
-  end
+    #
+    def priority(today = Date.new)
+        return 0
+    end
 
-  def event_dates
-    [Date.new(@datetime.year, @datetime.month, @datetime.day)]
-  end
+    def event_dates
+        [Date.new(@datetime.year, @datetime.month, @datetime.day)]
+    end
 end
 

data/lib/sculd/plan/todo.rb

@@ -9,35 +9,35 @@
 #
 class Sculd::Plan::Todo < Sculd::Plan
 
-  SYMBOL_CHAR = "+"
-  DEFAULT_OPTION = 7
+    SYMBOL_CHAR = "+"
+    DEFAULT_OPTION = 7
 
-  #
-  def priority(today)
-    #@option = 1 if @option < 1
-    option = @option || DEFAULT_OPTION
-    beginning = @datetime
-    ending    = @datetime + option
-    if today < beginning
-      return 0
-    elsif today <= ending
-      rp = Sculd::Plan::REMINDER_PRIORITY
-      dp = Sculd::Plan::DEADLINE_PRIORITY
-      return (rp + (dp - rp) * (today - beginning)/(option.to_f)).to_i
-    else
-      return Sculd::Plan::DEADLINE_PRIORITY
+    #
+    def priority(today)
+        #@option = 1 if @option < 1
+        option = @option || DEFAULT_OPTION
+        beginning = @datetime
+        ending      = @datetime + option
+        if today < beginning
+            return 0
+        elsif today <= ending
+            rp = Sculd::Plan::REMINDER_PRIORITY
+            dp = Sculd::Plan::DEADLINE_PRIORITY
+            return (rp + (dp - rp) * (today - beginning)/(option.to_f)).to_i
+        else
+            return Sculd::Plan::DEADLINE_PRIORITY
+        end
     end
-  end
 
-  def event_dates
-    #@option ||= DEFAULT_OPTION
+    def event_dates
+        #@option ||= DEFAULT_OPTION
 
-    results = []
-    results << @datetime
-    results << @datetime + (@option || DEFAULT_OPTION)
-    results.map do |datetime|
-      Date.new(datetime.year, datetime.month, datetime.day)
+        results = []
+        results << @datetime
+        results << @datetime + (@option || DEFAULT_OPTION)
+        results.map do |datetime|
+            Date.new(datetime.year, datetime.month, datetime.day)
+        end
     end
-  end
 end
 

data/sculd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sculd"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2014-05-06"
+  s.date = "2014-08-29"
   s.description = "Schedule management system using 'howm' like format. Plans, i.e., schedule(@), reminder(-), deadline(!), and tood(+), make events and tasks. Command 'sculd' can output events on each date and tasks with high priority. "
   s.email = "ippei94da@gmail.com"
   s.executables = ["dates", "sculd"]
@@ -59,20 +59,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rdoc>, ["~> 4.1.1"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.7.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0.8.2"])
       s.add_development_dependency(%q<highline>, [">= 1.6.21"])
     else
       s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_dependency(%q<bundler>, ["~> 1.7.2"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0.8.2"])
       s.add_dependency(%q<highline>, [">= 1.6.21"])
     end
   else
     s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+    s.add_dependency(%q<bundler>, ["~> 1.7.2"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>, [">= 0.8.2"])
     s.add_dependency(%q<highline>, [">= 1.6.21"])

data/test/helper.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+    Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+    $stderr.puts e.message
+    $stderr.puts "Run `bundle install` to install missing gems"
+    exit e.status_code
 end
 require 'test/unit'
 

data/test/test_deadline.rb

@@ -4,67 +4,71 @@
 require "helper"
 
 class TC_Deadline < Test::Unit::TestCase
-  def setup
-    date = Date.new(2012, 10, 15)
-    @d00 = Sculd::Plan::Deadline.new(date, false, 10, 'deadlineA')
+    def setup
+        date = Date.new(2012, 10, 15)
+        @d00 = Sculd::Plan::Deadline.new(date, false, 10, 'deadlineA')
 
-    date = DateTime.new(2012, 10, 15, 23, 45, 00)
-    @d01 = Sculd::Plan::Deadline.new(date, false, 10, 'deadlineA')
+        date = DateTime.new(2012, 10, 15, 23, 45, 00)
+        @d01 = Sculd::Plan::Deadline.new(date, false, 10, 'deadlineA')
 
-    date = Date.new(2012, 10, 15)
-    @d02 = Sculd::Plan::Deadline.new(date, false, nil, 'deadlineA')
+        date = Date.new(2012, 10, 15)
+        @d02 = Sculd::Plan::Deadline.new(date, false, nil, 'deadlineA')
 
-    #date = Date.new(2012, 10, 15)
-    #@d03 = Sculd::Plan::Deadline.new(date, false, 0, 'deadlineA')
+        date = Date.new(2012, 10, 15)
+        @d03 = Sculd::Plan::Deadline.new(date, false, 0, 'deadlineA')
 
-  end
+    end
 
-  #context 'Date[2012-10-15], 10, [2012-10-15]!10 deadlineA' do
+    #context 'Date[2012-10-15], 10, [2012-10-15]!10 deadlineA' do
 
-  def test_priority
-    today = Date.new(2012, 10, 15)
-    assert_equal(20000, @d00.priority(today))
+    def test_priority
+        today = Date.new(2012, 10, 15)
+        assert_equal(20000, @d00.priority(today))
 
-    today = Date.new(2012, 10, 20)
-    assert_equal(20000, @d00.priority(today))
+        today = Date.new(2012, 10, 20)
+        assert_equal(20000, @d00.priority(today))
 
-    today = Date.new(2012, 10, 10)
-    assert_equal(15000, @d00.priority(today))
+        today = Date.new(2012, 10, 10)
+        assert_equal(15000, @d00.priority(today))
 
-    today = Date.new(2012, 10,  1)
-    assert_equal(0, @d00.priority(today))
+        today = Date.new(2012, 10,  1)
+        assert_equal(0, @d00.priority(today))
 
 
-    today = Date.new(2012, 10,  1)
-    assert_equal(    0, @d02.priority(today))
+        today = Date.new(2012, 10,  1)
+        assert_equal(        0, @d02.priority(today))
 
-    today = Date.new(2012, 10,  8)
-    assert_equal(10000, @d02.priority(today))
+        today = Date.new(2012, 10,  8)
+        assert_equal(10000, @d02.priority(today))
 
-    today = Date.new(2012, 10, 10)
-    assert_equal(12857, @d02.priority(today))
+        today = Date.new(2012, 10, 10)
+        assert_equal(12857, @d02.priority(today))
 
-    today = Date.new(2012, 10, 15)
-    assert_equal(20000, @d02.priority(today))
+        today = Date.new(2012, 10, 15)
+        assert_equal(20000, @d02.priority(today))
 
-    today = Date.new(2012, 10, 20)
-    assert_equal(20000, @d02.priority(today))
-  end
+        today = Date.new(2012, 10, 20)
+        assert_equal(20000, @d02.priority(today))
 
-  def test_event_dates
-    results = @d00.event_dates
-    assert_equal(2                     , results.size)
-    assert_equal(Date.new(2012, 10,  5), results[0]  )
-    assert_equal(Date.new(2012, 10, 15), results[1]  )
-    assert_equal(Date                  , results[0].class  )
-    assert_equal(Date                  , results[1].class  )
 
-    results = @d01.event_dates
-    assert_equal(2                     , results.size)
-    assert_equal(Date.new(2012, 10,  5), results[0]  )
-    assert_equal(Date.new(2012, 10, 15), results[1]  )
-    assert_equal(Date                  , results[0].class  )
-    assert_equal(Date                  , results[1].class  )
-  end
+        today = Date.new(2012, 10, 15)
+        assert_equal(20000, @d03.priority(today))
+    end
+
+    def test_event_dates
+        results = @d00.event_dates
+        assert_equal(2                                       , results.size)
+        assert_equal(Date.new(2012, 10,  5), results[0]  )
+        assert_equal(Date.new(2012, 10, 15), results[1]  )
+        assert_equal(Date                                    , results[0].class  )
+        assert_equal(Date                                    , results[1].class  )
+
+        results = @d01.event_dates
+        assert_equal(2                                       , results.size)
+        assert_equal(Date.new(2012, 10,  5), results[0]  )
+        assert_equal(Date.new(2012, 10, 15), results[1]  )
+        assert_equal(Date                                    , results[0].class  )
+        assert_equal(Date                                    , results[1].class  )
+    end
 
 end

data/test/test_manager.rb

@@ -6,109 +6,109 @@ require "helper"
 #require "pkg/klass.rb"
 
 class Sculd::Manager
-  public :load_file, :show_events, :days_events, :show_tasks
-  attr_accessor :plans
+    public :load_file, :show_events, :days_events, :show_tasks
+    attr_accessor :plans
 end
 
 class TC_Manager < Test::Unit::TestCase
-  def setup
-    @s00 = Sculd::Manager.new("test/schedule/empty")
-#    @s01 = Sculd::Manager.new("test/schedule/normal")
-  end
+    def setup
+        @s00 = Sculd::Manager.new("test/schedule/empty")
+#        @s01 = Sculd::Manager.new("test/schedule/normal")
+    end
 
-#  def test_load_file
-#    #context "correct data" do #it "should overwrite data" do
-#    @s00.load_file("test/schedule/normal/a.dat")
-#    assert_equal(8, @s00.plans.size)
-#    plans = @s00.plans
-#    assert(plans.shift.is_a? Sculd::Plan)
-#    assert(plans.shift.is_a? Sculd::Plan)
-#    assert(plans.shift.is_a? Sculd::Plan)
-#    assert(plans.shift.is_a? Sculd::Plan)
-#    assert(plans.shift.is_a? Sculd::Plan)
-#    assert(plans.shift.is_a? Sculd::Plan)
-#    assert(plans.shift.is_a? Sculd::Plan)
-#    assert(plans.shift.is_a? Sculd::Plan)
-#  end
+#    def test_load_file
+#        #context "correct data" do #it "should overwrite data" do
+#        @s00.load_file("test/schedule/normal/a.dat")
+#        assert_equal(8, @s00.plans.size)
+#        plans = @s00.plans
+#        assert(plans.shift.is_a? Sculd::Plan)
+#        assert(plans.shift.is_a? Sculd::Plan)
+#        assert(plans.shift.is_a? Sculd::Plan)
+#        assert(plans.shift.is_a? Sculd::Plan)
+#        assert(plans.shift.is_a? Sculd::Plan)
+#        assert(plans.shift.is_a? Sculd::Plan)
+#        assert(plans.shift.is_a? Sculd::Plan)
+#        assert(plans.shift.is_a? Sculd::Plan)
+#    end
 
-  def test_load_file_empty
-    @s00.load_file("test/schedule/empty/empty.dat")
-    assert_equal(0, @s00.plans.size)
+    def test_load_file_empty
+        @s00.load_file("test/schedule/empty/empty.dat")
+        assert_equal(0, @s00.plans.size)
 
-    #context "data containing error" do it "should interrupt with error line." do
-    io = StringIO.new
-    assert_raise(Sculd::Manager::LoadError){ @s00.load_file("test/schedule/error/error.dat", io)}
-  end
+        #context "data containing error" do it "should interrupt with error line." do
+        io = StringIO.new
+        assert_raise(Sculd::Manager::LoadError){ @s00.load_file("test/schedule/error/error.dat", io)}
+    end
 
-#  def test_days_events
-#    #it 'should return hash dates as keys and events as values.' do
-#    #pp @s01
-#    results = @s01.days_events
-#    keys = results.keys
-#    #pp results
+#    def test_days_events
+#        #it 'should return hash dates as keys and events as values.' do
+#        #pp @s01
+#        results = @s01.days_events
+#        keys = results.keys
+#        #pp results
 #
-#    ## normal/a.dat
-#    assert_equal(Date.new(2012, 9, 15), keys.shift)
-#    assert_equal(Date.new(2012, 9,  9), keys.shift)
-#    assert_equal(Date.new(2012, 9, 16), keys.shift)
-#    assert_equal(Date.new(2012, 9, 17), keys.shift)
-#    assert_equal(Date.new(2012, 9, 18), keys.shift)
-#    assert_equal(Date.new(2012, 9, 25), keys.shift)
-#    assert_equal(Date.new(2012, 8, 17), keys.shift)
-#    assert_equal(Date.new(2012, 9, 28), keys.shift)
-#    ## normal/b.dat
-#    assert_equal(Date.new(2012,10, 15), keys.shift)
-#    assert_equal(Date.new(2012,10,  9), keys.shift)
-#    assert_equal(Date.new(2012,10, 16), keys.shift)
-#    assert_equal(Date.new(2012,10, 17), keys.shift)
-#    assert_equal(Date.new(2012,10, 18), keys.shift)
-#    assert_equal(Date.new(2012,10, 25), keys.shift)
-#    assert_equal(nil                  , keys.shift)
+#        ## normal/a.dat
+#        assert_equal(Date.new(2012, 9, 15), keys.shift)
+#        assert_equal(Date.new(2012, 9,  9), keys.shift)
+#        assert_equal(Date.new(2012, 9, 16), keys.shift)
+#        assert_equal(Date.new(2012, 9, 17), keys.shift)
+#        assert_equal(Date.new(2012, 9, 18), keys.shift)
+#        assert_equal(Date.new(2012, 9, 25), keys.shift)
+#        assert_equal(Date.new(2012, 8, 17), keys.shift)
+#        assert_equal(Date.new(2012, 9, 28), keys.shift)
+#        ## normal/b.dat
+#        assert_equal(Date.new(2012,10, 15), keys.shift)
+#        assert_equal(Date.new(2012,10,  9), keys.shift)
+#        assert_equal(Date.new(2012,10, 16), keys.shift)
+#        assert_equal(Date.new(2012,10, 17), keys.shift)
+#        assert_equal(Date.new(2012,10, 18), keys.shift)
+#        assert_equal(Date.new(2012,10, 25), keys.shift)
+#        assert_equal(nil                                    , keys.shift)
 #
-#    assert(results[Date.new(2012, 9, 15)].is_a? Array)
-#    assert(results[Date.new(2012, 9, 15)][0].is_a? Sculd::Plan)
-#  end
+#        assert(results[Date.new(2012, 9, 15)].is_a? Array)
+#        assert(results[Date.new(2012, 9, 15)][0].is_a? Sculd::Plan)
+#    end
 #
-#  def test_show_events
-#    #it 'should return itemized days and events' do
-#    #pp @s01
-#    io = StringIO.new
-#    today = Date.new(2012, 9, 15)
-#    @s01.show_events(2, today, io)
-#    io.rewind
-#    results = io.readlines
-#    #pp results
-#    #assert_equal(9, results.size)
-#    assert_equal("Events:\n"                    , results.shift)
-#    assert_equal("   2012-09-15 Sat \n",
-#                 results.shift)
-#    assert_equal("           @   schedule a\n"  , results.shift)
-#    assert_equal("    [23:45]@   schedule a'\n" , results.shift)
-#    assert_equal("\n"                           , results.shift)
-#    assert_equal("   2012-09-16 Sun \n",
-#                 results.shift)
-#    assert_equal("           !   deadline b\n"  , results.shift)
-#    assert_equal("    [23:45]!30 deadline b'\n"  , results.shift)
-#    assert_equal("\n"                           , results.shift)
-#    assert_equal(nil                            , results.shift)
-#  end
+#    def test_show_events
+#        #it 'should return itemized days and events' do
+#        #pp @s01
+#        io = StringIO.new
+#        today = Date.new(2012, 9, 15)
+#        @s01.show_events(2, today, io)
+#        io.rewind
+#        results = io.readlines
+#        #pp results
+#        #assert_equal(9, results.size)
+#        assert_equal("Events:\n"                                        , results.shift)
+#        assert_equal("   2012-09-15 Sat \n",
+#                                   results.shift)
+#        assert_equal("                     @       schedule a\n"    , results.shift)
+#        assert_equal("      [23:45]@       schedule a'\n" , results.shift)
+#        assert_equal("\n"                                                   , results.shift)
+#        assert_equal("   2012-09-16 Sun \n",
+#                                   results.shift)
+#        assert_equal("                     !       deadline b\n"    , results.shift)
+#        assert_equal("      [23:45]!30 deadline b'\n"  , results.shift)
+#        assert_equal("\n"                                                   , results.shift)
+#        assert_equal(nil                                                        , results.shift)
+#    end
 #
-#  def test_show_tasks
-#    #it 'should return sorted tasks' do
-#    io = StringIO.new
-#    today = Date.new(2012, 9,20)
-#    @s01.show_tasks(6, today, io)
-#    io.rewind
-#    results = io.readlines
-#    #pp results
-#    #assert_equal(7, results.size)
-#    assert_equal("Tasks:\n"                       , results.shift)
-#    assert_equal("  [2012-09-16]!30 deadline b'\n", results.shift)
-#    assert_equal("  [2012-09-16]!   deadline b\n" , results.shift)
-#    assert_equal("  [2012-09-18]+   todo d\n" , results.shift)
-#    assert_equal("  [2012-09-18]+10 todo d'\n", results.shift)
-#    assert_equal("  [2012-09-17]-   reminder c'\n", results.shift)
-#    assert_equal("  [2012-09-17]-   reminder c\n" , results.shift)
-#    assert_equal(nil                              , results.shift)
-#  end
+#    def test_show_tasks
+#        #it 'should return sorted tasks' do
+#        io = StringIO.new
+#        today = Date.new(2012, 9,20)
+#        @s01.show_tasks(6, today, io)
+#        io.rewind
+#        results = io.readlines
+#        #pp results
+#        #assert_equal(7, results.size)
+#        assert_equal("Tasks:\n"                                             , results.shift)
+#        assert_equal("  [2012-09-16]!30 deadline b'\n", results.shift)
+#        assert_equal("  [2012-09-16]!   deadline b\n" , results.shift)
+#        assert_equal("  [2012-09-18]+   todo d\n" , results.shift)
+#        assert_equal("  [2012-09-18]+10 todo d'\n", results.shift)
+#        assert_equal("  [2012-09-17]-   reminder c'\n", results.shift)
+#        assert_equal("  [2012-09-17]-   reminder c\n" , results.shift)
+#        assert_equal(nil                                                            , results.shift)
+#    end
 end