sculd 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5e5f8afdf363dced7623854381b2ebf40ae7c20d
+  data.tar.gz: a94f0df0b433e2120eb1e72667d0e1ddc6988e96
+SHA512:
+  metadata.gz: eb494f786bf70a17014f78d637618b893743f5dfc0161c1c6832f1a615300316e9de0c2fae1e48c040ca44502d33245614dcd63bf93802faeb62cdfaa4466b30
+  data.tar.gz: d84fd258f5e34948d215a775aedf9ad7a8aecb5b964d22ac57ff138925c88c08644bb3ea78a0360a94d36d6f1b1600b83143a8745fe8a4d6606aed7da327bcd3

data/CHANGES

@@ -1,38 +1,51 @@
 = sdrt changelog
 
-TODO
-== Master
+== Version 0.2.0 [2017-04-24] released
+
+* Change command line specification. Get arguments as list of dates.
+* Change the role of ~/.sculd; from directory to configuration file.
+* Enable use local name for weekdays to show events.
+* Enable use Japanese weekday names for reminder writing.
+* Add --weekday option
 
 == Version 0.1.3 [2014-08-29] released
+
 * Bugfix to show only one event when deadline with option 0, like [2013-12-10]!0 .
 * Bugfix to generate NaN when deadline with option 0, like [2013-12-10]!0 on the day.
 
 == Version 0.1.2 [2014-05-06] released
+
 * Adjust to highline-1.6.21.
 
 == Version 0.1.1 [2013-05-21] released
+
 * Bugfix of show_task.
 
 == 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.
 
 == Version 0.0.2 [2012-11-19] released
+
 * Dates are changed to be shown in colors.
 * Dates which has no plan shows '(no plan)'
 
 == 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/Gemfile

@@ -6,12 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  #gem "rdoc", "~> 4.0.1"
-  #gem "simplecov", ">= 0"
-  gem "rdoc", "~> 4.1.1"
-  gem "bundler", "~> 1.7.2"
-  gem "jeweler", "~> 2.0.1"
-  gem "simplecov", ">= 0.8.2"
-  gem "highline", ">= 1.6.21"
-  #gem "psych", ">= 0"
+  gem "test-unit", "~> 3.2"
+  gem "rdoc", "~> 4.2"
+  gem "bundler", "~> 1.11"
+  gem "jeweler", "~> 2.0"
+  gem "simplecov", "~> 0.11"
+  gem "highline", "~> 1.6"
 end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/bin/dates

@@ -31,7 +31,6 @@ unless ARGV.size == 2
 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

data/bin/sculd

@@ -5,56 +5,101 @@
 # Events include schedule and deadline(start and end).
 # Tasks  include deadline, reminder and todo.
 
-#SCULD_DAT = "#{ENV['HOME']}/.sculd.dat"
-SCULD_DIR = "#{ENV['HOME']}/.sculd"
+SCULD_CONF = "#{ENV['HOME']}/.sculd"
 
 require "pp"
 require "optparse"
-require "rubygems"
-gem "sculd"
 require "sculd"
+require "yaml"
 
 # option analysis
-OPTS = {}
+OPTIONS = {}
 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("-a day", "--after days" , "Event after n days."){|v|
+  OPTIONS[:after] = v.to_i}
+op.on("-b day", "--before days", "Event before n days."){|v|
+  OPTIONS[:before] = v.to_i}
+op.on("-c day", "--center days", "Event days between n days."){|v|
+  OPTIONS[:center] = v.to_i}
+op.on("-w weekdays", "--weekdays=wdays", "Event days only on weekdays. E.g., --weekday='Sun,Mon'"){|v|
+  OPTIONS[:weekdays] = v.split ','}
+op.on("-t num", "--task num"  , "Show tasks on today." ){|v|
+  OPTIONS[:task ] = v.to_i}
 op.parse!(ARGV)
 
-#num_day  = ARGV.shift.to_i
-#num_task = ARGV.shift.to_i
-OPTS[:event] ||= 0
-OPTS[:task ] ||= 0
 
-if (( OPTS[:event] == 0) &&( OPTS[:task ] == 0))
-  puts "USAGE: sculd -e 7 -t 10"
+## ~/.sculd check
+begin
+  configurations = YAML.load_file SCULD_CONF
+rescue
+  puts "'sculd' command requires ~/.sculd file with YAML format; not directory."
+  puts "key as sculd_dir and value as the path to directory should be indicated in ~/.sculd."
   exit
 end
