sculd 0.1.3 → 0.2.0

data/lib/sculd/plan.rb

@@ -1,93 +1,87 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-#require "sculd/plan/deadline.rb"
-#require "sculd/plan/reminder.rb"
-#require "sculd/plan/schedule.rb"
-#require "sculd/plan/todo.rb"
-
 #
 #
 #
 class Sculd::Plan
-    class NotDefinedError < Exception; end
-    class WeekdayMismatchError < Exception; end
-    class NotWeekdayError < Exception; end
-    class NotNumberError < Exception; end
-
-    attr_reader :description, :flag_time, :datetime, :option
-
-    REMINDER_PRIORITY = 10000
-    DEADLINE_PRIORITY = 20000
-
-    # Parse and return date, type, option.
-    def self.parse(str, io = $stdout)
-        #/\[([\d\- :]*)\](.)(\S*)/ =~ str #OK
-        /\[([^\]]*)\](.)(\S*)\s+(.*)/ =~ str #OK
-        result = {}
-
-        date, type, option, description = $1, $2, $3, $4
-
-        datetime            = DateTime::parse date
-        if /\((.+)\)/ =~ date
-            unless self.wday($1) == datetime.wday
-                io.puts "ERROR:"
-                io.puts "#{datetime} is #{Sculd::Manager::WEEKDAYS[datetime.wday]},"
-                io.puts "but string contains #{date}."
-                raise WeekdayMismatchError
-            end
-        end
-        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
+  class NotDefinedError < Exception; end
+  class WeekdayMismatchError < Exception; end
+  class NotWeekdayError < Exception; end
+  class NotNumberError < Exception; end
+
+  attr_reader :description, :flag_time, :datetime, :option
+
+  REMINDER_PRIORITY = 10000
+  DEADLINE_PRIORITY = 20000
+
+  # Parse and return date, type, option.
+  def self.parse(str, io = $stdout)
+    #/\[([\d\- :]*)\](.)(\S*)/ =~ str #OK
+    /\[([^\]]*)\](.)(\S*)\s+(.*)/ =~ str #OK
+    result = {}
+
+    date, type, option, description = $1, $2, $3, $4
+
+    datetime            = DateTime::parse date
+    if /\((.+)\)/ =~ date
+      weekday = self.wday($1)
+      unless weekday  == datetime.wday
+        raise WeekdayMismatchError,
+          "#{datetime} is #{Sculd::Manager::DEFAULT_WEEKDAYS[datetime.wday]}, but string contains #{date}."
+      end
     end
+    result[:datetime] = datetime
+    result[:flag_time] = date.include?(":")
 
-    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, flag_time, option, description)
-        @datetime        = datetime
-        @flag_time   = flag_time
-        @option          =  option
-        @description = description
-    end
+    result[:type]       = type
 
-    # return priority of task calculated by equation defined in subclass. 
-    def priority
-        raise NotDefinedError
+    unless option.empty?
+      raise NotNumberError unless option =~ /^[0-9]+$/
+      result[:option] = option.to_i 
     end
 
-    def event_dates
-        raise NotDefinedError
+    result[:description] = description
+
+    return result
+  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, "Unknown format string: #{str}"
     end
+  end
+
+  #
+  def initialize(datetime, flag_time, option, description)
+    @datetime    = datetime
+    @flag_time   = flag_time
+    @option      = option
+    @description = description
+  end
+
+  # return priority of task calculated by equation defined in subclass. 
+  def priority
+    raise NotDefinedError
+  end
+
+  def event_dates
+    raise NotDefinedError
+  end
 end
 

data/lib/sculd/plan/deadline.rb

@@ -9,37 +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
-            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
+  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
 
-    def event_dates
-        #@option ||= DEFAULT_OPTION
+  def event_dates
+    #@option ||= DEFAULT_OPTION
 
-        results = []
-        results << @datetime - (@option || DEFAULT_OPTION) unless @option == 0
-        results << @datetime
-        results.map do |datetime|
-            Date.new(datetime.year, datetime.month, datetime.day)
-        end
+    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
 

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
-        end
+  # 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
 
-    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
-        end
+  #
+  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
 
-    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)
-        end
+    results = []
+    results << @datetime
+    results << @datetime + (@option || DEFAULT_OPTION)
+    results.map do |datetime|
+      Date.new(datetime.year, datetime.month, datetime.day)
     end
+  end
 end
 

data/sculd.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: sculd 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sculd"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["ippei94da"]
-  s.date = "2014-08-29"
+  s.date = "2017-04-24"
   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"]
@@ -50,32 +52,34 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ippei94da/sculd"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.5.1"
   s.summary = "Sculd, SChedULe Dealer."
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     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.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"])
+      s.add_development_dependency(%q<test-unit>, ["~> 3.2"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.11"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.11"])
+      s.add_development_dependency(%q<highline>, ["~> 1.6"])
     else
-      s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
-      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"])
+      s.add_dependency(%q<test-unit>, ["~> 3.2"])
+      s.add_dependency(%q<rdoc>, ["~> 4.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.11"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
+      s.add_dependency(%q<simplecov>, ["~> 0.11"])
+      s.add_dependency(%q<highline>, ["~> 1.6"])
     end
   else
-    s.add_dependency(%q<rdoc>, ["~> 4.1.1"])
-    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"])
+    s.add_dependency(%q<test-unit>, ["~> 3.2"])
+    s.add_dependency(%q<rdoc>, ["~> 4.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.11"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
+    s.add_dependency(%q<simplecov>, ["~> 0.11"])
+    s.add_dependency(%q<highline>, ["~> 1.6"])
   end
 end
 

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,71 +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))
+    today = Date.new(2012, 10, 20)
+    assert_equal(20000, @d02.priority(today))
 
 
-        today = Date.new(2012, 10, 15)
-        assert_equal(20000, @d03.priority(today))
-    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  )
+  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
+    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