brisk 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 399ca02fec584349bbd680f46241c3fbb2ccd460
-  data.tar.gz: bd23cd438ac9b8a2565e8e953198bc5ddb4d7144
+  metadata.gz: 76fbd2e35a7b55d3bd7601cb83f8536c0614f4a6
+  data.tar.gz: aeb7b76485f8cd579b477b8f690ab80837020901
 SHA512:
-  metadata.gz: 1a6c748372dc5f9dcf5353bc9f9fc4a09b9717f1dbf7be9b81e5c956164618ea7b9aecea66bcdaa0c0db9c6e449774208480fc8f83f255eccac21f6ead2252d8
-  data.tar.gz: ddce60ca094595a5145a472ca97e68751df3bcec8a4fe43e8aa0b39f8fa1fb85b147d4c530ca5d5739bcbce900d56410247917e29cee95c9c9580632ccbaf255
+  metadata.gz: 769b4414c67e1a44a74911e9de84625b61a7120361119232d87cd7e4e48016ab8361a192bb15751d925ff345e5dca910d8b0b65e8acf47436db1d09c4cfdf08d
+  data.tar.gz: e5a7a6c482986629f202b79dd294b46682ea89ce0bcb17c38885e9e84a763bf87f87d6940876d708af8209d3269de9f51fd6a13306ef6eee7b721c3a1976ae03

data/lib/brisk.rb

@@ -57,7 +57,7 @@ class Valet < Thor
 
   desc "domain DOMAIN", "Sets a new domain"
   def domain(value)
-    old_domain = Configuration.read['domain']
+    old_domain = JSON.parse(FileSystem.read(Configuration.path))['domain']
 
     Configuration.update_domain(value)
 
@@ -69,7 +69,7 @@ class Valet < Thor
 
   desc "secure", "Secures the site with a SSL connection"
   def secure
-    domain = dirname = File.basename(Dir.getwd) + '.' + Configuration.read['domain']
+    domain = dirname = File.basename(Dir.getwd) + '.' + JSON.parse(FileSystem.read(Configuration.path))['domain']
 
     Site.secure(domain)
     Configuration.add('secured', File.basename(Dir.getwd))
@@ -80,7 +80,7 @@ class Valet < Thor
 
   desc "unsecure", "Unsecures the site from a SSL connection"
   def unsecure
-    domain = dirname = File.basename(Dir.getwd) + '.' + Configuration.read['domain']
+    domain = dirname = File.basename(Dir.getwd) + '.' + JSON.parse(FileSystem.read(Configuration.path))['domain']
 
     Site.unsecure(domain)
     Configuration.remove('secured', File.basename(Dir.getwd))

data/lib/brisk/caddy.rb

@@ -1,5 +1,7 @@
 require 'brisk/configuration'
 require 'brisk/constants'
+require 'brisk/file_system'
+
 class Caddy
 
   def self.install
@@ -24,26 +26,22 @@ class Caddy
   end
 
   def self.install_caddy_file
-    FileUtils.copy(File.expand_path("../../stubs/Caddyfile", __dir__), Constants.valet_home + '/Caddyfile')
-    file = File.read(Constants.valet_home + '/Caddyfile')
+    FileSystem.copy_file(File.expand_path("../../stubs/Caddyfile", __dir__), Constants.valet_home + '/Caddyfile')
+    file = FileSystem.read(Constants.valet_home + '/Caddyfile')
     new_file = file.gsub("BRISK_HOME_PATH", Constants.valet_home)
-    File.open(Constants.valet_home + '/Caddyfile', 'w+') do |file|
-      file.write(new_file)
-    end
+    File.write(Constants.valet_home + '/Caddyfile', new_file)
   end
 
   def self.install_caddy_directory
-    Configuration.create_dir(Constants.valet_home + '/Caddy')
-    File.new(Constants.valet_home + '/Caddy/.keep', 'w')
+    FileSystem.create_dir(Constants.valet_home + '/Caddy')
+    FileSystem.create_file(Constants.valet_home + '/Caddy/.keep')
   end
 
   def self.install_caddy_daemon
-    path = File.expand_path("../../stubs/caddy_daemon.plist", __dir__)
-    file = File.read(path)
+    path = FileSystem.get_path("../../stubs/caddy_daemon.plist", __dir__)
+    file = FileSystem.read(path)
     new_file = file.gsub("BRISK_HOME_PATH", Constants.valet_home)
-    File.open("/Library/LaunchDaemons/com.frankleef.caddyBriskServer.plist", "w+") do |file|
-      file.write(new_file)
-    end
+    FileSystem.write("/Library/LaunchDaemons/com.frankleef.caddyBriskServer.plist", new_file)
   end
 
   def self.restart

data/lib/brisk/configuration.rb

@@ -1,61 +1,39 @@
 require 'brisk/constants'
+require 'brisk/file_system'
 require 'fileutils'
 require 'json'
 
 class Configuration
 
   def self.install
-    create_dir(Constants.valet_home)
-    create_dir(Constants.valet_home + '/Certificates')
+    FileSystem.create_dir(Constants.valet_home)
+    FileSystem.create_dir(Constants.valet_home + '/Certificates')
 
-    unless file_exists?(path)
-      write({:domain => 'dev', 'paths' => [], 'secured' => []})
+    unless FileSystem.file_exists?(path)
+      config = {:domain => 'dev', 'paths' => [], 'secured' => []}
+      FileSystem.write(path, config.to_json)
     end
   end
 
-  def self.create_dir(directory)
-    unless dir_exists?(directory)
-      FileUtils.mkdir_p(directory, :mode => 0755)
-    end
-  end
-
-  def self.dir_exists?(directory)
-    File.directory?(directory)
-  end
-
-  def self.file_exists?(file)
-    File.file?(file)
-  end
-
   def self.add(key, value)
-    config = read
+    config = JSON.parse(FileSystem.read(Configuration.path))
     config[key].push(value)
-    write(config)
+    FileSystem.write(Configuration.path, config.to_json)
   end
 
   def self.remove(key, value)
-    config = read
+    config = JSON.parse(FileSystem.read(path))
     config[key].delete_if {|i| i == value}
-    write(config)
-  end
-
-  def self.path
-    return Constants.valet_home + '/config.json'
-  end
-
-  def self.read
-    JSON.parse(File.read(path))
-  end
-
-  def self.write(config)
-    File.open(path, "w+") do |f|
-      f.write(config.to_json)
-    end
+    FileSystem.write(Configuration.path, config.to_json)
   end
 
   def self.update_domain(domain)
-    config = read
+    config = JSON.parse(FileSystem.read(path))
     config['domain'] = domain
-    write(config)
+    FileSystem.write(Configuration.path, config.to_json)
+  end
+
+  def self.path
+    return Constants.valet_home + '/config.json'
   end
 end

data/lib/brisk/dnsmasq.rb

@@ -1,4 +1,5 @@
 require 'colorize'
+require 'brisk/file_system'
 
 class DnsMasq
 
@@ -41,30 +42,28 @@ class DnsMasq
 
  def self.create_custom_configuration(domain)
 
-   unless File.file?(config_path)
-     FileUtils.copy(example_config_path,config_path)
+   unless FileSystem.file_exists?(config_path)
+     FileSystem.copy_file(example_config_path,config_path)
    end
 
-   if File.read(config_path).index(dnsmasq_path) == nil
-     File.open(config_path, 'a') { |f| f.puts "conf-file=" + dnsmasq_path }
+   if FileSystem.read(config_path).index(dnsmasq_path) == nil
+     FileSystem.append(config_path, "conf-file=#{dnsmasq_path}")
    end
 
-   File.write(dnsmasq_path, "address=/.#{domain}/127.0.0.1")
+   FileSystem.write(dnsmasq_path, "address=/.#{domain}/127.0.0.1")
  end
 
  def self.create_resolver(domain)
-   unless File.directory?(resolver_path)
-     FileUtils.mkdir_p(resolver_path)
+   unless FileSystem.dir_exists?(resolver_path)
+     FileSystem.create_dir(resolver_path)
    end
 
   #  File.write('etc/resolver/dev', 'nameserver 127.0.0.1')
-   File.open("#{resolver_path}/#{domain}", 'w+') do |f|
-     f.write('nameserver 127.0.0.1')
-   end
+  File.write("#{resolver_path}/#{domain}", "nameserver 127.0.0.1")
  end
 
  def self.update_domain(domain, old_domain)
-   File.delete("#{resolver_path}/#{old_domain}")
+   FileSystem.delete("#{resolver_path}/#{old_domain}")
 
    install(domain)
  end

data/lib/brisk/file_system.rb

@@ -0,0 +1,46 @@
+class FileSystem
+
+  def self.create_dir(directory)
+    unless dir_exists?(directory)
+      FileUtils.mkdir_p(directory, :mode => 0755)
+    end
+  end
+
+  def self.create_file(file, permissions = 'w')
+    File.new(file, permissions)
+  end
+
+  def self.copy_file(from, to)
+    FileUtils.copy(from, to)
+  end
+
+  def self.get_path(file, path)
+    File.expand_path(file, path)
+  end
+
+  def self.dir_exists?(directory)
+    File.directory?(directory)
+  end
+
+  def self.file_exists?(file)
+    File.file?(file)
+  end
+
+  def self.read(path)
+    File.read(path)
+  end
+
+  def self.write(file, value)
+    File.open(file, "w+") do |f|
+      f.write(value)
+    end
+  end
+
+  def self.append(file, value)
+    File.open(file, 'a') { |f| f.puts value}
+  end
+
+  def self.delete(file)
+    File.delete(file)
+  end
+end

data/lib/brisk/server/brisk_request_helper.rb

@@ -1,3 +1,5 @@
+require 'brisk/file_system'
+
 class BriskRequestHelper
 
   def initialize(env)
@@ -16,6 +18,6 @@ class BriskRequestHelper
   end
 
   def get_config
-    config = JSON.parse(File.read(valet_home_path + '/config.json'))
+    config = JSON.parse(FileSystem.read(valet_home_path + '/config.json'))
   end
 end

data/lib/brisk/server/config.ru

@@ -1,7 +1,4 @@
 require 'brisk/server/proxy'
-require 'brisk/server/server_middleware'
-require 'brisk/server/https_middleware'
 
 use ServerMiddleware
-use HttpsMiddleware
 run AppProxy.new

data/lib/brisk/server/pid.rb

@@ -1,19 +1,23 @@
+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)
-    File.open("#{path}/pid.txt", 'w+') do |f|
-      f.write(pid)
-    end
+    FileSystem.write("#{path}/pid.txt", pid)
 
     sleep(1)
   end
 
   def self.read(path)
-    File.read("#{path}/tmp/pids/thin.pid")
+    FileSystem.read("#{path}/tmp/pids/thin.pid")
   end
 
   def self.exists?(path)
-    File.file?("#{path}/tmp/pids/thin.pid")
+    FileSystem.file_exists?("#{path}/tmp/pids/thin.pid")
   end
 
   def self.alive?(pid)

data/lib/brisk/server/proxy.rb

@@ -19,6 +19,13 @@ 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)
 
@@ -34,7 +41,7 @@ class AppProxy < Rack::Proxy
         return env
       end
 
-      existing_pid = Server.read(valet_home_path)
+      existing_pid = Pid.get(port)
       Server.shutdown(existing_pid)
     end
 
@@ -43,12 +50,10 @@ class AppProxy < Rack::Proxy
 
       Server.start_https(site_path)
       # Check if proccess is up and running
-      started = Server.is_started(site_path)
+      started = Server.is_started(site_path, port)
 
-  #    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(valet_home_path, pid)
         Site.write_site(valet_home_path, site)
       end
 
@@ -64,12 +69,10 @@ class AppProxy < Rack::Proxy
     Server.start(site_path)
 
     # Check if proccess is up and running
-    started = Server.is_started(site_path)
+    started = Server.is_started(site_path, port)
 
 #    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

@@ -1,19 +1,21 @@
 require 'brisk/server/pid'
+require 'brisk/file_system'
 
 class Server
 
   def self.is_running(path)
-    File.file?("#{path}/pid.txt")
-  end
-
-  def self.read(path)
-    File.read("#{path}/pid.txt")
+    FileSystem.file_exists?("#{path}/pid.txt")
   end
 
   def self.kill(path)
-    if is_running(path)
-      pid = read path
-      shutdown pid
+    http = Pid.get("3001")
+    https = Pid.get("3003")
+    unless http.nil?
+      shutdown http
+    end
+
+    unless https.nil?
+      shutdown https
     end
   end
 
@@ -25,17 +27,18 @@ 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, counter = 0)
+  def self.is_started(path, port)
     sleep(0.5)
-  
-    if Pid.exists?(path)
-      pid = Pid.read(path)
+
+    pid = Pid.get(port)
+
+    unless pid.nil?
       if Pid.alive?(pid)
         return true
       end
     end
 
-    is_started(path, counter + 1)
+    is_started(path, port)
   end
 
   def self.shutdown(pid)

data/lib/brisk/server/site.rb

@@ -6,14 +6,12 @@ class Site
   def self.secure(url)
     unsecure(url)
 
-    Configuration.create_dir(certificates_path)
+    FileSystem.create_dir(certificates_path)
     create_certificate(url)
 
     caddy_file = build_secure_caddy_file(url)
 
-    File.open("#{Constants.valet_home}/Caddy/#{url}", "w+") do |f|
-      f.write(caddy_file)
-    end
+    FileSystem.write("#{Constants.valet_home}/Caddy/#{url}", caddy_file)
   end
 
   def self.create_certificate(url)

data/lib/brisk/thin.rb

@@ -16,7 +16,7 @@ class Thin
 
      install_daemon
      install_secure_daemon
-
+     install_site_daemon
   end
 
   def self.update
@@ -26,27 +26,32 @@ class Thin
   end
 
   def self.install_daemon
-    path = File.expand_path("../../stubs/daemon.plist", __dir__)
-    server = File.expand_path("server/config.ru", __dir__)
+    path = FileSystem.get_path("../../stubs/daemon.plist", __dir__)
+    server = FileSystem.get_path("server/config.ru", __dir__)
 
-    file = File.read(path)
+    file = FileSystem.read(path)
 
     new_file = file.gsub("SERVER_PATH", server)
-    File.open("/Library/LaunchDaemons/com.frankleef.briskServer.plist", "w+") do |file|
-      file.write(new_file)
-    end
+
+    FileSystem.write("/Library/LaunchDaemons/com.frankleef.briskServer.plist", new_file)
   end
 
   def self.install_secure_daemon
-    path = File.expand_path("../../stubs/secure_daemon.plist", __dir__)
-    server = File.expand_path("server/config.ru", __dir__)
+    path = FileSystem.get_path("../../stubs/secure_daemon.plist", __dir__)
+    server = FileSystem.get_path("server/config.ru", __dir__)
 
-    file = File.read(path)
+    file = FileSystem.read(path)
 
     new_file = file.gsub("SERVER_PATH", server)
-    File.open("/Library/LaunchDaemons/com.frankleef.briskSecureServer.plist", "w+") do |file|
-      file.write(new_file)
-    end
+    FileSystem.write("/Library/LaunchDaemons/com.frankleef.briskSecureServer.plist", new_file)
+  end
+
+  def self.install_site_daemon
+    path = FileSystem.get_path("../../stubs/remove_site.plist", __dir__)
+    file = FileSystem.read(path)
+
+    new_file = file.gsub("USER", ENV["HOME"])
+    FileSystem.write("/Library/LaunchDaemons/com.frankleef.removeSite.plist", new_file)
   end
 
   def self.download
@@ -70,10 +75,12 @@ class Thin
   def self.start
     system "launchctl load /Library/LaunchDaemons/com.frankleef.briskServer.plist > /dev/null"
     system "launchctl load /Library/LaunchDaemons/com.frankleef.briskSecureServer.plist > /dev/null"
+    system "launchctl load /Library/LaunchDaemons/com.frankleef.removeSite.plist > /dev/null"
   end
 
   def self.stop
     system "launchctl unload /Library/LaunchDaemons/com.frankleef.briskServer.plist > /dev/null"
     system "launchctl unload /Library/LaunchDaemons/com.frankleef.briskSecureServer.plist > /dev/null"
+    system "launchctl unload /Library/LaunchDaemons/com.frankleef.removeSite.plist > /dev/null"
   end
 end

data/lib/brisk/version.rb

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

data/stubs/remove_site.plist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.frankleef.removeSite</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>rm</string>
+        <string>USER/.brisk/site.txt</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>StandardOutput</key>
+    <string>/tmp/com.frankleef.removeSite.out</string>
+    <key>StandardErrorPath</key>
+    <string>/tmp/com.frankleef.removeSite.err</string>
+</dict>
+</plist>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brisk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,10 +122,10 @@ files:
 - lib/brisk/configuration.rb
 - lib/brisk/constants.rb
 - lib/brisk/dnsmasq.rb
+- lib/brisk/file_system.rb
 - lib/brisk/rerun.rb
 - lib/brisk/server/brisk_request_helper.rb
 - lib/brisk/server/config.ru
-- lib/brisk/server/https_middleware.rb
 - lib/brisk/server/pid.rb
 - lib/brisk/server/proxy.rb
 - lib/brisk/server/server.rb
@@ -136,6 +136,7 @@ files:
 - stubs/Caddyfile
 - stubs/caddy_daemon.plist
 - stubs/daemon.plist
+- stubs/remove_site.plist
 - stubs/secureCaddyfile
 - stubs/secure_daemon.plist
 homepage: https://www.github.com/frankieleef/brisk

data/lib/brisk/server/https_middleware.rb

@@ -1,18 +0,0 @@
-require 'brisk/server/site'
-require 'brisk/server/brisk_request_helper'
-class HttpsMiddleware
-
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    request = BriskRequestHelper.new env
-    site = request.get_site
-    #
-    # return @app.call(env) unless Site.is_secured?(site)
-
-
-    @app.call(env)
-  end
-  end