rack-console 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0561b73e2bb80e0872e203829a7055483f2369
-  data.tar.gz: 95712c578db0c15afd3df09bf13baed2b156b95f
+  metadata.gz: ecc34ea943b04d2e308b3dbf8f3d29982a5fd99d
+  data.tar.gz: 133380b564caefea4356f257f263fe571663147f
 SHA512:
-  metadata.gz: 3b288b43f1dc8c5893e4a275a92e609c700802e2423e215940de8ecc427809e0dcea71e8e6c76b98bc206f16d14411f2d3960b71cd3eb85af0b45a438f551c99
-  data.tar.gz: e0cb6f3379972332014f1cba0bc4aa1c4fef4e9c930b5ee507385b1c0e73362e391866ebefc09f64063b011736698faa3274e550ff9035816c1726d5cf793e62
+  metadata.gz: a40df50a204f705d51b6772b48817761d34d120267628a60316e79c5e2b393331881ec3a05777492e449c23f5604f999f50af9a3f82df78c1446bd7114c2be92
+  data.tar.gz: 0cde9f6e9de162190b312827d2f0ddb967531a3bb816c10a4fe4aa4097c67fedd43e02a6bc718a37499d013a5913ce15d06ebeba7bd15504967cc8841f2189a5

data/lib/rack/console.rb

@@ -10,24 +10,18 @@ module Rack
     end
 
     def initialize(options = {})
-      @options = { config: 'config.ru' }.merge(options)
+      @options = default_options.merge(options)
 
-      ENV['RACK_ENV'] = @options[:environment] || 'development'
-      ENV['RACK_CONSOLE_PREAMBLE'] ||= "Loading #{ENV['RACK_ENV']} environment (Rack::Console #{Rack::Console::VERSION})"
+      ENV['RACK_ENV'] = @options[:environment]
+      set_preamble
 
-      if includes = @options[:include]
-        $LOAD_PATH.unshift(*includes)
-      end
+      $LOAD_PATH.unshift(*@options[:include]) if @options[:include]
 
-      if library = @options[:require]
-        require library
-      end
+      require @options[:require] if @options[:require]
     end
 
     def start
-      if ENV['RACK_CONSOLE_PREAMBLE'] && !ENV['RACK_CONSOLE_PREAMBLE'].empty?
-        puts ENV['RACK_CONSOLE_PREAMBLE']
-      end
+      puts ENV['RACK_CONSOLE_INTRO'] unless ENV['IGNORE_RACK_CONSOLE_INTRO']
 
       app = Rack::Builder.parse_file(@options[:config]).first
 
@@ -49,5 +43,21 @@ module Rack
     def main
       TOPLEVEL_BINDING.eval('self')
     end
+
+    def set_preamble
+      return if ENV['RACK_CONSOLE_INTRO']
+
+      loading = "Loading #{ENV['RACK_ENV']} environment"
+      version = "(Rack::Console #{Rack::Console::VERSION})"
+
+      ENV['RACK_CONSOLE_INTRO'] = "#{loading} #{version}"
+    end
+
+    def default_options
+      {
+        config: 'config.ru',
+        environment: ENV['RACK_ENV'] || 'development'
+      }
+    end
   end
 end

data/lib/rack/console/methods.rb

@@ -2,9 +2,9 @@ module Rack
   class Console
     module Methods
       def reload!
-        ENV['RACK_CONSOLE_PREAMBLE'] = ''
+        ENV['IGNORE_RACK_CONSOLE_INTRO'] = 'true'
         puts 'Reloading...'
-        exec $0
+        Kernel.exec $0, *ARGV
       end
 
       def app

data/lib/rack/console/version.rb

@@ -3,7 +3,7 @@ module Rack
     class Version
       MAJOR = 1
       MINOR = 3
-      PATCH = 0
+      PATCH = 1
 
       def self.to_s
         [MAJOR, MINOR, PATCH].join('.')

data/spec/rack/console/methods_spec.rb

@@ -0,0 +1,22 @@
+require 'rack/console/methods'
+
+describe Rack::Console::Methods do
+  let(:session) { Object.new }
+
+  before { session.send :extend, Rack::Console::Methods }
+
+  describe 'reload!' do
+    it 're-executes the running process' do
+      expect(Kernel).to receive(:exec).with(/bin\/rspec$/)
+
+      session.reload!
+    end
+  end
+
+  describe 'app' do
+    before { session.instance_variable_set(:@app, 'app') }
+    subject { session.app }
+
+    it { is_expected.to eq('app') }
+  end
+end

data/spec/rack/console_spec.rb

@@ -42,7 +42,27 @@ describe Rack::Console do
     expect(ENV['RACK_ENV']).to eq('production')
   end
 
+  describe 'preamble message' do
+    it 'defaults to a loading message' do
+      preamble = "Loading #{ENV['RACK_ENV']} environment (Rack::Console #{Rack::Console::VERSION})"
+
+      Rack::Console.new.start
+      expect(ENV['RACK_CONSOLE_INTRO']).to eq(preamble)
+    end
+
+    it 'does not override a preamble if one has already been set' do
+      ENV['RACK_CONSOLE_INTRO'] = 'Hello, Rack::Console!'
+
+      expect { Rack::Console.new.start }.not_to change { ENV['RACK_CONSOLE_INTRO'] }
+
+      ENV['RACK_CONSOLE_INTRO'] = nil
+    end
+  end
+
   after do
     Dir.chdir @old_pwd
+
+    ENV['RACK_ENV'] = 'test'
+    ENV['RACK_CONSOLE_INTRO'] = nil
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+ENV['RACK_ENV'] = 'test'
+ENV['IGNORE_RACK_CONSOLE_INTRO'] = 'true'
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # Allow more verbose output when running an individual spec file.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-console
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -71,6 +71,7 @@ files:
 - lib/rack/console/methods.rb
 - lib/rack/console/session.rb
 - lib/rack/console/version.rb
+- spec/rack/console/methods_spec.rb
 - spec/rack/console_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/davidcelis/rack-console
@@ -93,11 +94,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: "`rails console` for your Rack applications"
 test_files:
+- spec/rack/console/methods_spec.rb
 - spec/rack/console_spec.rb
 - spec/spec_helper.rb
 has_rdoc: