nanoc 4.1.0rc2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023f1a7d6ab12c07227e7173bc85ad3595b292f2
-  data.tar.gz: c6c4d7bdf320ba8fa1c04085b4b2596dcded339d
+  metadata.gz: a25f62d7d0cba592a2fac26511e3a33c8b23568e
+  data.tar.gz: 58ebd91d32f0188962896e11e58f619cf71c30eb
 SHA512:
-  metadata.gz: 196b924475b05dc01d2b96f5c21749ac9d8b8034c93a94fa15abd10298c6e5330c2a4eff31fc687869b30be2fcb7fa64874c818a48a4ad51089001a82446125c
-  data.tar.gz: 000e3458409b477d50a5c3a7cd08c871f5f651639981cf73dd95aa622505cc0960747f882ac133a873a3278f2fd84b9c15824e4762c827af3c41824520f6ef70
+  metadata.gz: 20f2f9e77c44f4bb357c03e32dd2c63573f07d6284b6e3ba5cbea1af13c9b64524366ec3171dbc12d9394e743490e6d18ec98efafddc0a173f9ca064c36aabfc
+  data.tar.gz: 03083d54d98bf95205a30c378d00c2eb714eb526b460022c87d6ec5c20406dbcdef965361b4dac165f7c1014892fc2480f958c369d6b9a04425bc502b2d21afc

data/Gemfile.lock

@@ -362,4 +362,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.1.0 (2015-12-18)
+
+Fixes:
+
+* Fixed crash when attempting to `#puts` an object that’s not a string (#778)
+* Made pruner not prune away files from routes defined for custom snapshots (#779)
+* Wrapped `@layout` in a layout view (#773)
+
+Enhancements:
+
+* Added a base path to the Checks file, so that it supports `#require_relative` (#774)
+
 ## 4.1.0rc2 (2015-12-13)
 
 Fixes:

data/README.md

@@ -19,4 +19,4 @@ Contributions are greatly appreciated! Consult the [Development guidelines](http
 
 Many thanks to everyone who has contributed to Nanoc in one way or another:
 
-Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Š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, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada
+Ale Muñoz, Alexander Mankuta, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Gregory Pakosz, Grégory Karékinian, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Louis T., Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Michal Cichra, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Š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, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

data/do-release

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'fileutils'
+require 'octokit'
+
+def run(*args)
+  puts "I will execute the following:"
+  puts '    ' + args.map { |a| a =~ /\s/ ? a.inspect : a }.join(' ')
+  print "Is this correct? [y/N] "
+  res = gets
+  unless res.strip.downcase == 'y'
+    $stderr.puts "Answer was not Y; release aborted."
+    exit 1
+  end
+
+  system('echo', *args)
+  system(*args)
+end
+
+
+
+puts "=== Logging in to GitHub’s API…"
+client = Octokit::Client.new(netrc: true)
+puts
+
+puts "=== Deleting old *.gem files…"
+Dir['*.gem'].each do |fn|
+  puts "  #{fn}…"
+  FileUtils.rm_f(fn)
+end
+puts
+
+puts "=== Building new gem…"
+run('gem', 'build', 'nanoc.gemspec')
+puts
+
+puts "=== Reading version…"
+require_relative 'lib/nanoc/version'
+puts "Version = #{Nanoc::VERSION}"
+puts
+
+puts "=== Verifying that release does not yet exist…"
+releases = client.releases('nanoc/nanoc')
+release = releases.find { |r| r.tag_name == Nanoc::VERSION }
+if release
+  $stderr.puts "Release already exists!"
+  $stderr.puts "ABORTED!"
+  exit 1
+end
+puts
+
+puts "=== Creating Git tag…"
+run('git', 'tag', '--sign', '--annotate', Nanoc::VERSION, '--message', "Version #{Nanoc::VERSION}")
+puts
+
+puts "=== Pushing Git data…"
+run('git', 'push', 'origin')
+run('git', 'push', 'origin', '--tags')
+puts
+
+puts "=== Pushing gem…"
+run('gem', 'push', "nanoc-#{Nanoc::VERSION}.gem")
+puts
+
+puts "=== Reading release notes…"
+release_notes = File.readlines('NEWS.md')
+  .drop(4)
+  .take_while { |l| l !~ /^## / }
+  .join
+puts
+
+puts "=== Creating release on GitHub…"
+sleep 3 # Give GitHub some time to detect the new tag
+is_prerelease = !Nanoc::VERSION =~ /a|b|rc/ || Nanoc::VERSION =~ /^0/
+client.create_release(
+  'nanoc/nanoc', Nanoc::VERSION,
+  prerelease: !!is_prerelease,
+  body: release_notes,
+)
+puts
+
+puts "DONE!"

data/lib/nanoc/base/services/executor.rb

@@ -72,7 +72,8 @@ module Nanoc
         # Create filter
         klass = Nanoc::Filter.named(filter_name)
         raise Nanoc::Int::Errors::UnknownFilter.new(filter_name) if klass.nil?
-        filter = klass.new(assigns_for(rep).merge({ layout: layout }))
+        layout_view = Nanoc::LayoutView.new(layout, nil)
+        filter = klass.new(assigns_for(rep).merge({ layout: layout_view }))
 
         # Visit
         Nanoc::Int::NotificationCenter.post(:visit_started, layout)

data/lib/nanoc/cli/cleaning_stream.rb

@@ -140,7 +140,7 @@ module Nanoc::CLI
     protected
 
     def _nanoc_clean(s)
-      @stream_cleaners.reduce(s) { |a, e| e.clean(a) }
+      @stream_cleaners.reduce(s.to_s) { |a, e| e.clean(a) }
     end
 
     def _nanoc_swallow_broken_pipe_errors_while

data/lib/nanoc/cli/stream_cleaners/ansi_colors.rb

@@ -5,7 +5,7 @@ module Nanoc::CLI::StreamCleaners
   class ANSIColors < Abstract
     # @see Nanoc::CLI::StreamCleaners::Abstract#clean
     def clean(s)
-      s.is_a?(String) ? s.gsub(/\e\[.+?m/, '') : s
+      s.gsub(/\e\[.+?m/, '')
     end
   end
 end

data/lib/nanoc/extra/checking/dsl.rb

@@ -5,7 +5,7 @@ module Nanoc::Extra::Checking
 
     def self.from_file(filename)
       dsl = new
-      dsl.instance_eval File.read(filename)
+      dsl.instance_eval(File.read(filename), filename)
       dsl
     end
 

data/lib/nanoc/extra/pruner.rb

@@ -28,7 +28,7 @@ module Nanoc::Extra
 
       # Get compiled files
       # FIXME: requires #build_reps to have been called
-      all_raw_paths = site.compiler.reps.map(&:raw_path)
+      all_raw_paths = site.compiler.reps.flat_map { |r| r.raw_paths.values }
       compiled_files = all_raw_paths.flatten.compact.select { |f| File.file?(f) }
 
       # Get present files and dirs

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.1.0rc2'
+  VERSION = '4.1.0'
 end

data/test/cli/test_cleaning_stream.rb

@@ -53,4 +53,16 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
     cleaning_stream.write('lol')
   end
+
+  def test_non_string
+    obj = Object.new
+    def obj.to_s
+      'Hello… world!'
+    end
+
+    stream = StringIO.new
+    cleaning_stream = Nanoc::CLI::CleaningStream.new(stream)
+    cleaning_stream << obj
+    assert_equal 'Hello… world!', stream.string
+  end
 end

data/test/extra/checking/test_dsl.rb

@@ -11,4 +11,13 @@ class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
       assert_equal [:bar], dsl.deploy_checks
     end
   end
+
+  def test_has_base_path
+    with_site do |_site|
+      File.write('stuff.rb', '$greeting = "hello"')
+      File.write('Checks', 'require "./stuff"')
+      Nanoc::Extra::Checking::DSL.from_file('Checks')
+      assert_equal 'hello', $greeting
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.0rc2
+  version: 4.1.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -68,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - bin/nanoc
+- do-release
 - doc/yardoc_handlers/identifier.rb
 - doc/yardoc_templates/default/layout/html/footer.erb
 - lib/nanoc.rb
@@ -374,9 +375,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1