sculd 0.0.3 → 0.1.0

data/CHANGES

@@ -1,6 +1,14 @@
 = sdrt changelog
 
-== Master (for 0.0.3)
+== Master
+
+== Version 0.1.0 [2013-05-17] released
+* Use test-unit alternatively to rspec.
+* Enable to use directory, ~/.sculd alternatively to ~/.sculd.dat
+* Change output format.
+* Change library interfaces.
+
+== Version 0.0.3 [2013-04-18] released
 * Options -s, -t, -i is made into bin/dates command.
 * Use /usr/bin/env ruby in bin/dates, alternatively to /usr/bin/ruby.
 

data/Gemfile

@@ -6,11 +6,11 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.12.0"
+  #gem "rspec", "~> 2.12.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.3.5"
   gem "jeweler", "~> 1.8.4"
   gem "simplecov", ">= 0"
   gem "highline", ">= 1.6.15"
-  gem "psych", ">= 0"
+  #gem "psych", ">= 0"
 end

data/Rakefile

@@ -25,18 +25,36 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+#require 'rspec/core'
+#require 'rspec/core/rake_task'
+#RSpec::Core::RakeTask.new(:spec) do |spec|
+#  spec.pattern = FileList['spec/**/*_spec.rb']
+#end
+#
+#RSpec::Core::RakeTask.new(:rcov) do |spec|
+#  spec.pattern = 'spec/**/*_spec.rb'
+#  spec.rcov = true
+#end
+#
+#task :default => :spec
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-task :default => :spec
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#  test.rcov_opts << '--exclude "gems/*"'
+#end
+
+task :default => :test
+
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/bin/sculd

@@ -5,7 +5,8 @@
 # Events include schedule and deadline(start and end).
 # Tasks  include deadline, reminder and todo.
 
-SCULD_DAT = "#{ENV['HOME']}/.sculd.dat"
+#SCULD_DAT = "#{ENV['HOME']}/.sculd.dat"
+SCULD_DIR = "#{ENV['HOME']}/.sculd"
 
 require "pp"
 require "optparse"
@@ -18,7 +19,7 @@ OPTS = {}
 op = OptionParser.new
 op.on("-e day", "--event days", "Show events."){|v| OPTS[:event] = v.to_i}
 op.on("-t num", "--task num"  , "Show tasks." ){|v| OPTS[:task ] = v.to_i}
-op.on("-f file", "--file datafile", "Indicate file."){|v| OPTS[:file] = v}
+#op.on("-f file", "--file datafile", "Indicate file."){|v| OPTS[:file] = v}
 op.parse!(ARGV)
 
 #num_day  = ARGV.shift.to_i
@@ -31,18 +32,18 @@ if (( OPTS[:event] == 0) &&( OPTS[:task ] == 0))
   exit
 end
 
-file = OPTS[:file]
-file ||= SCULD_DAT
+#file = OPTS[:file]
+#file ||= SCULD_DAT
 
-unless FileTest.exist? file
+unless FileTest.exist? SCULD_DIR
 #  lines = File.open(file, "r").readlines
 #rescue
-  puts "Not found #{file}. Exit."
+  puts "Not found #{SCULD_DIR}. Exit."
   exit
 end
 
 begin
-  sm = Sculd::Manager.new(file)
+  sm = Sculd::Manager.new(SCULD_DIR)
 rescue Sculd::Manager::LoadError
   puts "Exit."
   exit

data/lib/sculd.rb

@@ -2,8 +2,8 @@ module Sculd; end
 
 require "sculd/manager.rb"
 require "sculd/plan.rb"
-require "sculd/event.rb"
-require "sculd/task.rb"
+#require "sculd/event.rb"
+#require "sculd/task.rb"
 
 require "sculd/plan/deadline.rb"
 require "sculd/plan/reminder.rb"

data/lib/sculd/manager.rb

@@ -5,7 +5,7 @@ require "date"
 require "sculd.rb"
 
 require "rubygems"
-gem     "highline"
+#gem     "highline"
 require "highline"
 
 #
@@ -18,9 +18,12 @@ class Sculd::Manager
   class LoadError < Exception; end
 
   #
-  def initialize(file, io = $stdout)
-    @source_file = file
-    load_file(@source_file, io)
+  def initialize(dir, io = $stdout)
+    @source_dir = dir
+    @plans = []
+    Dir.glob("#{@source_dir}/*").each do |file|
+      load_file(file, io)
+    end
   end
 
   def show(num_event, num_task, io = $stdout)
@@ -32,31 +35,35 @@ class Sculd::Manager
 
   # read, parse file and set data to @events and @tasks.
   def load_file(file, io = $stdio)
-    @plans = []
 
     File.open(file, "r").readlines.each_with_index do |line, index|
       begin
-        date, type, option = Sculd::Plan.parse(line, io)
-        option = option.to_i
-        next unless type
-        case type
-        when "@"
-          plan_type = Sculd::Plan::Schedule
-        when "!"
-          plan_type = Sculd::Plan::Deadline
-          option = 7 if option == 0
-        when "-"
-          plan_type = Sculd::Plan::Reminder
-        when "+"
-          plan_type = Sculd::Plan::Todo
-          option = 7 if option == 0
+        elems = Sculd::Plan.parse(line, io)
+        next unless elems[:type]
+        case elems[:type]
+        when Sculd::Plan::Schedule::SYMBOL_CHAR
+          plan_class = Sculd::Plan::Schedule
+        when Sculd::Plan::Deadline::SYMBOL_CHAR
+          plan_class = Sculd::Plan::Deadline
+        when Sculd::Plan::Reminder::SYMBOL_CHAR
+          plan_class = Sculd::Plan::Reminder
+        when Sculd::Plan::Todo::SYMBOL_CHAR
+          plan_class = Sculd::Plan::Todo
         else
           next
         end
-        @plans << plan_type.new(date, option, line)
+        @plans << plan_class.new(elems[:datetime   ],
+                                 elems[:flag_time  ],
+                                 elems[:option     ],
+                                 elems[:description],
+                                )
       rescue Sculd::Plan::WeekdayMismatchError
-        io.puts "error occured at #{index}: #{line}"
+        io.puts "error occured at #{index}: #{line.to_i + 1}"
         raise LoadError
+      rescue Sculd::Plan::NotNumberError
+        #io.puts "error occured at #{index}: #{line+1}"
+        #raise LoadError
+        next
       rescue
         # do nothing
       end
@@ -89,11 +96,28 @@ class Sculd::Manager
         #HIGHLINE.say("  <%= color(#{date.to_s} #{WEEKDAYS[date.wday]}, :white, :red) %>")
         #hl.say("  <%= color('red', :red) %>!")
         #io.puts str
-        events.sort_by{|i| i.datetime}.each do |job|
-          io.puts "    #{job.description.strip}"
+        events.sort_by{|i| i.datetime}.each do |event|
+          #pp event
+
+          io.print("    ") #indent
+          event_date = Date.new(event.datetime.year,
+                                event.datetime.month,
+                                event.datetime.day)
+          if event_date != date
+            io.printf("<%02d/%02d>", event.datetime.month, event.datetime.day )
+          elsif event.flag_time
+            io.printf("[%02d:%02d]", event.datetime.hour, event.datetime.minute )
+          else
+            io.print("       ")
+          end
+          io.printf("%s", event.class::SYMBOL_CHAR )
+          io.printf("%-2s ", event.option.to_s )
+          io.puts "#{event.description}"
+
+          #io.puts "    #{event.description.strip}"
         end
       else
-        io.puts "    (no plan)"
+        io.puts "    (no event)"
       end
       io.puts
     end
@@ -104,10 +128,12 @@ class Sculd::Manager
   def days_events
     results = {}
     @plans.each do |plan|
-      plan.events.each do |event|
-        date = event.date
+      #puts
+      #p plan
+      plan.event_dates.each do |date|
+        #pp date
         results[date] ||= []
-        results[date] << event
+        results[date] << plan
       end
     end
     return results
@@ -119,11 +145,21 @@ class Sculd::Manager
 
     io.puts "Tasks:"
     plans = @plans.sort_by {|plan| plan.priority(today)}.reverse
-    #pp plans
 
     num = plans.size if plans.size < num
     plans[0..(num-1)].each do |plan|
-      io.puts "  #{plan.description.strip}"
+      io.printf("  [%4d-%02d-%02d]",
+        plan.datetime.year,
+        plan.datetime.month,
+        plan.datetime.day,
+               )
+      io.printf("%s%-2s %s",
+        plan.class::SYMBOL_CHAR,
+        plan.option.to_s,
+        plan.description
+      #io.print "  #{plan.description.strip}"
+      )
+      io.puts
     end
   end
 end

data/lib/sculd/plan.rb

@@ -13,8 +13,9 @@ class Sculd::Plan
   class NotDefinedError < Exception; end
   class WeekdayMismatchError < Exception; end
   class NotWeekdayError < Exception; end
+  class NotNumberError < Exception; end
 
-  attr_reader :description
+  attr_reader :description, :flag_time, :datetime, :option
 
   REMINDER_PRIORITY = 10000
   DEADLINE_PRIORITY = 20000
