achoo 0.3 → 0.4.1

data/lib/achoo/extensions.rb

@@ -0,0 +1,24 @@
+class Array
+
+  #
+  # Useful for merging two sorted arrays with Comparable
+  # elements. 
+  #
+  # The content of the two input arrays should not be trusted after
+  # being mistreated by this method.
+  # 
+  def merge!(other)
+    # FIX raise exception if merge is defined?
+    array = []
+    until empty? or other.empty?
+      if first <= other.first
+        array << shift
+      else
+        array << other.shift
+      end
+    end
+    array.concat(self).concat(other)
+    array
+  end
+
+end

data/lib/achoo/ical.rb

@@ -1,58 +1,65 @@
-require 'achoo/timespan'
-require 'achoo/ui/exception_handling'
+require 'achoo'
+require 'achoo/temporal'
+require 'achoo/ui'
 require 'net/https'
 require 'ri_cal'
 
-class Achoo; end
+module Achoo
+  class ICal
 
-class Achoo::ICal
+    include UI::ExceptionHandling
 
-  Achoo::UI::ExceptionHandling
+    @@cache = {}
 
-  def self.from_http_request(params)
-    http = Net::HTTP.new(params[:host], params[:port])
-    http.use_ssl = true
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    ics = http.start do |http|
-      request = Net::HTTP::Get.new(params[:path])
-      request.basic_auth(params[:user], params[:pass])
-      response = http.request(request)
-      response.body
+    def self.from_http_request(params)
+      return @@cache[params] if @@cache[params]
+      
+      http = Net::HTTP.new(params[:host], params[:port])
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      ics = http.start do |http|
+        request = Net::HTTP::Get.new(params[:path])
+        request.basic_auth(params[:user], params[:pass])
+        response = http.request(request)
+        response.body
+      end
+    
+      @@cache[params] = self.new(ics)
     end
-    self.new(ics)
-  end
 
-  def initialize(ics_str)
-    @calendar = RiCal.parse_string(ics_str).first
-  end
+    def initialize(ics_str)
+      @calendar = RiCal.parse_string(ics_str).first
+    end
 
-  def print_events(date, io=$stdout)
-    arg_start = date
-    arg_end   = date + 1
-
-    @calendar.events.each do |e|
-      begin
-        if !e.x_properties['X-MICROSOFT-CDO-ALLDAYEVENT'].empty? && e.x_properties['X-MICROSOFT-CDO-ALLDAYEVENT'].first.value == 'TRUE'
-          # FIX handle this
-        elsif e.recurs?
-          e.occurrences({:overlapping => [arg_start, arg_end]}).each do |o|
-            print_event(o, io)
+    def print_events(date, io=$stdout)
+      arg_start = date
+      arg_end   = date + 1
+
+      @calendar.events.each do |e|
+        begin
+          if !e.x_properties['X-MICROSOFT-CDO-ALLDAYEVENT'].empty? && e.x_properties['X-MICROSOFT-CDO-ALLDAYEVENT'].first.value == 'TRUE'
+            # FIX handle this
+          elsif e.recurs?
+            e.occurrences({:overlapping => [arg_start, arg_end]}).each do |o|
+              print_event(o, io)
+            end
+          elsif e.dtstart >= arg_start && e.dtstart <= arg_end \
+            || e.dtend  >= arg_start && e.dtend <= arg_end
+            print_event(e, io)
           end
-        elsif e.dtstart >= arg_start && e.dtstart <= arg_end \
-          || e.dtend  >= arg_start && e.dtend <= arg_end
-          print_event(e, io)
+        rescue Exception => e
+          handle_exception("Failed to process calendar event", e)
         end
-      rescue Exception => e
-        handle_exception("Failed to process calendar event", e)
       end
     end
-  end
 
-  private
+    private
+    
+    def print_event(e, io)
+      dti = Temporal::Timespan.new(e.dtstart.to_s, e.dtend.to_s)
+      io.printf "%s: %s\n", dti, e.summary
+    end
 
-  def print_event(e, io)
-    dti = Achoo::Timespan.new(e.dtstart.to_s, e.dtend.to_s)
-    io.printf "%s: %s\n", dti, e.summary
   end
 end
 

data/lib/achoo/rc_loader.rb

@@ -1,55 +1,55 @@
+require 'achoo'
 require 'achoo/term'
-
-class Achoo; end
-
-module Achoo::RCLoader
-
-  def load_rc(rc_file="#{ENV['HOME']}/.achoo")
-    #create_empty_rc_if_not_exists(rc_file)
-    file_permissions_secure?(rc_file)
-
-    load rc_file
-
-    verify_rc_contents(rc_file)
-  end
-
-  private
-
-  def file_permissions_secure?(rc_file)
-    # FIX test to is to strict
-    if File.stat(rc_file).mode != 0100600
-      puts Achoo::Term.fatal "Insecure permissions on #{rc_file}"
-      exit 1
+require 'yaml'
+
+module Achoo
+  module RCLoader
+
+    def load_rc(rc_file="#{ENV['HOME']}/.achoo")
+      #create_empty_rc_if_not_exists(rc_file)
+      file_permissions_secure?(rc_file)
+      
+      self.class.const_set(:RC, YAML.load_file(rc_file))
+      if RC.is_a? String
+        abort "Failed to parse rc file. Do you use the old format? Please convert it to YAML."
+      end
+      
+      verify_rc_contents(rc_file)
     end
-  end
 
-  def create_empty_rc_if_not_exists(rc_file)
-    return if FileTest.exist?(rc_file)
+    private
 
-    FileUtils.touch(rc_file)
-    FileUtils.chmod(0600, rc_file)
-  end
+    def file_permissions_secure?(rc_file)
+      # FIX test to is to strict
+      if File.stat(rc_file).mode != 0100600
+        puts Term.fatal "Insecure permissions on #{rc_file}"
+        exit 1
+      end
+    end
 
-  def verify_rc_contents(rc_file)
-    unless Object.const_defined?('RC')
-      puts Achoo::Term.fatal "Malformed run control file: No RC constant defined"
-      exit 1
+    def create_empty_rc_if_not_exists(rc_file)
+      return if FileTest.exist?(rc_file)
+      
+      FileUtils.touch(rc_file)
+      FileUtils.chmod(0600, rc_file)
     end
 
-    %w(url user password).each do |key|
-      unless RC.has_key?(key.to_sym)
-        puts Achoo::Term.fatal "Missing mandatory run control configuration variable: #{key}"
-        exit 1
+    def verify_rc_contents(rc_file)
+      %w(url user password).each do |key|
+        unless RC.has_key?(key.to_sym)
+          puts Term.fatal "Missing mandatory run control configuration variable: #{key}"
+          exit 1
+        end
       end
-    end
 
-    %w(vcs_dirs ical).each do |key|
-      unless RC.has_key?(key.to_sym)
-        puts Achoo::Term.warn "Missing run control configuration variable: #{key}. " \
-             + "Add it to #{rc_file} to get rid of this warning"
-        RC[key] = []
+      %w(vcs_dirs ical).each do |key|
+        unless RC.has_key?(key.to_sym)
+          puts Term.warn "Missing run control configuration variable: #{key}. " \
+            + "Add it to #{rc_file} to get rid of this warning"
+          RC[key] = []
+        end
       end
     end
-  end
 
+  end
 end

data/lib/achoo/system.rb

@@ -1,6 +1,11 @@
-class Achoo
+require 'achoo'
+
+module Achoo
   module System
-    autoload :Wtmp,      'achoo/system/wtmp.rb'
-    autoload :PMSuspend, 'achoo/system/pm_suspend.rb'
+    autoload :CStruct,    'achoo/system/cstruct'
+    autoload :LogEntry,   'achoo/system/log_entry'
+    autoload :PMSuspend,  'achoo/system/pm_suspend'
+    autoload :UTMPRecord, 'achoo/system/utmp_record'
+    autoload :Wtmp,       'achoo/system/wtmp'
   end
 end

data/lib/achoo/system/cstruct.rb

@@ -0,0 +1,67 @@
+require 'achoo/system'
+
+module Achoo
+  module System
+
+    class CStruct
+
+      def initialize(bytes=nil)
+        @values = []
+        unpack(bytes) unless bytes.nil?
+      end
+
+      class << self
+
+        attr :template
+
+        def inherited(subclass)
+          subclass.instance_variable_set(:@template, '') 
+          subclass.instance_variable_set(:@count, 0)
+        end 
+
+        def char(name);  add_type(name, :char,  'c', 0); end
+        def short(name); add_type(name, :short, 's', 0); end
+        def long(name);  add_type(name, :long,  'l', 0); end
+        def quad(name);  add_type(name, :quad,  'q', 0); end
+
+        def string(name, length)
+          add_type(name, :string, 'A', '', length)
+        end
+
+        def bin_size
+          @bin_size ||= template.split('').select {|c| c =~ /[[:alpha:]]/}.map do |c|
+            c == 'A' ? '' : 0
+          end.pack(template).length
+        end
+
+        private 
+
+        def add_type(name, type, temp, zero, length=nil)
+          template << temp
+          template << length.to_s if type == :string
+          index = @count
+          @count += 1
+
+          send(:define_method, name) do
+            @values[index]
+          end
+
+          send(:define_method, "#{name}=") do |val|
+            @values[index] = val
+          end
+        end
+
+      end
+
+      def unpack(str)
+        @values = str.unpack(self.class.template)
+      end
+
+      def pack
+        t = self.class.template.tr('A', 'a')
+        @values.pack(t)
+      end
+
+    end
+  end
+end

data/lib/achoo/system/log_entry.rb

@@ -0,0 +1,24 @@
+require 'achoo/system'
+
+module Achoo
+  module System
+
+    class LogEntry 
+      include Comparable
+    
+      attr :time
+      attr :event
+    
+      def initialize(time, event)
+        @time  = time
+        @event = event
+      end
+      
+      def <=>(other_entry)
+        time <=> other_entry.time
+      end
+    end
+
+  end
+end
+

data/lib/achoo/system/pm_suspend.rb

@@ -1,30 +1,27 @@
 require 'achoo/system'
 require 'time'
 
-class Achoo::System::PMSuspend < Array
+module Achoo
+  module System
 
-  class LogEntry
-    attr :time
-    attr :action
-    
-    def initialize(time_str, action)
-      @action = action
-      @time   = Time.parse(time_str)
-    end
-  end
+    class PMSuspend < Array
 
-  def initialize(glob='/var/log/pm-suspend.log*')
-    super()
-    Dir.glob(glob).sort.reverse.each do |file|
-      next if file =~ /\.gz$/ # FIX uncompress?
-      File.open(file, 'r') do |fh|
-        fh.readlines.each do |l|
-          l.chop!
-          next unless l =~ /Awake|performing suspend/
-          self << LogEntry.new(*l.split(': '))
+      def initialize(glob='/var/log/pm-suspend.log*')
+        super()
+        Dir.glob(glob).sort.reverse.each do |file|
+          next if file =~ /\.gz$/ # FIX uncompress?
+          File.open(file, 'r') do |fh|
+            fh.readlines.each do |l|
+              l.chop!
+              next unless l =~ /Awake|performing suspend/
+              time, event = *l.split(': ')
+              time = Time.parse(time)
+              self << LogEntry.new(time, event)
+            end
+          end
         end
       end
+
     end
   end
-
 end

data/lib/achoo/system/utmp_record.rb

@@ -0,0 +1,64 @@
+require 'achoo/system'
+
+module Achoo
+  module System
+
+    class UTMPRecord < CStruct
+      long   :record_type
+      long   :process_id
+      string :device_name,        32
+      string :inittab_id,          4
+      string :username,           32
+      string :hostname,          256
+      short  :termination_status
+      short  :exit_status
+      long   :session_id
+      long   :seconds
+      long   :milliseconds
+      long   :ip_address1
+      long   :ip_address2
+      long   :ip_address3
+      long   :ip_address4
+      string :unused,             20
+
+
+      TYPE_MAP = [:empty,
+                  :run_lvl,
+                  :boot,
+                  :new_time,
+                  :old_time,
+                  :init,
+                  :login,
+                  :normal,
+                  :term,
+                  :account,
+                 ]
+  
+      def time
+        return nil if seconds.nil?
+        @time ||= Time.at(seconds, milliseconds)
+      end
+      
+      def record_type_symbol
+        TYPE_MAP[record_type]
+      end
+      
+      def record_type_symbol=(sym)
+        @values[0] = (TYPE_MAP.find_index(sym))
+      end
+      
+      def to_s
+        sprintf "%s  %-7s  %-8s %s", time.strftime('%F_%T'), record_type_symbol, username, device_name
+      end
+      
+      def boot_event?
+        record_type_symbol == :boot
+      end
+      
+      def halt_event?
+        record_type_symbol == :term && device_name == ':0'
+      end
+      
+    end
+  end
+end