nanoc-live 1.0.0a1 → 1.0.0a2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1362b4ea80415583b3399354722ae766ed61b0199516864b0fe219c7b1af308
-  data.tar.gz: 1dcd6212ba0b6d60f3e467908b3ae93000c5fe5fc0a1e4dc920f69e11c5ecf6f
+  metadata.gz: 412c66134e3f76c210f21c2b074f56d828843ac36f6bde4608226e65a8fa700b
+  data.tar.gz: 04e281da49f03ae98a92429a2a528b972573a195facb38431d2f60721585e6cb
 SHA512:
-  metadata.gz: 7fad4117f790e729f908f35617a4d924ca3ee00a14d39be26f1f309a40faf10c40ce22fe38f1a6b29e0c6a9195ba8b2d0f8160ee52fed16c6bfc54a3d22e0927
-  data.tar.gz: 1bc4a7ce7f0bf6b69de1ef2c1e2f7760b0a1586407dbbc2373149b4abab6831b18a2d4c49e3ad77d0708877ca92b684b6c1fc34f595439a8c8b1c05f458d24a5
+  metadata.gz: 5fbcefbcb984f6b526ae00b07356332c8f9bcc5c1b44980a6a43c58b22a9c5cdb1d4d7a5c8c79f4ce85f94ca5cfa1aa69812f15de6f7574945b5b89095e5bd49
+  data.tar.gz: c5051c3f36441a9b84ce7e56a02219852690d3132bb8415a3282e5db2ac4b250b15ac9b9f1d2a575e36de0615ab54405acd5a93c197c0937021c069950a6c8ba

data/NEWS.md

@@ -1,5 +1,12 @@
 # Release notes for nanoc-live
 
+## 1.0.0a2 (2017-12-09)
+
+Fixes:
+
+* Added missing dependency on `adsf-live`
+* Fixed errors not being printed (#1271)
+
 ## 1.0.0a1 (2017-12-03)
 
 Initial release.

data/lib/nanoc/live.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require 'adsf/live'
+require 'listen'
+require 'nanoc'
+require 'nanoc/cli'
 
 module Nanoc
   module Live
@@ -9,3 +12,9 @@ end
 
 require_relative 'live/version'
 require_relative 'live/live_recompiler'
+
+Nanoc::CLI.after_setup do
+  root = File.dirname(__FILE__)
+  live_command_path = File.join(root, 'live', 'commands', 'live.rb')
+  Nanoc::CLI.add_command(Nanoc::CLI.load_command_at(live_command_path))
+end

data/lib/nanoc/live/commands/live.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+usage 'live'
+summary 'auto-recompile and serve'
+description <<~EOS
+  Starts the live recompiler along with the static web server. Unless specified,
+  the web server will run on port 3000 and listen on all IP addresses. Running
+  this static web server requires `adsf` (not `asdf`!).
+EOS
+
+required :H, :handler, 'specify the handler to use (webrick/mongrel/...)'
+required :o, :host,    'specify the host to listen on (default: 127.0.0.1)'
+required :p, :port,    'specify the port to listen on (default: 3000)'
+flag :L, :'live-reload', 'reload on changes'
+
+module Nanoc::Live::Commands
+  class Live < ::Nanoc::CLI::CommandRunner
+    def run
+      self.class.enter_site_dir
+
+      Thread.new do
+        Thread.current.abort_on_exception = true
+        Nanoc::CLI::Commands::View.new(options, [], self).run
+      end
+
+      Nanoc::Live::LiveRecompiler.new(command_runner: self).run
+    end
+  end
+end
+
+runner Nanoc::Live::Commands::Live

data/lib/nanoc/live/live_recompiler.rb

@@ -79,6 +79,12 @@ module Nanoc::Live
     end
 
     def handle_changes(site, command_runner)
+      Nanoc::CLI::ErrorHandler.handle_while(exit_on_error: false) do
+        unsafe_handle_changes(site, command_runner)
+      end
+    end
+
+    def unsafe_handle_changes(site, command_runner)
       time_before = Time.now
 
       puts 'Compiling site…'
@@ -98,8 +104,6 @@ module Nanoc::Live
     end
 
     def gen_lib_changes
-      require 'listen'
-
       Nanoc::ChangesStream.new do |cl|
         opts = {
           latency: 0.0,
@@ -113,8 +117,6 @@ module Nanoc::Live
     end
 
     def gen_config_and_rules_changes
-      require 'listen'
-
       Nanoc::ChangesStream.new do |cl|
         opts = {
           only: /(\/|\A)(nanoc\.yaml|config\.yaml|rules|Rules|rules\.rb|Rules\.rb)\z/,

data/lib/nanoc/live/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Live
-    VERSION = '1.0.0a1'
+    VERSION = '1.0.0a2'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-live
 version: !ruby/object:Gem::Version
-  version: 1.0.0a1
+  version: 1.0.0a2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: adsf-live
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.8.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.8.16
 description: Provides support for auto-recompiling Nanoc sites.
 email: denis+rubygems@denis.ws
 executables: []
@@ -47,6 +67,7 @@ files:
 - NEWS.md
 - README.md
 - lib/nanoc/live.rb
+- lib/nanoc/live/commands/live.rb
 - lib/nanoc/live/live_recompiler.rb
 - lib/nanoc/live/version.rb
 homepage: http://nanoc.ws/