htttee 0.5.0 → 0.6.0

data/lib/htttee/version.rb

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

data/spec/client_spec.rb

@@ -1,13 +1,17 @@
 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)
+    if RUBY_VERSION =~ /^2\./
+      return Thread.pass if thread == Thread.main
+    end
+
     thread.join(0.1) if thread.alive?
   end
 
@@ -37,10 +41,12 @@ describe EY::Tea::Client do
       client.up(reader, uuid)
     end
 
+    client_called = false
     down_thread = Thread.new(new_client, i, scheduler) do |client, writer|
       run scheduler
       client.down(uuid) do |chunk|
         if chunk == 'Hello, '
+          client_called = true
           writer << 'World!'
           writer.close
           run scheduler
@@ -48,10 +54,48 @@ describe EY::Tea::Client do
       end
     end
 
+    client_called.should be_false
+
     run up_thread
     run down_thread
     run up_thread
     run down_thread
+
+    client_called.should be_true
+  end
+
+  it "can accept a stream containing CRLFs." do
+    scheduler = Thread.current
+    uuid = rand(10_000).to_s
+    o, i = IO.pipe
+    i << "Hello, \r\n\r\nthere"
+
+    up_thread = Thread.new(new_client, o) do |client, reader|
+      run scheduler
+      client.up(reader, uuid)
+    end
+
+    client_called = false
+
+    down_thread = Thread.new(new_client, i, scheduler) do |client, writer|
+      run scheduler
+      client.down(uuid) do |chunk|
+        if chunk == "Hello, \r\n\r\nthere"
+          client_called = true
+          writer.close
+          run scheduler
+        end
+      end
+    end
+
+    client_called.should be_false
+
+    run up_thread
+    run down_thread
+    run up_thread
+    run down_thread
+
+    client_called.should be_true
   end
 
   it "streams already recieved data on an open stream to peers." do
@@ -123,4 +167,60 @@ describe EY::Tea::Client do
     i.close
   end
 
+  it "gets the SSE setup page if the client supports SSE." do
+    scheduler = Thread.current
+    uuid = rand(10_000).to_s
+    o, i = IO.pipe
+    i << 'Ignore Me!'
+    i.close
+
+    up_thread = Thread.new(new_client, o) do |client, reader|
+      client.up(reader, uuid)
+    end
+
+    run up_thread
+
+    client = Rack::Client.new(HTTTee::Server.mock_uri.to_s)
+
+    response = client.get(uuid, 'User-Agent' => 'OctoWebKit', 'Accept' => 'text/html')
+
+    response.headers['Content-Type'].should == 'text/html'
+    response.body =~ /new EventSource/
+  end
+
+  it "gets the SSE stream response when making an SSE request." do
+    scheduler = Thread.current
+    uuid = rand(10_000).to_s
+    o, i = IO.pipe
+    i << "Don't Ignore Me!\nPlease!"
+    i.close
+
+    up_thread = Thread.new(new_client, o) do |client, reader|
+      client.up(reader, uuid)
+    end
+
+    run up_thread
+
+    client = Rack::Client.new(HTTTee::Server.mock_uri.to_s)
+
+    response = client.get(uuid, 'User-Agent' => 'OctoWebKit', 'Accept' => 'text/event-stream')
+
+    response.headers['Content-Type'].should == 'text/event-stream'
+
+    response.body.should == <<-BODY
+event: message
+data: Don't Ignore Me!
+
+event: ctrl
+data: newline
+
+event: message
+data: Please!
+
+event: ctrl
+data: eof
+
+    BODY
+  end
+
 end

data/spec/helpers/rackup.rb

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

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htttee
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-client
-  requirement: &70348419674800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1.pre.i
+        version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70348419674800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70348419673880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348419673880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70348420159880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348420159880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70348420156740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348420156740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: em-redis
-  requirement: &70348420155620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348420155620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70348420154460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348420154460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-mux
-  requirement: &70348420168760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348420168760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348420167380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348420167380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348420165540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348420165540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Stream any CLI output as an HTTP chunked response.
 email:
 - ben@benburkert.com
@@ -120,35 +165,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - bin/htttee
 - bin/htttee-exec
 - config.ru
-- deploy/after_restart.rb
-- deploy/before_restart.rb
-- deploy/before_symlink.rb
-- deploy/cookbooks/cloudkick-plugins/recipes/default.rb
-- deploy/cookbooks/cloudkick-plugins/recipes/resque.rb
-- deploy/cookbooks/cloudkick-plugins/templates/default/resque.sh.erb
-- deploy/cookbooks/god/recipes/default.rb
-- deploy/cookbooks/god/templates/default/config.erb
-- deploy/cookbooks/god/templates/default/god-inittab.erb
-- deploy/cookbooks/main/attributes/owner_name.rb
-- deploy/cookbooks/main/attributes/recipes.rb
-- deploy/cookbooks/main/libraries/dnapi.rb
-- deploy/cookbooks/main/recipes/default.rb
-- deploy/cookbooks/nginx/files/default/chunkin-nginx-module-v0.22rc1.zip
-- deploy/cookbooks/nginx/files/default/nginx-1.0.0.tar.gz
-- deploy/cookbooks/nginx/recipes/default.rb
-- deploy/cookbooks/nginx/recipes/install.rb
-- deploy/cookbooks/nginx/templates/default/nginx.conf.erb
-- deploy/cookbooks/resque/recipes/default.rb
-- deploy/cookbooks/resque/templates/default/resque.rb.erb
-- deploy/cookbooks/resque/templates/default/resque.yml.erb
-- deploy/cookbooks/resque/templates/default/resque_scheduler.rb.erb
-- deploy/solo.rb
 - htttee.gemspec
 - lib/htttee.rb
 - lib/htttee/client.rb
@@ -165,8 +188,11 @@ files:
 - lib/htttee/server/ext/thin/deferred_response.rb
 - lib/htttee/server/middleware/async_fixer.rb
 - lib/htttee/server/middleware/dechunker.rb
+- lib/htttee/server/middleware/rechunker.rb
 - lib/htttee/server/mock.rb
 - lib/htttee/server/pubsub_redis.rb
+- lib/htttee/server/sse/body.rb
+- lib/htttee/server/sse/middleware.rb
 - lib/htttee/version.rb
 - spec/client_spec.rb
 - spec/helpers/rackup.rb
@@ -191,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: htttee
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Unix's tee as a service

data/deploy/after_restart.rb

@@ -1 +0,0 @@
-sudo "god signal resque-#{app} QUIT"

data/deploy/before_restart.rb

@@ -1,4 +0,0 @@
-on_app_servers do
-  env_custom = "#{shared_path}/config/env.custom"
-  run "echo 'export APP_CURRENT_PATH=\"#{current_path}\"' > #{env_custom}"
-end

data/deploy/before_symlink.rb

@@ -1,2 +0,0 @@
-sudo "/usr/local/ey_resin/ruby/bin/chef-solo " \
-  "-c #{latest_release}/deploy/solo.rb -j /etc/chef/dna.json"

data/deploy/cookbooks/cloudkick-plugins/recipes/default.rb

@@ -1,8 +0,0 @@
-directory "/usr/lib/cloudkick-agent/plugins" do
-  owner "root"
-  group "root"
-  action :create
-  recursive true
-end
-
-require_recipe "cloudkick-plugins::resque"

data/deploy/cookbooks/cloudkick-plugins/recipes/resque.rb

@@ -1,18 +0,0 @@
-execute 'restart-cloudkick-agent' do
-  action :nothing
-
-  command 'pkill cloudkick-agent'
-end
-
-template "/usr/lib/cloudkick-agent/plugins/resque" do
-  mode "0755"
-  source "resque.sh.erb"
-  variables(
-    :dir       => "/data/#{node.engineyard.environment.apps.first.name}/current",
-    :script    => "script/cloudkick-resque",
-    :rack_env  => node.engineyard.environment.framework_env,
-    :redis_uri => "#{node.engineyard.environment.db_host}:6379"
-  )
-
-  notifies :run, resources(:execute => 'restart-cloudkick-agent')
-end