Permalink
Browse files

cleaning house

  • Loading branch information...
1 parent dfd5ed6 commit 8320e5ab9f1ce88d4cfa535432e5c380cd323c78 @steelThread committed Jan 11, 2012
Showing with 24 additions and 29 deletions.
  1. +4 −1 Gemfile.lock
  2. +7 −13 Rakefile
  3. +1 −2 redmon.gemspec
  4. +2 −3 spec/app_spec.rb
  5. +9 −9 spec/spec_helper.rb
  6. +1 −1 spec/worker_spec.rb
View
@@ -21,7 +21,10 @@ GEM
bson (1.5.2)
bson_ext (1.5.2)
bson (= 1.5.2)
+ chronic (0.6.6)
daemons (1.1.5)
+ delorean (1.2.0)
+ chronic
diff-lcs (1.1.3)
em-hiredis (0.1.0)
hiredis (~> 0.3.0)
@@ -60,7 +63,7 @@ PLATFORMS
ruby
DEPENDENCIES
- bundler (~> 1.0.0)
+ delorean
rack-test
rake
redmon!
View
@@ -1,17 +1,11 @@
-require 'rubygems'
require 'bundler'
-begin
- Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
- $stderr.puts e.message
- $stderr.puts "Run `bundle install` to install missing gems"
- exit e.status_code
-end
-require 'rake'
+Bundler::GemHelper.install_tasks
-require 'rspec'
require 'rspec/core/rake_task'
-desc "Run all examples"
-task RSpec::Core::RakeTask.new('spec')
-task :default => "spec"
+desc "Default: run specs."
+task :default => :spec
+
+desc "Run specs."
+task RSpec::Core::RakeTask.new
+
View
@@ -29,10 +29,9 @@ Gem::Specification.new do |s|
s.add_dependency "thin"
s.add_dependency "activesupport"
- s.add_development_dependency "rspec"
+ s.add_development_dependency "delorean"
s.add_development_dependency "rack-test"
s.add_development_dependency "rake"
s.add_development_dependency "rspec", "~> 2.6.0"
s.add_development_dependency "shoulda", ">= 0"
- s.add_development_dependency "bundler", "~> 1.0.0"
end
View
@@ -1,8 +1,7 @@
-require ::File.expand_path('../spec_helper.rb', __FILE__)
-
-include Rack::Test::Methods
+require 'spec_helper'
describe "app" do
+ include Rack::Test::Methods
def app
Redmon::App.new Redmon::DEFAULT_OPTS
View
@@ -1,13 +1,13 @@
-require 'rubygems'
-require 'json'
-require 'rspec'
-require 'redis'
-require 'rack'
-require 'rack/test'
-
+$:.unshift File.expand_path('../../lib', __FILE__)
ENV['RACK_ENV'] = "test"
-$: << ::File.expand_path('../../lib', __FILE__)
require "redmon"
require "eventmachine"
-require 'em-hiredis'
+require 'em-hiredis'
+require 'rack'
+require 'redis'
+
+require 'delorean'
+require 'rack/test'
+require 'rspec'
+
View
@@ -1,4 +1,4 @@
-require ::File.expand_path('../spec_helper.rb', __FILE__)
+require 'spec_helper'
describe "worker" do

0 comments on commit 8320e5a

Please sign in to comment.