sculd 0.0.0 → 0.0.1

data/CHANGES

@@ -1,6 +1,13 @@
 = sdrt changelog
 
-== Version 0.0.0
+== Master (for 0.0.2)
+
+== Version 0.0.1
+* Enable to use date and time.
+* Plan.parse is modified to deal with time.
+* [datetime(wday)], date and weekday, style is introduced, to check correct date.
+* Add dates command to help you input your plans.
 
+== Version 0.0.0
 * Initial release.
 

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/bin/dates

@@ -0,0 +1,41 @@
+#! /usr/bin/ruby
+# coding: utf-8
+
+require "date"
+require "pp"
+
+#WEEKDAYS = %w(日 月 火 水 木 金 土)
+WEEKDAYS = %w(Sun Mon Tue Wed Thu Fri Sat)
+TODAY = DateTime.now
+
+unless ARGV.size == 2
+  puts "USAGE: dates from_date to_date"
+  puts "  e.g., dates 2012-01-26 2012-02-29"
+  puts "  e.g., dates 1-26 2-29"
+  puts "  e.g., dates '' 29"
+  exit
+end
+
+def analyze_date(str)
+  #pp TODAY
+  nums = str.split(/[\-\/]/).map{|i| i.to_i}
+  nums = [TODAY.day         ] if nums.size == 0
+  nums = [TODAY.month, *nums] if nums.size == 1
+  nums = [TODAY.year,  *nums] if nums.size == 2
+  Date.new(* nums)
+end
+from_date = analyze_date(ARGV[0])
+to_date   = analyze_date(ARGV[1])
+
+if to_date < from_date
+  puts "Error: from_date must be earlier than to_date"
+  exit
+end
+
+#p from_date, to_date
+current = from_date
+while (current <= to_date)
+  puts current.strftime("[%Y-%m-%d (#{WEEKDAYS[current.wday]})]")
+  current += 1
+end
+

data/bin/sculd

@@ -18,6 +18,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.parse!(ARGV)
 
 #num_day  = ARGV.shift.to_i
@@ -30,15 +31,22 @@ if (( OPTS[:event] == 0) &&( OPTS[:task ] == 0))
   exit
 end
 
+file = OPTS[:file]
+file ||= SCULD_DAT
 
-unless FileTest.exist? SCULD_DAT
-#  lines = File.open(SCULD_DAT, "r").readlines
+unless FileTest.exist? file
+#  lines = File.open(file, "r").readlines
 #rescue
-  puts "Not found #{SCULD_DAT}. Exit."
+  puts "Not found #{file}. Exit."
   exit
 end
 
-sm = Sculd::Manager.new(SCULD_DAT)
+begin
+  sm = Sculd::Manager.new(file)
+rescue Sculd::Manager::LoadError
+  puts "Exit."
+  exit
+end
 sm.show(OPTS[:event], OPTS[:task])
 
 #while (true)

data/lib/sculd/manager.rb

@@ -12,10 +12,12 @@ class Sculd::Manager
   #WEEKDAYS = [ "日", "月", "火", "水", "木", "金", "土" ]
   WEEKDAYS = [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ]
 
+  class LoadError < Exception; end
+
   #
-  def initialize(file)
+  def initialize(file, io = $stdout)
     @source_file = file
-    load_file(@source_file)
+    load_file(@source_file, io)
   end
 
   def show(num_event, num_task)
@@ -26,12 +28,12 @@ class Sculd::Manager
   private
 
   # read, parse file and set data to @events and @tasks.
-  def load_file(file)
+  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)
+        date, type, option = Sculd::Plan.parse(line, io)
         option = option.to_i
         next unless type
         case type
@@ -49,8 +51,11 @@ class Sculd::Manager
           next
         end
         @plans << plan_type.new(date, option, line)
+      rescue Sculd::Plan::WeekdayMismatchError
+        io.puts "error occured at #{index}: #{line}"
+        raise LoadError
       rescue
-        #puts "error occured at #{index}: #{line}"
+        # do nothing
       end
     end
   end

data/lib/sculd/plan.rb

@@ -11,6 +11,8 @@
 #
 class Sculd::Plan
   class NotDefinedError < Exception; end
+  class WeekdayMismatchError < Exception; end
+  class NotWeekdayError < Exception; end
 
   attr_reader :description
 
@@ -18,20 +20,52 @@ class Sculd::Plan
   DEADLINE_PRIORITY = 20000
 
   # Parse and return date, type, option.
-  def self.parse(str)
-    #/\[(\d{4})-(\d{2})-(\d{2})\]([@+!-])(\d*)/ =~ @line
-    #/\[\d{4}-\d{2}-\d{2}(?: \d{2}\:\d{2})?\][@+!-](\d*)(.*)/ =~ line
-    #/\[\d{4}-\d{2}-\d{2}(?: \d{2}\:\d{2})?\][@+!-](\d*)(.*)/ =~ str
-    #/\[(\d{4}-\d{2}-\d{2}(?: \d{2}\:\d{2})?\][@+!-](\d*)(.*)/ =~ str
-    /\[(\d{4}-\d{2}-\d{2})\]([@+!-])(\S*)(.*)$/ =~ str
-    #/\[(^]+)\](.)(\S*)/ =~ str 
-    #date      = DateTime::new($1.to_i, $2.to_i, $3.to_i)
-    datetime      = DateTime::parse $1
-    type      = $2
-    option    = $3.to_s
+  def self.parse(str, io = $stdout)
+    #/\[([\d\- :]*)\](.)(\S*)/ =~ str #OK
+    /\[([^\]]*)\](.)(\S*)/ =~ str #OK
+
+    datestr = $1
+    type    = $2
+    option  = $3.to_s
+
+    datetime      = DateTime::parse datestr
+    if /\((.+)\)/ =~ datestr
+      #pp $1
+      #pp datetime.wday
+      #pp self.wday($1)
+      unless self.wday($1) == datetime.wday
+        #io.puts "#{datetime} is #{Sculd::Manager::WEEKDAYS[datetime.wday]},"
+        #io.puts "but string contains #{datestr}."
+        puts "ERROR:"
+        puts "#{datetime} is #{Sculd::Manager::WEEKDAYS[datetime.wday]},"
+        puts "but string contains #{datestr}."
+        raise WeekdayMismatchError
+      end
+    end
     return datetime, type, option
   end
 
+  def self.wday(str)
+    case str
+    when /^Su/i
+      return 0
+    when /^M/i
+      return 1
+    when /^Tu/i
+      return 2
+    when /^W/i
+      return 3
+    when /^Th/i
+      return 4
+    when /^F/i
+      return 5
+    when /^Sa/i
+      return 6
+    else
+      raise NotWeekdayError
+    end
+  end
+
   #
   def initialize(datetime, option, description)
     @datetime   = datetime

data/sculd.gemspec

@@ -0,0 +1,86 @@
+# 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 = "sculd"
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["ippei94da"]
+  s.date = "2012-11-01"
+  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"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "CHANGES",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/dates",
+    "bin/sculd",
+    "lib/sculd.rb",
+    "lib/sculd/event.rb",
+    "lib/sculd/manager.rb",
+    "lib/sculd/plan.rb",
+    "lib/sculd/plan/deadline.rb",
+    "lib/sculd/plan/reminder.rb",
+    "lib/sculd/plan/schedule.rb",
+    "lib/sculd/plan/todo.rb",
+    "lib/sculd/task.rb",
+    "sculd.gemspec",
+    "spec/command_spec.rb",
+    "spec/deadline_spec.rb",
+    "spec/event_spec.rb",
+    "spec/job_spec.rb",
+    "spec/manager_spec.rb",
+    "spec/plan_spec.rb",
+    "spec/reminder_spec.rb",
+    "spec/schedule/empty.dat",
+    "spec/schedule/error.dat",
+    "spec/schedule/schedule.dat",
+    "spec/schedule_spec.rb",
+    "spec/sculd_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/todo_spec.rb"
+  ]
+  s.homepage = "http://github.com/ippei94da/sculd"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Sculd, SChedULe Dealer."
+
+  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_development_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.2.1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+  end
+end
+

data/spec/command_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Command" do
-end
+#describe "Command" do
+#  context "data containg wrong weekday" do
+#  end
+#end
 

data/spec/manager_spec.rb

@@ -15,16 +15,25 @@ describe "Manager" do
     end
 
     describe "#load_file" do
-      it "should overwrite data" do
-        result = @s00.load_file("spec/schedule/schedule.dat")
-        @s00.plans.size.should == 4
-        @s00.plans[0].should be_kind_of Sculd::Plan
-        @s00.plans[1].should be_kind_of Sculd::Plan
-        @s00.plans[2].should be_kind_of Sculd::Plan
-        @s00.plans[3].should be_kind_of Sculd::Plan
+      context "correct data" do
+        it "should overwrite data" do
+          result = @s00.load_file("spec/schedule/schedule.dat")
+          @s00.plans.size.should == 4
+          @s00.plans[0].should be_kind_of Sculd::Plan
+          @s00.plans[1].should be_kind_of Sculd::Plan
+          @s00.plans[2].should be_kind_of Sculd::Plan
+          @s00.plans[3].should be_kind_of Sculd::Plan
 
-        result = @s00.load_file("spec/schedule/empty.dat")
-        @s00.plans.size.should == 0
+          result = @s00.load_file("spec/schedule/empty.dat")
+          @s00.plans.size.should == 0
+        end
+      end
+
+      context "data containing error" do
+        it "should interrupt with error line." do
+          io = StringIO.new
+          lambda{ @s00.load_file("spec/schedule/error.dat", io)}.should raise_error Sculd::Manager::LoadError
+        end
       end
     end
   end

