hi 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b9c09d4718077fca4fc2f656da9becf7f54517
-  data.tar.gz: 4053b75715a16a474269a6ed608dd679794e03e1
+  metadata.gz: d62905c572b1eec0a16b7e2eae36f284231c89bd
+  data.tar.gz: fad5a24a9be7b66e9be3046388454baa662afdfe
 SHA512:
-  metadata.gz: ecb8367a1625838354d137a540def00a06e699f048ff98fc1f4f610525152b8cfabb37a697a4970a1b937cf363feb39beec14ee59263ec0dd7e1c7c699178961
-  data.tar.gz: d1a587364e141c112de9daa65d98cb763b9c83252ec3b2cf785e0d680430bcdafcd3d1193adf9b039a782fd2df2a74ad8064a4298cfbae218aa03759c05d16f0
+  metadata.gz: aae46842f2606ab3374933b9e265dd2649bef5cb09315549001b943df3f87c4d6c39199c06b4c5f5798af39586d05069ffd2b43ddc013548c27b57cb3d34d6a0
+  data.tar.gz: fb7a173ed1ebb24171829acd469d32a2606cb263425c4a7912733bc295b33469e2d3940c4e3535c780a0e2ab82c2d0f367875543daa9b5defdc993f44f262e64

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+##v1.2.0
+*2013-12-29*
+
+- [#5](https://github.com/chrishunt/hi/pull/5) Use random port if port already in use
+
 ##v1.1.1
 *2013-12-28*
 

data/bin/hi

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
-require 'thin'
 require 'hi'
 
-app = Hi::Server.new(ARGV.pop)
-
-Thin::Server.start '0.0.0.0', app.port, app
+Hi::Server.new(Hi::App.new(ARGV.pop)).start

data/lib/hi.rb

@@ -1,3 +1,4 @@
 require 'hi/version'
 require 'hi/request'
+require 'hi/app'
 require 'hi/server'

data/lib/hi/app.rb

@@ -0,0 +1,29 @@
+require 'awesome_print'
+require 'hi/request'
+
+module Hi
+  class App
+    attr_reader :port
+
+    DEFAULT_PORT = 3000
+
+    def initialize(port = nil)
+      @port = (port = port.to_i) > 0 ? port : DEFAULT_PORT
+    end
+
+    def call(env)
+      log Hi::Request.new(env).to_h
+
+      [ 200, { 'Content-Type' => 'text/plain' }, ['hi'] ]
+    end
+
+    private
+
+    def log(request)
+      unless ENV['RACK_ENV'] == 'test'
+        ap "#{request[:request_method]} #{request[:url]} (#{Time.now})"
+        ap request
+      end
+    end
+  end
+end

data/lib/hi/request.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'rack/request'
 
 module Hi

data/lib/hi/server.rb

@@ -1,27 +1,41 @@
-require 'awesome_print'
-require 'hi/request'
+require 'thin'
 
 module Hi
   class Server
-    attr_reader :port
+    attr_reader :app
 
-    def initialize(port = nil)
-      @port = (port = port.to_i) > 0 ? port : 3000
+    CantStartServerError = Class.new(RuntimeError)
+
+    MAX_ATTEMPTS = 5
+
+    def initialize(app)
+      @app = app
     end
 
-    def call(env)
-      log Hi::Request.new(env).to_h
+    def start(port = app.port, attempts = 1)
+      log "Starting server on port #{port}...\n\n"
+      start! port
+    rescue RuntimeError => e
+      if attempts < MAX_ATTEMPTS
+        log "\nUnable to start server, trying random port instead."
+        start random_port, attempts + 1
+      else
+        raise CantStartServerError.new(e)
+      end
+    end
 
-      [ 200, { 'Content-Type' => 'text/plain' }, ['hi'] ]
+    def start!(port)
+      Thin::Server.start '0.0.0.0', port, app
     end
 
     private
 
-    def log(request)
-      unless ENV['RACK_ENV'] == 'test'
-        ap "#{request[:request_method]} #{request[:url]} (#{Time.now})"
-        ap request
-      end
+    def random_port
+      1000 + Random.rand(9000)
+    end
+
+    def log(message)
+      puts message unless ENV['RACK_ENV'] == 'test'
     end
   end
 end

data/lib/hi/version.rb

@@ -1,3 +1,3 @@
 module Hi
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/spec/hi/app_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'hi/app'
+require 'rack/test'
+
+describe Hi::App do
+  include Rack::Test::Methods
+
+  def app
+    described_class.new
+  end
+
+  [:get, :put, :post].each do |method|
+    it "responds to #{method.to_s.upcase}" do
+      send(method, '/')
+
+      expect(last_response).to be_ok
+      expect(last_response.body).to eq('hi')
+    end
+  end
+
+  it 'responds to any route' do
+    get '/some/random/route'
+
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq('hi')
+  end
+
+  it 'has a default port' do
+    expect(app.port).to eq described_class::DEFAULT_PORT
+  end
+
+  it 'allows a customized port' do
+    expect(described_class.new(1234).port).to   eq(1234)
+    expect(described_class.new('1234').port).to eq(1234)
+  end
+
+  it 'uses default port when customized port is invalid' do
+    expect(described_class.new(nil).port).to    eq described_class::DEFAULT_PORT
+    expect(described_class.new('nope').port).to eq described_class::DEFAULT_PORT
+    expect(described_class.new(-100).port).to   eq described_class::DEFAULT_PORT
+  end
+end

data/spec/hi/server_spec.rb

@@ -1,44 +1,27 @@
 require 'spec_helper'
+require 'hi/app'
 require 'hi/server'
-require 'rack/test'
-
-ENV['RACK_ENV'] = 'test'
 
 describe Hi::Server do
-  include Rack::Test::Methods
-
-  def app
-    described_class.new
-  end
+  let(:app)    { Hi::App.new }
+  let(:server) { described_class.new(app) }
 
-  [:get, :put, :post].each do |method|
-    it "responds to #{method.to_s.upcase}" do
-      send(method, '/')
+  describe '#start' do
+    it 'starts up the app' do
+      server.should_receive(:start!).with app.port
 
-      expect(last_response).to be_ok
-      expect(last_response.body).to eq('hi')
+      server.start
     end
-  end
-
-  it 'responds to any route' do
-    get '/some/random/route'
 
-    expect(last_response).to be_ok
-    expect(last_response.body).to eq('hi')
-  end
+    it 'tries to start again on a different port requested port is in use' do
+      server
+        .should_receive(:start!)
+        .exactly(Hi::Server::MAX_ATTEMPTS).times
+        .and_raise RuntimeError
 
-  it 'defaults to port 3000' do
-    expect(app.port).to eq(3000)
-  end
-
-  it 'allows a customized port' do
-    expect(described_class.new(1234).port).to   eq(1234)
-    expect(described_class.new('1234').port).to eq(1234)
-  end
-
-  it 'uses default port when customized port is invalid' do
-    expect(described_class.new(nil).port).to    eq(3000)
-    expect(described_class.new('nope').port).to eq(3000)
-    expect(described_class.new(-100).port).to   eq(3000)
+      expect {
+        server.start
+      }.to raise_error Hi::Server::CantStartServerError
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,5 @@
+require 'pry'
 require 'coveralls'
 Coveralls.wear!
+
+ENV['RACK_ENV'] = 'test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hi
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Hunt
@@ -127,10 +127,12 @@ files:
 - bin/hi
 - hi.gemspec
 - lib/hi.rb
+- lib/hi/app.rb
 - lib/hi/request.rb
 - lib/hi/server.rb
 - lib/hi/version.rb
 - screenshot.png
+- spec/hi/app_spec.rb
 - spec/hi/request_spec.rb
 - spec/hi/server_spec.rb
 - spec/spec_helper.rb
@@ -159,6 +161,7 @@ signing_key:
 specification_version: 4
 summary: hi, I'm here to debug your HTTP
 test_files:
+- spec/hi/app_spec.rb
 - spec/hi/request_spec.rb
 - spec/hi/server_spec.rb
 - spec/spec_helper.rb