achoo 0.3 → 0.4.1

data/lib/achoo/system/wtmp.rb

@@ -1,18 +1,22 @@
-require 'achoo/binary'
 require 'achoo/system'
 
-class Achoo::System::Wtmp < Array
+module Achoo
+  module System
 
-  def initialize(glob='/var/log/wtmp*')
-    super()
-    chunk_size = Achoo::Binary::UTMPRecord.bin_size
-    Dir.glob(glob).sort.reverse.each do |file|
-      File.open(file, 'r') do |io|
-        while (bytes = io.read(chunk_size)) 
-          self << Achoo::Binary::UTMPRecord.new(bytes)
+    class Wtmp < Array
+
+      def initialize(glob='/var/log/wtmp*')
+        super()
+        chunk_size = UTMPRecord.bin_size
+        Dir.glob(glob).sort.reverse.each do |file|
+          File.open(file, 'r') do |io|
+            while (bytes = io.read(chunk_size)) 
+              self << UTMPRecord.new(bytes)
+            end
+          end
         end
       end
+
     end
   end
-  
 end

data/lib/achoo/temporal.rb

@@ -0,0 +1,8 @@
+require 'achoo'
+
+module Achoo
+  module Temporal
+    autoload :Timespan,     'achoo/temporal/timespan.rb'
+    autoload :OpenTimespan, 'achoo/temporal/open_timespan.rb'
+  end
+end

data/lib/achoo/temporal/open_timespan.rb

@@ -0,0 +1,16 @@
+require 'achoo/temporal'
+
+module Achoo
+  module Temporal
+    class OpenTimespan < Timespan
+
+      def to_s
+        s = super
+        s.sub!(/^\([^)]+\)/, '(?+??:??)')
+        s.sub!(/- .*$/, '- ?')
+        s
+      end
+
+    end
+  end
+end

data/lib/achoo/temporal/timespan.rb

@@ -0,0 +1,122 @@
+require 'achoo/temporal'
+require 'time'
+
+module Achoo
+  module Temporal
+    class Timespan
+
+      SECONDS_IN_A_DAY    = 86400
+      SECONDS_IN_AN_HOUR  = 3600
+      SECONDS_IN_A_MINUTE = 60
+
+      attr :start
+      attr :end
+
+      def initialize(start, end_)
+        raise ArgumentError.new('Nil in parameters not allowed') if start.nil? || end_.nil?
+
+        self.start = start
+        self.end   = end_
+      end
+
+      def start=(timeish)
+        @start = to_time(timeish)
+      end
+      
+      def end=(timeish)
+        @end = to_time(timeish)
+      end
+
+      def to_s
+        duration = duration_string
+        from_to  = from_to_string
+
+        sprintf("(%s) %s", duration, from_to)
+      end
+
+      def contains?(timeish_or_timespan)
+        if timeish_or_timespan.is_a? Timespan
+          timespan = timeish_or_timespan
+          return start <= timespan.start && self.end >= timespan.end
+        else
+          time = to_time(timeish_or_timespan)
+          return start <= time && self.end >= time
+        end
+      end
+
+      def overlaps?(timespan)
+        start <= timespan.start && self.end >= timespan.start \
+        || start <= timespan.end && self.end >= timespan.end \
+        || contains?(timespan) || timespan.contains?(self)
+      end
+
+      private 
+      
+      def to_time(timeish)
+        case timeish
+        when Time
+          timeish.clone
+        when DateTime
+          Time.local(timeish.year, timeish.month, timeish.day, timeish.hour,timeish.minute, timeish.second)
+        when Date
+          Time.local(timeish.year, timeish.month, timeish.day)
+        else
+          if timeish.respond_to?(:to_s)
+            Time.parse(timeish.to_s)
+          else
+            raise ArgumentError.new("Don't know how to convert #{timeish.class} to Time")
+          end
+        end
+      end
+
+
+      def duration_string
+        delta = @end - @start
+        d     = delta.to_i / SECONDS_IN_A_DAY
+
+        delta = delta - d*SECONDS_IN_A_DAY
+        h     = delta.to_i / SECONDS_IN_AN_HOUR
+
+        delta = delta - h*SECONDS_IN_AN_HOUR
+        m     = delta.to_i / SECONDS_IN_A_MINUTE
+
+        sprintf "%d+%02d:%02d", d, h, m
+      end
+
+      def from_to_string
+        today      = Date.today
+        start_date = start.send(:to_date)
+        end_date   = self.end.send(:to_date)
+
+        format = if start_date == today
+                   "Today"
+                 elsif start_date.month == today.month && 
+                     start_date.year == today.year
+                   "%a %e."
+                 elsif start_date.year == today.year
+                   "%a %e. %b"
+                 else
+                   "%a %e. %b %Y"
+                 end
+        from = start.strftime(format << " %R")
+
+        format = if end_date == start_date
+                   "%R"
+                 elsif end_date == today
+                   "Today %R"
+                 elsif end_date.month == today.month && 
+                   end_date.year == today.year
+                   "%a %e. %R"
+                 elsif end_date.year == today.year
+                   "%a %e. %b %R"
+                 else
+                   "%a %e. %b %Y %R"
+                 end
+        to = self.end.strftime(format)
+
+        sprintf "%s - %s", from, to
+      end
+
+    end
+  end
+end

data/lib/achoo/term.rb

@@ -1,76 +1,78 @@
 # encoding: utf-8
 
-class Achoo; class Term; end; end
+require 'achoo'
 
-Achoo::Term.autoload :Menu,  'achoo/term/menu'
-Achoo::Term.autoload :Table, 'achoo/term/table'
+module Achoo
+  class Term
 
-class Achoo::Term
+    autoload :Menu,  'achoo/term/menu'
+    autoload :Table, 'achoo/term/table'
 
-  def self.bold(text); "\e[1m#{text}\e[0m"; end
+    def self.bold(text); "\e[1m#{text}\e[0m"; end
+    
+    def self.underline(text); "\e[4m#{text}\e[0m"; end
 
-  def self.underline(text); "\e[4m#{text}\e[0m"; end
+    def self.warn(text); "\e[1;33m#{text}\e[0m"; end
 
-  def self.warn(text); "\e[1;33m#{text}\e[0m"; end
+    def self.fatal(text); "\e[1;31m#{text}\e[0m"; end
 
-  def self.fatal(text); "\e[1;31m#{text}\e[0m"; end
-
-  def self.password
-    `stty -echo`
-    pas = ask('Password')
-    `stty echo`
-    pas
-  end
-
-  def self.ask(question='')
-    answer = nil
-    loop do
-      print bold("#{question}> ")
-      $stdout.flush
-      answer = gets
+    def self.password
+      `stty -echo`
+      pas = ask('Password')
+      `stty echo`
+      pas
+    end
 
-      # Answer is nil if user hits C-d on an empty input
-      if answer.nil?
-        puts
-        exit
+    def self.ask(question='')
+      answer = nil
+      loop do
+        print bold("#{question}> ")
+        $stdout.flush
+        answer = gets
+        
+        # Answer is nil if user hits C-d on an empty input
+        if answer.nil?
+          puts
+          exit
+        end
+        
+        answer.strip! unless answer.nil?
+
+        # FIX move this to achoo.rb?
+        unless $stdin.tty?
+          puts answer
+        end
+        break unless a_little_something(answer)
       end
-      
-      answer.strip! unless answer.nil?
+      answer
+    end
 
-      # FIX move this to achoo.rb?
-      unless $stdin.tty?
-        puts answer
-      end
-      break unless a_little_something(answer)
+    def self.choose(question, entries, special=nil, additional_valid_answers=[])
+      menu = Menu.new(question, entries, special, additional_valid_answers)
+      menu.print_ask_and_validate
     end
-    answer
-  end
 
-  def self.choose(question, entries, special=nil, additional_valid_answers=[])
-    menu = Achoo::Term::Menu.new(question, entries, special, additional_valid_answers)
-    menu.print_ask_and_validate
-  end
+    private
 
-  private
+    def self.a_little_something(answer)
+      return false if answer.nil?
 
-  def self.a_little_something(answer)
-    return false if answer.nil?
+      case answer.downcase
+      when 'bless you!', 'gesundheit!'
+        puts "Thank you!"
+        return true
+      else
+        return false
+      end
+    end
 
-    case answer.downcase
-    when 'bless you!', 'gesundheit!'
-      puts "Thank you!"
-      return true
-    else
-      return false
+    def self.shadowbox(text)
+      x =  "┌──────────────────────────────────────────┐ \n"
+      x << "│ #{text.center(40)} " <<                 "│▒\n"
+      x << "└──────────────────────────────────────────┘▒\n"
+      x << "  ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒\n"
+      x
     end
-  end
 
-  def self.shadowbox(text)
-    x =  "┌──────────────────────────────────────────┐ \n"
-    x << "│ #{text.center(40)} " <<                 "│▒\n"
-    x << "└──────────────────────────────────────────┘▒\n"
-    x << "  ▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒\n"
-    x
   end
-
 end

data/lib/achoo/term/menu.rb

@@ -1,6 +1,6 @@
 require 'achoo/term'
 
-class Achoo
+module Achoo
   class Term
     class Menu
 
@@ -22,7 +22,7 @@ class Achoo
         return '1' if only_one_option?
         
         loop do
