brisk 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fda12aee0efddd813bc88c4569ffe04cc38e9db
-  data.tar.gz: fb8e0e72095b7af45f7b5265fc345edf5ada054e
+  metadata.gz: 4daa16b5c768b4813fe28e5242b265f6d989e929
+  data.tar.gz: 9340e9f58325c4dea48080d982a75dfa92c75862
 SHA512:
-  metadata.gz: 0683d83026e1b2f5ee3396e3ac28c5c833eb05763e0b1222e3c811807c26ca9977df895c275ffd4e0b7b66022c8c60c8f069477c09c1abbbbe4eba5df172d8c6
-  data.tar.gz: 3d41ccf08b7112a259d60cc9098dd3bf12c0ec5b5cf6a17cfae259adaa4edca71bc8e4c091f531e869f0337d181b4546c46fe74276cc1fd1a6a4824f0248d791
+  metadata.gz: 823564cfb0b65657dc8e54863307b9f81f61af90fa4bb27f9be4bddb6ec857f9f5365b0c7677cf53946472dc84ef47a5f48ec4b03fd205a52269b5b38c43d908
+  data.tar.gz: d4f7efb1f0894cc35fd11487ff9a760108d138d368bab952b13d53fb2b760a542639e2b85aefc88c45201517428159e27312043c95285af7e404058b5f2e4e98

data/lib/brisk/server/pid.rb

@@ -15,4 +15,13 @@ class Pid
   def self.exists?(path)
     File.file?("#{path}/tmp/pids/thin.pid")
   end
+
+  def self.alive?(pid)
+    begin
+      Process.getpgid( pid.to_i )
+      true
+    rescue Errno::ESRCH
+      false
+    end
+  end
 end

data/lib/brisk/server/proxy.rb

@@ -6,6 +6,7 @@ require 'brisk/server/brisk_request_helper'
 require 'brisk/server/server'
 require 'brisk/server/site'
 require 'brisk/server/pid'
+require 'net/http'
 
 class AppProxy < Rack::Proxy
 
@@ -44,6 +45,7 @@ class AppProxy < Rack::Proxy
     # Boot up the server
     Server.start(valet_site_path)
 
+    # Check if proccess is up and running
     started = Server.is_started(valet_site_path)
 
 #    Write the pid to a file so we can delete it later on
@@ -53,11 +55,23 @@ class AppProxy < Rack::Proxy
       Site.write_site(valet_home_path, site)
     end
 
-    sleep(2)
+    run env
+  end
+
+  def run(env, counter = 0)
 
-    # # Set the host to the server we just started
-    env["HTTP_HOST"] = "localhost:3000"
+    raise Exception.new "Brisk is not able to run the server.. Connection refused" if counter == 10
 
-    env
+    sleep(0.5)
+    uri = URI('http://localhost:3000')
+
+    begin
+      # Check if the server is up and running. Find a cleaner way to do this
+      Net::HTTP.get(uri)
+      env['HTTP_HOST'] = 'localhost:3000'
+      return env
+    rescue Errno::ECONNREFUSED
+      run(env, counter + 1)
+    end
   end
  end

data/lib/brisk/server/server.rb

@@ -22,9 +22,12 @@ class Server
   end
 
   def self.is_started(path, counter = 0)
-    sleep(1)
     if Pid.exists?(path)
-      return true
+      sleep(0.5)
+      pid = Pid.read(path)
+      if Pid.alive?(pid)
+        return true
+      end
     end
 
     is_started(path, counter + 1)

data/lib/brisk/thin.rb

@@ -3,13 +3,14 @@ require 'colorize'
 class Thin
 
   def self.install
-     unless system "gem list -i thin > /dev/null"
-       system "gem install thin > /dev/null"
+     unless is_installed?
 
-       if $? == 0
+
+       if download
          puts "Successfuly installed thin".colorize(:green)
        else
          puts "Something went wrong while installing thin. The process gets stopped".colorize(:red)
+         exit
        end
      end
 
@@ -24,6 +25,18 @@ class Thin
      end
   end
 
+  def self.download
+    system "gem install thin > /dev/null"
+
+    $? == 0
+  end
+
+  def self.is_installed?
+    system "gem list -i thin > /dev/null"
+
+    $? == 0
+  end
+
   def self.restart
     stop
 

data/lib/brisk/version.rb

@@ -1,3 +1,3 @@
 module Brisk
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brisk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler