nanoc 4.11.2 → 4.11.3

data/lib/nanoc/deploying/deployers/rsync.rb

@@ -62,8 +62,7 @@ module Nanoc::Deploying::Deployers
     private
 
     def run_shell_cmd(cmd)
-      piper = Nanoc::Extra::Piper.new(stdout: $stdout, stderr: $stderr)
-      piper.run(cmd, nil)
+      TTY::Command.new(printer: :null).run(*cmd)
     end
   end
 end

data/lib/nanoc/extra.rb

@@ -16,6 +16,5 @@ module Nanoc::Extra
 end
 
 require_relative 'extra/link_collector'
-require_relative 'extra/piper'
 require_relative 'extra/jruby_nokogiri_warner'
 require_relative 'extra/core_ext'

data/lib/nanoc/filters/asciidoc.rb

@@ -12,11 +12,7 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, _params = {})
-      stdout = StringIO.new
-      stderr = $stderr
-      piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
-      piper.run(%w[asciidoc -o - -], content)
-      stdout.string
+      TTY::Command.new(printer: :null).run('asciidoc -o - -', input: content).out
     end
   end
 end

data/lib/nanoc/filters/colorize_syntax/colorizers.rb

@@ -13,8 +13,7 @@ module Nanoc::Filters::ColorizeSyntax::Colorizers
     private
 
     def check_availability(*cmd)
-      piper = Nanoc::Extra::Piper.new(stdout: StringIO.new, stderr: StringIO.new)
-      piper.run(cmd, nil)
+      TTY::Command.new(printer: :null).run!(*cmd).success?
     end
   end
 
@@ -66,12 +65,7 @@ module Nanoc::Filters::ColorizeSyntax::Colorizers
       cmd = ['pygmentize', '-l', language, '-f', 'html']
       cmd << '-O' << params.map { |k, v| "#{k}=#{v}" }.join(',') unless params.empty?
 
-      stdout = StringIO.new
-      stderr = $stderr
-      piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
-      piper.run(cmd, code)
-
-      stdout.string
+      TTY::Command.new(printer: :null).run(*cmd, input: code).out
     end
   end
 
@@ -116,12 +110,7 @@ module Nanoc::Filters::ColorizeSyntax::Colorizers
         end
       end
 
-      stdout = StringIO.new
-      stderr = $stderr
-      piper = Nanoc::Extra::Piper.new(stdout: stdout, stderr: stderr)
-      piper.run(cmd, code)
-
-      stdout.string
+      TTY::Command.new(printer: :null).run(*cmd, input: code).out
     end
   end
 

data/lib/nanoc/filters/kramdown.rb

@@ -7,7 +7,7 @@ module Nanoc::Filters
 
     requires 'kramdown'
 
-    # Runs the content through [Kramdown](http://kramdown.gettalong.org/).
+    # Runs the content through [Kramdown](https://kramdown.gettalong.org/).
     # Parameters passed to this filter will be passed on to Kramdown.
     #
     # @param [String] content The content to filter

data/lib/nanoc/filters/mustache.rb

@@ -8,7 +8,7 @@ module Nanoc::Filters
     requires 'mustache'
 
     # Runs the content through
-    # [Mustache](http://github.com/defunkt/mustache). This method takes no
+    # [Mustache](https://github.com/defunkt/mustache). This method takes no
     # options.
     #
     # @param [String] content The content to filter

data/lib/nanoc/filters/rainpress.rb

@@ -7,7 +7,7 @@ module Nanoc::Filters
 
     requires 'rainpress'
 
-    # Runs the content through [Rainpress](http://code.google.com/p/rainpress/).
+    # Runs the content through [Rainpress](https://github.com/ddfreyne/rainpress).
     # Parameters passed to this filter will be passed on to Rainpress.
     #
     # @param [String] content The content to filter

data/lib/nanoc/filters/rdiscount.rb

@@ -7,7 +7,7 @@ module Nanoc::Filters
 
     requires 'rdiscount'
 
-    # Runs the content through [RDiscount](http://github.com/rtomayko/rdiscount).
+    # Runs the content through [RDiscount](https://github.com/davidfstr/rdiscount).
     #
     # @option params [Array] :extensions ([]) A list of RDiscount extensions
     #

data/lib/nanoc/helpers/blogging.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#blogging
+  # @see https://nanoc.ws/doc/reference/helpers/#blogging
   module Blogging
     # @return [Array]
     def articles
