tux 0.1.0 → 0.2.0

data/.gemspec

@@ -9,12 +9,13 @@ Gem::Specification.new do |s|
   s.email       = "gabriel.horner@gmail.com"
   s.homepage    = "http://github.com/cldwalker/tux"
   s.summary = "Sinatra dressed for interactive ruby - a sinatra shell"
-  s.description =  "Tux dresses up sinatra for interactive use. Use it to interact with your helpers, view rendering and your app's response objects. Tux also gives you commands to view your app's routes and settings."
+  s.description =  "Tux dresses up sinatra in a shell. Use it to interact with your helpers, view rendering and your app's response objects. Tux also gives you commands to view your app's routes and settings."
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = 'tagaholic'
   s.executables = ['tux']
-  s.add_dependency 'ripl', '>= 0.3.4'
-  s.add_dependency 'ripl-rack', '>= 0.1.0'
+  s.add_dependency 'ripl', '>= 0.3.5'
+  s.add_dependency 'ripl-rack', '>= 0.2.0'
+  s.add_dependency 'ripl-multi_line', '>= 0.2.4'
   s.add_dependency 'sinatra', '>= 1.2.1'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]

data/CHANGELOG.rdoc

@@ -1,2 +1,7 @@
+== 0.2.0
+* Add -c option
+* Add better ripl-rack integration
+* Add multi-line support
+
 == 0.1.0
 * Initial release!

data/README.rdoc

@@ -1,5 +1,5 @@
 == Description
-Tux dresses up sinatra for interactive use. Use it to interact with your helpers, view rendering and
+Tux dresses up sinatra in a shell. Use it to interact with your helpers, view rendering and
 your app's response objects. Tux also gives you commands to view your app's routes and settings.
 
 == Install
@@ -9,9 +9,16 @@ Install the gem with:
 
 == Usage
 
+Start with:
+
+    $ tux
+
+If your app's config file isn't config.ru, specify with -c
+
+    $ tux -c app.ru
+
 To interact with your helpers:
 
-    $ tux.uri
     >> app.my_helper_method
     ...
 
@@ -27,7 +34,7 @@ methods:
     => {"Content-Type"=>"text/html"}
 
 For the above to work, tux sets up default empty request and response objects. To try the helpers
-with your own requests and responses:
+with custom requests and responses:
 
     >> app.request = Sinatra::Request.new({})
     >> app.response = Sinatra::Response.new
@@ -37,9 +44,34 @@ To interact with your views:
     >> app.erb :my_template
     => 'template rendered'
 
+    # also
+    >> app.haml
+    >> app.markdown
+    ...
+
+Tux let's you you make requests and interact with rack response objects thanks to
+{rack-test}[https://github.com/brynary/rack-test]:
+
+    >> get '/'
+    => #<Rack::MockResponse:0x13d452c @headers={"Content-Type"=>"text/html;charset=utf-8",
+    "Content-Length"=>"4"}, @errors="127.0.0.1 - - [05/Apr/2011 02:22:27] \"GET / \" 200 4
+    0.0015\n", @status=200, @original_headers={"Content-Type"=>"text/html;charset=utf-8",
+    "Content-Length"=>"4"}, @body="dude">
+
+    >> puts last_response.body
+    dude
+
+    >> post '/create'
+    ...
+
+To see the full list of rack-test actions you can make
+
+    >> rack.actions
+    => [:request, :get, :post, :put, :delete, :head, :follow_redirect!, :header, :set_cookie,
+    :clear_cookies, :authorize, :basic_authorize, :digest_authorize, :last_response, :last_request]
+
 Tux also comes with commands to give you a good overview of your app
 
-    $ tux
     >> routes
     HEAD  "/"
     HEAD  /book/:id
@@ -74,6 +106,11 @@ Tux also comes with commands to give you a good overview of your app
     static              true
     views               "/my/path/views"
 
+== Configure
+
+Since tux is a {ripl shell}[http://github.com/cldwalker/ripl], tux is highly configurable. You can
+create tux commands in the format tux-COMMAND and enhance your shell by adding ripl plugins to
+~/.riplrc. Read {ripl's readme}[http://github.com/cldwalker/ripl#readme] for more.
+
 == TODO
-* Better integration with ripl-rack
 * Tests

data/bin/tux

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'ripl'
-require 'ripl/rack'
 require 'tux'
+require 'tux/rack'
 require 'tux/runner'
+require 'ripl/multi_line' unless ENV['NO_RIPL_MULTI_LINE']
 Tux::Runner.run

data/deps.rip

@@ -1,3 +1,4 @@
-ripl >=0.3.4
-ripl-rack >=0.1.0
+ripl >=0.3.5
+ripl-rack >=0.2.0
+ripl-multi_line >=0.2.4
 sinatra >=1.2.1

data/lib/tux.rb

@@ -1,5 +1,7 @@
-require 'tux/commands'
+require 'ripl'
 require 'tux/version'
+require 'tux/commands'
+Ripl::Commands.include Tux::CommandsFormatted, Tux::Commands
 
 module Tux
   def self.app_class

data/lib/tux/commands.rb

@@ -1,5 +1,3 @@
-require 'ripl'
-
 module Tux
   module Commands
     SETTINGS = %w{methodoverride inline_templates}
@@ -45,4 +43,3 @@ module Tux
     end
   end
 end
-Ripl::Commands.include Tux::CommandsFormatted, Tux::Commands

data/lib/tux/rack.rb

@@ -0,0 +1,3 @@
+require 'ripl/rack'
+Ripl.config[:rackit] = true
+Ripl::Rack::App::MESSAGE.replace "No Sinatra application found. Specify the app's config file with tux -c."

data/lib/tux/runner.rb

@@ -1,5 +1,14 @@
 module Tux
   class Runner < Ripl::Runner
     self.app = 'tux'
+    add_options ['-c, --config FILE', 'Set rack config file i.e. config.ru']
+
+    def self.parse_option(option, argv)
+      if option[/(?:-c|--config)=?(.*)/]
+        ENV['RACK_CONFIG'] = $1.empty? ? argv.shift.to_s : $1
+      else
+        super
+      end
+    end
   end
 end

data/lib/tux/version.rb

@@ -1,3 +1,3 @@
 module Tux
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tux
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -04:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 3
-        - 4
-        version: 0.3.4
+        - 5
+        version: 0.3.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,18 +42,34 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: ripl-multi_line
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 2
+        - 4
+        version: 0.2.4
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,8 +81,8 @@ dependencies:
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id003
-description: Tux dresses up sinatra for interactive use. Use it to interact with your helpers, view rendering and your app's response objects. Tux also gives you commands to view your app's routes and settings.
+  version_requirements: *id004
+description: Tux dresses up sinatra in a shell. Use it to interact with your helpers, view rendering and your app's response objects. Tux also gives you commands to view your app's routes and settings.
 email: gabriel.horner@gmail.com
 executables: 
 - tux
@@ -77,6 +93,7 @@ extra_rdoc_files:
 - LICENSE.txt
 files: 
 - lib/tux/commands.rb
+- lib/tux/rack.rb
 - lib/tux/runner.rb
 - lib/tux/version.rb
 - lib/tux.rb