Permalink
Browse files

stop testing on 1.9.3 for now so we can see test output, remove 1.8 junk

  • Loading branch information...
1 parent 350e174 commit 0150eec73d62eb740358e1de04734d295eb22982 @qrush qrush committed Mar 20, 2012
View
2 .travis.yml
@@ -2,5 +2,5 @@ before_script: cp config/database.yml.example config/database.yml
language: ruby
rvm:
- 1.9.2
- - 1.9.3
+ #- 1.9.3
script: bundle exec rake db:create db:migrate db:test:prepare default
View
7 Gemfile
@@ -47,10 +47,9 @@ group :test do
gem 'launchy'
gem 'nokogiri'
gem 'rack-test', :require => 'rack/test'
- gem 'redgreen', :platforms => :ruby_18
gem 'rr'
gem 'shoulda'
- gem 'test-unit'
+ #gem 'test-unit', :require => 'test/unit'
gem 'timecop'
gem 'webmock'
end
@@ -69,7 +68,3 @@ end
platforms :jruby do
gem 'jruby-openssl'
end
-
-platforms :ruby_18 do
- gem 'system_timer'
-end
View
6 Gemfile.lock
@@ -174,7 +174,6 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- redgreen (1.2.2)
redis (2.2.2)
rest-client (1.6.7)
mime-types (>= 1.16)
@@ -194,9 +193,7 @@ GEM
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
slop (2.4.4)
- system_timer (1.2.4)
term-ansicolor (1.0.7)
- test-unit (2.4.8)
thor (0.14.6)
tilt (1.3.3)
timecop (0.3.5)
@@ -254,16 +251,13 @@ DEPENDENCIES
rails (~> 3.0.10)
rails-erd
rdoc
- redgreen
redis
rest-client
rr
rvm
shoulda
silent-postgres
sinatra
- system_timer
- test-unit
timecop
validates_formatting_of (>= 0.3.0)
webmock
View
14 app/jobs/notifier.rb
@@ -1,3 +1,5 @@
+require 'timeout'
+
class Notifier < Struct.new(:url, :host_with_port, :rubygem, :version, :api_key)
def payload
@@ -25,15 +27,7 @@ def perform
private
- if RUBY_VERSION < '1.9.2'
- def timeout(sec, &block)
- SystemTimer.timeout_after(sec, &block)
- end
- else
- require 'timeout'
-
- def timeout(sec, &block)
- Timeout.timeout(sec, &block)
- end
+ def timeout(sec, &block)
+ Timeout.timeout(sec, &block)
end
end
View
BIN vendor/cache/redgreen-1.2.2.gem
Binary file not shown.
View
BIN vendor/cache/system_timer-1.2.4.gem
Binary file not shown.

0 comments on commit 0150eec

Please sign in to comment.