docwatch-bin 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e525886a59746464f8ba5986e89bdcb343acbd1a96378bb56521f8e20bcf0288
-  data.tar.gz: a6829868d17db749392a11db8418519298e80bbfa386add54e2258bf72e59079
+  metadata.gz: 536d516bf8d5d6bce8771014f6b67aeb01d0762635334e6aaa4ea043aa7e6721
+  data.tar.gz: 0a7816f53dee0354d6d233779bae96a979421465caa9a191f84870bf8e9f0b9f
 SHA512:
-  metadata.gz: e7e12d6b4188d3d29964d9c842bad38454c383aec54b2a55d38fe8ace8de68a21065abb7f1ade4cabe5ec88263d4790d1d3a8e63bccb40bd3bc4ee22f7095172
-  data.tar.gz: 270e381c2bbf7f2b28ecfbfccc407050a6aab5ed2c44342ba0f60a2c16d0227f00d33d8ba14be11e4820e27b60c085af83e039be2cd777fd7c54e9fb3bed641f
+  metadata.gz: cce30488feeb53ea54e66ef4abe39e44f2a9dd163c78a97660b127d9ab436c27ffef559b4d0b48ad70c0a02f07367520ad297ff0055c106dffaab615d9807703
+  data.tar.gz: 9140ec6b8f178b8c096953970c082a8a5331c881c0a4b6ee035a6cd6b51fa14d03783b236ed6655835d82b241baeccdba2461ff7ad176d2be3d35275f4624f6c

data/bin/docwatch

@@ -2,28 +2,7 @@
 require_relative '../lib/docwatch'
 include Docwatch
 
-DOCS = <<~EOF
-    #{'Usage:'.bold}
-        #{File.basename($0)} [options] [<file-path>]
-
-    #{'Options:'.bold}
-        -p, --port=VALUE   Listen port [default: 8888]
-        -v, --verbose      Verbose
-        -h, --help         Help
-        -V, --version      Version
-
-    #{'Renderers:'.bold}
-        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.
-
-    In #{'--verbose'.bold} mode, incoming HTTP requests and file change event
-    notifications will be printed to standard output.
-EOF
-
-class App
+class Main
     def initialize(opts)
         @opts = opts
     end
@@ -68,11 +47,6 @@ class App
         exit 0
     end
 
-    def exit_invalid_arguments
-        puts 'Invalid arguments'.red
-        exit 1
-    end
-
     def exit_invalid_file
         puts 'File does not exist: %s'.red % params.file_path
         exit 2
@@ -90,7 +64,6 @@ class App
     def run
         exit_version if params.version
         exit_usage if params.help
-        exit_invalid_arguments unless params.file_path
         exit_invalid_file unless File.exist?(params.file_path)
         exit_invalid_port unless port_valid
 
@@ -107,7 +80,6 @@ class App
                     Connection.handle(
                         renderer,
                         watcher,
-                        logger,
                         Session.new(socket, logger)
                     )
                 end
@@ -128,9 +100,30 @@ class App
     end
 end
 
+docs = <<~EOF
+    #{'Usage:'.bold}
+        #{File.basename($0)} [options] <file-path>
+
+    #{'Options:'.bold}
+        -p, --port=VALUE    Listen port [default: 8888]
+        -v, --verbose       Be verbose
+        -V, --version       Show version
+        -h, --help          Show this help
+
+    #{'Renderers:'.bold}
+        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.
+
+    In #{'--verbose'.bold} mode, incoming HTTP requests and file change event
+    notifications will be printed to standard output.
+EOF
+
 begin
-    App.run(Docopt::docopt(DOCS, help: false))
+    Main.run(Docopt::docopt(docs, version: VERSION))
 rescue Docopt::Exit => e
-    puts 'Invalid arguments.'.red
+    puts e.message
     exit 1
 end

data/lib/docwatch.rb

@@ -1,16 +1,16 @@
 require 'require_all'
-require 'colorize'
-require 'docopt'
 require 'redcarpet'
+require 'colorize'
 require 'nokogiri'
+require 'docopt'
 
-require 'socket'
 require 'ostruct'
-
-require_rel 'docwatch'
+require 'socket'
 
 module Docwatch
-    def self.root
+    def self.root_dir
         File.expand_path('../..', __FILE__)
     end
 end
+
+require_rel 'docwatch'

data/lib/docwatch/connection.rb

@@ -1,9 +1,8 @@
 module Docwatch
     class Connection
-        def initialize(renderer, watcher, logger, session)
+        def initialize(renderer, watcher, session)
             @renderer = renderer
             @watcher = watcher
-            @logger = logger
             @session = session
         end
 

data/lib/docwatch/renderer.rb

@@ -18,7 +18,7 @@ module Docwatch
         end
 
         def js
-            File.read(Docwatch.root + '/res/inject.js')
+            File.read(Docwatch.root_dir + '/res/inject.js')
         end
 
         def to_html

data/lib/docwatch/version.rb

@@ -1,3 +1,3 @@
 module Docwatch
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docwatch-bin
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - crdx
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: docopt
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -162,5 +162,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: preview markdown documents in the browser with reload on change
+summary: Preview markdown documents in the browser with reload on change
 test_files: []