-          answer = Achoo::Term.ask(@question)
+          answer = Term.ask(@question)
           if @valid[answer]
             return answer
           else

data/lib/achoo/term/table.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-if RUBY_VERSION < "1.9"
-  $KCODE = 'u'
-  require 'jcode'
-end
+require 'achoo/term'
+
 
 # Unicode box drawing characters
 #
@@ -28,74 +26,75 @@ end
 #
 # 2570 ╰ ╱ ╲ ╳ ╴ ╵ ╶ ╷ ╸ ╹ ╺ ╻ ╼ ╽ ╾ ╿
 
-class Achoo; class Term; end; end
-
-class Achoo::Term::Table
+module Achoo
+  class Term
+    class Table
 
-  def initialize(headers, data_rows, summaries=nil)
-    @headers   = headers
-    @data_rows = data_rows
-    @summaries = summaries
-  end
+      def initialize(headers, data_rows, summaries=nil)
+        @headers   = headers
+        @data_rows = data_rows
+        @summaries = summaries
+      end
 
-  def print(io=$stdout)
-    lengths   = calculate_table_cell_widths
-    format    = build_format(lengths)
-    headers   = center_table_headers(lengths)
-    separator = lengths.map {|length| '─'*(length+2)}
+      def print(io=$stdout)
+        lengths   = calculate_table_cell_widths
+        format    = build_format(lengths)
+        headers   = center_table_headers(lengths)
+        separator = lengths.map {|length| '─'*(length+2)}
     
 
-    io.print '┌' << separator.join('┬') << "┐\n"
-    io.print '│ ' << headers.join(' │ ') << " │\n"
-    io.print '├' << separator.join('┼') << "┤\n"
-    @data_rows.each {|r| io.printf format, *r }
-    unless @summaries.nil? || @data_rows.length == 1
-      io.print '├' << separator.join('┼') << "┤\n"
-      io.printf format, *@summaries
-    end
-    io.print '└' << separator.join('┴') << "┘\n"
-  end
+        io.print '┌' << separator.join('┬') << "┐\n"
+        io.print '│ ' << headers.join(' │ ') << " │\n"
+        io.print '├' << separator.join('┼') << "┤\n"
+        @data_rows.each {|r| io.printf format, *r }
+        unless @summaries.nil? || @data_rows.length == 1
+          io.print '├' << separator.join('┼') << "┤\n"
+          io.printf format, *@summaries
+        end
+        io.print '└' << separator.join('┴') << "┘\n"
+      end
 
-  private
+      private
 
-  def center_table_headers(lengths)
-    headers = @headers.dup
-    lengths.each_with_index do |len,i|
-      headers[i] = headers[i].center(len)
-    end
-    headers
-  end
+      def center_table_headers(lengths)
+        headers = @headers.dup
+        lengths.each_with_index do |len,i|
+          headers[i] = headers[i].center(len)
+        end
+        headers
+      end
 
-  def calculate_table_cell_widths
-    lengths = []
-    @headers.each_with_index do |h, i|
-      lengths[i] = RUBY_VERSION < '1.9' ? h.jlength : h.length
-    end
-    @data_rows.each do |r|
-      r.each_with_index do |d, i|
-        len = RUBY_VERSION < '1.9' ? d.jlength : d.length
-        lengths[i] = [len, lengths[i]].max
+      def calculate_table_cell_widths
+        lengths = []
+        @headers.each_with_index do |h, i|
+          lengths[i] = h.length
+        end
+        @data_rows.each do |r|
+          r.each_with_index do |d, i|
+            lengths[i] = [d.length, lengths[i]].max
+          end
+        end
+        lengths
       end
-    end
-    lengths
-  end
 
-  def build_format(lengths)
-    is_column_left_justified = Array.new(lengths.count)
-    is_column_left_justified.fill(false)
+      def build_format(lengths)
+        is_column_left_justified = Array.new(lengths.count)
+        is_column_left_justified.fill(false)
     
-    @data_rows.each do |r|
-      r.each_index do |c|
-        if !r[c].strip.empty? && !r[c].match(/^\d+[:.,]?\d*$/)
-          is_column_left_justified[c] = true
+        @data_rows.each do |r|
+          r.each_index do |c|
+            if !r[c].strip.empty? && !r[c].match(/^\d+[:.,]?\d*$/)
+              is_column_left_justified[c] = true
+            end
+          end
         end
+    
+        lengths.reduce('│') do |f, l|
+          justify = is_column_left_justified.shift ? '-' : ''
+          f + " %#{justify}#{l}s │"
+        end + "\n"
       end
+
     end
-    
-    lengths.reduce('│') do |f, l|
-      justify = is_column_left_justified.shift ? '-' : ''
-      f + " %#{justify}#{l}s │"
-    end + "\n"
   end
-
 end