@@ -120,8 +120,8 @@ module Nanoc::Helpers
           xml.updated(updated.__nanoc_to_iso8601_time)
 
           # Add links
-          xml.link(rel: 'alternate', href: (alt_link || root_url))
-          xml.link(rel: 'self',      href: feed_url)
+          xml.link(rel: 'alternate', href: (alt_link || root_url), type: 'text/html')
+          xml.link(rel: 'self',      href: feed_url,               type: 'application/atom+xml')
 
           # Add author information
           xml.author do
@@ -163,7 +163,7 @@ module Nanoc::Helpers
           end
 
           # Add link
-          xml.link(rel: 'alternate', href: url)
+          xml.link(rel: 'alternate', href: url, type: 'text/html')
 
           # Add content
           summary = excerpt_proc.call(article)

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#breadcrumbs
+  # @see https://nanoc.ws/doc/reference/helpers/#breadcrumbs
   module Breadcrumbs
-    class AmbiguousAncestorError < Nanoc::Int::Errors::Generic
+    class AmbiguousAncestorError < ::Nanoc::Core::Error
       def initialize(pattern, items)
         @pattern = pattern
         @items = items

data/lib/nanoc/helpers/capturing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#capturing
+  # @see https://nanoc.ws/doc/reference/helpers/#capturing
   module Capturing
     # @api private
     class SetContent

data/lib/nanoc/helpers/child_parent.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#childparent
+  # @see https://nanoc.ws/doc/reference/helpers/#childparent
   module ChildParent
     def parent_of(item)
       if item.identifier.legacy?

data/lib/nanoc/helpers/filtering.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#filtering
+  # @see https://nanoc.ws/doc/reference/helpers/#filtering
   module Filtering
     require 'nanoc/helpers/capturing'
     include Nanoc::Helpers::Capturing

data/lib/nanoc/helpers/html_escape.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#filtering
+  # @see https://nanoc.ws/doc/reference/helpers/#filtering
   module HTMLEscape
     require 'nanoc/helpers/capturing'
     include Nanoc::Helpers::Capturing

data/lib/nanoc/helpers/link_to.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#linkto
+  # @see https://nanoc.ws/doc/reference/helpers/#linkto
   module LinkTo
     require 'nanoc/helpers/html_escape'
     include Nanoc::Helpers::HTMLEscape

data/lib/nanoc/helpers/rendering.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#rendering
+  # @see https://nanoc.ws/doc/reference/helpers/#rendering
   module Rendering
     include Nanoc::Helpers::Capturing
 

data/lib/nanoc/helpers/tagging.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#tagging
+  # @see https://nanoc.ws/doc/reference/helpers/#tagging
   module Tagging
     require 'nanoc/helpers/html_escape'
     include Nanoc::Helpers::HTMLEscape

data/lib/nanoc/helpers/text.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#text
+  # @see https://nanoc.ws/doc/reference/helpers/#text
   module Text
     # @param [String] string
     # @param [Number] length

data/lib/nanoc/helpers/xml_sitemap.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::Helpers
-  # @see http://nanoc.ws/doc/reference/helpers/#xmlsitemap
+  # @see https://nanoc.ws/doc/reference/helpers/#xmlsitemap
   module XMLSitemap
     # @option params [Array] :items
     # @option params [Proc] :rep_select

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nanoc::RuleDSL
-  class ActionProvider < Nanoc::Int::ActionProvider
+  class ActionProvider < Nanoc::Core::ActionProvider
     identifier :rule_dsl
 
     # @api private

data/lib/nanoc/rule_dsl/action_recorder.rb

@@ -7,7 +7,7 @@ module Nanoc
 
       contract Nanoc::Core::ItemRep => C::Any
       def initialize(rep)
-        @action_sequence_builder = Nanoc::Int::ActionSequenceBuilder.new(rep)
+        @action_sequence_builder = Nanoc::Core::ActionSequenceBuilder.new(rep)
 
         @any_layouts = false
         @last_snapshot = false
@@ -61,7 +61,7 @@ module Nanoc
         nil
       end
 
-      contract C::None => Nanoc::Int::ActionSequence
+      contract C::None => Nanoc::Core::ActionSequence
       def action_sequence
         @action_sequence_builder.action_sequence
       end

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -40,7 +40,7 @@ module Nanoc::RuleDSL
 
     # @param [#reference] obj
     #
-    # @return [Nanoc::Int::ActionSequence]
+    # @return [Nanoc::Core::ActionSequence]
     def [](obj)
       case obj
       when Nanoc::Core::ItemRep
@@ -78,7 +78,7 @@ module Nanoc::RuleDSL
 
     # @param [Nanoc::Core::Layout] layout
     #
-    # @return [Nanoc::Int::ActionSequence]
+    # @return [Nanoc::Core::ActionSequence]
     def new_action_sequence_for_layout(layout)
       res = @rules_collection.filter_for_layout(layout)
 
@@ -86,7 +86,7 @@ module Nanoc::RuleDSL
         raise NoActionSequenceForLayoutException.new(layout)
       end
 
-      Nanoc::Int::ActionSequenceBuilder.build(layout) do |b|
+      Nanoc::Core::ActionSequenceBuilder.build(layout) do |b|
         b.add_filter(res[0], res[1])
       end
     end
@@ -100,7 +100,7 @@ module Nanoc::RuleDSL
           actions << action
         end
       end
-      Nanoc::Int::ActionSequence.new(seq.item_rep, actions: actions)
+      Nanoc::Core::ActionSequence.new(seq.item_rep, actions: actions)
     end
 
     def copy_paths_from_routing_rules(seq, snapshots_for_which_to_skip_routing_rule, rep:)

data/lib/nanoc/spec.rb

@@ -12,13 +12,8 @@ module Nanoc
         Dir.chdir(here)
       end
 
-      def on_windows?
-        Nanoc.on_windows?
-      end
-
       def command?(cmd)
-        which, null = on_windows? ? %w[where NUL] : ['which', '/dev/null']
-        system("#{which} #{cmd} > #{null} 2>&1")
+        TTY::Which.exist?(cmd)
       end
 
       def skip_unless_have_command(cmd)
@@ -184,7 +179,7 @@ module Nanoc
       end
 
       def new_action_provider
-        Class.new(Nanoc::Int::ActionProvider) do
+        Class.new(Nanoc::Core::ActionProvider) do
           def self.for(_context)
             raise NotImplementedError
           end

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.11.2
+  version: 4.11.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.2
+        version: 4.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.2
+        version: 4.11.3
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: tty-command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: tty-file
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: tty-platform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: tty-which
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: Nanoc is a static-site generator focused on flexibility. It transforms
   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.
@@ -113,8 +169,6 @@ files:
 - lib/nanoc/base/assertions.rb
 - lib/nanoc/base/changes_stream.rb
 - lib/nanoc/base/entities.rb
-- lib/nanoc/base/entities/action_sequence.rb
-- lib/nanoc/base/entities/checksum_collection.rb
 - lib/nanoc/base/entities/dependency.rb
 - lib/nanoc/base/entities/outdatedness_reasons.rb
 - lib/nanoc/base/entities/outdatedness_status.rb
@@ -140,8 +194,6 @@ files:
 - lib/nanoc/base/repos/store.rb
 - lib/nanoc/base/repos/textual_compiled_content_cache.rb
 - lib/nanoc/base/services.rb
-- lib/nanoc/base/services/action_provider.rb
-- lib/nanoc/base/services/action_sequence_builder.rb
 - lib/nanoc/base/services/compilation_context.rb
 - lib/nanoc/base/services/compiler.rb
 - lib/nanoc/base/services/compiler/phases.rb
@@ -170,7 +222,6 @@ files:
 - lib/nanoc/base/services/dependency_tracker.rb
 - lib/nanoc/base/services/executor.rb
 - lib/nanoc/base/services/filter.rb
-- lib/nanoc/base/services/instrumentor.rb
 - lib/nanoc/base/services/item_rep_builder.rb
 - lib/nanoc/base/services/item_rep_router.rb
 - lib/nanoc/base/services/item_rep_selector.rb
@@ -276,7 +327,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/piper.rb
 - lib/nanoc/filters.rb
 - lib/nanoc/filters/asciidoc.rb
 - lib/nanoc/filters/asciidoctor.rb
@@ -337,7 +387,7 @@ files:
 - lib/nanoc/rule_dsl/rules_loader.rb
 - lib/nanoc/spec.rb
 - lib/nanoc/version.rb
-homepage: http://nanoc.ws/
+homepage: https://nanoc.ws/
 licenses:
 - MIT
 metadata: {}
@@ -356,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.