shatty 0.0.6 → 0.0.7

data/bin/shatty

@@ -4,6 +4,13 @@ require "clamp"
 require "pty"
 require "ftw"
 require "uuidtools"
+require "cabin"
+
+if $DEBUG
+  logger = Cabin::Channel.get
+  logger.level = :debug if $DEBUG
+  logger.subscribe(STDERR)
+end
 
 class Shatty < Clamp::Command
   subcommand "share", "Share a terminal session (read only for now)" do
@@ -17,8 +24,12 @@ class Shatty < Clamp::Command
     def execute
       start = Time.now
       if output.nil?
-        self.output = "http://r.logstash.net:8200/s/#{UUIDTools::UUID.random_create}"
+        self.output = "http://shatty.semicomplete.com:8200/s/#{UUIDTools::UUID.random_create}"
         puts "Sending output to: #{output}"
+        puts "View commands"
+        puts "  wget -qO- #{output}"
+        puts "  curl -Lso- #{output}"
+        puts "  shatty play #{output}"
       end
 
       if output =~ /^https?:/
@@ -59,8 +70,7 @@ class Shatty < Clamp::Command
         # for each chunk of text read from tmux, record
         # the timestamp (duration since 'start' of recording)
         out.syswrite([time_offset.to_f, buffer.length, buffer].pack("GNA#{buffer.length}"))
-
-        $stdout.write(buffer) unless headless?
+        $stdout.syswrite(buffer) unless headless?
       end
 
       system("stty sane")

data/shatty.gemspec

@@ -2,16 +2,13 @@ Gem::Specification.new do |spec|
   files = %x{git ls-files}.split("\n")
 
   spec.name = "shatty"
-  spec.version = "0.0.6"
+  spec.version = "0.0.7"
   spec.summary = "shatty"
   spec.description = "shatty"
   spec.license = "none chosen yet"
 
   # Note: You should set the version explicitly.
-  spec.add_dependency "cabin"
-  spec.add_dependency "clamp"
-  spec.add_dependency "ftw"
-  spec.add_dependency "uuidtools"
+  spec.add_dependency "cabin", ">0" # for logging. apache 2 license
   spec.files = files
   spec.require_paths << "lib"
   spec.bindir = "bin"

data/web.rb

@@ -2,43 +2,49 @@ require "ftw" # gem ftw
 require "cabin" # gem cabin
 require "thread"
 
+Thread.abort_on_exception = true
 ShutdownSignal = :shutdown
 
 class Session
   def initialize
     @queue = Queue.new
     @recent = []
+    @subscribers = []
+
+    @publisher_thread = Thread.new { run }
   end # def initialize
 
+  def run
+    while true
+      chunk = @queue.pop
+      puts "#{@subscribers.count} subscribers"
+      @subscribers.each do |subscriber|
+        #p subscriber => chunk
+        subscriber << chunk
+      end
+      break if chunk == ShutdownSignal
+    end
+  end # def run
+
   def <<(chunk)
-    @queue << chunk
     @recent << chunk
     @recent = @recent[0..100]
-  end # def push
+    @queue << chunk
+  end # def <<
 
-  def enumerator
-    return Enumerator.new do |y|
-      @recent.each { |chunk| y << chunk }
-      while true
-        chunk = @queue.pop
-        break if chunk == ShutdownSignal
-        y << chunk
-      end
-    end # Enumerator
-  end # def enumerator
+  def subscribe(output)
+    @recent.each { |c| output << c }
+    @subscribers << output
+  end # def subscribe
 
-  def raw
-    return Enumerator.new do |y|
-      enumerator.each do |chunk|
-        y << decode(chunk)
-      end
-    end # Enumerator
-  end # def enumerator
+  def unsubscribe(output)
+    @subscribers.delete(output)
+  end # def unsubscribe
 
-  def decode(chunk)
+  def self.decode(chunk)
     headersize = [1,1].pack("GN").size
     return chunk[headersize .. -1]
-  end # def decode
+  end # def self.decode
 
   def close
     @queue << ShutdownSignal
@@ -66,11 +72,27 @@ server = FTW::WebServer.new("0.0.0.0", port) do |request, response|
     elsif request.method == "GET"
       response.status = 200
       response["Content-Type"] = "text/plain"
+      queue = Queue.new
+      session.subscribe(queue)
       if request["user-agent"] =~ /^(curl|Wget)/
         # Curl or wget. Send raw text.
-        response.body = session.raw
+        response.body = Enumerator.new do |y|
+          while true
+            chunk = queue.pop
+            break if chunk == ShutdownSignal
+            puts "Raw: #{chunk.inspect}"
+            y << Session.decode(chunk)
+          end
+        end
       else
-        response.body = session.enumerator
+        response.body = Enumerator.new do |y|
+          while true
+            chunk = queue.pop
+            break if chunk == ShutdownSignal
+            puts "Plain: #{chunk.inspect}"
+            y << chunk
+          end
+        end
       end
     else
       response.status = 400

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shatty
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -24,55 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: clamp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ftw
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '0'
 description: shatty