rack-console 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9853207a501d22e1ccc2c0fe9b705ffd690879
-  data.tar.gz: 316aeb4748407057991eebed4221e343fc6399be
+  metadata.gz: be0561b73e2bb80e0872e203829a7055483f2369
+  data.tar.gz: 95712c578db0c15afd3df09bf13baed2b156b95f
 SHA512:
-  metadata.gz: 27f19bddc8c27b4e73548c68b92b504519f96f70b2cecdfe3b79f6df6767ac2081a61649fa83e05dd8bfae26b74340a9af5955a1e79e6c5233fb66294f9dcb6b
-  data.tar.gz: c65c2681b8774fe82375603d0fb8f1b246544da9186aaf8f44ddf4e9fb212666e4862785391180b0ca67882e2aab778eb42f3cd06f66bb5176902d9a767ca87e
+  metadata.gz: 3b288b43f1dc8c5893e4a275a92e609c700802e2423e215940de8ecc427809e0dcea71e8e6c76b98bc206f16d14411f2d3960b71cd3eb85af0b45a438f551c99
+  data.tar.gz: e0cb6f3379972332014f1cba0bc4aa1c4fef4e9c930b5ee507385b1c0e73362e391866ebefc09f64063b011736698faa3274e550ff9035816c1726d5cf793e62

data/bin/rack-console

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rack/console'
+require 'optparse'
 
 options = {}
 

data/lib/rack/console/methods.rb

@@ -0,0 +1,15 @@
+module Rack
+  class Console
+    module Methods
+      def reload!
+        ENV['RACK_CONSOLE_PREAMBLE'] = ''
+        puts 'Reloading...'
+        exec $0
+      end
+
+      def app
+        @app
+      end
+    end
+  end
+end

data/lib/rack/console/session.rb

@@ -0,0 +1,14 @@
+require 'rack/test'
+
+module Rack
+  class Console
+    class Session
+      include Rack::Test::Methods
+      attr_reader :app
+
+      def initialize(app)
+        @app = app
+      end
+    end
+  end
+end

data/lib/rack/console/version.rb

@@ -2,7 +2,7 @@ module Rack
   class Console
     class Version
       MAJOR = 1
-      MINOR = 2
+      MINOR = 3
       PATCH = 0
 
       def self.to_s

data/lib/rack/console.rb

@@ -1,15 +1,19 @@
 require 'rack'
+require 'rack/console/methods'
+require 'rack/console/session'
 require 'rack/console/version'
-require 'optparse'
 
 module Rack
   class Console
+    def self.start(options = {})
+      self.new(options).start
+    end
+
     def initialize(options = {})
       @options = { config: 'config.ru' }.merge(options)
-    end
 
-    def start
       ENV['RACK_ENV'] = @options[:environment] || 'development'
+      ENV['RACK_CONSOLE_PREAMBLE'] ||= "Loading #{ENV['RACK_ENV']} environment (Rack::Console #{Rack::Console::VERSION})"
 
       if includes = @options[:include]
         $LOAD_PATH.unshift(*includes)
@@ -18,16 +22,19 @@ module Rack
       if library = @options[:require]
         require library
       end
+    end
 
-      Rack::Builder.parse_file(@options[:config])
-
-      Object.class_eval do
-        def reload!
-          puts 'Reloading...'
-          exec $0
-        end
+    def start
+      if ENV['RACK_CONSOLE_PREAMBLE'] && !ENV['RACK_CONSOLE_PREAMBLE'].empty?
+        puts ENV['RACK_CONSOLE_PREAMBLE']
       end
 
+      app = Rack::Builder.parse_file(@options[:config]).first
+
+      # Add convenience methods to the top-level binding (main)
+      main.extend(Rack::Console::Methods)
+      main.instance_variable_set(:@app, Rack::Console::Session.new(app))
+
       begin
         require 'pry'
         Pry.start
@@ -36,5 +43,11 @@ module Rack
         IRB.start
       end
     end
+
+    private
+
+    def main
+      TOPLEVEL_BINDING.eval('self')
+    end
   end
 end

data/spec/rack/console_spec.rb

@@ -3,47 +3,46 @@ require 'irb'
 
 describe Rack::Console do
   before do
-    @old_cwd = Dir.pwd
+    @old_pwd = Dir.pwd
     Dir.chdir File.expand_path('../../support', __FILE__)
 
     expect(IRB).to receive(:start)
   end
 
-  context 'parsing config.ru' do
-    it 'defaults to a config.ru file in the current working directory' do
-      expect(Rack::Builder).to receive(:parse_file).with('config.ru')
+  it 'defaults to a config.ru file in the current working directory' do
+    expect(Rack::Builder).to receive(:parse_file).
+                             with('config.ru').
+                             and_call_original
 
-      Rack::Console.new.start
-    end
+    Rack::Console.new.start
   end
 
-  context 'overriding the location of config.ru' do
-    before { Dir.chdir @old_cwd }
+  it 'accepts the --config option to override the location of config.ru' do
+    Dir.chdir @old_pwd
+    expect(Rack::Builder).to receive(:parse_file).
+                             with('spec/support/config.ru').
+                             and_call_original
 
-    it 'accepts the --config option to override the location of config.ru' do
-      expect(Rack::Builder).to receive(:parse_file).with('spec/support/config.ru')
-
-      Rack::Console.new(config: 'spec/support/config.ru').start
-    end
+    Rack::Console.new(config: 'spec/support/config.ru').start
   end
 
-  context 'requiring libraries' do
-    it 'accepts the --require option' do
-      Rack::Console.new(require: 'json').start
-      expect { JSON }.not_to raise_error
-    end
+  it 'accepts the --require option to require a file or library' do
+    Rack::Console.new(require: 'json').start
+    expect { JSON }.not_to raise_error
   end
 
-  context 'adding paths to $LOAD_PATH' do
-    it 'accepts the --require option' do
-      Rack::Console.new(include: ['lib', 'spec']).start
-      expect($LOAD_PATH).to include('lib')
-      expect($LOAD_PATH).to include('spec')
-    end
+  it 'accepts the --require option to add paths to $LOAD_PATH' do
+    Rack::Console.new(include: ['lib', 'spec']).start
+    expect($LOAD_PATH).to include('lib')
+    expect($LOAD_PATH).to include('spec')
   end
 
   it 'accepts an argument to set the environment' do
     Rack::Console.new(environment: 'production').start
     expect(ENV['RACK_ENV']).to eq('production')
   end
+
+  after do
+    Dir.chdir @old_pwd
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-console
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +68,8 @@ files:
 - bin/rack-console
 - lib/rack-console.rb
 - lib/rack/console.rb
+- lib/rack/console/methods.rb
+- lib/rack/console/session.rb
 - lib/rack/console/version.rb
 - spec/rack/console_spec.rb
 - spec/spec_helper.rb