Skip to content
Browse files

lots of changes; added new rake tasks, updated Gemfile, updated gitig…

…nore, added Procfiles
  • Loading branch information...
1 parent 78d32cb commit 2f6a80d1c5378cac2c0cc525a28f4eaa2529c3af @gnarmis committed
Showing with 19 additions and 22 deletions.
  1. +3 −0 .bundle/config
  2. +1 −2 .gitignore
  3. +7 −7 Gemfile
  4. +1 −0 Procfile
  5. +1 −0 Procfile.dev
  6. +5 −11 Rakefile
  7. +1 −2 config.ru
  8. BIN vendor/cache/addressable-2.2.8.gem
  9. BIN vendor/cache/backports-2.5.3.gem
  10. BIN vendor/cache/capybara-1.1.2.gem
  11. BIN vendor/cache/childprocess-0.3.2.gem
  12. BIN vendor/cache/coderay-1.0.6.gem
  13. BIN vendor/cache/daemons-1.1.8.gem
  14. BIN vendor/cache/diff-lcs-1.1.3.gem
  15. BIN vendor/cache/em-http-request-1.0.0.gem
  16. BIN vendor/cache/em-resolv-replace-1.1.2.gem
  17. BIN vendor/cache/em-socksify-0.1.0.gem
  18. BIN vendor/cache/em-synchrony-1.0.0.gem
  19. BIN vendor/cache/eventmachine-1.0.0.beta.3.gem
  20. BIN vendor/cache/faraday-0.8.0.gem
  21. BIN vendor/cache/ffi-1.0.11.gem
  22. BIN vendor/cache/foreman-0.46.0.gem
  23. BIN vendor/cache/http_parser.rb-0.5.3.gem
  24. BIN vendor/cache/libwebsocket-0.1.3.gem
  25. BIN vendor/cache/logger-1.2.8.gem
  26. BIN vendor/cache/method_source-0.7.1.gem
  27. BIN vendor/cache/mime-types-1.18.gem
  28. BIN vendor/cache/multi_json-1.3.5.gem
  29. BIN vendor/cache/multipart-post-1.1.5.gem
  30. BIN vendor/cache/nokogiri-1.5.2.gem
  31. BIN vendor/cache/pry-0.9.9.6.gem
  32. BIN vendor/cache/rack-1.4.1.gem
  33. BIN vendor/cache/rack-fiber_pool-0.9.2.gem
  34. BIN vendor/cache/rack-protection-1.2.0.gem
  35. BIN vendor/cache/rack-test-0.6.1.gem
  36. BIN vendor/cache/rspec-2.10.0.gem
  37. BIN vendor/cache/rspec-core-2.10.0.gem
  38. BIN vendor/cache/rspec-expectations-2.10.0.gem
  39. BIN vendor/cache/rspec-mocks-2.10.1.gem
  40. BIN vendor/cache/rubyzip-0.9.8.gem
  41. BIN vendor/cache/selenium-webdriver-2.21.2.gem
  42. BIN vendor/cache/shotgun-0.9.gem
  43. BIN vendor/cache/simplecov-0.6.4.gem
  44. BIN vendor/cache/simplecov-html-0.5.3.gem
  45. BIN vendor/cache/sinatra-1.3.2.gem
  46. BIN vendor/cache/sinatra-contrib-1.3.1.gem
  47. BIN vendor/cache/sinatra-synchrony-0.3.0.gem
  48. BIN vendor/cache/slop-2.4.4.gem
  49. BIN vendor/cache/thin-1.3.1.gem
  50. BIN vendor/cache/thor-0.15.2.gem
  51. BIN vendor/cache/tilt-1.3.3.gem
  52. 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,5 +1,4 @@
*.lock
*.log
coverage
-.yardoc
-doc
+vendor/ruby
View
14 Gemfile
@@ -1,15 +1,17 @@
source :rubygems
-gem 'rack'
-gem 'rack'
-gem 'sinatra'
-gem 'data_mapper', '1.2.0'
-#gem 'dm-sqlite-adaptor', '1.2.0'
+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 'pry'
gem 'logger'
gem 'shotgun'
+ gem 'foreman'
+ gem 'pry'
end
group :test do
@@ -17,6 +19,4 @@ group :test do
gem 'rack-test', :require => "rack/test"
gem 'capybara', :require => "capybara/rspec"
gem 'simplecov', :require => false
- gem 'redcarpet'
- gem 'yard'
end
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
16 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
@@ -22,13 +23,6 @@ task :coverage do
sh "rspec -r spec_helper"
end
-desc "Produce documentation using YARD"
-task :doc do
- sh "rm -rf doc/*"
- ENV['DOC'] = "true"
- sh "yard doc"
-end
-
desc "Run IRB console with app environment"
task :console do
puts "Loading development console..."
@@ -44,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
3 config.ru
@@ -1,6 +1,5 @@
require File.dirname(__FILE__) + '/config/boot.rb'
run Rack::URLMap.new({
- "/" => Project::Foo,
- "/foo" => Project::FooAPI
+ "/" => Project::Foo
})
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 2f6a80d

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