nanoc 4.8.15 → 4.8.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72454ce3213cfb07daf01923f88260c8e1c3e439e163a1b38ecd603cb74794a2
-  data.tar.gz: fd783734d7a4fd46fe5b391f8ef0a3373bb51ad0e6300e356af66d03478e8b7b
+  metadata.gz: cfa738915a0c601d828aa97183ebbfee9613ee9e2b955ad0f52e6a3dbea6545e
+  data.tar.gz: 6f0989008933306c049073a1b384c9715969116dafb8fc0279390b1b4ec003dd
 SHA512:
-  metadata.gz: 33d234ba1e4646f801f273b26d43b5993cbe4f06f306d58139b8a9f2f6af01007b319dc3f47bf5b0ffa059c836cb3356b6d329a95901445382dc40eaec57dd2e
-  data.tar.gz: cefdbfa34c2f66ea3fe70fc42f6496b2fa4d607361ff7c5fb8065503f508b0e5786063679e350b996d581ed848860a68cf56055355796db8ddc3f8beb9eca226
+  metadata.gz: 8d7af61ff23c5a1f80e2d1b4e80bdb22f684ddca32391e9f19bb3fc44630a675d4cb29f7fbe9e1764f899e691dff0fad7d252e59e34bca86544edf397a07e0a5
+  data.tar.gz: 58286c12cf1b0037db772e116c456f4d851d53c64d7ede2a151b9c30611f71b4a9e35cd5b5f7f3609b2b1323b2aa2eec82540393b5d4b6ba9c47f97fb709b81e

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.8.16 (2017-12-09)
+
+Fixes:
+
+* Made `adsf-live` not be required for `nanoc view`, unless running with `--live-reload`
+
 ## 4.8.15 (2017-12-02)
 
 Fixes:

data/README.md

