docwatch-bin 1.1.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203f494fbe91f8a8119b44bf85810e3ceb97f0bf45af3004b0816001f419cf32
-  data.tar.gz: b753786ed78ec246c192b8de63a2605db13f1e09fc9070eab75d4634a58ad6e1
+  metadata.gz: 428e9a8f772a5877ea24b8aa37f63f01f17a6889f0e0d0e72e8502abaf4a5d51
+  data.tar.gz: 705d2828ede9e7ab93a91b0e0ce987cfb5b49212c9b7983e8309ce487498a1f6
 SHA512:
-  metadata.gz: d3cd164f0062369d5e85f3d10a897f57388656d40d46be34b6a5219cd6f80763536bbc39bb0d741806c4a8a06dfed45246a5a9ff224d4933fbc9c87269e59437
-  data.tar.gz: 602980ddaf70e96c66bff7e5c39f354ae02e96ab91f14edb9f62902bb436c129e4fb856452c4c4ef975049c9a7b8e5043dfeb69305ece9ae7fdebd0be3350237
+  metadata.gz: cbd08501ef11110b8d6cc5d5f6f5e6b0fe5cfb6567aab6655ac9436a33985d8ff29633f66ff53e4531181c7ebb31883ed6c272263d4e7359340deb9f6ad3713f
+  data.tar.gz: 3943bd1279191233d3417e8b5e263a324b5645d776e8dd62774865ccc646661c023dcd469c16d71ca1ca5323e440be1ebedc4cc1ba7aed49f82b59004e45cfd4

data/bin/docwatch

@@ -15,7 +15,6 @@ class Main
         @params ||= OpenStruct.new({
             verbose: @opts['--verbose'],
             version: @opts['--version'],
-            help: @opts['--help'],
             file_path: @opts['<file-path>']
         })
     end
@@ -37,11 +36,6 @@ class Main
         true
     end
 
-    def exit_usage
-        puts DOCS
-        exit 0
-    end
-
     def exit_version
         puts Docwatch::VERSION
         exit 0
@@ -63,7 +57,6 @@ class Main
 
     def run
         exit_version if params.version
-        exit_usage if params.help
         exit_invalid_file unless File.exist?(params.file_path)
         exit_invalid_port unless port_valid
 
@@ -100,30 +93,31 @@ class Main
     end
 end
 
-docs = <<~EOF
-    #{'Usage:'.bold}
+usage = <<~EOF
+    Usage:
         #{File.basename($0)} [options] <file-path>
+        #{File.basename($0)} ( --version | --help )
 
-    #{'Options:'.bold}
+    Options:
         -p, --port=VALUE    Listen port [default: 8888]
-        -v, --verbose       Be verbose
-        -V, --version       Show version
+        --verbose           Be verbose
+        -v, --version       Show version
         -h, --help          Show this help
 
-    #{'Renderers:'.bold}
-        markdown (.md)
-        html     (.html)
+    Renderers:
+        markdown    (.md)
+        html        (.html)
 
-    If #{'--port'.bold} is #{'random'.bold} a random port will be chosen, otherwise
-    the specified one will be used. The default is 8888.
+    If #{'--port'.bold} is #{'random'.bold} a random port will be chosen, otherwise the specified
+    one will be used. The default is 8888.
 
-    In #{'--verbose'.bold} mode, incoming HTTP requests and file change event
-    notifications will be printed to standard output.
+    In #{'--verbose'.bold} mode, incoming HTTP requests and file change event notifications will be
+    printed to standard output.
 EOF
 
 begin
-    Main.run(Docopt::docopt(docs, version: VERSION))
+    Main.run(Docopt::docopt(usage))
 rescue Docopt::Exit => e
-    puts e.message
-    exit 1
+    puts usage
+    exit 2
 end

data/lib/docwatch/connection.rb

@@ -17,6 +17,8 @@ module Docwatch
                 when '/wait'
                     @watcher.wait
                     @session.respond_with_text 'OK'
+                else
+                    @session.respond_with_404
             end
         end
     end

data/lib/docwatch/session.rb

@@ -12,22 +12,28 @@ module Docwatch
         end
 
         def path
-            return if first_request_line.length == 0
+            if first_request_line.nil? || first_request_line.length == 0
+                return
+            end
+
             first_request_line.split(' ')[1]
         end
 
         def respond_with_text(str)
-            respond_with(str, 'text/plain')
+            respond_with(200, str, 'text/plain')
         end
 
         def respond_with_html(str)
-            respond_with(str, 'text/html')
+            respond_with(200, str, 'text/html')
+        end
+
+        def respond_with_404
+            respond_with(404, 'Not Found', 'text/html')
         end
 
-        def respond_with(str, content_type)
-            println 'HTTP/1.1 200'
+        def respond_with(code, str, content_type)
+            println 'HTTP/1.1 %d' % code
             println 'Content-Type: %s; charset=utf8' % content_type
-            # println 'Connection: close'
             println
             println str
 
@@ -37,7 +43,9 @@ module Docwatch
         private
 
         def input_lines
-            @input_lines ||= @socket.recvmsg[0].lines rescue []
+            @input_lines ||= @socket.recvmsg[0].lines
+        rescue
+            []
         end
 
         def first_request_line

data/lib/docwatch/version.rb

@@ -1,3 +1,3 @@
 module Docwatch
-    VERSION = "1.1.0"
+    VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docwatch-bin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.4
 platform: ruby
 authors:
 - crdx
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,16 +114,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-description: 
-email: 
+        version: '13.0'
+description:
+email:
 executables:
 - docwatch
 extensions: []
@@ -145,7 +145,7 @@ homepage: https://github.com/crdx/docwatch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
 summary: Preview markdown documents in the browser with reload on change
 test_files: []