+sculd_dir = configurations['sculd_dir']
+
+## dates
+if ARGV.empty?
+  dates = [Date.today]
+else
+  dates = []
+  ARGV.each do |v|
+    begin
+      date = (Date.parse v)
+    rescue ArgumentError
+      next
+    end
+    dates << date
+  end
+end
+
+if OPTIONS[:center]
+  OPTIONS[:after]  ||= OPTIONS[:center]
+  OPTIONS[:before] ||= OPTIONS[:center]
+end
+
+if OPTIONS[:after]
+  results = []
+  dates.each do |date|
+    0.upto OPTIONS[:after] do |i|
+      results << date + i
+    end
+  end
+  dates = results
+end
+
+if OPTIONS[:before]
+  results = []
+  dates.each do |date|
+    0.upto OPTIONS[:before] do |i|
+      results << date - i
+    end
+  end
+  dates = results
+end
+
+
+if OPTIONS[:weekdays]
+  weekdays = OPTIONS[:weekdays].map {|v| Sculd::Plan.wday v}
+  dates.select!{|date| weekdays.include? date.wday}
+end
+#pp dates
 
-#file = OPTS[:file]
-#file ||= SCULD_DAT
+dates = dates.sort.uniq
 
-unless FileTest.exist? SCULD_DIR
-#  lines = File.open(file, "r").readlines
-#rescue
-  puts "Not found #{SCULD_DIR}. Exit."
+unless FileTest.exist? sculd_dir
+  puts "Not found #{sculd_dir}. Exit."
   exit
 end
 
 begin
-  sm = Sculd::Manager.new(SCULD_DIR)
-rescue Sculd::Manager::LoadError
+  sm = Sculd::Manager.new(sculd_dir)
+  sm.set_weekdays configurations['weekdays'] if configurations['weekdays']
+rescue Sculd::Manager::LoadError => message
+  puts message
   puts "Exit."
   exit
 end
-io = $stdout
-sm.show(OPTS[:event], OPTS[:task], io)
+sm.show_events(dates)
+sm.show_tasks(OPTIONS[:task ]) if OPTIONS[:task]
 
-#while (true)
-#  s.show(OPTS[:event], OPTS[:task])
-#  command = STDIN.gets
-#  case
-#  when command == 
-#  end
-#end

data/lib/sculd/manager.rb

@@ -2,165 +2,166 @@
 # coding: utf-8
 
 require "date"
-require "sculd.rb"
 
 require "rubygems"
-#gem         "highline"
 require "highline"
 
 #
 #
 #
 class Sculd::Manager
-    #WEEKDAYS = [ "日", "月", "火", "水", "木", "金", "土" ]
-    WEEKDAYS = [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ]
+  attr_reader :weekdays
 
-    class LoadError < Exception; end
+  DEFAULT_WEEKDAYS = [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ]
 
-    #
-    def initialize(dir, io = $stdout)
-        @source_dir = dir
-        @plans = []
-        Dir.glob("#{@source_dir}/*").each do |file|
-            load_file(file, io)
-        end
-    end
+  class LoadError < StandardError; end
+  class ArgumentError < StandardError; end
 
-    def show(num_event, num_task, io = $stdout)
-        show_events(num_event)
-        show_tasks(num_task)
+  def initialize(dir, io = $stdout)
+    @source_dir = dir
+    @weekdays = DEFAULT_WEEKDAYS
+    @plans = []
+    Dir.glob("#{@source_dir}/*").each do |file|
+      load_file(file, io)
     end
+  end
 
-    private
-
-    # read, parse file and set data to @events and @tasks.
-    def load_file(file, io = $stdio)
-
-        File.open(file, "r").readlines.each_with_index do |line, index|
-            begin
-                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_class.new(elems[:datetime     ],
-                                                                 elems[:flag_time    ],
-                                                                 elems[:option       ],
-                                                                 elems[:description],
-                                                                )
-            rescue Sculd::Plan::WeekdayMismatchError
-                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
-        end
+  def set_weekdays(ary)
+    unless ary.size == 7
+      raise ArgumentError, ary.to_s
     end
