nanoc 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec5f1b744e1d1a155a6b2d1dc1d603874d2deb57
-  data.tar.gz: eb4aa79555b133ab4ce28878aefb88b1644d3d04
+  metadata.gz: f9c0263d7b1a82695a400be99ff361742a79f205
+  data.tar.gz: 9e037c0b7f6dd9e0dde26ee2e17c5b0b512c108b
 SHA512:
-  metadata.gz: e144b54d2dd138af0e36e90274d2c4d20350aae065496aaeaf5a0e39f3a8506c7235adc1c0325dfc94d0e835657359d9bd883536665de12dabc6b36626b90654
-  data.tar.gz: f1192638a1b3c2182c6c21911f54de5a9f0fa8c17e2ee99adbb683e55e7f7847aab1e34dec1f425a73d3a016035507eb3206b90aca1513203bb3cc13e94a78f6
+  metadata.gz: d878758c199d21225f6ab0a893f248b2f51cd47d4e740fe2fad232f92ccdcfebc05921252271cd3f4123e6bb9d6eb5f033aa859387d6e196242ea2aea81286d5
+  data.tar.gz: ec1f03f5120a5c3cbab4c49bb785edafc0c8eaa7b100fc37a66dda63f313281242adf1fe1b701b2ecebd2c69e81519975b40f3e99703e91a23a4a7f5c0651b31

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.1.4)
+    nanoc (4.1.5)
       cri (~> 2.3)
 
 GEM
@@ -10,13 +10,13 @@ GEM
     CFPropertyList (2.3.2)
     RedCloth (4.2.9)
     addressable (2.4.0)
-    adsf (1.2.0)
+    adsf (1.2.1)
       rack (>= 1.0.0)
     ast (2.2.0)
     bluecloth (2.2.0)
     builder (3.2.2)
     chunky_png (1.3.5)
-    coderay (1.1.0)
+    coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -35,9 +35,8 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    coveralls (0.8.10)
+    coveralls (0.8.13)
       json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
@@ -48,10 +47,8 @@ GEM
       colored (~> 1.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.20160128)
-      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    excon (0.45.4)
+    excon (0.48.0)
     execjs (2.6.0)
     ffi (1.9.10)
     fission (0.5.0)
@@ -90,7 +87,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.8.1)
+    fog-aws (0.9.2)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -99,11 +96,11 @@ GEM
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.35.0)
+    fog-core (1.36.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
-    fog-dynect (0.0.2)
+    fog-dynect (0.0.3)
       fog-core
       fog-json
       fog-xml
@@ -117,7 +114,7 @@ GEM
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.2.1)
+    fog-local (0.3.0)
       fog-core (~> 1.27)
     fog-powerdns (0.1.1)
       fog-core (~> 1.27)
@@ -141,7 +138,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.0.3)
+    fog-softlayer (1.1.0)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -156,7 +153,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.6.0)
+    fog-vsphere (0.6.3)
       fog-core
       rbvmomi (~> 1.8)
     fog-xenserver (0.2.3)
@@ -185,12 +182,10 @@ GEM
       therubyracer (~> 0.12.1)
     handlebars-source (3.0.3)
     hashdiff (0.3.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     inflecto (0.0.2)
-    ipaddress (0.8.2)
+    ipaddress (0.8.3)
     json (1.8.3)
-    kramdown (1.9.0)
+    kramdown (1.10.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.13)
@@ -203,22 +198,23 @@ GEM
     maruku (0.7.2)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.99)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.2)
-    mustache (1.0.2)
+    mustache (1.0.3)
     nenv (0.3.0)
-    netrc (0.11.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (1.0.0)
-    parser (2.3.0.5)
+    parser (2.3.0.6)
       ast (~> 2.2)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
@@ -232,7 +228,7 @@ GEM
     rack (1.6.4)
     rainbow (2.1.0)
     rainpress (1.0)
-    rake (10.5.0)
+    rake (11.1.1)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -245,16 +241,12 @@ GEM
       json (~> 1.4)
     redcarpet (3.3.4)
     ref (2.0.0)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rouge (1.10.1)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -263,12 +255,12 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.37.2)
-      parser (>= 2.3.0.4, < 3.0)
+    rubocop (0.38.0)
+      parser (>= 2.3.0.6, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 0.3)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.7.5)
     rubypants (0.2.0)
     safe_yaml (1.0.4)
@@ -295,18 +287,14 @@ GEM
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
-    unicode-display_width (0.3.1)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.0.2)
     vcr (3.0.1)
     w3c_validators (1.2)
       json
       nokogiri
-    webmock (1.22.6)
+    webmock (1.24.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/NEWS.md

@@ -1,5 +1,12 @@
 # Nanoc news
 
+## 4.1.5 (2016-03-24)
+
+Fixes:
+
+* Fixed crash in `show-data` command (#833, #835)
+* Fixed preprocessor not being invoked before running checks (#841, #842)
+
 ## 4.1.4 (2016-02-13)
 
 Fixes:

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

@@ -13,6 +13,7 @@ module Nanoc::CLI::Commands
     def run
       validate_options_and_arguments
       load_site
+      site.compiler.action_provider.preprocess(site)
 
       runner = Nanoc::Extra::Checking::Runner.new(site)
 

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

@@ -13,78 +13,107 @@ option :n, :'dry-run',      'show what would be deployed'
 module Nanoc::CLI::Commands
   class Deploy < ::Nanoc::CLI::CommandRunner
     def run
+      prepare
+
+      case
+      when options[:'list-deployers']
+        list_deployers
+      when options[:list]
+        list_deploy_configs
+      else
+        deploy
+      end
+    end
+
+    private
+
+    def prepare
       load_site
       # FIXME: ugly to preprocess here
       site.compiler.action_provider.preprocess(site)
+    end
 
-      # List deployers
-      if options[:'list-deployers']
-        deployers      = Nanoc::Int::PluginRegistry.instance.find_all(Nanoc::Extra::Deployer)
-        deployer_names = deployers.keys.sort_by(&:to_s)
-        puts 'Available deployers:'
-        deployer_names.each do |name|
+    def list_deployers
+      deployers      = Nanoc::Int::PluginRegistry.instance.find_all(Nanoc::Extra::Deployer)
+      deployer_names = deployers.keys.sort_by(&:to_s)
+      puts 'Available deployers:'
+      deployer_names.each do |name|
+        puts "  #{name}"
+      end
+    end
+
+    def list_deploy_configs
+      if deploy_configs.empty?
+        puts 'No deployment configurations.'
+      else
+        puts 'Available deployment configurations:'
+        deploy_configs.keys.each do |name|
           puts "  #{name}"
         end
-        return
       end
+    end
 
-      # Get & list configs
-      deploy_configs = site.config.fetch(:deploy, {})
+    def deploy
+      deployer = deployer_for(deploy_config)
 
-      if options[:list]
-        if deploy_configs.empty?
-          puts 'No deployment configurations.'
-        else
-          puts 'Available deployment configurations:'
-          deploy_configs.keys.each do |name|
-            puts "  #{name}"
-          end
-        end
-        return
-      end
+      checks_successful = options[:'no-check'] ? true : check
+      return unless checks_successful
+
+      deployer.run
+    end
 
-      # Can't proceed further without a deploy config
+    def deploy_config
       if deploy_configs.empty?
         raise Nanoc::Int::Errors::GenericTrivial, 'The site has no deployment configurations.'
       end
 
-      # Get target
       target = options.fetch(:target, :default).to_sym
-      config = deploy_configs.fetch(target) do
+      deploy_configs.fetch(target) do
+        # FIXME: target name is unobvious
         raise Nanoc::Int::Errors::GenericTrivial, "The site has no deployment configuration for #{target}."
       end
+    end
 
-      # Get deployer
+    def deployer_for(config)
+      deployer_class_for_config(config).new(
+        site.config[:output_dir],
+        config,
+        dry_run: options[:'dry-run'],
+      )
+    end
+
+    def check
+      runner = Nanoc::Extra::Checking::Runner.new(site)
+      if runner.dsl_present?
+        puts 'Running issue checks…'
+        is_success = runner.run_for_deploy
+        if is_success
+          puts 'No issues found. Deploying!'
+        else
+          puts 'Issues found, deploy aborted.'
+        end
+        is_success
+      else
+        true
+      end
+    end
+
+    def deploy_configs
+      site.config.fetch(:deploy, {})
+    end
+
+    def deployer_class_for_config(config)
       names = Nanoc::Extra::Deployer.all.keys
       name = config.fetch(:kind) do
         $stderr.puts 'Warning: The specified deploy target does not have a kind attribute. Assuming rsync.'
         'rsync'
       end
+
       deployer_class = Nanoc::Extra::Deployer.named(name)
       if deployer_class.nil?
         raise Nanoc::Int::Errors::GenericTrivial, "The specified deploy target has an unrecognised kind “#{name}” (expected one of #{names.join(', ')})."
       end
-
-      # Check
-      unless options[:'no-check']
-        runner = Nanoc::Extra::Checking::Runner.new(site)
-        if runner.dsl_present?
-          puts 'Running issue checks…'
-          ok = runner.run_for_deploy
-          unless ok
-            puts 'Issues found, deploy aborted.'
-            return
-          end
-          puts 'No issues found. Deploying!'
-        end
-      end
-
-      # Run
-      deployer = deployer_class.new(
-        site.config[:output_dir],
-        config,
-        dry_run: options[:'dry-run'])
-      deployer.run
+      deployer_class
     end
   end
 end

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

@@ -40,7 +40,7 @@ module Nanoc::CLI::Commands
     def sorted_reps_with_prev(items)
       prev = nil
       items.sort_by(&:identifier).each do |item|
-        item.reps.sort_by { |r| r.name.to_s }.each do |rep|
+        site.compiler.reps[item].sort_by { |r| r.name.to_s }.each do |rep|
           yield(rep, prev)
           prev = rep
         end

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -282,7 +282,6 @@ files:
 - test/cli/commands/test_check.rb
 - test/cli/commands/test_compile.rb
 - test/cli/commands/test_create_site.rb
-- test/cli/commands/test_deploy.rb
 - test/cli/commands/test_help.rb
 - test/cli/commands/test_info.rb
 - test/cli/commands/test_prune.rb

data/test/cli/commands/test_deploy.rb

@@ -1,191 +0,0 @@
-class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
-  def test_deploy
-    skip_unless_have_command 'rsync'
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  public:\n"
-        io.write "    kind: rsync\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      Nanoc::CLI.run %w( deploy -t public )
-
-      assert File.directory?('mydestination')
-      assert File.file?('mydestination/blah.html')
-    end
-  end
-
-  def test_deploy_with_dry_run
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  public:\n"
-        io.write "    kind: rsync\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      Nanoc::CLI.run %w( deploy -t public -n )
-
-      refute File.directory?('mydestination')
-      refute File.file?('mydestination/blah.html')
-    end
-  end
-
-  def test_deploy_with_list_without_config
-    with_site do |_site|
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      ios = capturing_stdio do
-        Nanoc::CLI.run %w( deploy -L )
-      end
-
-      assert ios[:stdout].include?('No deployment configurations.')
-
-      refute File.directory?('mydestination')
-      refute File.file?('mydestination/blah.html')
-    end
-  end
-
-  def test_deploy_with_list
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  public:\n"
-        io.write "    kind: rsync\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      ios = capturing_stdio do
-        Nanoc::CLI.run %w( deploy -L )
-      end
-
-      assert ios[:stdout].include?('Available deployment configurations:')
-
-      refute File.directory?('mydestination')
-      refute File.file?('mydestination/blah.html')
-    end
-  end
-
-  def test_deploy_with_list_deployers
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  public:\n"
-        io.write "    kind: rsync\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      ios = capturing_stdio do
-        Nanoc::CLI.run %w( deploy -D )
-      end
-
-      assert ios[:stdout].include?('Available deployers:')
-
-      refute File.directory?('mydestination')
-      refute File.file?('mydestination/blah.html')
-    end
-  end
-
-  def test_deploy_without_kind
-    skip_unless_have_command 'rsync'
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  public:\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      ios = capturing_stdio do
-        Nanoc::CLI.run %w( deploy -t public )
-      end
-
-      assert ios[:stderr].include?('Warning: The specified deploy target does not have a kind attribute. Assuming rsync.')
-
-      assert File.directory?('mydestination')
-      assert File.file?('mydestination/blah.html')
-    end
-  end
-
-  def test_deploy_without_target_without_default
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  public:\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      capturing_stdio do
-        err = assert_raises Nanoc::Int::Errors::GenericTrivial do
-          Nanoc::CLI.run %w( deploy )
-        end
-        assert_equal 'The site has no deployment configuration for default.', err.message
-      end
-    end
-  end
-
-  def test_deploy_without_target_with_default
-    skip_unless_have_command 'rsync'
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  default:\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      capturing_stdio do
-        Nanoc::CLI.run %w( deploy )
-      end
-
-      assert File.directory?('mydestination')
-      assert File.file?('mydestination/blah.html')
-    end
-  end
-
-  def test_deploy_with_preprocessor
-    skip_unless_have_command 'rsync'
-    with_site do |_site|
-      File.open('nanoc.yaml', 'w') do |io|
-        io.write "deploy:\n"
-        io.write "  default:\n"
-        io.write '    dst: mydestination'
-      end
-
-      FileUtils.mkdir_p('output')
-      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
-
-      File.write('Rules', "preprocess do ; @config[:deploy][:default][:dst] = 'otherdestination' ; end\n\n" + File.read('Rules'))
-
-      capturing_stdio do
-        Nanoc::CLI.run %w( deploy )
-      end
-
-      refute File.directory?('mydestination')
-      refute File.file?('mydestination/blah.html')
-      assert File.directory?('otherdestination')
-      assert File.file?('otherdestination/blah.html')
-    end
-  end
-end