@@ -22,27 +23,33 @@ class Sculd::Plan
   # Parse and return date, type, option.
   def self.parse(str, io = $stdout)
     #/\[([\d\- :]*)\](.)(\S*)/ =~ str #OK
-    /\[([^\]]*)\](.)(\S*)/ =~ str #OK
+    /\[([^\]]*)\](.)(\S*)\s+(.*)/ =~ str #OK
+    result = {}
 
-    datestr = $1
-    type    = $2
-    option  = $3.to_s
+    date, type, option, description = $1, $2, $3, $4
 
-    datetime      = DateTime::parse datestr
-    if /\((.+)\)/ =~ datestr
-      #pp $1
-      #pp datetime.wday
-      #pp self.wday($1)
+    datetime      = DateTime::parse date
+    if /\((.+)\)/ =~ date
       unless self.wday($1) == datetime.wday
-        #io.puts "#{datetime} is #{Sculd::Manager::WEEKDAYS[datetime.wday]},"
-        #io.puts "but string contains #{datestr}."
         io.puts "ERROR:"
         io.puts "#{datetime} is #{Sculd::Manager::WEEKDAYS[datetime.wday]},"
-        io.puts "but string contains #{datestr}."
+        io.puts "but string contains #{date}."
         raise WeekdayMismatchError
       end
     end
-    return datetime, type, option
+    result[:datetime] = datetime
+    result[:flag_time] = date.include?(":")
+
+    result[:type]   = type
+
+    unless option.empty?
+      raise NotNumberError unless option =~ /^[0-9]+$/
+      result[:option] = option.to_i 
+    end
+
+    result[:description] = description
+
+    return result
   end
 
   def self.wday(str)
@@ -67,9 +74,10 @@ class Sculd::Plan
   end
 
   #
-  def initialize(datetime, option, description)
-    @datetime   = datetime
-    @option = option
+  def initialize(datetime, flag_time, option, description)
+    @datetime    = datetime
+    @flag_time   = flag_time
+    @option      =  option
     @description = description
   end
 
@@ -78,7 +86,7 @@ class Sculd::Plan
     raise NotDefinedError
   end
 
-  def events
+  def event_dates
     raise NotDefinedError
   end
 end

data/lib/sculd/plan/deadline.rb

@@ -1,17 +1,20 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "sculd/event.rb"
-require "sculd/plan.rb"
+#require "sculd/event.rb"
+#require "sculd/plan.rb"
 
 #
 #
 #
 class Sculd::Plan::Deadline < Sculd::Plan
 
+  SYMBOL_CHAR = "!"
+  DEFAULT_OPTION = 7
+
   def priority(today)
-    @option = 1 if @option < 1
-    beginning = @datetime - @option
+    #@option = 1 if @option < 1
+    beginning = @datetime - (@option || DEFAULT_OPTION)
     if today < beginning
       return 0
     elsif today <= @datetime
@@ -23,11 +26,15 @@ class Sculd::Plan::Deadline < Sculd::Plan
     end
   end
 
-  def events
+  def event_dates
+    #@option ||= DEFAULT_OPTION
+
     results = []
-    results << Sculd::Event.new(@datetime - @option, @description)
-    results << Sculd::Event.new(@datetime, @description)
-    return results
+    results << @datetime - (@option || DEFAULT_OPTION)
+    results << @datetime
+    results.map do |datetime|
+      Date.new(datetime.year, datetime.month, datetime.day)
+    end
   end
 end
 

data/lib/sculd/plan/reminder.rb

@@ -1,13 +1,16 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "sculd/event.rb"
-require "sculd/plan.rb"
+#require "sculd/event.rb"
+#require "sculd/plan.rb"
 
 #
 #
 #
 class Sculd::Plan::Reminder < Sculd::Plan
+
+  SYMBOL_CHAR = "-"
+
   # value of @option does not work
   def priority(today = Date.now)
     if today < @datetime
@@ -18,8 +21,8 @@ class Sculd::Plan::Reminder < Sculd::Plan
     end
   end
 
-  def events
-    return [Sculd::Event.new(@datetime, @description)]
+  def event_dates
+    [Date.new(@datetime.year, @datetime.month, @datetime.day)]
   end
 end
 

data/lib/sculd/plan/schedule.rb

@@ -1,19 +1,22 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "sculd/event.rb"
+#require "sculd/event.rb"
 
 #
 #
 #
 class Sculd::Plan::Schedule < Sculd::Plan
+
+  SYMBOL_CHAR = "@"
+
   #
   def priority(today = Date.new)
     return 0
   end
 
-  def events
-    return [Sculd::Event.new(@datetime, @description)]
+  def event_dates
+    [Date.new(@datetime.year, @datetime.month, @datetime.day)]
   end
 end