-
-    # Show events in 'num' days from todary.
-    def show_events(num, today = Date.today, io = $stdout)
-        return if num == 0
-        hl = HighLine.new($stdin, io)
-
-        d_e = days_events
-        io.puts "Events:"
-        num.times do |i|
-            date = today + i
-            str = " #{date.to_s} #{WEEKDAYS[date.wday]} "
-
-            case date.wday
-            when 0
-                hl.say("    <%= color('#{str}', :white, :on_red) %>\n")
-            when 6
-                hl.say("    <%= color('#{str}', :white, :on_blue) %>\n")
-            else
-                hl.say("    <%= color('#{str}', :white, :on_black) %>\n")
-            end
-
-            events = d_e[date]
-            if events # if plan is not empty.
-                #HIGHLINE.say("<%= color('red', :red) %>!")
-                #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 |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 event)"
-            end
-            io.puts
+    @weekdays = ary
+  end
+
+  #def show(num_event, num_task, io = $stdout)
+  #  show_events(num_event)
+  #  show_tasks(num_task)
+  #end
+
+  # Show events in 'num' days from todary.
+  #def show_events(num, today = Date.today, io = $stdout)
+  def show_events(dates, io = $stdout)
+    hl = HighLine.new($stdin, io)
+
+    d_e = days_events
+    io.puts "Events:"
+    dates.each do |date|
+      str = " #{date.to_s} #{@weekdays[date.wday]} "
+
+      case date.wday
+      when 0
+        fgcolor = ":white"; bgcolor = ":on_red";
+      when 6
+        fgcolor = ":white"; bgcolor = ":on_blue";
+      else
+        fgcolor = ":black"; bgcolor = ":on_white";
+      end
+      hl.say("  <%= color('#{str}', #{fgcolor}, #{bgcolor}) %>\n")
+
+      events = d_e[date]
+      if events # if plan is not empty.
+        events.sort_by{|j| j.datetime}.each do |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}"
         end
+      else
+        io.puts "        (no event)"
+      end
+      io.puts
     end
-
-    # Return a hash of dates and events.
-    # The eventes generated from @schedules sorted by date and time.
-    def days_events
-        results = {}
-        @plans.each do |plan|
-            #puts
-            #p plan
-            plan.event_dates.each do |date|
-                #pp date
-                results[date] ||= []
-                results[date] << plan
-            end
-        end
-        return results
+  end
+
+  # Show 'num' tasks of the highest priority.
+  def show_tasks(num, today = Date.today, io = $stdout)
+    return if num == 0
+
+    io.puts "Tasks:"
+    plans = @plans.sort_by {|plan| plan.priority(today)}.reverse
+
+    num = plans.size if plans.size < num
+    plans[0..(num-1)].each do |plan|
+      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
-
-    # Show 'num' tasks of the highest priority.
-    def show_tasks(num, today = Date.today, io = $stdout)
-        return if num == 0
-
-        io.puts "Tasks:"
-        plans = @plans.sort_by {|plan| plan.priority(today)}.reverse
-
-        num = plans.size if plans.size < num
-        plans[0..(num-1)].each do |plan|
-            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
+  private
+
+  # read, parse file and set data to @events and @tasks.
+  def load_file(file, io = $stdin)
+
+    File.open(file, "r").readlines.each_with_index do |line, index|
+      begin
+        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_class.new(elems[:datetime     ],
+                                elems[:flag_time    ],
+                                elems[:option       ],
+                                elems[:description],
+                                )
+      rescue Sculd::Plan::WeekdayMismatchError => error
+        message = error.message
+        message += "\nError occured in #{file} at #{index}: #{line.to_i + 1}\n"
+        message +=  line
+        raise LoadError, message
+      rescue Sculd::Plan::NotWeekdayError => error
+        message = error.message
+        message += "\nError occured in #{file} at #{index}: #{line.to_i + 1}\n"
+        message +=  line
+        raise LoadError, message
+      rescue Sculd::Plan::NotNumberError
+        next
+      rescue
+      end
     end
+  end
+
+  # Return a hash of dates and events.
+  # The eventes generated from @schedules sorted by date and time.
+  def days_events
+    results = {}
+    @plans.each do |plan|
+      plan.event_dates.each do |date|
+        results[date] ||= []
+        results[date] << plan
+      end
+    end
+    return results
+  end
+
 end