solo-rb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13bb83ba0be61b946f7a7d5e536763cde28f50109a1b077c6666c3249da4f596
-  data.tar.gz: b9e2a15a899c976f8b46fd8185b9f1a51a543102238899a6f27d17f95ca5ace5
+  metadata.gz: 4014fde68b2c883f67c864f9025b616653facd634df73a654f5564abe9dee8b7
+  data.tar.gz: cc85ce2b449fafbf0fa7f9a701f46aca481e4e2cae355777c73e464134d332f4
 SHA512:
-  metadata.gz: 1f5d62274511d1bc30208be743c3f294eb39f918f431daed879d2147285c509e27b50c7e766ed54b4a36ba298432124ee72764cb69c55705d1aa238746b71195
-  data.tar.gz: f530459297eae2bb30aa7aa7f0cf3598a033bce4a84458fb910c7d83c00f8cf73d2d0cb23a8f195106299cb1ca235e85b304b19c2f7363558c2f1903ddf93985
+  metadata.gz: 87f55aabbd3bf5a8e9a11383abc8df1c8df8199e3a7154704b3e7ce1e5f9a7beed026daabe119cd5d602eb3d86bf742cc056867af0c54514f2594328fb235c85
+  data.tar.gz: 8303771ce25767bdecd3d50210d0bc73422e54e9780bb0566c769500ab269aafbb6a756f398a3d34095322333589d1b47d5d3a02127ff8e36448850b1e39aab9

data/bin/solo

@@ -1,18 +1,8 @@
 #!/usr/bin/env ruby
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require "bundler/setup"
 require "solo"
+require "solo/cli"
 
-begin
-  opts = Solo.parse_opts
-  trap("INT") { 
-    puts "Shutting down..." unless opts[:quiet]
-    exit
-  }
-  Solo.open_server(port: opts[:port]) do
-    system(*opts[:command])
-  end
-rescue
-  STDERR.puts "#{$!}" unless opts[:quiet]
-  exit 1
-end
+Solo::CLI.call

data/lib/solo.rb

@@ -1,41 +1,11 @@
 require "solo/version"
-
-require 'rationalist'
 require 'socket'
 
 module Solo
-  class Error < StandardError; end
   
-  def self.parse_opts args=ARGV
-    opts = Rationalist.parse(
-      args,
-      boolean: ["quiet"],
-      default: { quiet: false },
-      alias: { q: "quiet", p: "port" },
-      stop_early: true
-    )
-    unless opts[:port] and (opts[:port].is_a? Integer) and (opts[:port] > 0)
-      STDERR.puts "Invalid port: #{opts[:port]}" unless opts[:quiet]
-      STDERR.puts "Usage: solo --port PORT [--quiet] -- COMMAND" unless opts[:quiet]
-      exit 1
-    end
-    if opts[:"_"].nil? or opts[:"_"].empty?
-      STDERR.puts "No command given" unless opts[:quiet]
-      STDERR.puts "Usage: solo --port PORT [--quiet] -- COMMAND" unless opts[:quiet]
-      exit 1
-    elsif opts[:"_"].length == 1
-      opts[:command] = opts[:"_"].first
-    else
-      opts[:command] = opts[:"_"]
-    end
-    opts
-  end
-
-  def self.open_server port:, address: "127.0.0.1", &block
-    TCPServer.open(address, port) do |serv|
+  def self.call port, &block
+    TCPServer.open("127.0.0.1", port) do |serv|
       block.call
     end
   end
-
 end
-

data/lib/solo/cli.rb

@@ -0,0 +1,30 @@
+require 'optparse'
+
+module Solo
+  module CLI
+    def self.call(argv=ARGV)
+      trap("INT") { puts "Shutting down..."; exit; }
+      begin
+        opts = parse_opts argv
+        Solo.call(opts[:port]) do
+          system(*argv)
+        end
+      rescue
+        STDERR.puts "#{$!}"
+        abort
+      end
+    end
+    def self.parse_opts argv
+      opts = {}
+      opts_parser = OptionParser.new do |parser|
+        parser.banner = "Usage: solo --port PORT COMMAND"
+        parser.on("-p", "--port [PORT]", Integer, "Set the PORT used to host the server")
+      end
+      opts_parser.parse!(argv, into: opts)
+      unless opts[:port] && opts[:port] > 0 && opts[:port] < 65565
+        raise ArgumentError.new("Invalid port: #{opts[:port]} \n#{opts_parser}")
+      end
+      opts
+    end
+  end
+end

data/lib/solo/version.rb

@@ -1,3 +1,3 @@
 module Solo
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solo-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Travis Rasor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rationalist
-  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'
 description: A port of Solo, a perl script, into a gem that prevents a program from
   running more than one copy at a time
 email:
@@ -77,6 +63,7 @@ extra_rdoc_files: []
 files:
 - bin/solo
 - lib/solo.rb
+- lib/solo/cli.rb
 - lib/solo/version.rb
 homepage: https://github.com/tlrasor/solo-rb
 licenses: