nanoc 3.7.3 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1846757f101a6af4c5ca4162918499723f8aef23
-  data.tar.gz: a98022b27dcd1006ea2302bc55fcf9dcd023930b
+  metadata.gz: 15684f17b89e23c06fbe52df15a80529390df3a1
+  data.tar.gz: fcac628a29b82a5783020594f69a5b738d0fdc9b
 SHA512:
-  metadata.gz: a6c17a90232a432a8f759c76922a9fee0917cfd79396707df54d6594fb5e665126ba04164d6e58aa42365a080450fdd87c025169b50dced1d0bda5c60501ee84
-  data.tar.gz: 30ca231cbcdb8057aec80cf81462c533d60b151b9618aa08f2596b2c553b8111de2c262bf68b2dd7831b0b726275c494f9cff2a6de12916bb76371ef144a4756
+  metadata.gz: 37fde883c3804bd00defeb90266326921e79a4077454402c511acd0988a948361642db481019fa3f29a8708a07abaa5accd8000f08e773363156fcd409b75fff
+  data.tar.gz: fbb6f99a16f66438e70918a0f058b0f3089c41908595270d7d9e68ed5bb29be8feb9c1adff7207c096162a42e33fb15cfb47e7a53b3b08c58b3965eeab599dc7

data/Gemfile.lock

@@ -11,12 +11,15 @@ GEM
     addressable (2.3.6)
     adsf (1.2.0)
       rack (>= 1.0.0)
+    allison (2.0.3)
     ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
     bluecloth (2.2.0)
     builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    chunky_png (1.3.1)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chunky_png (1.3.3)
     coderay (1.1.0)
     coffee-script (2.3.0)
       coffee-script-source
@@ -28,29 +31,36 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
-    coveralls (0.7.1)
+    coveralls (0.7.2)
       multi_json (~> 1.3)
-      rest-client
+      rest-client (= 1.6.7)
       simplecov (>= 0.7)
-      term-ansicolor
-      thor
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     cri (2.6.1)
       colored (~> 1.2)
     docile (1.1.5)
+    echoe (4.6.6)
+      allison (>= 2.0.3)
+      rake (>= 0.9.2)
+      rdoc (>= 2.5.11)
+      rubyforge (>= 2.0.4)
     erubis (2.7.0)
-    excon (0.39.5)
-    execjs (2.2.1)
-    ffi (1.9.3)
-    fog (1.23.0)
+    excon (0.41.0)
+    execjs (2.2.2)
+    ffi (1.9.6)
+    fog (1.24.0)
       fog-brightbox
       fog-core (~> 1.23)
       fog-json
+      fog-radosgw (>= 0.0.2)
+      fog-sakuracloud (>= 0.0.4)
       fog-softlayer
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.4.1)
+    fog-brightbox (0.6.1)
       fog-core (~> 1.22)
       fog-json
       inflecto
@@ -63,9 +73,19 @@ GEM
       net-ssh (>= 2.1.3)
     fog-json (1.0.0)
       multi_json (~> 1.0)
-    fog-softlayer (0.3.16)
+    fog-radosgw (0.0.3)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-sakuracloud (0.1.1)
+      fog-core
+      fog-json
+    fog-softlayer (0.3.24)
       fog-core
       fog-json
+    fog-xml (0.1.1)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
     fssm (0.2.10)
     haml (4.0.5)
@@ -74,14 +94,16 @@ GEM
       handlebars-source (~> 1.3.0)
       therubyracer (~> 0.12.0)
     handlebars-source (1.3.0)
+    hitimes (1.2.2)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     json (1.8.1)
-    kramdown (1.4.1)
+    json_pure (1.8.1)
+    kramdown (1.5.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    libv8 (3.16.14.3)
-    listen (2.7.9)
+    libv8 (3.16.14.7)
+    listen (2.8.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -90,21 +112,20 @@ GEM
     maruku (0.7.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.3)
-    mini_portile (0.6.0)
+    mime-types (2.4.3)
+    mini_portile (0.6.1)
     minitest (4.7.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
-    mustache (0.99.6)
+    mustache (0.99.7)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    netrc (0.7.7)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     pandoc-ruby (0.7.5)
-    parser (2.2.0.pre.4)
+    parser (2.2.0.pre.7)
       ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     posix-spawn (0.3.9)
@@ -119,61 +140,65 @@ GEM
     rack (1.5.2)
     rainbow (2.0.0)
     rainpress (1.0)
+      echoe
     rake (10.3.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.7.1)
-    rdoc (4.1.1)
+    rdoc (4.1.2)
       json (~> 1.4)
-    redcarpet (3.1.2)
+    redcarpet (3.2.0)
     ref (1.0.5)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rouge (1.6.2)
-    rubocop (0.25.0)
-      parser (>= 2.2.0.pre.4, < 3.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rouge (1.7.3)
+    rubocop (0.27.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
+    ruby-progressbar (1.7.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
     rubypants (0.2.0)
-    safe_yaml (1.0.3)
+    safe_yaml (1.0.4)
     sass (3.2.19)
-    simplecov (0.9.0)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slim (2.0.3)
-      temple (~> 0.6.6)
+    slim (2.1.0)
+      temple (~> 0.6.9)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    temple (0.6.8)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
+    temple (0.6.10)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.1)
+    thor (0.18.1)
     tilt (2.0.1)
-    timers (1.1.0)
-    tins (1.3.2)
+    timers (4.0.1)
+      hitimes
+    tins (0.13.2)
     typogruby (1.0.17)
       rubypants
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    vcr (2.9.2)
+    vcr (2.9.3)
     w3c_validators (1.2)
       json
       nokogiri
-    webmock (1.18.0)
+    webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     yajl-ruby (1.1.0)
-    yard (0.8.7.4)
+    yard (0.8.7.6)
     yuicompressor (1.3.3)
 
 PLATFORMS

data/NEWS.md

@@ -1,5 +1,19 @@
 # nanoc news
 
+## 3.7.4 (2014-11-23)
+
+Enhancements:
+
+* Made `check` command fail when output directory is missing (#472) [Mike Pennisi]
+* Made external links check timeouts start small and grow (#483) [Michal Papis]
+* Made code and API adhere much more closely to the Ruby style guide (#476)
+
+Fixes:
+
+* Fixed potential “parent directory is world writable” error (#465, #474)
+* Fixed retrying requests in the external link checker (#483) [Michal Papis]
+* Fixed issue with data sources not being unloaded (#491) [Michal Papis]
+
 ## 3.7.3 (2014-08-31)
 
 Fixes:

data/lib/nanoc.rb

@@ -15,7 +15,7 @@ module Nanoc
 
   # @return [Boolean] True if the current platform is Windows,
   def self.on_windows?
-    !!(RUBY_PLATFORM =~ /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i)
+    RUBY_PLATFORM =~ /windows|bccwin|cygwin|djgpp|mingw|mswin|wince/i
   end
 
 end

data/lib/nanoc/base/checksummer.rb

@@ -19,7 +19,7 @@ module Nanoc
         digest.base64digest
       end
 
-    private
+      private
 
       def update(obj, digest)
         digest.update(obj.class.to_s)

data/lib/nanoc/base/compilation/checksum_store.rb

@@ -42,7 +42,7 @@ module Nanoc
       @checksums = {}
     end
 
-  protected
+    protected
 
     def data
       @checksums

data/lib/nanoc/base/compilation/compiled_content_cache.rb

@@ -47,7 +47,7 @@ module Nanoc
       @cache = {}
     end
 
-  protected
+    protected
 
     def data
       @cache

data/lib/nanoc/base/compilation/compiler.rb

@@ -74,7 +74,7 @@ module Nanoc
     #
     # @overload run
     #   @return [void]
-    def run(*args)
+    def run(*_args)
       # Create output directory if necessary
       FileUtils.mkdir_p(@site.config[:output_dir])
 
@@ -206,7 +206,7 @@ module Nanoc
     # @api private
     def objects
       site.items + site.layouts + site.code_snippets +
-        [ site.config, rules_collection ]
+        [site.config, rules_collection]
     end
 
     # Creates the representations of all items as defined by the compilation
@@ -250,11 +250,12 @@ module Nanoc
           # Get normal path by stripping index filename
           rep.paths[snapshot] = basic_path
           @site.config[:index_filenames].each do |index_filename|
-            if rep.paths[snapshot][-index_filename.length..-1] == index_filename
-              # Strip and stop
-              rep.paths[snapshot] = rep.paths[snapshot][0..-index_filename.length - 1]
-              break
-            end
+            rep_path_ending = rep.paths[snapshot][-index_filename.length..-1]
+            next unless rep_path_ending == index_filename
+
+            # Strip and stop
+            rep.paths[snapshot] = rep.paths[snapshot][0..-index_filename.length - 1]
+            break
           end
         end
       end
@@ -294,7 +295,7 @@ module Nanoc
     end
     memoize :outdatedness_checker
 
-  private
+    private
 
     # @return [Array<Nanoc::Item>] The site’s items
     def items
@@ -324,7 +325,7 @@ module Nanoc
 
       # Listen to processing start/stop
       Nanoc::NotificationCenter.on(:processing_started, self) { |obj| @stack.push(obj) }
-      Nanoc::NotificationCenter.on(:processing_ended,   self) { |obj| @stack.pop       }
+      Nanoc::NotificationCenter.on(:processing_ended,   self) { |_obj| @stack.pop       }
 
       # Assign snapshots
       reps.each do |rep|
@@ -350,7 +351,7 @@ module Nanoc
       end
 
       # Check whether everything was compiled
-      if !content_dependency_graph.vertices.empty?
+      unless content_dependency_graph.vertices.empty?
         raise Nanoc::Errors::RecursiveCompilation.new(content_dependency_graph.vertices)
       end
     ensure

data/lib/nanoc/base/compilation/compiler_dsl.rb

@@ -151,7 +151,7 @@ module Nanoc
     #
     #     layout '/custom/',  :haml, :format => :html5
     def layout(identifier, filter_name, params = {})
-      @rules_collection.layout_filter_mapping[identifier_to_regex(identifier)] = [ filter_name, params ]
+      @rules_collection.layout_filter_mapping[identifier_to_regex(identifier)] = [filter_name, params]
     end
 
     # Creates a pair of compilation and routing rules that indicate that the
@@ -247,13 +247,13 @@ module Nanoc
     #     include_rules 'rules/assets'
     #     include_rules 'rules/content'
     def include_rules(name)
-      filename = [ "#{name}", "#{name}.rb", "./#{name}", "./#{name}.rb" ].find { |f| File.file?(f) }
+      filename = ["#{name}", "#{name}.rb", "./#{name}", "./#{name}.rb"].find { |f| File.file?(f) }
       raise Nanoc::Errors::NoRulesFileFound.new if filename.nil?
 
       @rules_collection.parse(filename)
     end
 
-  private
+    private
 
     # Converts the given identifier, which can contain the '*' or '+'
     # wildcard characters, matching zero or more resp. one or more
@@ -264,7 +264,7 @@ module Nanoc
         # Add leading/trailing slashes if necessary
         new_identifier = identifier.dup
         new_identifier[/^/] = '/' if identifier[0, 1] != '/'
-        new_identifier[/$/] = '/' unless [ '*', '/' ].include?(identifier[-1, 1])
+        new_identifier[/$/] = '/' unless ['*', '/'].include?(identifier[-1, 1])
 
         /^#{new_identifier.gsub('*', '(.*?)').gsub('+', '(.+?)')}$/
       else

data/lib/nanoc/base/compilation/dependency_tracker.rb

@@ -37,7 +37,7 @@ module Nanoc
       super('tmp/dependencies', 4)
 
       @objects = objects
-      @graph   = Nanoc::DirectedGraph.new([ nil ] + @objects)
+      @graph   = Nanoc::DirectedGraph.new([nil] + @objects)
       @stack   = []
     end
 
@@ -53,7 +53,7 @@ module Nanoc
 
       # Register start of visits
       Nanoc::NotificationCenter.on(:visit_started, self) do |obj|
-        if !@stack.empty?
+        unless @stack.empty?
           Nanoc::NotificationCenter.post(:dependency_created, @stack.last, obj)
           record_dependency(@stack.last, obj)
         end
@@ -61,7 +61,7 @@ module Nanoc
       end
 
       # Register end of visits
-      Nanoc::NotificationCenter.on(:visit_ended, self) do |obj|
+      Nanoc::NotificationCenter.on(:visit_ended, self) do |_obj|
         @stack.pop
       end
     end
@@ -71,7 +71,7 @@ module Nanoc
     # @return [void]
     def stop
       # Sanity check
-      if !@stack.empty?
+      unless @stack.empty?
         raise 'Internal inconsistency: dependency tracker stack not empty at end of compilation'
       end
 
@@ -169,10 +169,10 @@ module Nanoc
 
     # @see Nanoc::Store#unload
     def unload
-      @graph = Nanoc::DirectedGraph.new([ nil ] + @objects)
+      @graph = Nanoc::DirectedGraph.new([nil] + @objects)
     end
 
-  protected
+    protected
 
     def data
       {
@@ -183,7 +183,7 @@ module Nanoc
 
     def data=(new_data)
       # Create new graph
-      @graph = Nanoc::DirectedGraph.new([ nil ] + @objects)
+      @graph = Nanoc::DirectedGraph.new([nil] + @objects)
 
       # Load vertices
       previous_objects = new_data[:vertices].map do |reference|

data/lib/nanoc/base/compilation/filter.rb

@@ -135,7 +135,7 @@ module Nanoc
     # @return [String, void] If the filter output binary content, the return
     #   value is undefined; if the filter outputs textual content, the return
     #   value will be the filtered content.
-    def run(content_or_filename, params = {})
+    def run(_content_or_filename, _params = {})
       raise NotImplementedError.new('Nanoc::Filter subclasses must implement #run')
     end