jah 0.0.3 → 0.0.5

data/lib/jah/commands/status.rb

@@ -3,58 +3,18 @@ module Jah
   class Status
     include Command
     register(:ok, 'ok\??$')
-    register(:who, 'who\??$')
-    register(:mem, 'mem\??$')
-    register(:cpu, 'cpu\??$')
-    register(:net, 'net\??$')
-    register(:disk, 'disk\??$')
-    register(:proks, 'prok$|top$')
 
 
     class << self
 
       def ok
-        I18n.t("states." + case Jah::Cpu.get.med
+        I18n.t("states." + case Jah::Cpu.med
           when 0..0.5 then :green
           when 0.51..0.7 then :yellow
           else :red
         end.to_s)
       end
 
-      def mem
-        Mem.get.percent.to_s + "%"
-      end
-
-      def cpu
-        Cpu.get.load
-      end
-
-      def net
-        out = ""
-        Net.connections.each do |c|
-          out << "#{c[0]} => #{c[1]} connections\n"
-        end
-        out << "Total: #{Net.count}"
-      end
-
-      def disk
-        Disk.all.map do |d|
-          "\n*#{d[:path]}* => #{d[:percent]}"
-        end.join("\n")
-      end
-
-      def who
-        Who.all.map do |w|
-          "#{w[:who]} Logado via #{w[:terminal]} desde a data: #{w[:date]}"
-        end.join("\n")
-      end
-
-      def proks(find = nil)
-        Ps.all.map do |p|
-          next if find && p.comm !~ /#{find}/i
-          "#{p.comm} => #{p.mem}\n"
-        end
-      end
 
     end
   end

data/lib/jah/commands/who.rb

@@ -0,0 +1,27 @@
+module Jah
+
+  class Who
+    include Command
+    register(:snap, 'who\??$')
+
+    def self.snap
+      all.map do |w|
+        "#{w[:who]} Logado via #{w[:terminal]} desde a data: #{w[:date]}"
+      end.join("\n")
+    end
+
+    def self.all
+      @who = `who`.to_a.map do |l|
+        l = l.split(" ")
+
+        hash = {}
+
+        hash[:who] = l[0]
+        hash[:tty] = l[1]
+        2.times{ l.delete(l[0]) }
+        hash[:date] = l.join(" ")
+        hash
+      end
+    end
+  end
+end

data/lib/jah/history.rb

@@ -0,0 +1,25 @@
+module Jah
+
+  class History
+
+    @cache = []
+
+    class << self
+
+      def set(jid, body, time = Time.now)
+        @cache << [jid, body, time]
+      end
+      alias :add :set
+
+      def all(filter = nil)
+        filter ? @cache.select { |i| i[0] =~ /#{filter}/ } : @cache
+      end
+
+      # delegate?
+      def method_missing(*meth)
+        @cache.send(*meth)
+      end
+
+    end
+  end
+end

data/lib/jah/install.rb

@@ -16,20 +16,16 @@ module Jah
 
 Hello, thanks for trying Jah!
 
-Looks like #{Jah.hostname} doesn`t have a config file, shall we create one?
+Looks like #{Opt.hostname} doesn`t have a config file, shall we create one?
 
 Jah needs to know how it will run: xmpp, post or dump.
 
 END_MODE
       mode = nil
       print "Enter mode: "
-      while mode.nil?
-        mode = case gets.to_s.strip
-                when /xmpp/i then :xmpp
-                when /post/i then :post
-                when /dumpp/i then :dump
-                else print "Valid: xmpp, post or dump: "; nil
-                end
+      while mode !~ /xmpp|post|dump/i
+        print "Valid: xmpp, post or dump: "
+        mode = gets.strip
       end
       @config[:mode] = mode
     end
@@ -122,7 +118,7 @@ Use commas to separate multiple ones.
 
 END_INTRO
       print "ACL: "
-      @config[:acl] = gets.strip
+      @config[:acl] = gets.split(",").map(&:strip)
     end
 
     #
@@ -139,7 +135,7 @@ Use commas to separate multiple ones.
 
 END_INTRO
       print "Groups: "
-      @config[:groups] = gets.strip
+      @config[:groups] = gets.split(",").map(&:strip)
     end
 
 
@@ -239,9 +235,9 @@ Available options:
 * #{locs.join("\n* ")}
 
 END_I18N
-      print "Choose one (#{Jah.locale}): "
+      print "Choose one (#{Opt.locale}): "
       @config[:i18n] = gets.to_s.strip.downcase
-      @config[:i18n] = Jah.locale if @config[:i18n] == ""
+      @config[:i18n] = Opt.locale if @config[:i18n] == ""
     end
 
     #
@@ -279,11 +275,9 @@ END_ERROR
 
     def write_down
       outfile = "jah.yaml"
-      template = File.read(File.join(File.dirname(__FILE__), '..', 'jah.yaml.template'))
       @outfile =  File.writable?("/etc/") ? "/etc/" + outfile : HOME + outfile
       puts "Writing config to #{@outfile}.."
-      @config.keys.each { |k| template.gsub!(/#{k.to_s.upcase}/, @config[k].to_s) }
-      File.open(@outfile, "w") { |f| f.write template }
+      File.open(@outfile, "w") { |f| f.write @config.to_yaml }
     end
 
     def initialize
@@ -291,14 +285,14 @@ END_ERROR
       puts "No config file found.. running install.."
 
       @config = {}
-      @config[:host] = Jah.hostname
+      @config[:host] = Opt.hostname
       get_mode
-      if @config[:mode] == :xmpp
+      if @config[:mode] == 'xmpp'
         @config[:host] = ''
         get_jid
         get_pass
       end
-      if @config[:mode] == :post
+      if @config[:mode] == 'post'
         @config[:jid] = ''
         get_key
       end

data/lib/jah/opt.rb

@@ -0,0 +1,87 @@
+require 'logger'
+
+module Jah
+
+  HOME = ENV['HOME'] + "/.jah/"
+  unless File.exists? HOME
+    FileUtils.mkdir_p HOME
+  end
+
+  I18n.default_locale = "en_us"
+
+  Log = Logger.new(HOME + "jah.log")
+  def Log.write(d); self.warn(d); end
+  # $stderr = Log
+
+  # Opt = {}
+  OptBackup = {}
+
+  class Opt
+    @hash = {}
+
+    class << self
+      def hash
+        @hash
+      end
+
+      def defaults
+        { :mode => "xmpp", :daemon => false, :port => 5222 }
+      end
+
+      def hostname
+        @hostame ||= `hostname`.chomp.gsub(/\W/, "") rescue "jah#{rand(42000)}"
+      end
+
+      def locale
+        @locale ||= `locale | grep LANG`.scan(/LANG=(.*)\./)[0][0].downcase rescue "en_us"
+      end
+
+      # Load config [., ~/.jah, /etc]
+      def autoload_config(options)
+        conf = "jah.yaml"
+        unless file = options[:config]
+          if file = [nil, HOME, "/etc/"].select { |c| File.exists? "#{c}#{conf}" }[0]
+            file << conf
+            options[:config] = file
+          end
+        end
+        options = YAML.load(File.read(file)).merge!(options) if file rescue nil
+
+        I18n.locale = options[:i18n] if options[:i18n]
+        options[:groups] ||= []
+
+        @hash.merge!(defaults )
+        @hash.merge!(options)
+        OptBackup.merge!(@hash)
+      end
+
+      def closing_time!
+        if @hash != OptBackup
+          puts "Writing config..."
+          File.open(@hash[:config], "w+") do |f|
+            f.write "# Auto generated on #{Time.now}"
+            f.write @hash.to_yaml
+          end
+        end
+      end
+
+      def [](val);           @hash[val];            end
+      def []=(key, val);     @hash[key] = val;      end
+      def merge!(val);       @hash.merge!(val);     end
+
+      def method_missing(*meth)
+        key = meth[0].to_s.gsub(/\?|=/, "").to_sym
+        if val = meth[1]
+          @hash[key] = val
+        elsif !(val = @hash[key]).nil?
+          val
+        else
+          raise "No method #{ val} #{key}"
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/jah/prayer.rb

@@ -0,0 +1,75 @@
+module Jah
+
+  class Prayer
+
+    def initialize(config)
+      @config = config
+      setup
+      ping
+    end
+
+    def self.watch(options = {})
+      
+      God.watch do |w|
+        w.name              = "jah"
+        w.interval          = 1.minute
+        w.start             = "jah #{options[:config]}"
+        w.start_grace       = 10.seconds
+        w.restart_grace     = 10.seconds
+
+        w.start_if do |start|
+          start.condition(:process_running) do |c|
+            c.running = false
+          end
+        end
+
+        w.restart_if do |restart|
+          restart.condition(:memory_usage) do |c|
+            c.above = 30.megabytes
+            c.times = [3, 5]
+          end
+
+          restart.condition(:cpu_usage) do |c|
+            c.above = 25.percent
+            c.times = 5
+          end
+        end
+
+        w.lifecycle do |on|
+          on.condition(:flapping) do |c|
+            c.to_state = [:start, :restart]
+            c.times = 5
+            c.within = 5.minute
+            c.transition = :unmonitored
+            c.retry_in = 10.minutes
+            c.retry_times = 5
+            c.retry_within = 2.hours
+          end
+        end
+      end
+    end
+
+    def setup
+      DRb.start_service
+      @server = DRbObject.new(nil, God::Socket.socket(@config['god_port'])) || nil
+    rescue => e
+      @config[:god] = false
+    end
+
+    # ping server to ensure that it is responsive
+    def ping
+      if god?
+        tries = 3
+        begin
+          @server.ping
+        rescue Exception => e
+          retry if (tries -= 1) > 1
+          raise e, "The server is not available (or you do not have permissions to access it)"
+        end
+      end
+    end
+
+
+  end
+end
+

data/lib/jah.rb

@@ -1,26 +1,34 @@
 require 'rubygems'
 require 'optparse'
-require 'i18n'
+begin
+  require 'i18n'
+rescue LoadError
+  puts "Gem i18n not found. Try `gem install i18n`"
+end
 #autoload :Drb, 'drb'
-autoload :God, 'god'
+require 'jah/opt'
 require 'jah/cli'
 require 'jah/install'
 require 'jah/agent'
-require 'jah/collector'
-require "jah/collectors/mem"
-require "jah/collectors/cpu"
-require "jah/collectors/net"
-require "jah/collectors/disk"
-require "jah/collectors/prok"
-require "jah/collectors/net"
-require "jah/collectors/who"
+require 'jah/history'
+autoload :God, 'god'
+autoload :Prayer, "jah/prayer"
 require 'jah/command'
+require "jah/commands/mem"
+require "jah/commands/cpu"
+require "jah/commands/who"
+require "jah/commands/disk"
+require "jah/commands/prok"
+require "jah/commands/netstat"
 require "jah/commands/admin"
 require "jah/commands/status"
 require "jah/commands/extra"
-require "jah/commands/pub"
+require "jah/commands/packages"
+require "jah/act_pkg"
+require "jah/act_pkg/base"
+require "jah/act_pkg/pkg"
 
 module Jah
-  VERSION = "0.0.1"
-
+  VERSION =  File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+  I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'locales', "*.{rb,yml}")]
 end

data/lib/locales/en_us.yml

@@ -1,2 +1,10 @@
 en_us:
-  fail: Fail..
+  fail: Fail..
+  exit_code: Exit code
+  access_fail: Access Fail
+  ok: Ok!
+  no_sudo: No sudo!
+  states:
+    green: Everything ok...
+    yellow: Start to worry about me...
+    red: Overload! Overload!

data/lib/locales/pt_br.yml

@@ -1,2 +1,10 @@
 pt_br:
-  fail: Falhou..
+  fail: Falhou..
+  exit_code: Comando não fechou bem...
+  access_fail: Você não tem permissão!
+  ok: Ok!
+  no_sudo: sudo desabilitado!
+  states:
+    green: Tudo nos padrões...
+    yellow: Começo a me preocupar...
+    red: Sistema bem carregado!

data/spec/jah/act_pkg/apt_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require "jah/act_pkg/apt"
+
+describe Apt do
+
+
+
+
+
+
+
+
+
+
+
+AP = <<APT
+Desired=Unknown/Install/Remove/Purge/Hold
+| Status=Not/Inst/Cfg-files/Unpacked/Failed-cfg/Half-inst/trig-aWait/Trig-pend
+|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
+||/ Name                                                          Version                                   Description
++++-=============================================================-=========================================-=======================================================
+ii  ack-grep                                                      1.80-1                                    A grep-like program specifically for large source trees
+ii  acl                                                           2.2.47-2                                  Access control list utilities
+ii  acpi-support                                                  0.121                                     scripts for handling many ACPI events
+ii  acpid                                                         1.0.6-9ubuntu4.9.04.3                     Utilities for using ACPI power management
+ii  adduser                                                       3.110ubuntu5                              add and remove users and groups
+ii  adobe-certs                                                   1.5.8870                                  Certificates distributed by Adobe Systems.
+ii  adobe-flashplugin                                             10.0.32.18-1jaunty1                       Adobe Flash Player plugin version 10
+ii  adobeair1.0                                                   1.5.2.8870                                Adobe AIR
+ii  alacarte                                                      0.11.10-0ubuntu1                          easy GNOME menu editing tool
+ii  alien                                                         8.73                                      convert and install rpm and other packages
+ii  alsa-base                                                     1.0.18.dfsg-1ubuntu8                      ALSA driver configuration files
+ii  alsa-utils                                                    1.0.18-1ubuntu11                          ALSA utilities
+ii  amarok                                                        2:2.0.2mysql5.1.30-0ubuntu3               easy to use media player based on the KDE 4 technology
+ii  amarok-common                                                 2:2.0.2mysql5.1.30-0ubuntu3
+ii  bind9-host                                                    1:9.5.1.dfsg.P2-1ubuntu0.1
+APT
+
+
+end

data/spec/jah/act_pkg/pacman_spec.rb

@@ -0,0 +1,141 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require "jah/act_pkg/pacman"
+
+describe Pacman do
+
+  before do
+    @pac ||= Pacman.new
+  end
+
+  describe "Searching" do
+    before do
+      @pac.should_receive(:"`").with("pacman -Ss ruby").and_return(SS)
+      @pac.should_receive(:"`").with("pacman -Q").and_return(QL)
+      @pkgs = @pac.search("ruby")
+    end
+
+    it "should find pkgs" do
+      first = @pkgs[0]
+      first.name.should eql("ruby")
+      first.desc.should eql("An object-oriented language for quick and easy programming")
+    end
+
+    it "should work nicely" do
+      @pkgs[1].name.should eql("ruby-docs")
+      @pkgs[1].desc.should eql("Documentation files for ruby")
+    end
+
+    it "should have ruby" do
+      @pkgs[0].should be_installed
+    end
+
+    it "should not be installed" do
+      @pkgs[1].should_not be_installed
+    end
+
+    it "should install if I want" do
+      Pacman.should_receive(:new).and_return(@pac)
+      @pac.should_receive(:"`").with("pacman -Sy --noconfirm ruby")
+      @pkgs[0].install
+    end
+
+  end
+
+  it "should install stuff" do
+    @pac.should_receive(:"`").with("pacman -Sy --noconfirm foo")
+    @pac.install mock(Pkg, :name => "foo")
+  end
+
+  it "should list pkgs" do
+    @pac.should_receive(:"`").with("pacman -Q").and_return(QL)
+    @pac.all.first.should be_instance_of(Pkg)
+  end
+
+
+  describe "List" do
+
+    before do
+      @pac.stub!(:"`").and_return(QL)
+      @pkgs = @pac.all
+      @ruby = @pkgs[11]
+    end
+
+    it "should have name" do
+      @pkgs[0].name.should eql("a2ps")
+    end
+
+    it "should have version" do
+      @pkgs[0].version.should eql("4.14-1")
+    end
+
+    it "should fetch info about a pkg" do
+      @ruby.info.should be_instance_of Hash #("http://www.ruby-lang.org/en/")
+    end
+
+    it "should fetch url" do
+      @ruby.url.should eql("http://www.ruby-lang.org/en/")
+    end
+
+    it "should fetch arch" do
+      @ruby.arch.should eql("i686")
+    end
+
+    it "should fetch desc" do
+      @ruby.desc.should eql("An object-oriented language for quick and easy programming")
+    end
+
+    it "should fetch license" do
+      @ruby.license.should eql("custom")
+    end
+
+  end
+
+SS = <<SS
+extra/ruby 1.8.7_p174-1 [4.67 MB]
+    An object-oriented language for quick and easy programming
+extra/ruby-docs 1.8.7_p174-1 [0.87 MB]
+    Documentation files for ruby
+SS
+
+QL = <<QL
+a2ps 4.14-1
+a52dec 0.7.4-4
+acl 2.2.47-2
+alsa-lib 1.0.21.a-1
+ca-certificates 20090709-1
+couchdb-svn 784601-1
+emacs-cvs 20090730-1
+emacs-magit-git 20090811-1
+flashplugin 10.0.32.18-1.1
+hal-info 0.20090716-2
+libmad 0.15.1b-4
+ruby 1.8.7_p174-1
+xz-utils 4.999.9beta-1
+QL
+
+QI = <<QI
+Name           : ruby
+Version        : 1.8.7_p174-1
+URL            : http://www.ruby-lang.org/en/
+Licenses       : custom
+Groups         : None
+Provides       : None
+Depends On     : gdbm>=1.8.3  db>=4.7.25  openssl>=0.9.8k  zlib>=1.2.3.3 readline>=6
+Optional Deps  : None
+Required By    : rubygems  shoes
+Conflicts With : None
+Replaces       : None
+Installed Size : 11308.00 K
+Packager       : Allan McRae <allan@archlinux.org>
+Architecture   : i686
+Build Date     : Mon 20 Jul 2009 12:29:57 AM BRT
+Install Date   : Thu 23 Jul 2009 10:47:30 PM BRT
+Install Reason : Explicitly installed
+Install Script : No
+Description    : An object-oriented language for quick and easy programming
+
+
+QI
+
+
+end

data/spec/jah/act_pkg/pkg_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Pkg do
+
+  it "should instantiate" do
+    Pkg.new(:installed, "ruby", "1.9.1").should be_valid
+  end
+
+  describe "One pkg" do
+    before do
+      @pkg = Pkg.new(:installed, "jah", "1.0.0", "Talk to your machines.")
+    end
+
+    it "should have a name" do
+      @pkg.name.should eql("jah")
+    end
+
+    it "should have a version" do
+      @pkg.version.should eql("1.0.0")
+    end
+
+    it "should have a description" do
+      @pkg.desc.should eql("Talk to your machines.")
+    end
+
+    it "should have a installed meth" do
+      @pkg.should be_installed
+    end
+
+    it "should check equality with others" do
+      pkg2 = Pkg.new(:installed, "foo", "2.5b")
+      @pkg.should_not == pkg2
+    end
+
+    it "should check equality with others 2" do
+      pkg2 = Pkg.new(:installed, "jah", "1.0.0")
+      @pkg.should == pkg2
+    end
+
+    it "should compare version" do
+      pkg2 = Pkg.new(:installed, "jah", "1.0.1")
+      @pkg.should be < pkg2
+      pkg2.should be > @pkg
+    end
+
+    it "should not compare diff pkgs" do
+      pkg2 = Pkg.new(:installed, "foo", "1.0.1")
+      lambda { pkg2 > @pkg }.should raise_error
+    end
+  end
+end