Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into develop

Conflicts:
	Gemfile.lock
  • Loading branch information...
commit a0e15332f4d8de9987946810dea10ef1edda8389 2 parents 8254550 + 9def6d8
David Davis authored
3  .travis.yml
View
@@ -20,5 +20,4 @@ before_script:
notifications:
email:
- - kbennoune@gmail.com
- - ddavis1@gmail.com
+ - rubeque@scimedsolutions.com
12 Gemfile
View
@@ -4,8 +4,8 @@ source 'http://rubygems.org'
ruby "1.9.3"
gem "rails", "~> 3.2.2"
-gem "mongoid", "~> 2.4"
gem "bson_ext", "~> 1.5"
+gem "mongoid", "~> 2.4.12"
gem "coderay", "~> 1.0.5"
gem 'fakefs', :require => "fakefs/safe"
gem 'jquery-rails'
@@ -53,14 +53,10 @@ end
# gem 'ruby-debug19', :require => 'ruby-debug'
group :test, :development do
- gem 'cucumber-rails'
- gem 'database_cleaner'
- gem 'capybara'
gem 'rspec-rails', "~> 2.8"
# Pretty printed test output
gem 'turn', '0.8.2', :require => false
gem 'launchy'
- gem 'selenium-webdriver'
gem 'awesome_print'
gem 'interactive_editor'
end
@@ -71,3 +67,9 @@ group :development do
gem 'heroku'
gem 'pry-rails'
end
+
+group :test do
+ gem 'cucumber-rails'
+ gem 'database_cleaner'
+ gem 'capybara'
+end
10 Gemfile.lock
View
@@ -49,11 +49,9 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.4)
+ childprocess (0.3.5)
ffi (~> 1.0, >= 1.0.6)
chosen-rails (0.9.8.1)
- railties (~> 3.0)
- thor (~> 0.14)
coderay (1.0.7)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -96,7 +94,8 @@ GEM
fakefs (0.4.0)
faraday (0.8.1)
multipart-post (~> 1.1)
- ffi (1.1.0)
+ rack (~> 1.1)
+ ffi (1.1.4)
gherkin (2.11.1)
json (>= 1.4.6)
hashie (1.2.0)
@@ -301,7 +300,7 @@ DEPENDENCIES
jquery-rails
kaminari
launchy
- mongoid (~> 2.4)
+ mongoid (~> 2.4.12)
mongoid-history
newrelic_rpm
omniauth (~> 1.0.1)
@@ -315,7 +314,6 @@ DEPENDENCIES
rspec-rails (~> 2.8)
rubyheap (~> 0.1.2)
sass-rails (~> 3.2.3)
- selenium-webdriver
sicuro (~> 0.3.0)
turn (= 0.8.2)
twitter
2  README.md
View
@@ -1,4 +1,4 @@
-# Rubeque [![Build Status](https://secure.travis-ci.org/daviddavis/rubeque.png)](http://travis-ci.org/daviddavis/rubeque)
+# Rubeque [![Build Status](https://secure.travis-ci.org/SciMed/rubeque.png)](http://travis-ci.org/SciMed/rubeque)
Rubeque is an interactive problem website for learning Ruby.
39 app/views/static/ad.html.erb
View
@@ -0,0 +1,39 @@
+<h1>SciMed Solutions Looking for Developer</h1>
+
+<p>At SciMed Solutions, based in Durham, NC, we are passionate about much more
+ than exchanging and growing Ruby knowledge. SciMed's mission is to craft
+ software that frees our clients to do what they do best: advance cutting-edge
+ technology, improve lives, and effect social change. Our focus is to help the
+ medical, scientific, and academic communities achieve success by removing
+ obstacles and allowing them the freedom to streamline operations and
+ concentrate on their work.
+</p>
+
+<p>We are looking for someone equally passionate as well as self-motivated,
+ disciplined, driven, a decision-maker, and a team player. We want developers
+ who are not solely driven by personal success, but are invested in the succes
+ of the team.
+</p>
+
+<p>Although this position is for a Ruby on Rails developer, Ruby experience is
+ not required. If you have a 4 year degree, are a talented coder, can work
+ quickly, and work across multiple technologies and projects, we'll train you
+ on Ruby. We'll start your training with Rubeque. Solve a few problems and let
+ us see how you do.
+</p>
+
+<p>Experience or understanding of Agile development, experience in coding
+ technologies such as PHP, Python, Perl, .NET, JSP, XML, JavaScript, or AJAX
+ are a plus. The best applicants will bring valuable skills beyond computer
+ science and software engineering.
+</p>
+
+<p>We strive to find the best fit for every employee and value personal growth.
+ If you are interested in working in Durham, NC, in an environment of
+ accuracy, teamwork, openness, respect, and would like to limit your work week
+ to 40 hours, apply today. Send your resume, cover letter, and top three Rubeque
+ solutions to
+ <%= link_to "employment@scimedsolutions.com", "mailto:employment@scimedsolutions.com" %>.
+</p>
+
+
2  app/views/static/home.html.erb
View
@@ -19,7 +19,7 @@
are posted on a regular basis. Good luck!</p>
<div class="ad">
- <p>Interested in learning a functional programming language? Check out <%= link_to "4clojure.com", "http://4clojure.com" %>.</p>
+ <p>Interested in programming for the company responsible for Rubeque? <%= link_to "SciMed Solutions is hiring", ad_path %>.</p>
</div>
</div>
</div>
1  config/routes.rb
View
@@ -24,6 +24,7 @@
match 'help' => 'static#help', :via => :get, :as => :help
match 'problem_submission' => "static#problem_submission", via: :get, as: "submission_help"
match "admin" => "static#admin", as: "admin"
+ match "ad" => "static#ad", as: "ad"
get "cheating", as: :cheating, controller: :cheating, action: :index
2  features/support/local_env.rb
View
@@ -1,4 +1,4 @@
-# require 'ruby-debug' # this breaks travis ci
+require 'debugger'
Before('@javascript') do
@javascript = true
Please sign in to comment.
Something went wrong with that request. Please try again.