Skip to content

Commit

Permalink
Revert "be incompatible with the spdy gem... FIXME!!"
Browse files Browse the repository at this point in the history
This reverts commit 76bd510.
  • Loading branch information
jonasschneider committed Jan 1, 2012
1 parent 76bd510 commit b1a27f5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
4 changes: 3 additions & 1 deletion Gemfile
@@ -1,4 +1,6 @@
source "http://rubygems.org"

# Specify your gem's dependencies in momentum.gemspec
gemspec
gemspec

gem 'spdy', :path => './spdy'
7 changes: 1 addition & 6 deletions lib/momentum.rb
@@ -1,9 +1,4 @@
if defined? SPDY
raise "Sorry, momentum is not compatible with the original 'spdy' gem at the moment."
end
$:.push File.expand_path("../spdy/lib", __FILE__)
require "spdy"

require 'spdy'
require 'eventmachine'
require 'em-http'

Expand Down
6 changes: 1 addition & 5 deletions momentum.gemspec
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_development_dependency "rspec"
s.add_development_dependency "rake"
s.add_development_dependency "webmock"
Expand All @@ -25,8 +25,4 @@ Gem::Specification.new do |s|
s.add_runtime_dependency "eventmachine", "~> 1.0.0.beta4"
s.add_runtime_dependency "em-http-request"
s.add_runtime_dependency "unicorn"

# spdy deps
s.add_dependency "bindata"
s.add_dependency "ffi-zlib"
end
1 change: 1 addition & 0 deletions spec/support/helpers.rb
Expand Up @@ -5,6 +5,7 @@
Bundler.setup
require 'rspec'

require 'spdy'
require 'eventmachine'
require 'em-http'

Expand Down

0 comments on commit b1a27f5

Please sign in to comment.