Skip to content
Browse files

merged stuff

  • Loading branch information...
2 parents a5c1e67 + cfa934a commit 0028480d96684a8a30e704906e090d3ff40cfb42 @gnarmis committed May 14, 2012
Showing with 32 additions and 25 deletions.
  1. +3 −0 .bundle/config
  2. +1 −2 .gitignore
  3. +1 −0 .rvmrc
  4. +6 −3 Gemfile
  5. +1 −0 Procfile
  6. +1 −0 Procfile.dev
  7. +14 −16 README.md
  8. +5 −4 Rakefile
  9. BIN vendor/cache/addressable-2.2.8.gem
  10. BIN vendor/cache/backports-2.5.3.gem
  11. BIN vendor/cache/capybara-1.1.2.gem
  12. BIN vendor/cache/childprocess-0.3.2.gem
  13. BIN vendor/cache/coderay-1.0.6.gem
  14. BIN vendor/cache/daemons-1.1.8.gem
  15. BIN vendor/cache/diff-lcs-1.1.3.gem
  16. BIN vendor/cache/em-http-request-1.0.0.gem
  17. BIN vendor/cache/em-resolv-replace-1.1.2.gem
  18. BIN vendor/cache/em-socksify-0.1.0.gem
  19. BIN vendor/cache/em-synchrony-1.0.0.gem
  20. BIN vendor/cache/eventmachine-1.0.0.beta.3.gem
  21. BIN vendor/cache/faraday-0.8.0.gem
  22. BIN vendor/cache/ffi-1.0.11.gem
  23. BIN vendor/cache/foreman-0.46.0.gem
  24. BIN vendor/cache/http_parser.rb-0.5.3.gem
  25. BIN vendor/cache/libwebsocket-0.1.3.gem
  26. BIN vendor/cache/logger-1.2.8.gem
  27. BIN vendor/cache/method_source-0.7.1.gem
  28. BIN vendor/cache/mime-types-1.18.gem
  29. BIN vendor/cache/multi_json-1.3.5.gem
  30. BIN vendor/cache/multipart-post-1.1.5.gem
  31. BIN vendor/cache/nokogiri-1.5.2.gem
  32. BIN vendor/cache/pry-0.9.9.6.gem
  33. BIN vendor/cache/rack-1.4.1.gem
  34. BIN vendor/cache/rack-fiber_pool-0.9.2.gem
  35. BIN vendor/cache/rack-protection-1.2.0.gem
  36. BIN vendor/cache/rack-test-0.6.1.gem
  37. BIN vendor/cache/rspec-2.10.0.gem
  38. BIN vendor/cache/rspec-core-2.10.0.gem
  39. BIN vendor/cache/rspec-expectations-2.10.0.gem
  40. BIN vendor/cache/rspec-mocks-2.10.1.gem
  41. BIN vendor/cache/rubyzip-0.9.8.gem
  42. BIN vendor/cache/selenium-webdriver-2.21.2.gem
  43. BIN vendor/cache/shotgun-0.9.gem
  44. BIN vendor/cache/simplecov-0.6.4.gem
  45. BIN vendor/cache/simplecov-html-0.5.3.gem
  46. BIN vendor/cache/sinatra-1.3.2.gem
  47. BIN vendor/cache/sinatra-contrib-1.3.1.gem
  48. BIN vendor/cache/sinatra-synchrony-0.3.0.gem
  49. BIN vendor/cache/slop-2.4.4.gem
  50. BIN vendor/cache/thin-1.3.1.gem
  51. BIN vendor/cache/thor-0.15.2.gem
  52. BIN vendor/cache/tilt-1.3.3.gem
  53. BIN vendor/cache/xpath-0.1.4.gem
View
3 .bundle/config
@@ -0,0 +1,3 @@
+---
+BUNDLE_PATH: vendor
+BUNDLE_DISABLE_SHARED_GEMS: '1'
View
3 .gitignore
@@ -1,4 +1,3 @@
*.log
coverage
-.yardoc
-doc
+vendor/ruby
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm ruby-1.9.3
View
9 Gemfile
@@ -1,15 +1,18 @@
source :rubygems
-gem 'rack'
-gem 'sinatra'
-gem 'sinatra-synchrony'
+gem 'sinatra', :require => 'sinatra/base'
+gem 'sinatra-contrib', :require => 'sinatra/contrib'
+gem 'sinatra-synchrony', :require => "sinatra/synchrony"
+gem 'thin'
gem 'faraday'
group :development do
gem 'thin'
gem 'pry'
gem 'logger'
gem 'shotgun'
+ gem 'foreman'
+ gem 'pry', :require => "pry"
end
group :test do
View
1 Procfile
@@ -0,0 +1 @@
+web: bundle exec thin start -p $PORT -e $RACK_ENV
View
1 Procfile.dev
@@ -0,0 +1 @@
+web: bundle exec thin start -p 9292 -e development
View
30 README.md
@@ -10,37 +10,35 @@ Want to just dive into development without browsing around for a while and setti
## Usage
-- clone this repository
+- Install RVM and ruby-1.9.3
-- using RVM, install/use 1.9.2 (`rvm install 1.9.2`, `rvm use 1.9.2`). 1.9.3 doesn't play nice with EventMachine or Thin.
+- Clone this repository
-- create an RVM gemset
+- Run `bundle install --path vendor/ruby`. Later, add gems you need to Gemfile, run `bundle install`, and Bundler will install and package up your new gems too.
-- run `bundle install` (add other gems you may need to the Gemfile beforehand)
+- Start building your project
-- start building your project
+- Modify your app routes in `config.ru`
-- modify your app routes in `config.ru`
+- Add background processes and basically any process you need to run to start your app in Procfile.dev.
-- add specs in spec/
+- Procfile has been provided to allow you to easily deploy this on Heroku's Cedar stack. If you're only using Sinatra, it should be sufficient. Also, Sinatra-synchrony will speed your app up decently :)
-- `rackup` to run your app; `rake r` to run it with auto-reloading
+- Add specs in spec/
-- bump version number in lib/project.rb
+- `rake s` to run your app
+
+- Bump version number in lib/project.rb
You can add your own Rack-based frameworks in their own folders under `lib/`, putting your classes (which sub-class your favorite framework) under the main module (by default, it's called `Project`). Then, update `config.ru` and you're good to go!
## Development
-- run `rake` or `rake help` to see available tasks
-
-- run `rake r` to start the server with auto-reloading
-
-- run `rake console` for IRB console and `rake pry` for Pry console
+- Run `rake` or `rake help` to see available tasks
-- run `rake spec` for testing
+- Insert `binding.pry` anywhere in your code to invoke the Pry REPL, which you can use for debugging purposes.
-- run `rake coverage` to generate coverage reports
+- There's simple logging and an example of a Capybara test you can look at in this template.
## Thanks
View
9 Rakefile
@@ -2,10 +2,11 @@ require 'rspec/core/rake_task'
task :default => :help
-desc "Run with auto-reloading"
-task :r do
- sh "shotgun config.ru"
+desc "Run app using foreman and Procfile.dev"
+task :start do
+ sh "bundle exec foreman start -f Procfile.dev"
end
+task :s => :start
desc "Run specs"
task :spec do
@@ -37,7 +38,7 @@ end
desc "Show help menu"
task :help do
puts "Available rake tasks: "
- puts "rake r - Run with auto-reloading"
+ puts "rake start, rake s - Run app using foreman and Procfile.dev"
puts "rake console - Run a IRB console with the enviroment loaded"
puts "rake pry - Run a Pry console with the enviroment loaded"
puts "rake spec - Run specs"
View
BIN vendor/cache/addressable-2.2.8.gem
Binary file not shown.
View
BIN vendor/cache/backports-2.5.3.gem
Binary file not shown.
View
BIN vendor/cache/capybara-1.1.2.gem
Binary file not shown.
View
BIN vendor/cache/childprocess-0.3.2.gem
Binary file not shown.
View
BIN vendor/cache/coderay-1.0.6.gem
Binary file not shown.
View
BIN vendor/cache/daemons-1.1.8.gem
Binary file not shown.
View
BIN vendor/cache/diff-lcs-1.1.3.gem
Binary file not shown.
View
BIN vendor/cache/em-http-request-1.0.0.gem
Binary file not shown.
View
BIN vendor/cache/em-resolv-replace-1.1.2.gem
Binary file not shown.
View
BIN vendor/cache/em-socksify-0.1.0.gem
Binary file not shown.
View
BIN vendor/cache/em-synchrony-1.0.0.gem
Binary file not shown.
View
BIN vendor/cache/eventmachine-1.0.0.beta.3.gem
Binary file not shown.
View
BIN vendor/cache/faraday-0.8.0.gem
Binary file not shown.
View
BIN vendor/cache/ffi-1.0.11.gem
Binary file not shown.
View
BIN vendor/cache/foreman-0.46.0.gem
Binary file not shown.
View
BIN vendor/cache/http_parser.rb-0.5.3.gem
Binary file not shown.
View
BIN vendor/cache/libwebsocket-0.1.3.gem
Binary file not shown.
View
BIN vendor/cache/logger-1.2.8.gem
Binary file not shown.
View
BIN vendor/cache/method_source-0.7.1.gem
Binary file not shown.
View
BIN vendor/cache/mime-types-1.18.gem
Binary file not shown.
View
BIN vendor/cache/multi_json-1.3.5.gem
Binary file not shown.
View
BIN vendor/cache/multipart-post-1.1.5.gem
Binary file not shown.
View
BIN vendor/cache/nokogiri-1.5.2.gem
Binary file not shown.
View
BIN vendor/cache/pry-0.9.9.6.gem
Binary file not shown.
View
BIN vendor/cache/rack-1.4.1.gem
Binary file not shown.
View
BIN vendor/cache/rack-fiber_pool-0.9.2.gem
Binary file not shown.
View
BIN vendor/cache/rack-protection-1.2.0.gem
Binary file not shown.
View
BIN vendor/cache/rack-test-0.6.1.gem
Binary file not shown.
View
BIN vendor/cache/rspec-2.10.0.gem
Binary file not shown.
View
BIN vendor/cache/rspec-core-2.10.0.gem
Binary file not shown.
View
BIN vendor/cache/rspec-expectations-2.10.0.gem
Binary file not shown.
View
BIN vendor/cache/rspec-mocks-2.10.1.gem
Binary file not shown.
View
BIN vendor/cache/rubyzip-0.9.8.gem
Binary file not shown.
View
BIN vendor/cache/selenium-webdriver-2.21.2.gem
Binary file not shown.
View
BIN vendor/cache/shotgun-0.9.gem
Binary file not shown.
View
BIN vendor/cache/simplecov-0.6.4.gem
Binary file not shown.
View
BIN vendor/cache/simplecov-html-0.5.3.gem
Binary file not shown.
View
BIN vendor/cache/sinatra-1.3.2.gem
Binary file not shown.
View
BIN vendor/cache/sinatra-contrib-1.3.1.gem
Binary file not shown.
View
BIN vendor/cache/sinatra-synchrony-0.3.0.gem
Binary file not shown.
View
BIN vendor/cache/slop-2.4.4.gem
Binary file not shown.
View
BIN vendor/cache/thin-1.3.1.gem
Binary file not shown.
View
BIN vendor/cache/thor-0.15.2.gem
Binary file not shown.
View
BIN vendor/cache/tilt-1.3.3.gem
Binary file not shown.
View
BIN vendor/cache/xpath-0.1.4.gem
Binary file not shown.

0 comments on commit 0028480

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