Skip to content
Browse files

Updated README for CIM, Fixed bug in the Rakefile for running sinatra

  • Loading branch information...
1 parent 36a51c5 commit 159020104198a298abec62a7f408e3f5f7b22e21 @trevmex trevmex committed Jan 9, 2012
Showing with 47 additions and 4 deletions.
  1. +43 −0 Gemfile.lock
  2. +2 −2 README.md
  3. +2 −2 Rakefile
View
43 Gemfile.lock
@@ -0,0 +1,43 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ diff-lcs (1.1.3)
+ ffi (1.0.11)
+ guard (0.10.0)
+ ffi (>= 0.5.0)
+ thor (~> 0.14.6)
+ guard-rspec (0.6.0)
+ guard (>= 0.10.0)
+ highline (1.6.9)
+ rack (1.4.0)
+ rack-protection (1.2.0)
+ rack
+ rake (0.9.2.2)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.8.0)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ thor (0.14.6)
+ tilt (1.3.3)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ guard
+ guard-rspec
+ highline
+ rake
+ rb-fchange
+ rb-notifu
+ rspec
+ sinatra
+ win32console
View
4 README.md
@@ -119,7 +119,7 @@ Push all your committed changes to your git repository `week-02-YOURNAME`
#### Finding a Victim / Being a Victim
-Find another student in class: that is seated near you; through Hipchat; or through our [Github organization](https://github.com/organizations/UWE-Ruby/teams/90635). Ask them to fork, clone and fix your repository. You should do the same for them.
+Find another student in class: that is seated near you or through our [Github organization](https://github.com/organizations/CIM-Ruby/teams/125764). Ask them to fork, clone and fix your repository. You should do the same for them. (If you are NOT doing this exercise in class, message me (trevmex) and I'll do it with you. You can get mine at [my Github repo](https://github.com/trevmex/week-02-Trevor).)
For your friends repository that you are creating a fix for the failing test it is time to open up a [Pull Request](http://help.github.com/send-pull-requests/). A pull request is initiated from your repository and send to the person's repository that you originally forked.
@@ -275,4 +275,4 @@ $ ruby lib/sinatra.rb
It should launch a website on `localhost:4567` that if you visit in your browser. When that is working for you open up `lib/sinatra.rb` and look at the syntax. Again this strange sense of deja-vu when looking at the code.
-Look at the [documentation](http://www.sinatrarb.com/intro.html) and create some of your own routes and play with parameters.
+Look at the [documentation](http://www.sinatrarb.com/intro.html) and create some of your own routes and play with parameters.
View
4 Rakefile
@@ -9,10 +9,10 @@ end
desc "Run the sample Sinatra sample"
task :sinatra do
- system "bundle exec sinatra lib/sinatra.rb"
+ system "bundle exec ruby lib/sinatra.rb"
end
desc "Run the HighLine sample"
task :highline do
system "bundle exec ruby lib/highline.rb"
-end
+end

0 comments on commit 1590201

Please sign in to comment.
Something went wrong with that request. Please try again.