update from master

jasnow · Oct 13, 2012 · c5dfd99 · c5dfd99
2 parents 6d39e00 + 8c15edf
commit c5dfd99
Show file tree

Hide file tree

Showing 34 changed files with 364 additions and 11,929 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,7 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+
+# Test stuff
+/coverage
+/spec/rspec_report.html
diff --git a/.rspec b/.rspec
@@ -0,0 +1,3 @@
+--colour
+--format progress
+--format html -o "spec/rspec_report.html"
diff --git a/.rvmrc b/.rvmrc
@@ -1 +1 @@
-rvm use --create ruby-1.9.3-p194@contrib-hub
+rvm use --create 1.9.3@contrib-hub
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+before_install:
+  - gem update --system
+  - gem --version
+env:
+  - RAILS=3.2.8
+script:
+  - RAILS_ENV=test bundle exec rake --trace db:migrate
+  - bundle exec rake db:test:prepare
+  - bundle exec rspec spec/
diff --git a/Gemfile b/Gemfile
@@ -32,6 +32,10 @@ end
 
 group :development, :test do
   gem 'sqlite3'
+
+  gem "rspec-rails", "~> 2.11.0"
+  gem "factory_girl_rails", "~> 4.1.0"
+  gem 'simplecov', :require => false
 end
 
 group :production do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -37,9 +37,15 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    factory_girl (4.1.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.1.0)
+      factory_girl (~> 4.1.0)
+      railties (>= 3.0.0)
     faraday (0.8.4)
       multipart-post (~> 1.1)
     geocoder (1.1.4)
@@ -117,19 +123,36 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
     sass (3.2.1)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
     thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
@@ -142,6 +165,7 @@ PLATFORMS
 
 DEPENDENCIES
   coffee-rails (~> 3.2.1)
+  factory_girl_rails (~> 4.1.0)
   geocoder
   github_api
   jquery-rails
@@ -150,6 +174,8 @@ DEPENDENCIES
   omniauth-github
   pg
   rails (= 3.2.8)
+  rspec-rails (~> 2.11.0)
   sass-rails (~> 3.2.3)
+  simplecov
   sqlite3
   uglifier (>= 1.0.3)
diff --git a/app/assets/images/github-admin.png b/app/assets/images/github-admin.png
diff --git a/app/assets/images/off.png b/app/assets/images/off.png
diff --git a/app/assets/images/on.png b/app/assets/images/on.png
diff --git a/app/assets/images/repo-icon.png b/app/assets/images/repo-icon.png
diff --git a/app/assets/javascripts/contribhub.js b/app/assets/javascripts/contribhub.js
@@ -0,0 +1,13 @@
+$(function() {
+  $('.repo-user-description').hide();
+
+  $('.expand-description').click(function() {
+    $(this).parents('li').find(".repo-user-description").toggle('fast')
+  })
+
+  $('.help-button').click(function(e) {
+    var repoName = $(this).attr('data-repo')
+    $.post("/repos/toggle_help", {repo: repoName});
+    e.preventDefault();
+  });
+})
diff --git a/app/assets/stylesheets/bootstrap.min.css b/app/assets/stylesheets/bootstrap.min.css
diff --git a/app/assets/stylesheets/bootstrap.minOLD.css b/app/assets/stylesheets/bootstrap.minOLD.css