jah 0.0.3 → 0.0.5

data/README.md

@@ -6,14 +6,21 @@ Talk to your machines. Like a god.
 
 Just run it for the first time to create a config file.
 Use `jah install` to force the wizard again.
+Jah will try to find a `jah.yaml` file on ~/.jah or /etc.
 
-Gems needed for XMPP mode:
 
-* EventMachine (gem install eventmachine)
-* Blather      (gem install blather)
+## Support
 
+* ArchLinux (tested)
+* Mac OS X (tested)
+* CentOS (tested)
+* Debian (tested)
+* BSD
 
-Jah will try to find a `jah.yaml` file on ~/.jah or /etc.
+Gems required for XMPP mode:
+
+* Blather
+* EventMachine
 
 
 ## Modes
@@ -37,8 +44,6 @@ AkA: Security freak. Jah just writes to tmp/ or whatever a dump file,
 Jah Web securely connects (scp) and downloads the data to parse.
 
 
-## Use God?
-
 
 ## XMPP Bot
 
@@ -80,25 +85,68 @@ Group session:
     me: ok?
     msweet: I'm fine, thanks..
     ssaint: Kinda busy right now..
-    naomi: I need you! Now!
+    naomi: I need you! NOW!
+
+
+### System commands
+
+
+## PubSub
+
+Create a pubsub:
+
+    pub create foo
+    jah: Done.
+
+Publish to it:
+
+    foo: pubbin and dubbin from jah!
+    jah: Published.
+
+My pubs:
+
+    pub mine
+    jah: Pubsubs
+    Owner: foo
+
+All pubs:
 
+    pub all
+    jah: All Pubsubs
+    => /foo
+    => /bar
 
-Execute God statements:
+Subscribe to bar:
+
+    pub sub bar
+    jah: Done.
+
+
+Unsubscribe to bar:
+
+    pub unsub bar
+    jah:Done.
+
+
+Destroy a pub:
+
+    pub destroy foo
+    jah: Done.
+
+
+## Use God?
+
+### God commands
 
 Start, stop, restart, monitor and unmonitor words on the beginning
 of a phrase will make Jah add a "god" on the front of it, making it
 trivial to work with your services:
 
-
     start nginx
     restart nanites
     unmonitor postgresql
 
 
-More to come...
-
-
-
 ## Note on Patches/Pull Requests
 
 * Fork the project.
@@ -110,6 +158,7 @@ More to come...
    bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+
 ## Copyright
 
 Copyright (c) 2009 Marcos Piccinini. See LICENSE for details.

data/Rakefile

@@ -5,14 +5,15 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "jah"
-    gem.summary = "be omnipresent..."
-    gem.description = "talk to your machines"
+    gem.summary = "Be omnipresent..."
+    gem.description = "Talk to your machines. Like a God."
     gem.email = "x@nofxx.com"
     gem.homepage = "http://github.com/nofxx/jah"
     gem.authors = ["Marcos Piccinini"]
-    gem.add_dependency "blather"
+    gem.add_dependency "blather", '>=0.4.7'
     gem.add_dependency "i18n"
     gem.add_development_dependency "rspec"
+    # gem.add_development_dependency "rr"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/bin/jah

@@ -3,7 +3,9 @@
 $VERBOSE = true # -w
 $KCODE = "u" # -Ku
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), *%w[.. lib])
+# $LOAD_PATH << File.join(File.dirname(__FILE__), *%w[.. lib])
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require "jah"
+include Jah
 
-Jah::Cli.dispatch(ARGV)
+Jah::Cli.work(ARGV)

data/jah.gemspec

@@ -1,17 +1,17 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{jah}
-  s.version = "0.0.3"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2009-09-29}
+  s.date = %q{2009-11-26}
   s.default_executable = %q{jah}
-  s.description = %q{talk to your machines}
+  s.description = %q{Talk to your machines. Like a God.}
   s.email = %q{x@nofxx.com}
   s.executables = ["jah"]
   s.extra_rdoc_files = [
@@ -28,33 +28,64 @@ Gem::Specification.new do |s|
      "bin/jah",
      "jah.gemspec",
      "lib/jah.rb",
-     "lib/jah.yaml.template",
+     "lib/jah/act_pkg.rb",
+     "lib/jah/act_pkg/apt.rb",
+     "lib/jah/act_pkg/base.rb",
+     "lib/jah/act_pkg/emerge.rb",
+     "lib/jah/act_pkg/pacman.rb",
+     "lib/jah/act_pkg/pkg.rb",
+     "lib/jah/act_pkg/ports.rb",
+     "lib/jah/act_pkg/slack.rb",
+     "lib/jah/act_pkg/urpm.rb",
+     "lib/jah/act_pkg/yum.rb",
+     "lib/jah/act_pkg/zypp.rb",
      "lib/jah/agent.rb",
      "lib/jah/agents/dump.rb",
      "lib/jah/agents/post.rb",
      "lib/jah/agents/xmpp.rb",
      "lib/jah/cli.rb",
-     "lib/jah/collector.rb",
-     "lib/jah/collectors/cpu.rb",
-     "lib/jah/collectors/disk.rb",
-     "lib/jah/collectors/mem.rb",
-     "lib/jah/collectors/net.rb",
-     "lib/jah/collectors/prok.rb",
-     "lib/jah/collectors/services.rb",
-     "lib/jah/collectors/who.rb",
      "lib/jah/command.rb",
      "lib/jah/commands/admin.rb",
+     "lib/jah/commands/cpu.rb",
+     "lib/jah/commands/disk.rb",
      "lib/jah/commands/extra.rb",
-     "lib/jah/commands/pub.rb",
+     "lib/jah/commands/mem.rb",
+     "lib/jah/commands/netstat.rb",
+     "lib/jah/commands/packages.rb",
+     "lib/jah/commands/prok.rb",
+     "lib/jah/commands/services.rb",
      "lib/jah/commands/status.rb",
-     "lib/jah/god.rb",
+     "lib/jah/commands/who.rb",
+     "lib/jah/history.rb",
      "lib/jah/install.rb",
+     "lib/jah/opt.rb",
+     "lib/jah/prayer.rb",
      "lib/locales/en_us.yml",
      "lib/locales/pt_br.yml",
      "lib/locales/pt_br_gostosa.yml",
      "lib/locales/pt_br_mano.yml",
      "lib/locales/pt_br_mineiro.yml",
      "spec/console",
+     "spec/jah/act_pkg/apt_spec.rb",
+     "spec/jah/act_pkg/pacman_spec.rb",
+     "spec/jah/act_pkg/pkg_spec.rb",
+     "spec/jah/act_pkg/ports_spec.rb",
+     "spec/jah/act_pkg/yum_spec.rb",
+     "spec/jah/act_pkg_spec.rb",
+     "spec/jah/agent_spec.rb",
+     "spec/jah/agents/xmpp_spec.rb",
+     "spec/jah/cli_spec.rb",
+     "spec/jah/command_spec.rb",
+     "spec/jah/commands/cpu_spec.rb",
+     "spec/jah/commands/disk_spec.rb",
+     "spec/jah/commands/mem_spec.rb",
+     "spec/jah/commands/netstat_spec.rb",
+     "spec/jah/commands/prok_spec.rb",
+     "spec/jah/commands/who_spec.rb",
+     "spec/jah/history_spec.rb",
+     "spec/jah/install_spec.rb",
+     "spec/jah/opt_spec.rb",
+     "spec/jah/prayer_spec.rb",
      "spec/jah_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -62,9 +93,29 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{be omnipresent...}
+  s.summary = %q{Be omnipresent...}
   s.test_files = [
-    "spec/jah_spec.rb",
+    "spec/jah/cli_spec.rb",
+     "spec/jah/agents/xmpp_spec.rb",
+     "spec/jah/install_spec.rb",
+     "spec/jah/commands/mem_spec.rb",
+     "spec/jah/commands/cpu_spec.rb",
+     "spec/jah/commands/who_spec.rb",
+     "spec/jah/commands/netstat_spec.rb",
+     "spec/jah/commands/disk_spec.rb",
+     "spec/jah/commands/prok_spec.rb",
+     "spec/jah/agent_spec.rb",
+     "spec/jah/command_spec.rb",
+     "spec/jah/act_pkg/yum_spec.rb",
+     "spec/jah/act_pkg/apt_spec.rb",
+     "spec/jah/act_pkg/pkg_spec.rb",
+     "spec/jah/act_pkg/ports_spec.rb",
+     "spec/jah/act_pkg/pacman_spec.rb",
+     "spec/jah/opt_spec.rb",
+     "spec/jah/act_pkg_spec.rb",
+     "spec/jah/prayer_spec.rb",
+     "spec/jah/history_spec.rb",
+     "spec/jah_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -73,17 +124,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<blather>, [">= 0"])
+      s.add_runtime_dependency(%q<blather>, [">= 0.4.7"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<blather>, [">= 0"])
+      s.add_dependency(%q<blather>, [">= 0.4.7"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<blather>, [">= 0"])
+    s.add_dependency(%q<blather>, [">= 0.4.7"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/lib/jah/act_pkg/apt.rb

@@ -0,0 +1,13 @@
+
+module Jah
+  class Apt < ActPkg::Base
+    BIN = "aptitude"
+
+
+    def self.all
+      "dpkg -l"
+    end
+
+
+  end
+end

data/lib/jah/act_pkg/base.rb

@@ -0,0 +1,17 @@
+module Jah
+  module ActPkg
+
+    class Base
+
+
+      def install(comm = "install")
+        BIN + comm
+      end
+
+      def run(comm)
+        `#{comm}`
+      end
+
+    end
+  end
+end

data/lib/jah/act_pkg/emerge.rb

@@ -0,0 +1,4 @@
+module Jah
+
+
+end

data/lib/jah/act_pkg/pacman.rb

@@ -0,0 +1,59 @@
+
+module Jah
+
+  class Pacman < ActPkg::Base
+
+    # -Q installed packages
+    def all(filter = nil)
+      res = run("pacman -Q").to_a.map do |line|
+        Pkg.new(:installed, *line.split(" "))
+      end
+      res.select { |p| p.name =~ /#{filter}/ } if filter
+      res
+    end
+
+    # -Ss /regex/ search all pkgs
+    def search(filter = nil)
+      pkgs = []
+      installed = all(filter) # until figure out a memoize for all this
+      run("pacman -Ss #{filter}").to_a.each_slice(2) do |info, desc|
+        name, version, size = info.split("/")[1].split(" ")
+        state = installed.find { |i| i.name == name }
+        pkgs << Pkg.new(state ? :installed : :new, name, version, desc.strip)
+      end
+      pkgs
+    end
+
+    # -Qi info about a pkg (only installed ones)
+    def info(pkg)
+      ary = run("pacman -Qi #{pkg.name}").to_a
+      return nil if ary[0] =~ /error/
+      ary.map! do |i|
+        val = i.split("\s:\s")[1]
+        val.strip if val
+      end #.reject(&:nil?)
+      { :url => ary[2], :license => ary[3], :groups => ary[4], :provides => ary[5],
+      :depends => ary[6], :required => ary[8], :size => ary[12], :arch => ary[14],
+      :desc => ary[19]}
+    end
+
+    def install(pkgs)
+      pkgs = [pkgs] unless pkgs.class == Array
+      run "pacman -Sy --noconfirm #{pkgs.map(&:name).join(' ')}"
+    end
+
+    def uninstall(pkg)
+      run "pacman -R --noconfirm #{pkg.name}"
+    end
+
+    def upgrade(pkg)
+      run "pacman -U --noconfirm #{pkg.name}"
+    end
+
+    def update
+      run "pacman -Syu"
+    end
+
+  end
+
+end

data/lib/jah/act_pkg/pkg.rb

@@ -0,0 +1,52 @@
+module Jah
+
+  class Pkg
+    include Comparable
+    attr_reader :name, :version, :status, :size
+
+    def initialize(*args)
+      @status, @name, @version, @desc = args
+    end
+
+    def desc
+      @desc ||= info[:desc]
+    end
+
+    def info
+      @info ||= ActPkg.info(self)
+    end
+
+    def installed?
+      @status == :installed
+    end
+
+    def install
+      ActPkg.install(self)
+    end
+
+    def uninstall
+    end
+
+    def ==(other)
+      (name == other.name) && (version == other.version)
+    end
+
+    def <=>(other)
+      raise "Not same pkg.." unless name == other.name
+      version <=> other.version
+    end
+
+    def valid?
+      !(@name.nil? or @version.nil?)
+    end
+
+
+    def method_missing(*meth)
+      unless (val = info[meth[0]]).nil?
+        val
+      else
+        raise NoMethodError
+      end
+    end
+  end
+end

data/lib/jah/act_pkg/ports.rb

@@ -0,0 +1,9 @@
+
+module Jah
+
+  class Ports < ActPkg::Base
+    
+
+
+  end
+end

data/lib/jah/act_pkg/slack.rb

@@ -0,0 +1,8 @@
+module Jah
+
+  class Slack < ActPkg::Base
+
+  end
+
+
+end

data/lib/jah/act_pkg/urpm.rb

@@ -0,0 +1,7 @@
+module Jah
+  class Urpm < ActPkg::Base
+
+
+
+  end
+end

data/lib/jah/act_pkg/yum.rb

@@ -0,0 +1,31 @@
+module Jah
+
+
+  class Yum < ActPkg::Base
+
+    def all(filter = nil)
+      run("yum -q list installed").to_a[1..-1].map do |l|
+        name, version = l.split(" ")[0..1]
+        Pkg.new(:installed, name.split(".i")[0], version )
+      end
+    end
+    
+    # all pkgs...search repo
+    def info(pkg)
+      
+    end
+
+    def install(what)
+      "yum install #{what}"
+    end
+
+    def uninstall
+      "remove"
+    end
+
+    def update
+      "check-update"
+    end
+  end
+
+end

data/lib/jah/act_pkg/zypp.rb

@@ -0,0 +1,12 @@
+module Jah
+
+
+  class Zypp < ActPkg::Base
+    BIN = "zypper"
+
+
+
+
+  end
+
+end

data/lib/jah/act_pkg.rb

@@ -0,0 +1,41 @@
+#
+# ActPkg - Say 'install' and it works =D
+#
+# Nice tables:
+# http://distrowatch.com/dwres.php?resource=package-management
+# http://www.guiadohardware.net/dicas/referencia-pacotes-linux.html
+#
+module Jah
+
+  module ActPkg
+    autoload :Pacman, "jah/act_pkg/pacman"
+
+    def self.detect
+      if RUBY_PLATFORM =~ /darwin/
+        :ports
+      else
+        case File.read("/etc/issue")
+        when /Arch/i    then :pacman
+        when /SUSE/i    then :zypp
+        when /Mandriva/ then :urpm
+        when /BSD/      then :ports
+        when /Fedora|CentOS/ then :yum
+        when /Debian|Ubuntu/ then :apt
+        when /This|Gentoo/   then :emerge
+        when /Welcome|Slack/ then :slack
+        else
+          raise "Is this LFS??"
+        end
+      end
+    end
+
+    def self.manager
+      @manager ||= const_get(detect.to_s.capitalize).new
+    end
+
+    def self.method_missing(*meth)
+      manager.send(*meth)
+    end
+  end
+
+end

data/lib/jah/agent.rb

@@ -13,7 +13,7 @@ module Jah
     autoload :DumpAgent, "jah/agents/xmpp"
 
     def initialize(options=nil)#, config)
-      if Jah.daemon?
+      if Opt.daemon?
         puts "Jah starting in background.."
         fork do
           daemonize
@@ -29,16 +29,19 @@ module Jah
     end
 
     def run_agent_run
-      case Jah.mode # @mode
+      case Opt.mode # @mode
       when "xmpp" then  XmppAgent.new.run
       when "post" then  PostAgent.new.run
-      else
-        DumpAgent.new
+      else DumpAgent.new
       end
     end
 
     def self.start
-      new
+      if File.exists?(PID_FILE)
+        puts "Jah already running...#{PID_FILE}"
+      else
+        new
+      end
     end
 
     def self.stop
@@ -54,13 +57,18 @@ module Jah
 
     def self.restart
       stop
+      sleep 2
       start
     end
 
-    def self.install
+    def self.config
       Install.new
     end
 
+    class << self
+      alias :install :config
+    end
+
     def daemonize
       begin
         File.open(pid_file, File::CREAT|File::EXCL|File::WRONLY) do |pid|