socks 0.0.8.beta → 0.1.8.beta

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - rbx-19mode
 notifications:
   recipients:
     - main@seven7.flowdock.com

data/CHANGELOG

@@ -1,3 +1,7 @@
+- 0.1.8.beta
+	* Setup RSpec as default test framework
+	* Get simple RSpec tests using Rack operating
+
 - 0.0.8.beta
 	* Bug fixes
 	* Cleanup

data/README.md

@@ -49,6 +49,27 @@ Take a look, you should see the following text appear in your web browser:
 
     This is my first Socks app!
 
+## Adding tests for Socks apps
+
+Socks comes with built-in support for RSpec matchers and DSL. It also comes with a built-in `spec_helper.rb` in the `spec/`directory.
+
+Paste in the following to test the simple Socks app in the quickstart:
+
+```ruby
+require 'spec_helper'
+require File.expand_path("../../config/router.rb", __FILE__)
+
+describe Myapp::Router do
+  let(:request) { Rack::MockRequest.new(Myapp::Router) }
+
+  it 'returns something at /' do
+    request.get('/').should == "This is my first Socks app!"
+  end
+  
+  end
+end
+```
+
 ## Contributing
 
 1. Fork it
@@ -61,6 +82,8 @@ Take a look, you should see the following text appear in your web browser:
 
 See LICENSE (MIT).
 
+[More on MIT »](http://www.opensource.org/licenses/MIT)
+
 ## TODO
 
 See TODO.md

data/bin/socks

@@ -69,8 +69,10 @@ gem \"http_router\"
 # Use Warden for authentication
 # gem \"warden\"
 
-# Use RSpec for tests
-gem \"rspec\""
+group :development, :test do
+  # Use RSpec for tests
+  gem \"rspec\"
+end"
 
     rakefile = "# Socks generates many helpful Rake tasks for you!
 require \"socks\"
@@ -91,15 +93,28 @@ module #{app.capitalize}
 end
     "
 
+    ########################
+    # Spec-helper template #
+    ########################
+    
+    spec_helper = "# Default helpers for your specs are added here
+require \"rspec\"
+require \"rack\"
+"
+
+  dotrspec = "--color
+  --format documentation"
+    
+
     # -------------------------------------------------------------------------
     #                                Creation                                 |
     # ------------------------------------------------------------------------- 
 
     FileUtils.mkdir app
     FileUtils.cd app
-    FileUtils.mkdir %w( app config )
+    FileUtils.mkdir %w( app config spec )
     FileUtils.mkdir %w( app/controllers app/views ) # Sub-dirs
-    FileUtils.touch %w( config.ru Gemfile Rakefile .gitignore Procfile )
+    FileUtils.touch %w( spec/spec_helper.rb .rspec ) # Spec file(s)
 
     # -------------------------------------------------------------------------
     #                           File Initialization                           |
@@ -117,6 +132,9 @@ end
 
     system("echo '#{router_template}' >> config/router.rb")
 
+    system("echo '#{spec_helper}' >> spec/spec_helper.rb")
+    system("echo '#{dotrspec}' >> .rspec")
+
     system("bundle")
 
   end
@@ -157,6 +175,14 @@ command :start do |c|
   end
 end
 
+command :test do |c|
+  c.syntax = 'socks test [options]'
+  c.description = 'Run tests with RSpec'
+  c.action do |args, options|
+    system('rspec .')
+  end
+end
+
 command :version do |c|
   c.syntax = 'socks version [options]'
   c.description = 'Display the current version (altertative to --version)'

data/lib/socks/version.rb

@@ -1,3 +1,3 @@
 module Socks
-  VERSION = "0.0.8.beta"
+  VERSION = "0.1.8.beta"
 end

data/socks.gemspec

@@ -14,14 +14,13 @@ Gem::Specification.new do |gem|
   gem.name          = "socks"
   gem.require_paths = ["lib"]
   gem.version       = Socks::VERSION
-
-  # Rack HTTP
-  gem.add_dependency "rack"
+ 
+  gem.add_dependency "rack" # Rack HTTP
   gem.add_dependency "http_router"
   gem.add_dependency "commander" # For command-line app
+    gem.add_dependency "rspec" # Default testing framework
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
   gem.add_development_dependency "guard"
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "debugger"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socks
 version: !ruby/object:Gem::Version
-  version: 0.0.8.beta
+  version: 0.1.8.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -60,14 +60,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: