brisk 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fbd2e35a7b55d3bd7601cb83f8536c0614f4a6
-  data.tar.gz: aeb7b76485f8cd579b477b8f690ab80837020901
+  metadata.gz: ffba212e4a0a9322a6367d04872200d2862e1052
+  data.tar.gz: a67db63ef02e8581542ff3e56fba940945adcb6d
 SHA512:
-  metadata.gz: 769b4414c67e1a44a74911e9de84625b61a7120361119232d87cd7e4e48016ab8361a192bb15751d925ff345e5dca910d8b0b65e8acf47436db1d09c4cfdf08d
-  data.tar.gz: e5a7a6c482986629f202b79dd294b46682ea89ce0bcb17c38885e9e84a763bf87f87d6940876d708af8209d3269de9f51fd6a13306ef6eee7b721c3a1976ae03
+  metadata.gz: 8281b3c315bd1cf328e4df8efe879c7a05ffc5b1c9c75782ab9e962ef1e45525375cb5025efc282f5f0ac592dc50d9d777afa8334bb469b13af8ea59387064af
+  data.tar.gz: a3732fdfbc01e746cb27e8f03fd03059279a48f7d2fa000d27e5da0baa011cf5fee0c370f947e87350ca6c4c5cef4c2a1fbd91b931ba2b6ca9b0257380105d09

data/lib/brisk/caddy.rb

@@ -4,6 +4,14 @@ require 'brisk/file_system'
 
 class Caddy
 
+  @caddy_path = File.expand_path("../../stubs/Caddyfile", __dir__)
+  @caddy_daemon_path = "/Library/LaunchDaemons/com.frankleef.caddyBriskServer.plist"
+  class << self
+    attr_accessor :caddy_path
+    attr_accessor :caddy_daemon_path
+  end
+
+
   def self.install
     unless is_installed?
       puts "Installing Caddy for you...".colorize(:green)
@@ -26,7 +34,7 @@ class Caddy
   end
 
   def self.install_caddy_file
-    FileSystem.copy_file(File.expand_path("../../stubs/Caddyfile", __dir__), Constants.valet_home + '/Caddyfile')
+    FileSystem.copy_file(caddy_path, Constants.valet_home + '/Caddyfile')
     file = FileSystem.read(Constants.valet_home + '/Caddyfile')
     new_file = file.gsub("BRISK_HOME_PATH", Constants.valet_home)
     File.write(Constants.valet_home + '/Caddyfile', new_file)
@@ -41,7 +49,7 @@ class Caddy
     path = FileSystem.get_path("../../stubs/caddy_daemon.plist", __dir__)
     file = FileSystem.read(path)
     new_file = file.gsub("BRISK_HOME_PATH", Constants.valet_home)
-    FileSystem.write("/Library/LaunchDaemons/com.frankleef.caddyBriskServer.plist", new_file)
+    FileSystem.write(caddy_daemon_path, new_file)
   end
 
   def self.restart

data/lib/brisk/server/pid.rb

@@ -2,16 +2,17 @@ require 'brisk/file_system'
 
 class Pid
 
-  def self.get(port)
-    `sudo lsof -i tcp:#{port} | grep ruby | awk '{ print $2; }'`
-  end
-
   def self.write(path, pid)
     FileSystem.write("#{path}/pid.txt", pid)
 
     sleep(1)
   end
 
+  def self.write_https(path, pid)
+    FileSystem.write("#{path}/https_pid.txt", pid)
+    sleep(1)
+  end
+
   def self.read(path)
     FileSystem.read("#{path}/tmp/pids/thin.pid")
   end

data/lib/brisk/server/proxy.rb

@@ -19,13 +19,6 @@ class AppProxy < Rack::Proxy
     config = request.get_config
     site_path = Site.get_site_paths(config, site)
 
-    port = "3001"
-    port = "3003" if Site.is_secured?(config, site)
-
-    # Check if site is running
-    # check if site is equal to written site
-    # Check if site is secured
-    # otherwise, kill process
     # Kill existing servers, so we don't get conflitcs
     if Server.is_running(valet_home_path)
 
@@ -41,7 +34,9 @@ class AppProxy < Rack::Proxy
         return env
       end
 
-      existing_pid = Pid.get(port)
+      existing_pid = FileSystem.read("#{valet_home_path}/pid.txt") if FileSystem.file_exists?("#{valet_home_path}/pid.txt")
+      existing_pid = FileSystem.read("#{valet_home_path}/https_pid.txt") if Site.is_secured?(config, site)
+      puts existing_pid
       Server.shutdown(existing_pid)
     end
 
@@ -50,10 +45,12 @@ class AppProxy < Rack::Proxy
 
       Server.start_https(site_path)
       # Check if proccess is up and running
-      started = Server.is_started(site_path, port)
+      started = Server.is_started(site_path)
 
-      # Write the pid to a file so we can delete it later on
+  #    Write the pid to a file so we can delete it later on
       if started
+        pid = Pid.read(site_path)
+        Pid.write_https(valet_home_path, pid)
         Site.write_site(valet_home_path, site)
       end
 
@@ -69,10 +66,12 @@ class AppProxy < Rack::Proxy
     Server.start(site_path)
 
     # Check if proccess is up and running
-    started = Server.is_started(site_path, port)
+    started = Server.is_started(site_path)
 
 #    Write the pid to a file so we can delete it later on
     if started
+      pid = Pid.read(site_path)
+      Pid.write(valet_home_path, pid)
       Site.write_site(valet_home_path, site)
     end
 

data/lib/brisk/server/server.rb

@@ -4,18 +4,13 @@ require 'brisk/file_system'
 class Server
 
   def self.is_running(path)
-    FileSystem.file_exists?("#{path}/pid.txt")
+    FileSystem.file_exists?("#{path}/pid.txt") || FileSystem.file_exists?("#{path}/https_pid.txt")
   end
 
   def self.kill(path)
-    http = Pid.get("3001")
-    https = Pid.get("3003")
-    unless http.nil?
-      shutdown http
-    end
-
-    unless https.nil?
-      shutdown https
+    if is_running(path)
+      pid = FileSystem.read("#{path}/pid.txt")
+      shutdown pid
     end
   end
 
@@ -27,18 +22,17 @@ class Server
     spawn "cd #{path} && /usr/local/bin/thin start -d -R config.ru -a localhost -p 3003 --ssl"
   end
 
-  def self.is_started(path, port)
+  def self.is_started(path, counter = 0)
     sleep(0.5)
 
-    pid = Pid.get(port)
-
-    unless pid.nil?
+    if Pid.exists?(path)
+      pid = Pid.read(path)
       if Pid.alive?(pid)
         return true
       end
     end
 
-    is_started(path, port)
+    is_started(path, counter + 1)
   end
 
   def self.shutdown(pid)

data/lib/brisk/thin.rb

@@ -2,6 +2,14 @@ require 'colorize'
 
 class Thin
 
+  @thin_daemon = "/Library/LaunchDaemons/com.frankleef.briskServer.plist"
+  @thin_secure_daemon = "/Library/LaunchDaemons/com.frankleef.briskSecureServer.plist"
+
+  class << self
+    attr_accessor :thin_daemon
+    attr_accessor :thin_secure_daemon
+  end
+
   def self.install
      unless is_installed?
 
@@ -33,7 +41,7 @@ class Thin
 
     new_file = file.gsub("SERVER_PATH", server)
 
-    FileSystem.write("/Library/LaunchDaemons/com.frankleef.briskServer.plist", new_file)
+    FileSystem.write(thin_daemon, new_file)
   end
 
   def self.install_secure_daemon
@@ -43,7 +51,7 @@ class Thin
     file = FileSystem.read(path)
 
     new_file = file.gsub("SERVER_PATH", server)
-    FileSystem.write("/Library/LaunchDaemons/com.frankleef.briskSecureServer.plist", new_file)
+    FileSystem.write(thin_secure_daemon, new_file)
   end
 
   def self.install_site_daemon

data/lib/brisk/version.rb

@@ -1,3 +1,3 @@
 module Brisk
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

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