wsio 0.0.3 → 0.0.4

data/README

@@ -1,5 +1,7 @@
 wsio -- web stream input/output tool
 
+Install: gem install wsio
+
 Usage: wsio [options] [user[:pass]@][hostname][path]
   -l  Listen to stream and print to STDOUT
   -s  Use HTTPS
@@ -11,10 +13,7 @@ This tool is similar to netcat in that it's intended to be used with STDIN and
 STDOUT, making it perfect for command pipelining. However, instead of direct
 point to point TCP/UDP connections, it uses HTTP. Coupled with a server that
 provides realtime pubsub over HTTP and you have one of the most magical tools
-ever. Example:
-
-Log Aggregation
-===============
+ever. Here's a toy log aggregation example:
 
 Run this on one or several machines:
 
@@ -24,6 +23,17 @@ Run this on your central aggregator:
 
   wsio -l somehost/log > /var/log/aggregate
 
-Run this on your *laptop* behind a NAT to watch the logs:
+Run this on your *laptop behind a NAT* to watch the logs:
+
+  wsio -l somehost/log
+
+
+Obviously there is a server-side component to this. It's not that complicated
+and there are some servers that already implement streams this way. 
+
+For example, Twitter's Stream API:
+
+  wsio -l <user>:<pass>@stream.twitter.com/1/statuses/sample.json
 
-  wsio -l somehost/log
+However, wsio was made with a particular server-side component in mind. If you
+are interested in this, please email me. 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('wsio', '0.0.3') do |p|
+Echoe.new('wsio', '0.0.4') do |p|
   p.description    = "Web stream input/output tool"
   p.url            = "http://github.com/progrium/wsio"
   p.author         = "Jeff Lindsay"

data/bin/wsio

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'wsio'
+#require 'lib/wsio'
 
 help =<<EOF
 Usage: wsio [options] [user[:pass]@][hostname][path]

data/lib/wsio.rb

@@ -17,9 +17,13 @@ def start(args)
   args = args.join.gsub('-', '')
   scheme = (args.include? 's') ? 'https' : 'http'
   url = "#{scheme}://#{host_and_path}"
+  client = HTTPClient.new
+  client.ssl_config.verify_mode = nil if args.include? 'k'
+  #client.set_auth(url, 'user', 'pass') if user  ## This doesn't work?
+  headers = {}
+  headers['Authorization'] = "Basic #{Base64.encode64([user,pass].join(':')).gsub("\n",'')}" if user # Fix set_auth
   if args.include? 'l'
-    c = HTTPClient.new
-    c.get_content(url) do |chunk|
+    client.get_content(url, nil, headers) do |chunk|
       obj = JSON.parse(chunk)
       if obj.is_a? Array
         puts obj.first
@@ -33,27 +37,21 @@ def start(args)
         obj = JSON.parse(line)
         if obj.is_a? Hash
           body = line
-          headers = {"Content-Type" => "application/json"}
+          headers["Content-Type"] = "application/json"
         elsif obj.is_a? Array
           body = obj.first.to_s
-          headers = {"Content-Type" => "text/plain"}
+          headers["Content-Type"] = "text/plain"
         else 
           body = obj.to_s
-          headers = {"Content-Type" => "text/plain"}
+          headers["Content-Type"] = "text/plain"
         end
       rescue JSON::ParserError
         body = line.strip
-        if body.split('&').collect{|m| /^[^&^=]+=[^&^=]+$/.match(m) }.all?
-          headers = {}
-        else
-          headers = {"Content-Type" => "text/plain"}
+        unless body.split('&').collect{|m| /^[^&^=]+=[^&^=]+$/.match(m) }.all?
+          headers["Content-Type"] = "text/plain"
         end
       end
-      c = HTTPClient.new
-      #c.set_auth(url, 'user', 'pass') if user  ## This doesn't work?
-      headers['Authorization'] = "Basic #{Base64.encode64([user,pass].join(':')).gsub("\n",'')}" if user # Fix set_auth
-      c.ssl_config.verify_mode = nil if args.include? 'k'
-      resp = c.post(url, body, headers)
+      resp = client.post(url, body, headers)
       if resp.status != 200
         puts resp.content
       end

data/wsio.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wsio}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Lindsay"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jeff Lindsay