Permalink
Browse files

Fixed tests

  • Loading branch information...
1 parent 695972c commit 5e74932fcd7a42a2818fa3e562923760e384f718 @joelmoss joelmoss committed Jan 23, 2012
View
@@ -8,7 +8,7 @@
/.bundle
# Ignore the default SQLite database.
-/db/*.sqlite3
+/db/*.sqlite3*
# Ignore all logfiles and tempfiles.
/log/*.log
View
@@ -1,13 +1,14 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.3'
+gem 'rails', '~> 3.2'
+gem 'mysql2'
gem 'sqlite3'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '~> 3.1.5'
- gem 'coffee-rails', '~> 3.1.1'
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
end
@@ -44,10 +45,11 @@ group :development, :test do
gem "database_cleaner"
gem 'marked'
gem 'ffaker'
- gem 'vcr'
+ gem 'vcr', '~> 2.0.0.rc'
end
group :test do
gem 'webmock'
+ gem 'resque_spec'
gem "fakefs", :require => "fakefs/safe"
end
View
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/plataformatec/simple_form.git
- revision: 5ee3653f397382602e3ebb6f27558871ca136973
+ revision: 95f711366184cf38ebf9a571387ba5006114a40a
specs:
simple_form (2.0.0.dev)
actionpack (~> 3.0)
@@ -9,73 +9,72 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionmailer (3.2.0)
+ actionpack (= 3.2.0)
+ mail (~> 2.4.0)
+ actionpack (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.0)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ activesupport (3.2.0)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
airbrake (3.0.9)
activesupport
builder
- arel (2.2.1)
+ arel (3.0.0)
builder (3.0.0)
capistrano (2.10.0.pre)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.1)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0.beta)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.2.0)
commonjs (0.2.0)
therubyracer (~> 0.9.9)
crack (0.3.1)
- database_cleaner (0.7.0)
+ database_cleaner (0.7.1)
diff-lcs (1.1.3)
dotiw (1.1.1)
actionpack (~> 3)
erubis (2.7.0)
- execjs (1.2.13)
+ execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (2.3.2)
+ factory_girl (2.5.0)
activesupport
- factory_girl_rails (1.4.0)
- factory_girl (~> 2.3.0)
+ factory_girl_rails (1.6.0)
+ factory_girl (~> 2.5.0)
railties (>= 3.0.0)
fakefs (0.4.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
- rack (>= 1.1.0, < 2)
+ faraday (0.7.6)
+ addressable (~> 2.2)
+ multipart-post (~> 1.1)
+ rack (~> 1.1)
faraday-stack (0.1.4)
faraday (>= 0.6, < 0.8)
faraday_middleware (0.7.0)
@@ -86,7 +85,7 @@ GEM
diff-lcs (~> 1.1)
mime-types (~> 1.15)
growl (1.0.3)
- guard (0.10.0)
+ guard (1.0.0)
ffi (>= 0.5.0)
thor (~> 0.14.6)
guard-bundler (0.1.3)
@@ -104,40 +103,42 @@ GEM
inherited_resources (1.3.0)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
- jquery-rails (1.0.19)
- railties (~> 3.0)
+ journey (1.0.0)
+ jquery-rails (2.0.0)
+ railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
- json (1.6.4)
+ json (1.6.5)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
less (2.0.8)
commonjs (~> 0.2.0)
therubyracer (~> 0.9.9)
- less-rails (2.1.2)
+ less-rails (2.1.3)
actionpack (>= 3.1)
less (~> 2.0.7)
libv8 (3.3.10.4)
- mail (2.3.0)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
marked (1.2.2)
mime-types (1.17.2)
multi_json (1.0.4)
multipart-post (1.1.4)
+ mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.2.2)
+ net-ssh (2.3.0)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
oauth2 (0.5.2)
faraday (~> 0.7)
multi_json (~> 1.0)
- omniauth (1.0.1)
+ omniauth (1.0.2)
hashie (~> 1.2)
rack
omniauth-github (1.0.1)
@@ -150,28 +151,26 @@ GEM
permanent_records (2.1.2)
activerecord
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ rails (3.2.0)
+ actionmailer (= 3.2.0)
+ actionpack (= 3.2.0)
+ activerecord (= 3.2.0)
+ activeresource (= 3.2.0)
+ activesupport (= 3.2.0)
bundler (~> 1.0)
- railties (= 3.1.3)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (= 3.2.0)
+ railties (3.2.0)
+ actionpack (= 3.2.0)
+ activesupport (= 3.2.0)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -189,6 +188,9 @@ GEM
redis-namespace (~> 1.0.2)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
+ resque_spec (0.9.0)
+ resque (>= 1.19.0)
+ rspec (>= 2.5.0)
rspec (2.8.0)
rspec-core (~> 2.8.0)
rspec-expectations (~> 2.8.0)
@@ -203,17 +205,16 @@ GEM
railties (>= 3.0)
rspec (~> 2.8.0)
sass (3.1.12)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
+ sass-rails (3.2.3)
+ railties (~> 3.2.0.beta)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
shoulda-matchers (1.0.0)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -231,11 +232,11 @@ GEM
less-rails (~> 2.1.0)
railties
tzinfo (0.3.31)
- uglifier (1.2.1)
+ uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- vcr (1.11.3)
- vegas (0.1.8)
+ vcr (2.0.0.rc1)
+ vegas (0.1.11)
rack (>= 1.0.0)
webmock (1.7.10)
addressable (~> 2.2, > 2.2.5)
@@ -248,7 +249,7 @@ PLATFORMS
DEPENDENCIES
airbrake
capistrano (~> 2.10.0.pre)
- coffee-rails (~> 3.1.1)
+ coffee-rails (~> 3.2.1)
database_cleaner
dotiw
factory_girl_rails
@@ -267,19 +268,21 @@ DEPENDENCIES
jquery-rails
kaminari
marked
+ mysql2
omniauth-github
open4
permanent_records
- rails (= 3.1.3)
+ rails (~> 3.2)
rb-fsevent
resque
+ resque_spec
rspec-rails
- sass-rails (~> 3.1.5)
+ sass-rails (~> 3.2.3)
shoulda-matchers
simple_form!
sqlite3
twitter-bootstrap-rails
uglifier (>= 1.0.3)
- vcr
+ vcr (~> 2.0.0.rc)
webmock
yajl-ruby
View
@@ -2,48 +2,6 @@
class Project < ActiveRecord::Base
- class CloneRepo
- @queue = :project
-
- def self.perform(project_id)
- project = Project.find(project_id)
- project.update_column :pull_in_progress, true
-
- Strano::Repo.clone project.url
-
- Project.update_all({:updated_at => Time.now,
- :cloned_at => Time.now,
- :pulled_at => Time.now,
- :pull_in_progress => false},
- :id => project_id)
- end
- end
-
- class PullRepo
- @queue = :project
-
- def self.perform(project_id)
- project = Project.find(project_id)
- project.update_column :pull_in_progress, true
-
- Strano::Repo.pull project.url
-
- Project.update_all({:updated_at => Time.now,
- :pulled_at => Time.now,
- :pull_in_progress => false},
- :id => project_id)
- end
- end
-
- class RemoveRepo
- @queue = :project
-
- def self.perform(project_id)
- Strano::Repo.remove Project.unscoped.find(project_id).url
- end
- end
-
-
# The github data will be serialzed as a Hash.
serialize :github_data
Oops, something went wrong.

0 comments on commit 5e74932

Please sign in to comment.