De-EY the code.

bin/htttee

@@ -24,7 +24,7 @@ end
 opts = Trollop::options do
   opt :uuid, "The UUID of the stream.", :short => '-u', :type => String
   opt :'content-type', "The content-type of the stream.", :short => '-c', :type => String, :default => 'text/plain'
-  opt :endpoint, "The endpoint of the htttee service.", :short => '-e', :type => String, :default => 'http://htttee.engineyard.com/'
+  opt :endpoint, "The endpoint of the htttee service.", :short => '-e', :type => String, :default => 'http://localhost:3000/'
   opt :quiet, "Don't echo to stdout.", :short => '-q', :default => false
 end
 
@@ -34,6 +34,6 @@ $stdin.sync  = true
 $stdout.sync = true
 
 input  = opts[:quiet] ? $stdin : MultiplexedIO.new($stdin, $stdout)
-client = EY::Tea::Client.new(:endpoint => opts[:endpoint])
+client = HTTTee::Client.new(:endpoint => opts[:endpoint])
 
 client.up(input, opts[:uuid], opts[:'content-type'])

config.ru

@@ -3,4 +3,4 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'htttee/server'
 
 use Rack::CommonLogger
-run EY::Tea::Server.app
+run HTTTee::Server.app

lib/htttee/client.rb

@@ -2,14 +2,12 @@ require 'net/http'
 require 'rack/client'
 #require 'uuidtools'
 
-module EY
-  module Tea
+module HTTTee
   module Client
     def self.new(*a)
       Consumer.new(*a)
     end
   end
-  end
 end
 
 require 'htttee/client/ext/net/http'

lib/htttee/client/consumer.rb

@@ -1,9 +1,8 @@
-module EY
-  module Tea
+module HTTTee
   module Client
     class Consumer < Rack::Client::Base
       def initialize(options = {})
-          @base_uri = URI.parse(options.fetch(:endpoint, 'http://tea.engineyard.com/'))
+        @base_uri = URI.parse(options.fetch(:endpoint, 'http://localhost:3000/'))
         inner_app = options.fetch(:app, Rack::Client::Handler::NetHTTP.new)
 
         super(inner_app)
@@ -45,5 +44,4 @@ module EY
       end
     end
   end
-  end
 end

lib/htttee/server.rb

@@ -5,8 +5,7 @@ require 'em-redis'
 
 EM.epoll
 
-module EY
-  module Tea
+module HTTTee
   module Server
 
     def self.app
@@ -59,7 +58,6 @@ module EY
       @mock_uri
     end
   end
-  end
 end
 
 require 'htttee/server/ext/em-redis'

lib/htttee/server/api.rb

@@ -1,5 +1,4 @@
-module EY
-  module Tea
+module HTTTee
   module Server
     class Api
       STREAMING, FIN = ?0, ?1
@@ -169,6 +168,7 @@ module EY
         redis.publish channel, encode(FIN)
       end
 
+      require 'debugger'
       def subscribe(channel, &block)
         conn = pubsub
         conn.subscribe channel do |type, chan, data|
@@ -183,7 +183,6 @@ module EY
               block.call(FIN, data)
             end
           else
-              debugger
             ''
           end
         end
@@ -194,7 +193,7 @@ module EY
       end
 
       def redis
-          @redis ||= EM::Protocols::Redis.connect(@host, @port)
+        @@redis ||= EM::Protocols::Redis.connect(@host, @port)
       end
 
       def encode(*parts)
@@ -202,5 +201,4 @@ module EY
       end
     end
   end
-  end
 end

lib/htttee/server/chunked_body.rb

@@ -1,5 +1,4 @@
-module EY
-  module Tea
+module HTTTee
   module Server
     class ChunkedBody < Thin::DeferrableBody
       def call(body)
@@ -18,5 +17,4 @@ module EY
       end
     end
   end
-  end
 end

lib/htttee/server/middleware/async_fixer.rb

@@ -1,6 +1,4 @@
-
-module EY
-  module Tea
+module HTTTee
   module Server
     class AsyncFixer
       def initialize(app)
@@ -18,5 +16,4 @@ module EY
       end
     end
   end
-  end
 end

lib/htttee/server/middleware/dechunker.rb

@@ -1,5 +1,4 @@
-module EY
-  module Tea
+module HTTTee
   module Server
     class Dechunker
       def initialize(app)
@@ -59,5 +58,4 @@ module EY
       end
     end
   end
-  end
 end

lib/htttee/server/mock.rb

@@ -1,7 +1,6 @@
 require 'rack/mux'
 
-module EY
-  module Tea
+module HTTTee
   module Server
     module Mock
 
@@ -21,7 +20,7 @@ module EY
 
       def self.process_child(i)
         EM.run do
-            client = Rack::Client.new { run EY::Tea::Server.mock_app }
+          client = Rack::Client.new { run HTTTee::Server.mock_app }
 
           uri = client.get("/mux-uri").body
           i << uri
@@ -65,5 +64,4 @@ module EY
       end
     end
   end
-  end
 end

lib/htttee/version.rb

@@ -1,5 +1,3 @@
-module EY
-  module Tea
+module HTTTee
   VERSION = '0.0.0'
-  end
 end

spec/client_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe EY::Tea::Client do
+describe HTTTee::Client do
   subject { @client }
 
   def new_client
-    EY::Tea::Client.new(:endpoint => EY::Tea::Server.mock_uri.to_s)
+    HTTTee::Client.new(:endpoint => HTTTee::Server.mock_uri.to_s)
   end
 
   def run(thread)

spec/helpers/rackup.rb

@@ -1,4 +1,4 @@
-module TeaHelpers
+module HTTTeeHelpers
   class ThinMuxer
     def initialize(app)
       @app = Rack::Mux.new(thin_options)

spec/spec_helper.rb

@@ -6,16 +6,16 @@ require 'htttee/client'
 
 require 'digest/sha2'
 
-EY::Tea::Server.mock!
+HTTTee::Server.mock!
 Thin::Logging.debug = Thin::Logging.trace = true
 
 RSpec.configure do |config|
   config.color_enabled = config.tty = true #Force ANSI colors
 
   config.around :each do |callback|
-    EY::Tea::Server.reset!
+    HTTTee::Server.reset!
 
-    @client = EY::Tea::Client.new(:endpoint => EY::Tea::Server.mock_uri.to_s)
+    @client = HTTTee::Client.new(:endpoint => HTTTee::Server.mock_uri.to_s)
     callback.run
   end
 end