explorer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98c521d0a44b160340aada8309f8dd0d477a5ed1
-  data.tar.gz: 914098ac5bf5a11069543362fa6784cbbb69a283
+  metadata.gz: 91e8f458b57b8c4eb97ffeb015e48760ebaa567f
+  data.tar.gz: f8f840dd80dab06d3e116b0dc7a3f4085f2f06a7
 SHA512:
-  metadata.gz: ea0b143c3fd4db514d9151bdaa3fdf79020169cdd1716c31c518d9ffcd7a77f1dea2f791136dbe5de8e5a50c4afe36b8a54e9df648eceb751dfbc5018888d12a
-  data.tar.gz: 803f6d1d50a28a59fef4e0d485ed7ea7554561db0d54210fdacd2d2a6f8bd6e8d33e22299f8c63afe0ef59ea930444ebf6d4b217d0498d8b3e947b4727d730fd
+  metadata.gz: caa9f3faae42f352422074dac92c0e3c024a157704814aa1678d7ac8b422f4ef4aaac5763009ea585ec0441806fa88f7176c55504da2520733c69d23d710950d
+  data.tar.gz: 9eadcee57798f0ea63fbcc62cce85646c02b49ac0ac5eb1d7d067b4dcbb1e666edff5301a92af5126a7e2f7af996f7926ac5b81fa855bb17e61567a647bbdde7

data/lib/explorer.rb

@@ -11,10 +11,30 @@ require 'explorer/ipc_client'
 require 'explorer/process'
 require 'explorer/process_manager'
 require 'explorer/log_watcher'
+require 'explorer/hostmap'
 require 'explorer/setup'
 
 module Explorer
   DATADIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data'))
+  CONFIGDIR = File.join(Dir.home, '.explorer')
+
+  def self.hostmap
+    @hostmap ||= Hostmap.new
+  end
+
+  def self.process_manager
+    @process_manager ||= ProcessManager.new
+  end
+
+  def self.log_watcher
+    @log_watcher ||= LogWatcher.new
+  end
+
+  def self.terminate
+    @hostmap.terminate if @hostmap
+    @log_watcher.terminate if @log_watcher
+    @process_manager.terminate if @process_manager
+  end
 
   def self.without_bundler
     if defined?(Bundler)

data/lib/explorer/cli.rb

@@ -22,10 +22,10 @@ module Explorer
       desc 'setup SUBCOMMAND ...ARGS', 'manage explorer setup'
       subcommand 'setup', Setup
 
-      desc "boot [CONFIG]", 'Start explorer'
-      def boot(config=nil)
-        servers = Servers.new hostmap: {'test.dev' => {host: 'localhost', port: 8080}}
-        servers.log_watcher.add(STDOUT)
+      desc "boot", 'Start explorer'
+      def boot
+        servers = Servers.new
+        Explorer.log_watcher.add(STDOUT)
         servers.run
       end
 

data/lib/explorer/hostmap.rb

@@ -0,0 +1,44 @@
+require 'yaml'
+
+module Explorer
+  class Hostmap
+    include Celluloid
+
+    attr_reader :mappings
+
+    def initialize
+      @mappings = {}
+    end
+
+    def add domain, host, port
+      @mappings[domain] = { host: host, port: port }
+    end
+
+    def remove domain
+      @mappings.delete domain
+    end
+
+    def resolve domain
+      domain = domain.gsub(/\d+.\d+.\d+.\d+.xip.io/, 'dev') #Support xip.io
+      parts = domain.split '.'
+      map = nil
+      while !parts.empty? && map.nil? do
+        map = @mappings[parts.join('.')]
+        parts.shift
+      end
+      map
+    end
+
+    def save file
+      Dir.mkdir File.dirname(file) unless Dir.exist?(File.dirname(file))
+      File.write file, YAML.dump(mappings)
+    end
+
+    def load file
+      return unless File.exist? file
+
+      yaml = YAML.load_file file
+      @mappings = yaml
+    end
+  end
+end

data/lib/explorer/log_watcher.rb

@@ -30,8 +30,26 @@ module Explorer
       end
     end
 
+    def logger(label='system')
+      @logger ||= ::Logger.new(LogDevice.new(self, label))
+    end
+
     private
 
+    class LogDevice
+      def initialize(watcher, label='system')
+        @watcher = watcher
+        @label = label
+      end
+
+      def close
+      end
+
+      def write(data)
+        @watcher.log(@label, data)
+      end
+    end
+
     def next_color
       color = COLORS.shift
       COLORS.push color

data/lib/explorer/process.rb

@@ -12,7 +12,7 @@ module Explorer
     def initialize(label, command, working_dir: ENV['PWD'], log_watcher: nil, env: {})
       @label = label
       @command = command
-      @working_dir = working_dir
+      @working_dir = File.expand_path(working_dir)
       @log_watcher = log_watcher
       @env = env
       @state = :stopped

data/lib/explorer/process_manager.rb

@@ -1,9 +1,10 @@
 require 'dotenv'
+require 'yaml'
 
 module Explorer
   class ProcessManager
-    def initialize log_watcher = nil
-      @log_watcher = log_watcher
+    def initialize options={}
+      @log_watcher = options.fetch(:log_watcher) { Explorer.log_watcher }
       @processes = {}
     end
 
@@ -56,10 +57,30 @@ module Explorer
       @processes.keys
     end
 
+    def load file
+      return unless File.exist? file
+
+      yaml = YAML.load_file file
+      yaml.each do |cfg|
+        add(cfg[:label], cfg[:command], working_dir: cfg[:working_dir])
+      end
+    end
+
+    def save file
+      Dir.mkdir File.dirname(file) unless Dir.exist?(File.dirname(file))
+      File.write file, YAML.dump(processes.map do |p|
+        {
+          label: p.label,
+          command: p.command,
+          working_dir: p.working_dir
+        }
+      end)
+    end
+
     private
 
     def load_env(directory = ENV['PWD'])
-      path = File.join(directory, '.env')
+      path = File.expand_path File.join(directory, '.env')
       return {} unless File.exist?(path)
       Dotenv::Environment.new(path)
     end

data/lib/explorer/proxy.rb

@@ -27,6 +27,8 @@ module Explorer
       end
     rescue Errno::ECONNREFUSED
       reel_request.respond 504, 'Could not connect to upstream server'
+    rescue Net::ReadTimeout
+      reel_request.respond 599, 'Upstream timed out'
     end
 
     private

data/lib/explorer/server/dns.rb

@@ -3,7 +3,7 @@ require 'rubydns'
 module Explorer
   module Server
     class DNS < RubyDNS::Server
-      def initialize(port = 23400)
+      def initialize(port)
         super listen: interfaces(port)
         async.run
       end

data/lib/explorer/server/http.rb

@@ -3,8 +3,8 @@ require 'reel'
 module Explorer
   module Server
     class HTTP < Reel::Server::HTTP
-      def initialize(port = 23401, map={})
-        @map = map
+      def initialize(port, options={})
+        @map = options.fetch(:hostmap) { Explorer.hostmap }
 
         super '0.0.0.0', port, {}, &method(:on_connection)
       end
@@ -16,7 +16,7 @@ module Explorer
       end
 
       def handle_request(request)
-        map = @map[request.headers['Host']]
+        map = @map.resolve(request.headers['Host'])
         if map
           Proxy.new(map[:host], map[:port]).handle(request)
         else

data/lib/explorer/server/https.rb

@@ -3,8 +3,8 @@ require 'reel'
 module Explorer
   module Server
     class HTTPS < Reel::Server::HTTPS
-      def initialize(port = 23402, map={})
-        @map = map
+      def initialize(port, options={})
+        @map = options.fetch(:hostmap) { Explorer.hostmap }
 
         options = {
           cert: File.read(File.join(Explorer::DATADIR, 'server.crt')),
@@ -20,11 +20,11 @@ module Explorer
       end
 
       def handle_request(request)
-        map = @map[request.headers['Host']]
+        map = @map.resolve(request.headers['Host'])
         if map
           Proxy.new(map[:host], map[:port]).handle(request)
         else
-          request.respond 404, "Map not found (#{request.headers['Host']}) (#{@map.inspect})"
+          request.respond 404, "Map not found (#{request.headers['Host']})"
         end
 
       end

data/lib/explorer/server/ipc.rb

@@ -8,10 +8,12 @@ module Explorer
       finalizer :shutdown
       attr_reader :socket_path, :server
 
-      def initialize(socket_path = '/tmp/explorer_ipc', servers)
+      def initialize(socket_path, options={})
         @socket_path = socket_path
         @server = UNIXServer.new(socket_path)
-        @servers = servers
+        @hostmap = options.fetch(:hostmap) { Explorer.hostmap }
+        @log_watcher = options.fetch(:log_watcher) { Explorer.log_watcher }
+        @process_manager = options.fetch(:process_manager) { Explorer.process_manager }
         async.run
       end
 
@@ -31,23 +33,29 @@ module Explorer
           json = JSON.parse socket.readline
           case json['command']
           when 'map-list'
-            socket.puts @servers.hostmap.to_json
+            socket.puts @hostmap.mappings.to_json
           when 'map-add'
-            @servers.hostmap[json['map']] = { host: json['host'], port: json['port'].to_i }
+            @hostmap.add json['map'], json['host'], json['port'].to_i
+            @hostmap.save File.join(Explorer::CONFIGDIR, 'hostmap.yaml') # TODO: Refactor filename
           when 'map-remove'
-            @servers.hostmap.delete json['map']
+            @hostmap.remove json['map']
+            @hostmap.save File.join(Explorer::CONFIGDIR, 'hostmap.yaml')
           when 'cmd-tail'
-            @servers.log_watcher.add(socket)
+            @log_watcher.add(socket)
           when 'cmd-add'
-            @servers.process_manager.add(json['label'], json['cmd'], working_dir: json['dir'] || ENV['PWD'])
+            @process_manager.add(json['label'], json['cmd'], working_dir: json['dir'] || ENV['PWD'])
+            @process_manager.save File.join(Explorer::CONFIGDIR, 'process.yaml')
           when 'cmd-start'
-            @servers.process_manager.start(json['label'])
+            @process_manager.start(json['label'])
+            @process_manager.save File.join(Explorer::CONFIGDIR, 'process.yaml')
           when 'cmd-stop'
-            @servers.process_manager.stop(json['label'])
+            @process_manager.stop(json['label'])
+            @process_manager.save File.join(Explorer::CONFIGDIR, 'process.yaml')
           when 'cmd-remove'
-            @servers.process_manager.remove(json['label'])
+            @process_manager.remove(json['label'])
+            @process_manager.save File.join(Explorer::CONFIGDIR, 'process.yaml')
           when 'cmd-list'
-            socket.puts @servers.process_manager.processes.map { |p|
+            socket.puts @process_manager.processes.map { |p|
               {
                 label: p.label,
                 cmd: p.command,

data/lib/explorer/servers.rb

@@ -1,19 +1,12 @@
 require 'celluloid'
 
 module Explorer
-  # TODO: Hostmap should be it's own actor; immutable; or thread-safe
   class Servers
-    attr_reader :dns_port, :http_port, :https_port, :ipc_file
-    attr_reader :hostmap, :process_manager, :log_watcher
-
-    def initialize dns_port: 23400, http_port: 23401, https_port: 23402, hostmap: {}, ipc_file: '/tmp/explorer_ipc'
-      @dns_port = dns_port
-      @http_port = http_port
-      @https_port = https_port
-      @ipc_file = ipc_file
-      @hostmap = hostmap
-      @log_watcher = LogWatcher.new
-      @process_manager = ProcessManager.new log_watcher
+    def initialize options={}
+      @dns_port = options.fetch(:dns_port) { 23400 }
+      @http_port = options.fetch(:http_port) { 23401 }
+      @https_port = options.fetch(:https_port) { 23402 }
+      @ipc_file = options.fetch(:ipc_file) { '/tmp/explorer_ipc' }
     end
 
     def run
@@ -24,24 +17,33 @@ module Explorer
       # Start servers
       run!
 
+      # Load configuration
+      load
+
       IO.select([read]) # Wait for trap
 
       # Cleanup
       terminate
     end
 
+    def load
+      Explorer.hostmap.load File.join(Explorer::CONFIGDIR, 'hostmap.yaml')
+      Explorer.process_manager.load File.join(Explorer::CONFIGDIR, 'process.yaml')
+    end
+
+    # Do I need this?
     def terminate
       @group.terminate if @group
-      @process_manager.terminate if @process_manager
-      @log_watcher.terminate if @log_watcher
+      Explorer.terminate
     end
 
     def run!
+      Celluloid.logger = Explorer.log_watcher.logger
       @group = Celluloid::SupervisionGroup.new do |group|
-        group.supervise_as :dns, Server::DNS, dns_port
-        group.supervise_as :http, Server::HTTP, http_port, hostmap
-        group.supervise_as :https, Server::HTTPS, https_port, hostmap
-        group.supervise_as :ipc, Server::IPC, ipc_file, self
+        group.supervise_as :dns, Server::DNS, @dns_port
+        group.supervise_as :http, Server::HTTP, @http_port
+        group.supervise_as :https, Server::HTTPS, @https_port
+        group.supervise_as :ipc, Server::IPC, @ipc_file
       end
     end
   end

data/lib/explorer/version.rb

@@ -1,3 +1,3 @@
 module Explorer
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: explorer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tim Peters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -175,6 +175,7 @@ files:
 - lib/explorer/cli/process.rb
 - lib/explorer/cli/proxy.rb
 - lib/explorer/cli/setup.rb
+- lib/explorer/hostmap.rb
 - lib/explorer/ipc_client.rb
 - lib/explorer/log_watcher.rb
 - lib/explorer/process.rb