docwatch-bin 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ab45880b0ec4a3dabedeec7ba8480d7201035a06ba11b90f7a7bd103ecd725f
-  data.tar.gz: 27d24ba2beea3a03d344584313a1735668607afc5a04c5ee69d95786afc35921
+  metadata.gz: fab5dc94d05d184be658795e8470af249f9fdb4f3e8c8e0f376bb194f456b26e
+  data.tar.gz: 444cb4d3d3259107828b72077c2d77850860b4b10926fe9f86fbecb23577af2c
 SHA512:
-  metadata.gz: 783df445e617e2896b9180f49a36af08c8adfee6b59224b9ef3fe18326cd6bc0033688ad3bce1aa06f1d492dc2b111de0a59f7c2d56126cf3ca70aad94cad34c
-  data.tar.gz: 15ec12b7fc4d432d84b4c6202ee021b2a29c7c60fa85a412ba763a012a7362601a960fb9c5ca30fbf08343cd06072d07f5e9019c9fa124a5f798b74f867beefd
+  metadata.gz: d9424eccb478f69d96c2353088c998188593fcd25ac217e66fe0b705bfe3320aa3afe9bdcae1fcb198805d8526f1c2d88a5b098b586062733b38248b953982b0
+  data.tar.gz: 7c494c2bfef056300b98bb76320646d87e03c7fba80aac0426b14990d814b8d7f21549cae527543868c9c57ea0b6db7027592e822a2f5479308d95318220340a

data/bin/docwatch

@@ -2,6 +2,13 @@
 require_relative '../lib/docwatch'
 include Docwatch
 
+Params = Struct.new(
+    :verbose,
+    :version,
+    :file_path,
+    keyword_init: true,
+)
+
 class Main
     def initialize(opts)
         @opts = opts
@@ -12,20 +19,19 @@ class Main
     end
 
     def params
-        @params ||= OpenStruct.new({
+        @params ||= Params.new(
             verbose: @opts['--verbose'],
             version: @opts['--version'],
-            help: @opts['--help'],
-            file_path: @opts['<file-path>']
-        })
+            file_path: @opts['<file-path>'],
+        )
     end
 
     def port
-        @port ||= if @opts['--port'] == 'random'
+        if @opts['--port'] == 'random'
             # TODO: check if this port is in use
-            10000 + Random.random_number(50000)
+            @port ||= 10_000 + Random.random_number(50_000)
         else
-            @opts['--port']
+            @port ||= @opts['--port']
         end
     end
 
@@ -37,11 +43,6 @@ class Main
         true
     end
 
-    def exit_usage
-        puts DOCS
-        exit 0
-    end
-
     def exit_version
         puts Docwatch::VERSION
         exit 0
@@ -63,7 +64,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
 
@@ -75,12 +75,12 @@ class Main
         watcher = Watcher.new(params.file_path)
 
         Thread.new do
-            while socket = server.accept
+            while (socket = server.accept)
                 Thread.new do
                     Connection.handle(
                         renderer,
                         watcher,
-                        Session.new(socket, logger)
+                        Session.new(socket, logger),
                     )
                 end
             end
@@ -90,40 +90,41 @@ class Main
         puts 'Press enter to open page in the default handler (xdg-open)'.green
 
         begin
-            while STDIN.gets
+            while $stdin.gets
                 system('xdg-open %s' % url)
             end
-        rescue Interrupt => e
+        rescue Interrupt
             puts
             puts 'Bye'
         end
     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))
-rescue Docopt::Exit => e
-    puts e.message
-    exit 1
+    Main.run(Docopt.docopt(usage))
+rescue Docopt::Exit
+    puts usage
+    exit 2
 end

data/lib/docwatch/connection.rb

@@ -12,11 +12,13 @@ module Docwatch
 
         def handle
             case @session.path
-                when '/'
-                    @session.respond_with_html @renderer.to_html
-                when '/wait'
-                    @watcher.wait
-                    @session.respond_with_text 'OK'
+            when '/'
+                @session.respond_with_html(@renderer.to_html)
+            when '/wait'
+                @watcher.wait
+                @session.respond_with_text('OK')
+            else
+                @session.respond_with_404
             end
         end
     end

data/lib/docwatch/renderer/markdown.rb

@@ -16,8 +16,8 @@ module Docwatch
             Redcarpet::Markdown.new(
                 Redcarpet::Render::HTML,
                 fenced_code_blocks: true,
-                autolink:  true,
-                tables:    true,
+                autolink: true,
+                tables: true,
                 footnotes: true,
             ).render(contents)
         end

data/lib/docwatch/renderer.rb

@@ -10,6 +10,7 @@ module Docwatch
         def self.by_filetype(file_path)
             extname = File.extname(file_path)[1..]
             return if extname.length == 0
+
             @@extensions[extname.to_sym].first.new(file_path)
         end
 
@@ -44,9 +45,7 @@ module Docwatch
 
         protected
 
-        def file_path
-            @file_path
-        end
+        attr_reader :file_path
 
         def contents
             File.read(@file_path)

data/lib/docwatch/session.rb

@@ -4,7 +4,7 @@ module Docwatch
             @socket = socket
             @logger = logger
 
-            logger.log first_request_line
+            logger.log(first_request_line)
         end
 
         def close
@@ -12,22 +12,28 @@ module Docwatch
         end
 
         def path
-            return if first_request_line.length == 0
-            first_request_line.split(' ')[1]
+            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.2"
+    VERSION = '1.1.6'
 end

data/lib/docwatch/watcher.rb

@@ -10,7 +10,7 @@ module Docwatch
 
         def wait
             now = mtime
-            sleep 0.2 while mtime <= now
+            sleep(0.2) while mtime <= now
         end
     end
 end

data/lib/docwatch.rb

@@ -9,7 +9,7 @@ require 'socket'
 
 module Docwatch
     def self.root_dir
-        File.expand_path('../..', __FILE__)
+        File.expand_path('..', __dir__)
     end
 end
 

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: docwatch-bin
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: docopt
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 description:
 email:
 executables:
@@ -144,7 +144,8 @@ files:
 homepage: https://github.com/crdx/docwatch
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -153,14 +154,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Preview markdown documents in the browser with reload on change