data/spec/plan_spec.rb

@@ -4,14 +4,63 @@ describe Sculd::Plan do # E.g., Klass
   context 'Class method' do # 'when stack is empty'
     describe '#parse' do # ''
       context '[2012-10-23]! deadlineA' do
-        it 'should return Date, !, deadlineA' do
+        it 'should return Date, !, ""' do
           a, b, c = Sculd::Plan.parse('[2012-10-23]! deadlineA')
-          a.should == Date.new(2012, 10, 23)
+          a.should == DateTime.new(2012, 10, 23, 0, 0, 0)
           b.should == "!"
           c.should == ""
         end
       end
 
+      context '[2012-10-23 01:02:03]@ deadlineA' do
+        it 'should return Date, @, ""' do
+          a, b, c = Sculd::Plan.parse('[2012-10-23 01:02:03]@ deadlineA')
+          a.should == DateTime.new(2012, 10, 23, 1, 2, 3)
+          b.should == "@"
+          c.should == ""
+        end
+      end
+
+      context 'schedule with correct weekday' do
+        it 'should return Date, @, ""' do
+          a, b, c = Sculd::Plan.parse('[2012-11-01 01:02:03(Thu)]@ deadlineA')
+          a.should == DateTime.new(2012, 11, 01, 1, 2, 3)
+          b.should == "@"
+          c.should == ""
+
+          a, b, c = Sculd::Plan.parse('[2012-11-01 01:02:03(th)]@ deadlineA')
+          a.should == DateTime.new(2012, 11, 01, 1, 2, 3)
+          b.should == "@"
+          c.should == ""
+        end
+      end
+
+      context 'schedule with wrong weekday' do
+        it 'should return Date, @, ""' do
+          io = StringIO.new
+          lambda{ Sculd::Plan.parse('[2012-11-01 01:02:03(Sun)]@ deadlineA', io)}.should raise_error Sculd::Plan::WeekdayMismatchError
+
+          lambda{ Sculd::Plan.parse('[2012-11-01 01:02:03(abc)]@ deadlineA', io)}.should raise_error Sculd::Plan::NotWeekdayError
+        end
+      end
+
+      context '[abc]! deadlineA' do
+        it 'should raise exception' do
+          #Sculd::Plan.parse('[abc]! deadlineA')
+          #fail
+          lambda{ Sculd::Plan.parse('[abc]! deadlineA')}.should raise_error
+        end
+      end
+
+      context '[abc]]! deadlineA' do
+        it 'should raise exception' do
+          a, b, c = Sculd::Plan.parse('[2012-01-01]]! deadlineA')
+          a.should == DateTime.new(2012, 01, 01)
+          b.should == "]"
+          c.should == "!"
+        end
+      end
+
       context '  [2012-10-23]! deadlineA with space at head' do
         it 'should return Date, !, deadlineA' do
           a, b, c = Sculd::Plan.parse('  [2012-10-23]! deadlineA with space at head')

data/spec/schedule/error.dat

@@ -0,0 +1,2 @@
+[2012-11-01(Thu)]@ no problem
+[2012-11-01(Fri)]@ mismatch weekday

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sculd
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77033260 !ruby/object:Gem::Requirement
+  requirement: &71356360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *77033260
+  version_requirements: *71356360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77032900 !ruby/object:Gem::Requirement
+  requirement: &71355770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *77032900
+  version_requirements: *71355770
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77032620 !ruby/object:Gem::Requirement
+  requirement: &71355240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *77032620
+  version_requirements: *71355240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77032340 !ruby/object:Gem::Requirement
+  requirement: &71354270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *77032340
+  version_requirements: *71354270
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &77032060 !ruby/object:Gem::Requirement
+  requirement: &71353730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,12 +65,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77032060
+  version_requirements: *71353730
 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. '
 email: ippei94da@gmail.com
 executables:
+- dates
 - sculd
 extensions: []
 extra_rdoc_files:
@@ -85,6 +86,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/dates
 - bin/sculd
 - lib/sculd.rb
 - lib/sculd/event.rb
@@ -95,6 +97,7 @@ files:
 - lib/sculd/plan/schedule.rb
 - lib/sculd/plan/todo.rb
 - lib/sculd/task.rb
+- sculd.gemspec
 - spec/command_spec.rb
 - spec/deadline_spec.rb
 - spec/event_spec.rb
@@ -103,6 +106,7 @@ files:
 - spec/plan_spec.rb
 - spec/reminder_spec.rb
 - spec/schedule/empty.dat
+- spec/schedule/error.dat
 - spec/schedule/schedule.dat
 - spec/schedule_spec.rb
 - spec/sculd_spec.rb
@@ -123,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 792041583
+      hash: 229991729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: