test_server_rb 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161eb86462ccdd0f44087e996ed93cce19e298b0
-  data.tar.gz: eeff69b5debd38143aed37cd976e37cab049d00a
+  metadata.gz: 289ffec419272ff9df85f63bd5010ced0c7e543a
+  data.tar.gz: cc92b99766d9795ea727b323d5a2b2b9f4c13fe5
 SHA512:
-  metadata.gz: af5a2e95acd132c7cfedbf09ae030da9002b01022acf9fd3af131ce36764be30d6b1b551023628883d64efebbe623cfcb3b2a23dfe01086329a749c5076a641c
-  data.tar.gz: 4c83df1ae0757dd5ae8e7763297ec7be7170ebcabba20d59f9f09eba224eedfafbfdf51388e43c7fe9b7f8f6240c69ed79a223ee082ad8c2210ab20779d3622f
+  metadata.gz: 53c25d84e06f3e7d91e586f9c9a096a374b44fa6370d91bea48a0c3072c065516d6cf69484fe97624ecf0f5ddaf98c2388218d720c2b263442c873d262feeb86
+  data.tar.gz: 58deeca4da3796aaf15c6d2818a9b80a3f55cc1f5f7a613aee06ff7d14b5e60cd697cc155396738f7e27e1feb527377ee2273bb17888cfce66922e7c30b9843e

data/exe/test_server

@@ -2,66 +2,42 @@
 
 $: << 'test'
 require 'bundler/setup'
-require 'socket'
-require 'terminal-notifier' if ENV['NOTIFY']
+require 'test_server'
+require 'optparse'
 
-module TestServer
-  class << self
-    SOCK = "test.sock".freeze
+options = {
+  remote: false,
+  sock: "test.sock"
+}
 
-    def client
-      @client ||= UNIXSocket.new(SOCK)
-    end
+OptionParser.new do |opts|
+  opts.banner = "Usage: test_server [OPTIONS] [TEST...]"
 
-    def server
-      @server ||= UNIXServer.new(SOCK)
-    end
+  opts.on("--serve", "Boot the server") do |mode|
+    options[:mode] = :serve
+  end
 
-    def running?
-      File.exist?(SOCK)
-    end
+  opts.on("--test", "Push a test to the server") do |mode|
+    options[:mode] = :push
+  end
 
-    def test(files)
-      client.sendmsg files.join(' ')
-    end
+  opts.on("--notify", "Send system notification based on test result") do |notify|
+    options[:notify_on_fail] = notify
+    options[:notify_on_pass] = notify
+  end
+
+  opts.on("--notify-on-pass", "Send system notification when the test passes") do |notify|
+    options[:notify_on_pass] = notify
+  end
 
-    def start!
-      `rm #{SOCK}` if running?
-      puts "Initializing TestServer with pid #{$$}..."
-      require 'test_helper'
-      puts "Ready!"
-      loop do
-        conn = server.accept
-        files, _ = conn.recvmsg
-        pid = fork do
-          puts "> Testing files: #{files}"
-          if files == ":all".freeze
-            all_glob = ENV['ALL_GLOB'] || 'test/unit/*_test.rb'
-            Dir.glob(all_glob).each { |f| load f }
-          else
-            files.split(' ').each { |f| load f }
-          end
-        end
-        _, status = Process.wait2(pid)
-        if ENV['NOTIFY']
-          msg = (status.exitstatus == 0) ? "Tests passed :)" : "Warning! Tests failed :("
-          TerminalNotifier.notify(msg)
-        end
-      end
-    ensure
-      `rm #{SOCK}`
-    end
+  opts.on("--notify-on-fail", "Send system notification when the test fails") do |notify|
+    options[:notify_on_fail] = notify
   end
-end
 
-queue = ARGV
-until queue.empty?
-  case queue.shift
-  when "--serve"
-    TestServer.start!
-  when "--test"
-    TestServer.test(queue)
-    queue = []
+  opts.on("--socket", "Socket file to use") do |sock|
+    options[:sock] = sock
   end
-end
+end.parse!
 
+options[:files] = ARGV
+TestServer.run!(options)

data/exe/test_server_remote

@@ -2,57 +2,47 @@
 
 $: << 'test'
 require 'bundler/setup'
-require 'socket'
-require 'terminal-notifier' if ENV['NOTIFY']
-
-module TestServer
-  class << self
-    def client
-      @client ||= TCPSocket.new(ENV['HOST'], ENV['PORT'])
-    end
-
-    def server
-      @server ||= TCPServer.new(ENV['HOST'], ENV['PORT'])
-    end
-
-    def test(files)
-      client.sendmsg files.join(' ')
-    end
-
-    def start!
-      puts "Initializing TestServer with pid #{$$}..."
-      require 'test_helper'
-      puts "Ready!"
-      loop do
-        conn = server.accept
-        files, _ = conn.recvmsg
-        pid = fork do
-          puts "> Testing files: #{files}"
-          if files == ":all".freeze
-            all_glob = ENV['ALL_GLOB'] || 'test/unit/*_test.rb'
-            Dir.glob(all_glob).each { |f| load f }
-          else
-            files.split(' ').each { |f| load f }
-          end
-        end
-        _, status = Process.wait2(pid)
-        if ENV['NOTIFY']
-          msg = (status.exitstatus == 0) ? "Tests passed :)" : "Warning! Tests failed :("
-          TerminalNotifier.notify(msg)
-        end
-      end
-    end
+require 'test_server'
+require 'optparse'
+
+options = {
+  remote: true,
+  host: "localhost",
+  port: 4545
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: test_server_remote [OPTIONS] [TEST...]"
+
+  opts.on("--serve", "Boot the server") do |mode|
+    options[:mode] = :serve
+  end
+
+  opts.on("--test", "Push a test to the server") do |mode|
+    options[:mode] = :push
+  end
+
+  opts.on("--notify", "Send system notification based on test result") do |notify|
+    options[:notify_on_fail] = notify
+    options[:notify_on_pass] = notify
   end
-end
-
-queue = ARGV
-until queue.empty?
-  case queue.shift
-  when "--serve"
-    TestServer.start!
-  when "--test"
-    TestServer.test(queue)
-    queue = []
+
+  opts.on("--notify-on-pass", "Send system notification when the test passes") do |notify|
+    options[:notify_on_pass] = notify
+  end
+
+  opts.on("--notify-on-fail", "Send system notification when the test fails") do |notify|
+    options[:notify_on_fail] = notify
+  end
+
+  opts.on("--port", Integer, "Server's port (default: 4545)") do |port|
+    options[:port] = port
+  end
+
+  opts.on("--host", "Server's host (default: localhost)") do |host|
+    options[:host] = host
   end
-end
+end.parse!
 
+options[:files] = ARGV
+TestServer.run!(options)

data/lib/test_server/version.rb

@@ -1,3 +1,3 @@
 module TestServer
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/lib/test_server.rb

@@ -1,5 +1,75 @@
 require "test_server/version"
 
+require 'socket'
+
 module TestServer
-  # Your code goes here...
+  class << self
+    def run!(options)
+      case options[:mode]
+      when :serve
+        serve!(options)
+      when :push
+        test(options)
+      end
+    end
+
+    def test(options)
+      with_client(options) do |client|
+        client.sendmsg options[:files].join(' ')
+      end
+    end
+
+    def serve!(options)
+      with_server(options) do |server|
+        puts "Initializing TestServer with pid #{$$}..."
+        require 'test_helper'
+        puts "Ready!"
+        loop do
+          conn = server.accept
+          files, _ = conn.recvmsg
+          pid = fork do
+            puts "> Testing files: #{files}"
+            if files == ":all".freeze
+              all_glob = ENV['ALL_GLOB'] || 'test/unit/*_test.rb'
+              Dir.glob(all_glob).each { |f| load f }
+            else
+              files.split(' ').each { |f| load f }
+            end
+          end
+          _, status = Process.wait2(pid)
+          if status.exitstatus == 0
+            notify("Tests passed :)") if options[:notify_on_pass]
+          else
+            notify("Warning! Tests failed :(") if options[:notify_on_fail]
+          end
+        end
+      end
+    end
+
+    def with_client(options)
+      if options[:remote]
+        yield TCPSocket.new(options[:host], options[:port])
+      else
+        yield UNIXSocket.new(options[:sock])
+      end
+    end
+
+    def with_server(options)
+      if options[:remote]
+        yield TCPServer.new(options[:host], options[:port])
+      else
+        begin
+          `rm #{options[:sock]}` if File.exist?(options[:sock])
+          yield UNIXServer.new(options[:sock])
+        ensure
+          `rm #{options[:sock]}` if File.exist?(options[:sock])
+        end
+      end
+    end
+
+    def notify(msg)
+      require 'terminal-notifier'
+      TerminalNotifier.notify(msg)
+    end
+  end
 end

data/test_server.gemspec

@@ -23,4 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_dependency "terminal-notifier"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_server_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Josh Bodah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - joshuabodah@gmail.com
@@ -77,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: dead simple fork based test server