explorer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecdc58b1c28dcdbd33d92cfab008eb4252df0fb8
-  data.tar.gz: 7e0f277198bb44695818fc849a4f11480767d5b1
+  metadata.gz: 92c4c5434dfa27aea21de62e797f79e5634aee95
+  data.tar.gz: 332c6ce3352491289eaf6c3199f599e9216395b8
 SHA512:
-  metadata.gz: 3aa239b18db10c9c8573b7b6116f5da84f6647ee595a8a08a9950c01d7b7e36e91d0cb729f4d9713a3c2cde9921dcdeec5d6ab87f394cc177810205e3c4732e1
-  data.tar.gz: 552fdfb5179d368fe5ba55a4c905da3ed728b659621a3c5ac9fcebabf6e00bd722154c89b4640b9124430ba94997001555ed2532af3f1800f42a6f3a7674f184
+  metadata.gz: d574b77ff7efdb07ba7821823fc1c96152459812a9c0f4ef111bc9ffa1b1c9eb5d6c0b6a342220f05a82824d51a0390f4346cf4a12a4e5e179f07d33cf23cdf1
+  data.tar.gz: 98d3806a19b602d463d44cbe8652194664b84923bf0b1220ab3378837230131ceea14e7dac30645547730e294237db04a2201950960f400ccf34c45a2656cc09

data/README.md

@@ -1,6 +1,8 @@
 # Explorer
 
-TODO: Write a gem description
+Explorer is a replacement for Pow! written in Ruby.
+
+[![Dependency Status](https://gemnasium.com/Darksecond/explorer.svg)](https://gemnasium.com/Darksecond/explorer)
 
 ## Installation
 

data/bin/explore

@@ -2,4 +2,4 @@
 
 require 'explorer'
 
-Explorer::CLI.start(ARGV)
+Explorer::CLI::CLI.start(ARGV)

data/explorer.gemspec

@@ -26,4 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'celluloid', '~> 0.16'
   spec.add_dependency 'celluloid-io', '~> 0.16'
+  spec.add_dependency 'dotenv', '~> 1.0'
+  spec.add_dependency 'rainbow', '~> 2.0'
+  spec.add_dependency 'formatador', '~> 0.2'
 end

data/lib/explorer/cli.rb

@@ -1,50 +1,30 @@
 require 'thor'
+require 'explorer/cli/proxy'
+require 'explorer/cli/process'
 
 module Explorer
-  class CLI < Thor
-    desc "version", "Print version of explorer"
-    def version
-      puts Explorer::VERSION
-    end
-    map %w(-v --version) => :version
-
-    desc "start CONFIG", 'Start explorer'
-    def start(file)
-      servers = Servers.new hostmap: {'test.dev' => {host: 'localhost', port: 8080}}
-      servers.log_watcher.add(STDOUT)
-      servers.run
-    end
-
-    desc 'map-list', 'List hostmapping'
-    def map_list
-      ipc = IPCClient.new
-      map = ipc.hostmap_list
-        puts "-------------------------------------------------------"
-        puts "|             MAP |            HOST |            PORT |"
-      map.each do |k,v|
-        puts "| #{k.rjust(15)} | #{v['host'].rjust(15)} | #{v['port'].to_s.rjust(15)} |"
+  module CLI
+    # TODO: Rename
+    class CLI < Thor
+      desc "version", "Print version of explorer"
+      def version
+        puts Explorer::VERSION
       end
-        puts "-------------------------------------------------------"
-    end
+      map %w(-v --version) => :version
 
-    desc 'map-add DOMAIN HOST PORT', 'Add to mapping'
-    def map_add(domain, host, port)
-      ipc = IPCClient.new
-      ipc.hostmap_add(domain, host, port)
-      puts "Added #{domain} to hostmap"
-    end
+      desc 'proxy SUBCOMMAND ...ARGS', 'manage proxy'
+      subcommand 'proxy', Proxy
 
-    desc 'tail', 'Tail log'
-    def tail
-      ipc = IPCClient.new
-      ipc.tail
-    end
+      desc 'process SUBCOMMAND ...ARGS', 'manage processes'
+      subcommand 'process', Process
+
+      desc "boot [CONFIG]", 'Start explorer'
+      def boot(config=nil)
+        servers = Servers.new hostmap: {'test.dev' => {host: 'localhost', port: 8080}}
+        servers.log_watcher.add(STDOUT)
+        servers.run
+      end
 
-    desc 'cmd-add LABEL CMD', 'Add command'
-    option :dir
-    def cmd_add(label, cmd)
-      ipc = IPCClient.new
-      ipc.cmd_add(label, cmd, options[:dir])
     end
   end
 end

data/lib/explorer/cli/process.rb

@@ -0,0 +1,89 @@
+require 'rainbow'
+require 'formatador'
+
+module Explorer
+  module CLI
+    class Process < Thor
+      desc 'tail', 'Tail log'
+      def tail
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        ipc.tail
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+
+      desc 'add LABEL CMD (--dir=DIR)', 'Add command'
+      option :dir
+      def add(label, cmd)
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        ipc.cmd_add(label, cmd, options[:dir])
+        puts Rainbow("Added #{label}").color(:green).bright
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+
+      desc 'start LABEL', 'Start process'
+      def start(label)
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        ipc.cmd_start(label)
+        puts Rainbow("Started #{label}").color(:green).bright
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+
+      desc 'stop LABEL', 'Stop process'
+      def stop(label)
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        ipc.cmd_stop(label)
+        puts Rainbow("Stopped #{label}").color(:green).bright
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+
+      desc 'remove LABEL', 'Remove process'
+      def remove(label)
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        ipc.cmd_remove(label)
+        puts Rainbow("Removed #{label}").color(:green).bright
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+
+      desc 'list', 'list processes'
+      def list
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        list = ipc.cmd_list
+        data = list.map do |p|
+          color = if p['state'] == 'stopped'
+                    'red'
+                  else
+                    'green'
+                  end
+          {
+            label: "[#{color}]#{p['label']}[/]",
+            command: "[#{color}]#{p['cmd']}[/]",
+            'working directory' => "[#{color}]#{p['dir']}[/]",
+            'PID' => "[#{color}]#{p['pid']}[/]",
+            'exit code' => "[#{color}]#{p['status']}[/]",
+            'status' => "[#{color}]#{p['state']}[/]",
+          }
+        end
+        Formatador.display_compact_table(data, [:label, :command, 'PID', 'exit code', 'status', 'working directory'])
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+    end
+  end
+end

data/lib/explorer/cli/proxy.rb

@@ -0,0 +1,47 @@
+require 'rainbow'
+require 'formatador'
+
+module Explorer
+  module CLI
+    class Proxy < Thor
+      desc 'list', 'List proxy map'
+      def list
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        data = ipc.hostmap_list.map do |k, v|
+          {
+            domain: "[yellow]#{k}[/]",
+            host: "[yellow]#{v['host']}[/]",
+            port: "[yellow]#{v['port']}[/]",
+          }
+        end
+        Formatador.display_compact_table(data, [:domain, :host, :port])
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+
+      desc 'add DOMAIN HOST PORT', 'Add domain to proxy'
+      def add(domain, host, port)
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        ipc.hostmap_add(domain, host, port)
+        puts "Added #{domain} to proxy"
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+
+      desc 'remove DOMAIN', 'remove domain from proxy'
+      def remove(domain)
+        Celluloid.logger = nil # Silence celluloid
+
+        ipc = IPCClient.new
+        ipc.hostmap_remove(domain)
+        puts "Removed #{domain} from proxy"
+      rescue Errno::ENOENT
+        puts Rainbow('Explore is not running').color(:red).bright
+      end
+    end
+  end
+end

data/lib/explorer/ipc_client.rb

@@ -29,9 +29,17 @@ module Explorer
       @socket.puts msg.to_json
     end
 
+    def hostmap_remove domain
+      msg = {
+        command: 'map-remove',
+        map: domain
+      }
+      @socket.puts msg.to_json
+    end
+
     def tail(io = STDOUT)
       msg = {
-        command: 'tail'
+        command: 'cmd-tail'
       }
       @socket.puts msg.to_json
 
@@ -51,6 +59,38 @@ module Explorer
       @socket.puts msg.to_json
     end
 
+    def cmd_start(label)
+      msg = {
+        command: 'cmd-start',
+        label: label,
+      }
+      @socket.puts msg.to_json
+    end
+
+    def cmd_stop(label)
+      msg = {
+        command: 'cmd-stop',
+        label: label,
+      }
+      @socket.puts msg.to_json
+    end
+
+    def cmd_remove(label)
+      msg = {
+        command: 'cmd-remove',
+        label: label,
+      }
+      @socket.puts msg.to_json
+    end
+
+    def cmd_list
+      msg = {
+        command: 'cmd-list'
+      }
+      @socket.puts msg.to_json
+      JSON.parse @socket.readline
+    end
+
     def shutdown
       @socket.close if @socket
     end

data/lib/explorer/process.rb

@@ -5,15 +5,16 @@ module Explorer
     finalizer :shutdown
 
     attr_reader :label, :command, :working_dir, :state, :status
-    attr_reader :pid, :pgid, :pipe, :log_watcher
+    attr_reader :pid, :pgid, :pipe, :log_watcher, :env
 
     # Log watcher should implement a 'log' method which accepts a label and a line of text
     # Log watcher should also be thread-safe or an actor
-    def initialize(label, command, working_dir: ENV['PWD'], log_watcher: nil)
+    def initialize(label, command, working_dir: ENV['PWD'], log_watcher: nil, env: {})
       @label = label
       @command = command
       @working_dir = working_dir
       @log_watcher = log_watcher
+      @env = env
       @state = :stopped
       @status = nil
     end
@@ -95,7 +96,6 @@ module Explorer
     end
 
     def spawn_process(label, command, working_dir: ENV['PWD'], pipe: :out)
-      env = {}
       options = {
         chdir: working_dir,
         in: :close,

data/lib/explorer/process_manager.rb

@@ -1,3 +1,5 @@
+require 'dotenv'
+
 module Explorer
   class ProcessManager
     def initialize log_watcher = nil
@@ -12,8 +14,8 @@ module Explorer
     end
 
     def add(label, command, working_dir: ENV['PWD'])
-      #TODO $PORT replacement? (or somewhere else, perhaps)
-      @processes[label] = Process.new(label, command, working_dir: working_dir, log_watcher: @log_watcher)
+      env = load_env(working_dir)
+      @processes[label] = Process.new(label, command, working_dir: working_dir, log_watcher: @log_watcher, env: env)
     end
 
     def remove(label)
@@ -53,5 +55,13 @@ module Explorer
     def labels
       @processes.keys
     end
+
+    private
+
+    def load_env(directory = ENV['PWD'])
+      path = File.join(directory, '.env')
+      return {} unless File.exist?(path)
+      Dotenv::Environment.new(path)
+    end
   end
 end

data/lib/explorer/server/ipc.rb

@@ -34,11 +34,29 @@ module Explorer
             socket.puts @servers.hostmap.to_json
           when 'map-add'
             @servers.hostmap[json['map']] = { host: json['host'], port: json['port'].to_i }
-          when 'tail'
+          when 'map-remove'
+            @servers.hostmap.delete json['map']
+          when 'cmd-tail'
             @servers.log_watcher.add(socket)
           when 'cmd-add'
             @servers.process_manager.add(json['label'], json['cmd'], working_dir: json['dir'] || ENV['PWD'])
-            @servers.process_manager.start(json['label']) #TODO Refactor out?
+          when 'cmd-start'
+            @servers.process_manager.start(json['label'])
+          when 'cmd-stop'
+            @servers.process_manager.stop(json['label'])
+          when 'cmd-remove'
+            @servers.process_manager.remove(json['label'])
+          when 'cmd-list'
+            socket.puts @servers.process_manager.processes.map { |p|
+              {
+                label: p.label,
+                cmd: p.command,
+                dir: p.working_dir,
+                state: p.state,
+                pid: p.pid,
+                status: p.status.nil? ? nil : p.status.to_i,
+              }
+            }.to_json
           end
         end
       rescue EOFError, JSON::ParserError

data/lib/explorer/version.rb

@@ -1,3 +1,3 @@
 module Explorer
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: explorer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tim Peters
@@ -108,6 +108,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: formatador
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: A pow! replacement written in ruby.
 email:
 - mail@darksecond.nl
@@ -128,6 +170,8 @@ files:
 - lib/celluloid/io/pty.rb
 - lib/explorer.rb
 - lib/explorer/cli.rb
+- lib/explorer/cli/process.rb
+- lib/explorer/cli/proxy.rb
 - lib/explorer/ipc_client.rb
 - lib/explorer/log_watcher.rb
 - lib/explorer/process.rb