@@ -1,24 +1,5 @@
-[![Gem version](http://img.shields.io/gem/v/nanoc.svg)](http://rubygems.org/gems/nanoc)
-[![Gem downloads](https://img.shields.io/gem/dt/nanoc.svg)](http://rubygems.org/gems/nanoc)
-[![Build status](http://img.shields.io/travis/nanoc/nanoc.svg)](https://travis-ci.org/nanoc/nanoc)
-[![Code Climate](http://img.shields.io/codeclimate/github/nanoc/nanoc.svg)](https://codeclimate.com/github/nanoc/nanoc)
-[![Code Coverage](https://img.shields.io/codecov/c/github/nanoc/nanoc.svg)](https://codecov.io/gh/nanoc/nanoc)
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnanoc%2Fnanoc.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fnanoc%2Fnanoc?ref=badge_shield)
-
 ![Nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
 
 # Nanoc
 
 Nanoc is a flexible static-site generator written in Ruby. See the [Nanoc web site](http://nanoc.ws) for more information.
-
-**Please take a moment and [donate](http://pledgie.com/campaigns/9282) to Nanoc. A lot of time has gone into developing Nanoc, and I would like to keep it going. Your support will ensure that Nanoc will continue to improve.**
-
-## Contributing
-
-Contributions are greatly appreciated! Consult the [Development guidelines](http://nanoc.ws/development/) for information on how you can contribute.
-
-### Contributors
-
-Many thanks to everyone who has contributed to Nanoc in one way or another:
-
-Abubakar Ango, Ale Muñoz, Alexander Groß, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Cédric Boutillier, Chris Burkhardt, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Hugo Peixoto, Jack Chu, Jake Benilov, Jan M. Faber, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Seiichi Yonezawa, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

data/lib/nanoc/base/entities/props.rb

@@ -49,6 +49,16 @@ module Nanoc::Int
       end
     end
 
+    contract C::None => String
+    def to_s
+      (+'').tap do |s|
+        s << (raw_content? ? 'r' : '_')
+        s << (attributes? ? 'a' : '_')
+        s << (compiled_content? ? 'c' : '_')
+        s << (path? ? 'p' : '_')
+      end
+    end
+
     contract C::None => C::Bool
     def raw_content?
       case @raw_content

data/lib/nanoc/cli.rb

@@ -118,8 +118,6 @@ module Nanoc::CLI
 
       next if basename == 'nanoc'
 
-      next if basename == 'live' && !Nanoc::Feature.enabled?(Nanoc::Feature::LIVE_CMD)
-
       cmd = load_command_at(cmd_filename)
       add_command(cmd)
     end

data/lib/nanoc/cli/command_runner.rb

@@ -10,7 +10,7 @@ module Nanoc::CLI
     #
     # @return [void]
     def call
-      Nanoc::CLI::ErrorHandler.handle_while(command: self) do
+      Nanoc::CLI::ErrorHandler.handle_while do
         run
       end
     end

data/lib/nanoc/cli/commands/compile.rb

@@ -26,7 +26,8 @@ module Nanoc::CLI::Commands
     end
 
     def run_repeat
-      Nanoc::Extra::LiveRecompiler.new(command_runner: self).run
+      require 'nanoc/live'
+      Nanoc::Live::LiveRecompiler.new(command_runner: self).run
     end
 
     def run_once

data/lib/nanoc/cli/commands/show-data.rb

@@ -108,16 +108,19 @@ module Nanoc::CLI::Commands
               pred.identifier.to_s
             when Nanoc::Int::Configuration
               nil
+            when Nanoc::Int::IdentifiableCollection
+              case dep.props.raw_content
+              when true
+                'matching any'
+              else
+                "matching any of #{dep.props.raw_content.sort.join(', ')}"
+              end
+            else
+              raise Nanoc::Int::Errors::InternalInconsistency, "unexpected pred type #{pred}"
             end
 
-          props = +''
-          props << (dep.props.raw_content? ? 'r' : '_')
-          props << (dep.props.attributes? ? 'a' : '_')
-          props << (dep.props.compiled_content? ? 'c' : '_')
-          props << (dep.props.path? ? 'p' : '_')
-
           if pred
-            puts "  [ #{format '%6s', type} ] (#{props}) #{pred_identifier}"
+            puts "  [ #{format '%6s', type} ] (#{dep.props}) #{pred_identifier}"
           else
             puts '  ( removed item )'
           end

data/lib/nanoc/cli/commands/view.rb

@@ -19,7 +19,6 @@ module Nanoc::CLI::Commands
 
     def run
       load_adsf
-      require 'adsf/live'
 
       config = Nanoc::Int::ConfigLoader.new.new_from_cwd
 

data/lib/nanoc/cli/error_handler.rb

@@ -5,23 +5,14 @@ module Nanoc::CLI
   #
   # @api private
   class ErrorHandler
-    # @param [Nanoc::CLI::Command, nil] command The command that is
-    #   currently being executed, or nil if there is none
-    def initialize(command: nil)
-      @command = command
-    end
-
     # Enables error handling in the given block.
     #
-    # @param [Nanoc::CLI::Command, nil] command The command that is
-    #   currently being executed, or nil if there is none
-    #
     # @return [void]
-    def self.handle_while(command: nil, &block)
+    def self.handle_while(exit_on_error: true)
       if @disabled
         yield
       else
-        new(command: command).handle_while(&block)
+        new.handle_while(exit_on_error: exit_on_error) { yield }
       end
     end
 
@@ -42,7 +33,7 @@ module Nanoc::CLI
     # called directly; use {Nanoc::CLI::ErrorHandler.handle_while} instead.
     #
     # @return [void]
-    def handle_while(&_block)
+    def handle_while(exit_on_error:)
       # Set exit handler
       %w[INT TERM].each do |signal|
         Signal.trap(signal) do
@@ -74,7 +65,7 @@ module Nanoc::CLI
       else
         print_error(e)
       end
-      exit(1)
+      exit(1) if exit_on_error
     end
 
     # Prints the given error to stderr. Includes message, possible resolution
@@ -190,6 +181,7 @@ module Nanoc::CLI
       'markaby'        => 'markaby',
       'maruku'         => 'maruku',
       'mime/types'     => 'mime-types',
+      'nanoc/live'     => 'nanoc-live',
       'nokogiri'       => 'nokogiri',
       'nokogumbo'      => 'nokogumbo',
       'pry'            => 'pry',

data/lib/nanoc/extra.rb

@@ -16,7 +16,6 @@ module Nanoc::Extra
 end
 
 require_relative 'extra/link_collector.rb'
-require_relative 'extra/live_recompiler'
 require_relative 'extra/piper'
 require_relative 'extra/jruby_nokogiri_warner'
 require_relative 'extra/core_ext'

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.8.15'
+  VERSION = '4.8.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.15
+  version: 4.8.16
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -112,16 +112,12 @@ description: Nanoc is a static-site generator focused on flexibility. It transfo
   content from a format such as Markdown or AsciiDoc into another format, usually
   HTML, and lays out pages consistently to retain the site’s look and feel throughout.
   Static sites built with Nanoc can be deployed to any web server.
-email: denis@stoneship.org
+email: denis+rubygems@denis.ws
 executables:
 - nanoc
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
-- NEWS.md
+extra_rdoc_files: []
 files:
-- CODE_OF_CONDUCT.md
 - LICENSE
 - NEWS.md
 - README.md
@@ -286,7 +282,6 @@ files:
 - lib/nanoc/cli/commands/compile_listeners/timing_recorder.rb
 - lib/nanoc/cli/commands/create-site.rb
 - lib/nanoc/cli/commands/deploy.rb
-- lib/nanoc/cli/commands/live.rb
 - lib/nanoc/cli/commands/nanoc.rb
 - lib/nanoc/cli/commands/prune.rb
 - lib/nanoc/cli/commands/shell.rb
@@ -317,7 +312,6 @@ files:
 - lib/nanoc/extra/core_ext/time.rb
 - lib/nanoc/extra/jruby_nokogiri_warner.rb
 - lib/nanoc/extra/link_collector.rb
-- lib/nanoc/extra/live_recompiler.rb
 - lib/nanoc/extra/parallel_collection.rb
 - lib/nanoc/extra/piper.rb
 - lib/nanoc/filters.rb
@@ -380,16 +374,14 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at denis+nanoc-coc@stoneship.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

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

@@ -1,31 +0,0 @@
-# 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::CLI::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::Extra::LiveRecompiler.new(command_runner: self).run
-    end
-  end
-end
-
-runner Nanoc::CLI::Commands::Live

data/lib/nanoc/extra/live_recompiler.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc::Extra
-  class LiveRecompiler
-    def initialize(command_runner:)
-      @command_runner = command_runner
-    end
-
-    def run
-      run_parent do |site|
-        handle_changes(site, @command_runner)
-      end
-    end
-
-    private
-
-    def gen_changes_for_child(site)
-      changes = [
-        site.data_source.item_changes,
-        site.data_source.layout_changes,
-        gen_config_and_rules_changes,
-      ]
-
-      SlowEnumeratorTools.batch(SlowEnumeratorTools.merge(changes))
-    end
-
-    def run_child(pipe_write, pipe_read)
-      pipe_write.close
-
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      changes_enum = gen_changes_for_child(site)
-      yield(site)
-
-      quit = Object.new
-      parent_enum = Enumerator.new do |y|
-        pipe_read.read
-        y << quit
-      end
-
-      SlowEnumeratorTools.merge([parent_enum, changes_enum]).each do |e|
-        break if quit.equal?(e)
-
-        $stderr.print 'Reloading site… '
-        $stderr.flush
-        site_loader = Nanoc::Int::SiteLoader.new
-        site = Nanoc::Int::Site.new(
-          config: Nanoc::Int::ConfigLoader.new.new_from_cwd,
-          data_source: site_loader.gen_data_source_for_config(site.config),
-          code_snippets: site.code_snippets,
-        )
-        $stderr.puts 'done'
-
-        yield(site)
-      end
-
-      exit 0
-    rescue Interrupt
-      exit 0
-    end
-
-    def run_parent
-      # create initial child
-      pipe_read, pipe_write = IO.pipe
-      fork { run_child(pipe_write, pipe_read) { |s| yield(s) } }
-      pipe_read.close
-
-      gen_lib_changes.each do |_e|
-        # stop child
-        pipe_write.write('q')
-        pipe_write.close
-        Process.wait
-
-        # create new child
-        pipe_read, pipe_write = IO.pipe
-        fork { run_child(pipe_write, pipe_read) { |s| yield(s) } }
-        pipe_read.close
-      end
-    rescue Interrupt
-    end
-
-    def handle_changes(site, command_runner)
-      time_before = Time.now
-
-      puts 'Compiling site…'
-      compiler = Nanoc::Int::Compiler.new_for(site)
-      listener = Nanoc::CLI::Commands::CompileListeners::Aggregate.new(
-        command_runner: command_runner,
-        site: site,
-        compiler: compiler,
-      )
-      listener.run_while do
-        compiler.run_until_end
-      end
-
-      time_after = Time.now
-      puts "Site compiled in #{format('%.2f', time_after - time_before)}s."
-      puts
-    end
-
-    def gen_lib_changes
-      require 'listen'
-
-      Nanoc::ChangesStream.new do |cl|
-        opts = {
-          latency: 0.0,
-          wait_for_delay: 0.0,
-        }
-
-        listener = Listen.to('lib', opts) { |*| cl.lib }
-        listener.start
-        sleep
-      end
-    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/,
-          latency: 0.0,
-          wait_for_delay: 0.0,
-        }
-
-        listener = Listen.to('.', opts) { |*| cl.unknown }
-        listener.start
-        sleep
-      end
-    end
-  end
-end