nanoc 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb28957e1fb5b1563b0171cc7796ea2fc05a3d4
-  data.tar.gz: 82ea5fc8aaa8ccb02ba80e78c1f94b0be0ddb278
+  metadata.gz: 67e0bd2577c8efa7e807709b09a5b4df6e95024b
+  data.tar.gz: 4adc8f82bbc6d85e2a77b06a3792aac2b0f05d71
 SHA512:
-  metadata.gz: fea9dcd73c69e4e5dc0b413c77a5b9f32fa633c477f3c525e700d8dda04a6d1b6099a2054780dc12df5db8daaba8e06412c93201e1485432c1489a53a37a4e78
-  data.tar.gz: 3c4182f1b3c1107c2aca9c91fe6a6b69037ff08c6de4690011e24a6b99cfecaadca4d9c22bcf556aace7a0287712c5145f5aa23e5b4844af28e9d2633949df39
+  metadata.gz: 17f1e158368ac1f9f6b0b1970f0d0cc5cdf616160277fffba13d2e0f9069ffd9db60a80a64cdf144912043c52e71086c57da71540650b9005286fab59f8844f4
+  data.tar.gz: d26cec92f468874b2d14133b5d5b7e360d591443a559590b0b5bd85bb81f3154d981d80dea5c3f7f76d4071dcf8b8798cd1fbb496a7aba0128bf960903682b6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.3.2)
+    nanoc (4.3.3)
       cri (~> 2.3)
       hamster (~> 3.0)
       ref (~> 2.0)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
+    CFPropertyList (2.3.3)
     RedCloth (4.3.2)
     addressable (2.4.0)
     adsf (1.2.1)
@@ -17,7 +17,7 @@ GEM
     ast (2.3.0)
     bluecloth (2.2.0)
     builder (3.2.2)
-    chunky_png (1.3.6)
+    chunky_png (1.3.7)
     coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
@@ -94,7 +94,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.11.0)
+    fog-aws (0.12.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -128,7 +128,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-openstack (0.1.11)
+    fog-openstack (0.1.12)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -136,10 +136,9 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
+    fog-profitbricks (2.0.1)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
     fog-rackspace (0.1.1)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
@@ -159,7 +158,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.3)
+    fog-softlayer (1.1.4)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -174,9 +173,9 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.0.0)
+    fog-vsphere (1.2.0)
       fog-core
-      rbvmomi (~> 1.8)
+      rbvmomi (~> 1.8.0)
     fog-xenserver (0.2.3)
       fog-core
       fog-xml
@@ -229,7 +228,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
@@ -242,7 +241,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
-    parser (2.3.1.2)
+    parser (2.3.1.4)
       ast (~> 2.2)
     pkg-config (1.1.7)
     posix-spawn (0.3.11)
@@ -257,25 +256,24 @@ GEM
     rack (2.0.1)
     rainbow (2.1.0)
     rainpress (1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rbvmomi (1.9.1)
-      builder (~> 3.2)
-      json (>= 1.8)
-      nokogiri (~> 1.5)
-      trollop (~> 2.1)
+    rbvmomi (1.8.2)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
     rdiscount (2.2.0.1)
     rdoc (4.2.1)
     redcarpet (3.3.4)
     ref (2.0.0)
-    rouge (2.0.5)
+    rouge (2.0.6)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
+    rspec-core (3.5.3)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -284,7 +282,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.42.0)
+    rubocop (0.43.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -319,7 +317,7 @@ GEM
       rubypants
     uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.1.0)
+    unicode-display_width (1.1.1)
     vcr (3.0.3)
     w3c_validators (1.2)
       json
