syc-task 0.3.2 → 1.0.0

data/lib/syctime/time_util.rb

@@ -1,8 +1,8 @@
 require 'time'
+require 'syctimeleap/time_leap'
 
 # Functions for time operations
 module Syctime
-
   # Translates seconds to years, months, weeks, days, hours, minutes and seconds
   # The return value is an array [seconds,...,years]
   def seconds_to_time(seconds)
@@ -20,9 +20,9 @@ module Syctime
   # Translates seconds into a time string like 1 year 2 weeks 5 days 10 minutes.
   def string_for_seconds(seconds)
     time = seconds_to_time(seconds)
-    time_name = ['year','month','week','day','hour','minute','second']
-    time_string = ""
-    time.reverse.each_with_index do |part,index|
+    time_name = %w[year month week day hour minute second]
+    time_string = ''
+    time.reverse.each_with_index do |part, index|
       time_string << part.to_s + ' ' + time_name[index] + ' ' if part == 1
       time_string << part.to_s + ' ' + time_name[index] + 's ' if part > 1
     end
@@ -34,29 +34,30 @@ module Syctime
   def separated_time_string(seconds, separator)
     secs  = seconds % 60
     mins  = seconds / 60 % 60
-    hours = seconds / 60 / 60 
-    time_string = sprintf("%02d#{separator}%02d#{separator}%02d", hours, mins, secs)
+    hours = seconds / 60 / 60
+    format("%02d#{separator}%02d#{separator}%02d", hours, mins, secs)
   end
 
   # Translates a time in the ISO 8601 schema to a time object.
   #     2013-04-09 21:45 -200
   def time_for_string(time)
-    time = time.scan(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0].sub(' ','T')
+    time = time.scan(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)[0].sub(' ', 'T')
     Time.xmlschema(time)
   end
-  
+
   # Tests whether the date is between from and to. Returns true then otherwise
   # false. Time, from and to are Time objects as retrieved from Time.now or
   # Time.local(2013,"apr",13,10,50,0). Alternatively time strings can be
   # provided in the form of "2013-04-13".
   def date_between?(date, from, to)
-    date = date.strftime("%Y-%m-%d") if date.class == Time || date.class == Date
-    from = from.strftime("%Y-%m-%d") if from.class == Time || from.class == Date
-    to   =   to.strftime("%Y-%m-%d") if to.class   == Time || to.class   == Date
+    date = date.strftime('%Y-%m-%d') if date.class == Time || date.class == Date
+    from = from.strftime('%Y-%m-%d') if from.class == Time || from.class == Date
+    to = to.strftime('%Y-%m-%d') if to.class == Time || to.class == Date
     time_pattern = /\d{4}-\d{2}-\d{2}/
     raise ArgumentError if date.scan(time_pattern).empty?
     raise ArgumentError if from.scan(time_pattern).empty?
     raise ArgumentError if to.scan(time_pattern).empty?
+
     date >= from && date <= to
   end
 
@@ -66,4 +67,54 @@ module Syctime
     time >= from && time <= to
   end
 
+  # Checks whether the date is a valid date in the form of yyyy-mm-dd. If it's
+  # no valid date false is returned otherwise true
+  def valid_date?(date_string)
+    if date_string.match(/\d{4}-\d{2}-\d{2}/)
+      begin
+        Date.parse(date_string)
+        true
+      rescue ArgumentError
+        false
+      end
+    else
+      begin
+        SycTimeleap::TimeLeap.new.send(date_string)
+        true
+      rescue StandardError
+        false
+      end
+    end
+  end
+
+  # Extracts the time out of a time string. Accepts 'today', 'tomorrow',
+  # 'yesterday' or a date in the form 'YYYY-MM-DD'. Returns the date contained
+  # in the time_string or if time = true in a Time object
+  def extract_time(time_string, time = false)
+    time_string = 'today' if time_string.nil?
+
+    if time_string.match(/\d{4}-\d{2}-\d{2}/)
+      date = time_string
+      date = Time.xmlschema("#{time_string}T00:00:00") if time
+    else
+      timeleap = SycTimeleap::TimeLeap.new
+      begin
+        date = timeleap.send(time_string)
+        date = date.to_s unless time
+      rescue NoMethodError
+        help_now! "Arguments may be 'time distances', YYYY-MM-DD or <RETURN>\n" +
+                  "\ntime distances are:\n" +
+                  "* yesterday|today|tomorrow\n" +
+                  "* next|previous_monday|tuesday|...|sunday\n" +
+                  "* in|back_10_days|weeks|months|years\n" +
+                  "* monday|tuesday|...|sunday_in|back_1_day|week|month|year\n" +
+                  "Short forms are also possible:\n" +
+                  "* y|tod|tom\n" +
+                  "* n|pmo|tu|we|th|fr|sa|su\n" +
+                  "* i|b10d|w|m|y\n" +
+                  '* mo|tu|we|th|fr|sa|sui|b1d|w|m|y'
+      end
+    end
+    date
+  end
 end

data/lib/sycutil/console_timer.rb

@@ -14,7 +14,6 @@ require 'rainbow'
 # To stop the timer the semaphore has to be deleted
 #    FileUtils.rm semaphore
 class ConsoleTimer
-
   # Create a new ConsoleTimer with the time to count down, the task's ID and a
   # semaphore. The semaphore is a file named id.track where id is equal to the
   # provided id. The semaphore is checked for existence. If the semaphore is
@@ -32,7 +31,7 @@ class ConsoleTimer
     while track
       sleep 1
       output
-      track = File.exists? @semaphore
+      track = File.exist? @semaphore
     end
     exit 0
   end
@@ -49,16 +48,15 @@ class ConsoleTimer
     end
     seconds = difference % 60
     minutes = difference / 60 % 60
-    hours   = difference / 60 / 60 % 60 
-    count_down = sprintf("%d: %02d:%02d:%02d", @id, hours, minutes, seconds)
+    hours   = difference / 60 / 60 % 60
+    count_down = format('%d: %02d:%02d:%02d', @id, hours, minutes, seconds)
     size = count_down.size
     count_down = count_down.color(color)
-    command = "tput sc;"+
-              "tput cup 0 $(($(tput cols) - #{size}));"+
+    command = 'tput sc;' +
+              "tput cup 0 $(($(tput cols) - #{size}));" +
               "echo #{count_down};tput rc"
     system command
   end
-
 end
 
 # Expects to receive parameters duration, id and semaphore
@@ -71,5 +69,3 @@ if ARGV.size == 3
 else
   exit -1
 end
-
-