arunthampi-injour 0.1.2 → 0.2.0

data/README.rdoc

@@ -8,10 +8,17 @@ An evolution of the In/Out app which 37Signals uses. A distributed In/Out, if yo
   sudo gem install arunthampi-injour --source=http://gems.github.com
   
 == Installation from Source (More reliable)
+  sudo gem install dnssd
   git clone git://github.com/arunthampi/injour.git
   cd injour
   rake install
 
+== Useful bash aliases the author recommends
+  # To be put in your ~/.bash_profile
+  alias ise='injour serve &'
+  alias ist='injour st'
+  alias ils='injour ls'
+
 == Usage
 
   alice$ injour serve                       # Starts up publishing your statuses

data/bin/injour

@@ -7,18 +7,16 @@ begin
   cmd = ARGV.shift
 
   case cmd
-  when "status"
+  when 'status', 'st'
     Injour.set_status(ARGV.join(' '))
-  when "st"
-    Injour.set_status(ARGV.join(' '))  
-  when "serve"
+  when 'serve'
     Injour.serve(*ARGV)
-  when "list"
+  when 'list', 'ls'
     Injour.list(*ARGV)
-  when "ls"
-    Injour.list(*ARGV)
-  when "show"
-    Injour.get(*ARGV)  
+  when 'show'
+    Injour.get(*ARGV)
+  else
+    Injour.usage
   end
 rescue => e
   puts "ERROR: running '#{cmd}': #{e.message} (#{e.class})\n"

data/lib/injour.rb

@@ -5,6 +5,8 @@ require "dnssd"
 require "set"
 require "socket"
 require "webrick"
+require 'net/http'
+require 'uri'
 
 require "injour/version"
 
@@ -37,7 +39,11 @@ show user
     HELP
   end
 
-  def self.get(name)
+  def self.retrieve_status_using_http(host, port, limit)
+    Net::HTTP.get_response(URI.parse("http://#{host}:#{port}/?number=#{limit}")).body
+  end  
+
+  def self.get(name, limit = 10)
     hosts = find(name)
 
     if hosts.empty?
@@ -50,23 +56,20 @@ show user
     else
       # Set is weird. There is no #[] or #at
       hosts.each do |host|
-        sock = TCPSocket.open host.host, host.port
-        puts sock.read
+        puts retrieve_status_using_http(host.host, host.port, limit)
       end
     end
   end
 
   def self.list(name = nil)
-    return show(name) if name
+    return get(name) if name
     hosts = []
 
-    waiting = Thread.current
-
     service = DNSSD.browse(SERVICE) do |reply|
       DNSSD.resolve(reply.name, reply.type, reply.domain) do |rr|
         host = Server.new(reply.name, rr.target, rr.port)
         unless hosts.include? host
-          puts "#{host.name} (#{host.host}:#{host.port})"
+          puts "#{host.name} (#{host.host}:#{host.port}) -> #{retrieve_status_using_http(host.host, host.port, 1)}"
           hosts << host
         end
       end
@@ -78,6 +81,11 @@ show user
 
   def self.set_status(message)
     File.open(INJOUR_STATUS, 'a') { |file| file.puts("[#{Time.now.strftime("%d-%b-%Y %I:%M %p")}] #{message}") }
+    if message !~ /\S/
+      puts 'Your status has been cleared.'
+    else
+      puts "Your status has been set to '#{message}'."
+    end
   end
 
   def self.find(name, first=true)
@@ -96,14 +104,19 @@ show user
 
     sleep 5
     service.stop
-
     hosts
   end
 
-  def self.get_status(limit = 3)
+  def self.get_status(limit = 5)
     File.read(INJOUR_STATUS).split("\n").reverse.slice(0, limit).join("\n")
   end
 
+  def self.get_limit(query_string)
+    (query_string.match(/number=(\d+)/)[1]).to_i || 5
+  rescue
+    5
+  end
+
   def self.serve(name="", port=PORT)
     name = ENV['USER'] if name.empty?
 
@@ -114,20 +127,27 @@ show user
       puts "#{name}'s In/Out Records..."
     end
     
-    log = WEBrick::Log.new(true) # true fools it
-    def log.log(*anything); end # send it to the abyss
-    
-    # Open webrick babeh
-    server = WEBrick::GenericServer.new(:Port => port.to_i, :Logger => log)
-    # Get the latest status
+    # Don't log anything, everything goes in an abyss
+    log = WEBrick::Log.new(true)
+    def log.log(*anything); end
+    server = WEBrick::HTTPServer.new(:Port => port.to_i, :Logger => log)
+
+    # Open up a servlet, so that status can be viewed in a browser
+    server.mount_proc("/") do |req, res|
+      @logger = log
+      limit = get_limit(req.query_string)
+      res.body = get_status(limit)
+      res['Content-Type'] = "text/plain"
+    end
+    # Ctrl+C must quit it
     %w(INT TERM).each do |signal|
       trap signal do
         server.shutdown
         exit!
       end
     end
-    # Get the latest status
-    server.start { |socket| socket.print(get_status) }
+    # Start the server
+    server.start
   end
 
 end

data/lib/injour/version.rb

@@ -1,3 +1,3 @@
 module Injour
-  VERSION = "0.1.2".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arunthampi-injour
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Arun Thampi
@@ -9,7 +9,7 @@ autorequire: injour
 bindir: bin
 cert_chain: []
 
-date: 2008-06-18 00:00:00 -07:00
+date: 2008-06-20 00:00:00 -07:00
 default_executable: injour
 dependencies: 
 - !ruby/object:Gem::Dependency