@@ -391,4 +389,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.12.5
+   1.13.1

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.3.3 (2016-09-26)
+
+Fixes:
+
+* Fixed issue causing `Bundler::GemfileNotFound` to be thrown (#936) [Lorin Werthen]
+* Fixed issue when replacing a directory with a file or vice versa (#942, #946)
+
+Enhancements:
+
+* Modified the `compile` command to allow specifying the deploy target as argument (#945)
+
 ## 4.3.2 (2016-08-23)
 
 Identical to 4.3.1, but with corrected release notes.
@@ -25,7 +36,7 @@ Fixes:
 
 * Fixed `UnmetDependency` errors in postprocessor (#913, #917)
 
-Enhancement:
+Enhancements:
 
 * Sped up Nanoc by not releasing cache memory as quickly (#902)
 * Let `internal_links` check also verify resource paths, such as scripts and images (#912) [Lorin Werthen]

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

@@ -74,6 +74,7 @@ module Nanoc::Int
     def run_all
       @action_provider.preprocess(@site)
       build_reps
+      prune
       run
       @action_provider.postprocess(@site, @reps)
     end
@@ -180,6 +181,20 @@ module Nanoc::Int
 
     private
 
+    def prune
+      if site.config[:prune][:auto_prune]
+        Nanoc::Extra::Pruner.new(site, exclude: prune_config_exclude).run
+      end
+    end
+
+    def prune_config
+      site.config[:prune] || {}
+    end
+
+    def prune_config_exclude
+      prune_config[:exclude] || {}
+    end
+
     def compile_reps
       # Listen to processing start/stop
       Nanoc::Int::NotificationCenter.on(:processing_started, self) { |obj| @stack.push(obj) }

data/lib/nanoc/base/feature.rb

@@ -1,11 +1,19 @@
 module Nanoc
   # @api private
   module Feature
-    TRUES = %w(y yes 1 t true).freeze
+    PROFILER = 'profiler'.freeze
 
-    def self.enabled?(name)
-      env_name = "NANOC_FEATURE_#{name.upcase}"
-      TRUES.include?(ENV.fetch(env_name, 'f').downcase)
+    def self.enabled_features
+      @enabled_features ||= Set.new(ENV.fetch('NANOC_FEATURES', '').split(','))
+    end
+
+    def self.enabled?(feature_name)
+      enabled_features.include?(feature_name) ||
+        enabled_features.include?('all')
+    end
+
+    def self.reset_caches
+      @enabled_features = nil
     end
   end
 end

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

@@ -67,6 +67,13 @@ module Nanoc::Int
         @notifications[name].reject! { |i| i[:id] == id }
       end
 
+      # @api private
+      #
+      # @return [void]
+      def reset
+        @notifications = nil
+      end
+
       private
 
       def initialize_if_necessary(name)

data/lib/nanoc/cli.rb

@@ -106,7 +106,13 @@ module Nanoc::CLI
 
     if defined?(Bundler)
       # Discover external commands through Bundler
-      Bundler.require(:nanoc)
+      begin
+        Bundler.require(:nanoc)
+      rescue Bundler::GemfileNotFound
+        # When running nanoc with Bundler being defined but
+        # no gemfile being present (rubygems automatically loads
+        # Bundler when executing from command line), don't crash.
+      end
     end
   end
 

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

@@ -14,7 +14,7 @@ IDENTICAL - The item was deemed outdated and has been recompiled, but the compil
 SKIP - The item was deemed not outdated and was therefore not recompiled
 
 EOS
-flag nil, :profile, 'profile compilation' if Nanoc::Feature.enabled?('PROFILER')
+flag nil, :profile, 'profile compilation' if Nanoc::Feature.enabled?(Nanoc::Feature::PROFILER)
 
 module Nanoc::CLI::Commands
   class Compile < ::Nanoc::CLI::CommandRunner
@@ -404,7 +404,6 @@ module Nanoc::CLI::Commands
       puts 'Compiling site…'
       run_listeners_while do
         site.compile
-        prune
       end
 
       time_after = Time.now
@@ -414,12 +413,6 @@ module Nanoc::CLI::Commands
 
     protected
 
-    def prune
-      if site.config[:prune][:auto_prune]
-        Nanoc::Extra::Pruner.new(site, exclude: prune_config_exclude).run
-      end
-    end
-
     def default_listener_classes
       [
         Nanoc::CLI::Commands::Compile::DiffGenerator,
@@ -458,14 +451,6 @@ module Nanoc::CLI::Commands
     def reps
       site.compiler.reps
     end
-
-    def prune_config
-      site.config[:prune] || {}
-    end
-
-    def prune_config_exclude
-      prune_config[:exclude] || {}
-    end
   end
 end
 

data/lib/nanoc/cli/commands/create-site.rb

@@ -2,7 +2,7 @@ usage 'create-site [options] path'
 aliases :create_site, :cs
 summary 'create a site'
 description 'Create a new site at the given path. The site will use the `filesystem` data source.'
-flag nil, :force, 'Force creation of new site. Disregards previous existence of site in destination'
+flag nil, :force, 'force creation of new site'
 
 module Nanoc::CLI::Commands
   class CreateSite < ::Nanoc::CLI::CommandRunner

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

@@ -1,4 +1,4 @@
-usage 'deploy [options]'
+usage 'deploy [target] [options]'
 summary 'deploy the compiled site'
 description "
 Deploys the compiled site. The compiled site contents in the output directory will be uploaded to the destination, which is specified using the `--target` option.
@@ -60,8 +60,18 @@ module Nanoc::CLI::Commands
         raise Nanoc::Int::Errors::GenericTrivial, 'The site has no deployment configurations.'
       end
 
-      target = options.fetch(:target, :default).to_sym
-      deploy_configs.fetch(target) do
+      if arguments.length > 1
+        raise Nanoc::Int::Errors::GenericTrivial, "usage: #{command.usage}"
+      end
+
+      target_from_arguments = arguments[0]
+      target_from_options = options.fetch(:target, nil)
+      if target_from_arguments && target_from_options
+        raise Nanoc::Int::Errors::GenericTrivial, 'Only one deployment target can be specified on the command line.'
+      end
+
+      target = target_from_arguments || target_from_options || :default
+      deploy_configs.fetch(target.to_sym) do
         raise Nanoc::Int::Errors::GenericTrivial, "The site has no deployment configuration named `#{target}`."
       end
     end

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.3.2'.freeze
+  VERSION = '4.3.3'.freeze
 end

data/test/filters/test_relativize_paths.rb

@@ -106,13 +106,13 @@ class Nanoc::Filters::RelativizePathsTest < Nanoc::TestCase
   </body>
 </html>
 EOS
-    expected_match_0 = %r{<a href="\.\./\.\.">foo</a>}
-    expected_match_1 = %r{\A\s*<!DOCTYPE html\s*>\s*<html>\s*<head>(.|\s)*<title>Hello</title>\s*</head>\s*<body>\s*<a href="../..">foo</a>\s*</body>\s*</html>\s*\Z}m
+    expected0 = %r{<a href="\.\./\.\.">foo</a>}
+    expected1 = %r{\A\s*<!DOCTYPE html\s*>\s*<html>\s*<head>(.|\s)*<title>Hello</title>\s*</head>\s*<body>\s*<a href="../..">foo</a>\s*</body>\s*</html>\s*\Z}m
 
     # Test
     actual_content = filter.setup_and_run(raw_content, type: :html)
-    assert_match(expected_match_0, actual_content)
-    assert_match(expected_match_1, actual_content)
+    assert_match(expected0, actual_content)
+    assert_match(expected1, actual_content)
   end
 
   def test_filter_html_multiple

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri