remi-rackbox 1.1.4 → 1.1.5

data/README.markdown

@@ -87,21 +87,27 @@ on how things work in [Merb][] so I can duplicate any functionality I'm missing.
 `request` gives you a [`Rack::Response`](http://rack.rubyforge.org/doc/classes/Rack/Response.html) which has 
 `body`, `headers`, `status` methods ([and more](http://rack.rubyforge.org/doc/classes/Rack/Response.html))
 
+Script
+------
+
+[RackBox][] also comes with a `rackbox` script.
+
+    # prints usage ... this is all you really need  :)
+    $ rackbox
+
+    # prints out information about the app in the current directory (if found).
+    # this looks like a config.ru or a Rails environment
+    $ rackbox info
+
+    # prints out the response for a call to GET '/' on your application
+    $ rackbox request --method get /foo
+    $ rackbox get /foo
+    $ rackbox /foo
+
 TODO
 ----
 
- - recreate examples so they all follow a SIMPLE spec ... eg. they should all return request headers if you call `/request_headers`
- - get rid of Thin as a dependency!  use rails-rack-adapter
- - get rid of including custom rpsec matchers, use rspec-custom-matchers
- - make the spec module inclusion less magical!  refactor the spec helpers out ... make it more explicit to include the spec helpers?
- - add test/unit support (the above'll be helpful for this)
- - bugfix: 'request' method makes spec helpers angry!
- - request('/', :format => :json)          # simple helpers for content type request accepts
- - get usage documentation working for `./script/generate blackbox_spec`
- - refactor all specs ... an app should implement a simple API that we can spec against ... some URIs should return session vars, some request vars, etc
- - add a rackbox script for helping to quickly run requests against apps!
- - add a Rackbox Webrat backend so we can use the helpers to browse around and click buttons and whatnot?  could be yummy!
-
+see [RackBox][]'s [Lighthouse Tickets](http://remitaylor.lighthouseapp.com/projects/27570-rackbox)
 
 
 [rackbox]:    http://github.com/remi/rackbox

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 1
-:patch: 4
+:patch: 5

data/lib/rackbox/bin.rb

@@ -24,7 +24,17 @@ class RackBox::Bin
       rackbox command [options]
 
     Examples:
-      rackbox info             # prints app info
+      rackbox info               # prints app info
+      rackbox commands           # list commands
+      rackbox get /              # request / path
+      rackbox post -d '<XML>' /  # POST data to / path
+      rackbox /                  # GET / 
+      rackbox --data '<XML>'     # POST data to / path
+      rackbox /dogs --xml        # get /dogs, accepting xml
+
+    Options:
+      -a, --app "MyApp.new"      # ruby to eval to get Rack app
+      -r, --require file[.rb]    # ruby file(s) to require
 
     Further help:
       rackbox commands         # list all available commands
@@ -68,6 +78,17 @@ Usage: #{ script_name } request '/some/path'
 doco
   end
   def request *args
+
+    # if args is ampty, we likely just called: $ rackbox
+    # which came to #request because it's the default command, 
+    # so we should print out the usage for rackbox and exit
+    if args.empty?
+      usage
+      exit
+    end
+
+    set_rackbox_app args
+
     options = {
       :show => [],
       :headers => {}
@@ -87,13 +108,14 @@ doco
 
     rackbox_options = { }
     rackbox_options[:method] = options[:method] if options[:method]
-    rackbox_options[:data]   = options[:data] if options[:data]
+    rackbox_options[:data]   = options[:data]   if options[:data]
 
     options[:headers].each do |name, value|
       rackbox_options[name] = value
     end
 
     url = args.pop
+
     response = RackBox.request url, rackbox_options
     options[:show] = %w( body headers status ) if options[:show].empty?
 
@@ -119,8 +141,43 @@ Usage: #{ script_name } info
   end
 doco
   end
-  def info
-    puts "RackBox.app => #{ RackBox.app.inspect }"
+  def info *args
+    set_rackbox_app args
+    puts "RackBox.app => #{ RackBox.app( :silent => true ).inspect }"
+  end
+
+  private
+
+  #
+  # we let users pass a ruby string that will return 
+  # the rack app to be used, eg.
+  #
+  # you can also set files to be required ( -r  )
+  #
+  # $ rackbox -r myapp.rb --app 'lambda {|env| [200, {}, "hi!"] }' info
+  # $ rackbox -r myapp.rb,another-file.rb --app 'Sinatra::Application' get '/'
+  # $ rackbox -r myapp --app 'MyApp.new' '/'
+  #
+  def set_rackbox_app args
+    files_to_require = []
+    ruby_to_run      = nil
+
+    opts = OptionParser.new do |opts|
+      opts.on('-r', '--require [file]') {|x| files_to_require << x }
+      opts.on('-a', '--app [ruby]')     {|x| ruby_to_run = x       }
+    end 
+    opts.parse! args
+    
+    files_to_require.each {|file| require file }
+
+    if ruby_to_run
+      begin
+        RackBox.app = eval(ruby_to_run)
+      rescue Exception => ex
+        puts "tried running Ruby code to set RackBox app: #{ ruby_to_run.inspect }"
+        raise ex
+      end
+    end
   end
 
 end

data/lib/rackbox/rackbox.rb

@@ -94,27 +94,39 @@ class RackBox
     # If not explicitly set, uses RAILS_ROOT (if defined?) and RAILS_ENV (if defined?)
     attr_accessor :app
 
-    def app
+    def app options = { }
       unless @app and @app.respond_to?:call
-        
+
+        options = {
+          :silent => false
+        }.merge(options)
+
         if File.file? 'config.ru'
           @app = Rack::Builder.new { eval(File.read('config.ru')) }
         
         elsif defined?RAILS_ENV and defined?RAILS_ROOT
-          raise "You need the Rack::Adapter::Rails to run Rails apps with RackBox." + 
-                " Try: sudo gem install thin" unless defined?Rack::Adapter::Rails
-          @app = Rack::Adapter::Rails.new :root => RAILS_ROOT, :environment => RAILS_ENV
+          unless defined?Rack::Adapter::Rails
+            # TODO this is no longer true ... right?  does rails < 2.3 work without Thin
+            puts "You need the Rack::Adapter::Rails to run Rails apps with RackBox." + 
+                 " Try: sudo gem install thin" unless options[:silent]
+          else
+            @app = Rack::Adapter::Rails.new :root => RAILS_ROOT, :environment => RAILS_ENV
+          end
 
         elsif File.file?('config/routes.rb') && File.file?('config/environment.rb')
-          raise "You need the Rack::Adapter::Rails to run Rails apps with RackBox." + 
-                " Try: sudo gem install thin" unless defined?Rack::Adapter::Rails
-          @app = Rack::Adapter::Rails.new :root => '.', :environment => 'development'
+          unless defined?Rack::Adapter::Rails
+            puts "You need the Rack::Adapter::Rails to run Rails apps with RackBox." + 
+                 " Try: sudo gem install thin" unless options[:silent]
+          else
+            @app = Rack::Adapter::Rails.new :root => '.', :environment => 'development'
+          end
         
         else
-          raise "RackBox.app not configured."
+          puts "RackBox.app not configured." unless options[:silent]
         
         end
       end
+
       @app
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remi-rackbox
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - remi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-14 00:00:00 -07:00
+date: 2009-04-01 00:00:00 -07:00
 default_executable: rackbox
 dependencies: 
 - !ruby/object:Gem::Dependency