editserver 0.1.1 → 0.1.3

data/lib/editserver/command.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'yaml'
+require 'webrick/log'
 require 'rack'
 require 'editserver'
 
@@ -17,12 +18,13 @@ class Editserver
       }
 
       @rackopts = {
-        :environment => 'development',
-        :pid         => nil,
-        :Port        => 9999,
         :Host        => '127.0.0.1',
-        :AccessLog   => [],
-        :config      => ''
+        :Port        => 9999,
+        :Logger      => WEBrick::Log.new(nil, WEBrick::BasicLog::WARN), # be less chatty
+        :AccessLog   => [], # rack does its own access logging, so keep this blank
+        :pid         => nil,
+        :config      => '',
+        :environment => 'deployment'
       }
     end
 
@@ -64,7 +66,7 @@ class Editserver
         if @opts[:norcfile]
           empty
         elsif File.exists? rcfile
-          opts = YAML.load_file File.expand_path rcfile
+          opts = YAML.load_file File.expand_path(rcfile)
           opts           ||= {}
           opts['rack']   ||= {}
           opts['editor'] ||= {}
@@ -101,8 +103,35 @@ class Editserver
 
     def run
       options.parse @args
-      $0 = 'editserver'
-      server.start
+
+      begin
+        $0 = 'editserver'
+        puts banner
+        server.start
+      ensure
+        puts fx("\nGoodbye!", [32,1])
+      end
+    end
+
+    private
+
+    def banner
+      %Q(\
+                 __      __
+                /\\ \\  __/\\ \\__
+           __   \\_\\ \\/\\_\\ \\ ,_\\   ____     __   _ __   __  __     __   _ __
+         /'__`\\ /'_` \\/\\ \\ \\ \\/  /',__\\  /'__`\\/\\`'__\\/\\ \\/\\ \\  /'__`\\/\\`'__\\
+        /\\  __//\\ \\L\\ \\ \\ \\ \\ \\_/\\__, `\\/\\  __/\\ \\ \\/ \\ \\ \\_/ |/\\  __/\\ \\ \\/
+        \\ \\____\\ \\___,_\\ \\_\\ \\__\\/\\____/\\ \\____\\\\ \\_\\  \\ \\___/ \\ \\____\\\\ \\_\\
+         \\/____/\\/__,_ /\\/_/\\/__/\\/___/  \\/____/ \\/_/   \\/__/   \\/____/ \\/_/
+
+        Listening on #{fx "#{rackopts[:Host]}:#{rackopts[:Port]}", [32,1]}\
+      ).gsub(/^ {8}/, '')
+    end
+
+    def fx str, effects = []
+      return str unless $stdout.tty?
+      str.gsub /^(.*)$/, "\e[#{[effects].flatten.join ';'}m\\1\e[0m"
     end
   end
 end

data/lib/editserver/version.rb

@@ -1,3 +1,3 @@
 class Editserver
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/test/editserver/command.test.rb

@@ -16,7 +16,7 @@ describe Editserver::Command do
       cmd.instance_variable_get(:@opts).must_equal(:rcfile => '~/.editserverrc')
       cmd.instance_variable_get(:@editoropts).must_equal('default' => nil, 'terminal' => nil)
       cmd.instance_variable_get(:@rackopts).keys.sort_by(&:to_s).must_equal [
-        :environment, :pid, :Port, :Host, :AccessLog, :config
+        :Host, :Port, :Logger, :AccessLog, :pid, :config, :environment
       ].sort_by &:to_s
     end
   end

data/test/editserver/editor.test.rb

@@ -24,6 +24,7 @@ describe Editserver::Editor do
 
     describe :@@terminal do
       it "should have a reader and writer for the metaclass's @@terminal" do
+        @klass.terminal = nil
         @klass.terminal.must_equal nil
         @klass.terminal = 'xterm -fg white -bg black'
         @klass.terminal.must_equal %w[xterm -fg white -bg black]

data/test/editserver/response.test.rb

@@ -1,6 +1,7 @@
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'rack/mock'
+require 'editserver/editor'
 require 'editserver/response'
 require 'minitest/pride' if $stdout.tty?
 require 'minitest/autorun'

data/test/editserver.test.rb

@@ -6,7 +6,6 @@ require 'minitest/pride' if $stdout.tty?
 require 'minitest/autorun'
 require 'editserver'
 require 'editserver/version'
-require 'editserver/command'
 
 describe Editserver do
   describe :VERSION do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Sung Pae