bookbindery 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e569c8b49b909c17b4b30acd65b3986b07ab304b
-  data.tar.gz: a55e74657a1f9e2e12c13de88fb9ae7e53d069d2
+  metadata.gz: 86f65f7bef679ee010fe1e1e48699f25c8a52459
+  data.tar.gz: 36903b0839abb3d2d34de78b685497900920572a
 SHA512:
-  metadata.gz: 19a3737931f428d599b991f09422bb307fb4749aa28729dcf8139a89e3b175c583497cafa28a0c68fcdd26baf0421318b05840d30d8dd16d4d29a9d7aab26b60
-  data.tar.gz: b3e5e09c41cf9db7dae8b231176b1ede5efa7a1e41c2472d01511ff54c44fb80be9a4540d6aee995df113151c944651577ca7d1c6c5e4363032738ba196f67fc
+  metadata.gz: 642e96e2a97bddd0492c9eac223d1b0b07db5bf5897f5926a25029c4246de28c26cb6bf9f6cf4066a2344b9faa6e99403d22825aeaa6ef2057d82c4c30adc99e
+  data.tar.gz: 6710d7e2f7a298e5c7dd94ae5ad74684389e5426b1abd2a0dd9bfbc4f1222c3dd26d9aae71a1912e2aa0d52b604fc65e1c6ef628bc3ad6b3d2fa943f532b014b

data/lib/bookbinder/commands/bind.rb

@@ -21,9 +21,8 @@ module Bookbinder
                      version_control_system,
                      file_system_accessor,
                      static_site_generator,
-                     sitemap_generator,
+                     sitemap_writer,
                      final_app_directory,
-                     server_director,
                      context_dir,
                      dita_preprocessor,
                      cloner_factory,
@@ -35,9 +34,8 @@ module Bookbinder
         @version_control_system = version_control_system
         @file_system_accessor = file_system_accessor
         @static_site_generator = static_site_generator
-        @sitemap_generator = sitemap_generator
+        @sitemap_writer = sitemap_writer
         @final_app_directory = final_app_directory
-        @server_director = server_director
         @context_dir = context_dir
         @dita_preprocessor = dita_preprocessor
         @cloner_factory = cloner_factory
@@ -62,7 +60,7 @@ module Bookbinder
 
         @section_repository = Repositories::SectionRepository.new(logger)
         @gem_root = File.expand_path('../../../../', __FILE__)
-        publisher = Publisher.new(logger, sitemap_generator, static_site_generator, server_director, file_system_accessor)
+        publisher = Publisher.new(logger, sitemap_writer, static_site_generator, file_system_accessor)
 
         bind_source, *options = cli_arguments
 
@@ -121,8 +119,7 @@ module Bookbinder
                   :file_system_accessor,
                   :static_site_generator,
                   :final_app_directory,
-                  :sitemap_generator,
-                  :server_director,
+                  :sitemap_writer,
                   :context_dir,
                   :dita_preprocessor,
                   :cloner_factory,

data/lib/bookbinder/dita_preprocessor.rb

@@ -22,10 +22,10 @@ module Bookbinder
 
       dita_formatter.format_html dita_section.html_from_dita_section_dir, dita_section.formatted_section_dir
 
-      copy_images(dita_section)
+      copy_images(dita_section.path_to_local_repo, dita_section.formatted_section_dir)
 
-     local_fs_accessor.copy_contents(dita_section.formatted_section_dir,
-                                     dita_section.section_source_for_site_generator)
+      local_fs_accessor.copy_contents(dita_section.formatted_section_dir,
+                                      dita_section.section_source_for_site_generator)
     end
 
     private
@@ -50,15 +50,15 @@ module Bookbinder
                                        to: File.join(subnavs_dir, "dita_subnav.erb")
     end
 
-    def copy_images(dita_section)
+    def copy_images(src, dest)
       image_paths = ACCEPTED_IMAGE_FORMATS.map do |format|
-        local_fs_accessor.find_files_with_ext(format, dita_section.path_to_local_repo)
+        local_fs_accessor.find_files_with_ext(format, src)
       end.flatten
 
       image_paths.each do |image_path|
         local_fs_accessor.copy_including_intermediate_dirs(image_path,
-                                                           dita_section.path_to_local_repo,
-                                                           dita_section.section_source_for_site_generator)
+                                                           src,
+                                                           dest)
       end
     end
 

data/lib/bookbinder/git_hub_repository.rb

@@ -94,8 +94,9 @@ module Bookbinder
         @logger.log '  copying '.yellow + path_to_local_repo
         destination = File.join(destination_dir, directory)
 
-        unless destination.include?(path_to_local_repo)
+        if !destination.include?(path_to_local_repo) && !File.exists?(destination)
           FileUtils.mkdir_p(destination)
+
           FileUtils.cp_r(File.join(path_to_local_repo, '.'), destination)
         end
 

data/lib/bookbinder/local_file_system_accessor.rb

@@ -44,7 +44,7 @@ module Bookbinder
         FileUtils.mkdir_p(dest)
       end
 
-      contents = Dir.glob File.join(src, '**/*')
+      contents = Dir.glob File.join(src, '**')
       contents.each do |dir|
         FileUtils.cp_r dir, dest
       end
@@ -62,7 +62,7 @@ module Bookbinder
     end
 
     def find_files_with_ext(ext, path)
-      Dir[File.join path, '**/*'].select { |file| File.basename(file).include?(".#{ext}") }
+      Dir[File.join path, "**/*.#{ext}"]
     end
 
     def relative_path_from(src, target)

data/lib/bookbinder/post_production/sitemap_writer.rb

@@ -0,0 +1,32 @@
+require_relative '../server_director'
+require_relative '../spider'
+
+module Bookbinder
+  module PostProduction
+    class SitemapWriter
+      def self.build(logger, final_app_directory, port)
+        new(
+          Spider.new(logger, app_dir: final_app_directory),
+          ServerDirector.new(logger, directory: final_app_directory, port: port)
+        )
+      end
+
+      def initialize(spider, server_director)
+        @spider = spider
+        @server_director = server_director
+      end
+
+      def write(host_for_sitemap)
+        server_director.use_server { |port|
+          spider.generate_sitemap(host_for_sitemap, port)
+        }.tap do |sitemap|
+          File.write(sitemap.to_path, sitemap.to_xml)
+        end
+      end
+
+      private
+
+      attr_reader :server_director, :spider
+    end
+  end
+end

data/lib/bookbinder/publisher.rb

@@ -2,17 +2,15 @@ require 'middleman-syntax'
 require_relative 'deprecated_logger'
 require_relative 'directory_helpers'
 require_relative 'repositories/section_repository'
-require_relative 'server_director'
 
 module Bookbinder
   class Publisher
     include DirectoryHelperMethods
 
-    def initialize(logger, spider, static_site_generator, server_director, file_system_accessor)
+    def initialize(logger, sitemap_writer, static_site_generator, file_system_accessor)
       @logger = logger
-      @spider = spider
+      @sitemap_writer = sitemap_writer
       @static_site_generator = static_site_generator
-      @server_director = server_director
       @file_system_accessor = file_system_accessor
     end
 
@@ -29,21 +27,20 @@ module Bookbinder
       host_for_sitemap = publish_config.fetch(:host_for_sitemap)
 
       generate_site(cli_options, output_paths, publish_config, master_dir, workspace_dir, subnavs, build_directory, public_directory)
-      generate_sitemap(host_for_sitemap, @spider)
+      result = generate_sitemap(host_for_sitemap)
 
       @logger.log "Bookbinder bound your book into #{final_app_dir.to_s.green}"
 
-      !@spider.has_broken_links?
+      !result.has_broken_links?
     end
 
     private
 
-    attr_reader :section_repository, :logger, :file_system_accessor
+    attr_reader :section_repository, :logger, :file_system_accessor, :sitemap_writer
 
-    def generate_sitemap(host_for_sitemap, spider)
+    def generate_sitemap(host_for_sitemap)
       raise "Your public host must be a single String." unless host_for_sitemap.is_a?(String)
-
-      @server_director.use_server { |port| spider.generate_sitemap host_for_sitemap, port }
+      sitemap_writer.write(host_for_sitemap)
     end
 
     def generate_site(cli_options, output_paths, publish_config, middleman_dir, workspace_dir, subnavs, build_dir, public_dir)

data/lib/bookbinder/repositories/command_repository.rb

@@ -10,7 +10,7 @@ require_relative '../ingest/cloner_factory'
 require_relative '../dita_to_html_converter'
 require_relative '../local_file_system_accessor'
 require_relative '../middleman_runner'
-require_relative '../spider'
+require_relative '../post_production/sitemap_writer'
 require_relative '../subnav_formatter'
 require_relative '../yaml_loader'
 require_relative '../config/bind_config_factory'
@@ -78,9 +78,8 @@ module Bookbinder
           version_control_system,
           local_file_system_accessor,
           middleman_runner,
-          spider,
+          PostProduction::SitemapWriter.build(logger, final_app_directory, sitemap_port),
           final_app_directory,
-          server_director,
           File.absolute_path('.'),
           dita_preprocessor,
           Ingest::ClonerFactory.new(logger, version_control_system),
@@ -103,17 +102,6 @@ module Bookbinder
         )
       end
 
-      def spider
-        @spider ||= Spider.new(logger, app_dir: final_app_directory)
-      end
-
-      def server_director
-        @server_director ||= ServerDirector.new(
-          logger,
-          directory: final_app_directory
-        )
-      end
-
       def middleman_runner
         @middleman_runner ||= MiddlemanRunner.new(logger, version_control_system)
       end
@@ -170,6 +158,10 @@ module Bookbinder
       def bind_config_factory
         @bind_config_factory  ||= Config::BindConfigFactory.new(logger, version_control_system, configuration_fetcher)
       end
+
+      def sitemap_port
+        41722
+      end
     end
   end
 end

data/lib/bookbinder/server_director.rb

@@ -10,16 +10,18 @@ module Bookbinder
 
     def use_server
       Dir.chdir(@directory) do
+        result = nil
         POpen4::popen4("puma -p #{@port}") do |stdout, stderr, stdin, pid|
           begin
             wait_for_server(stdout)
             consume_stream_in_separate_thread(stdout)
             consume_stream_in_separate_thread(stderr)
-            yield @port
+            result = yield @port
           ensure
             stop_server(pid)
           end
         end
+        result
       end
     end
 

data/lib/bookbinder/sitemap_generator.rb

@@ -2,8 +2,8 @@ require 'nokogiri'
 
 module Bookbinder
   class SitemapGenerator
-    def generate(links, sitemap_file)
-      builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+    def generate(links)
+      Nokogiri::XML::Builder.new(encoding: 'UTF-8') { |xml|
         xml.urlset('xmlns' => 'http://www.sitemaps.org/schemas/sitemap/0.9') {
           links.each do |link|
             xml.url {
@@ -12,8 +12,7 @@ module Bookbinder
             }
           end
         }
-      end
-      File.write(sitemap_file, builder.to_xml)
+      }.to_xml
     end
   end
 end

data/lib/bookbinder/spider.rb

@@ -7,6 +7,26 @@ require_relative 'sitemap_generator'
 
 module Bookbinder
   class Spider
+    class Result
+      def initialize(broken_links, sitemap, app_dir)
+        @broken_links = broken_links
+        @sitemap = sitemap
+        @app_dir = app_dir
+      end
+
+      def has_broken_links?
+        @broken_links.any? { |link| !link.include?('#') }
+      end
+
+      def to_xml
+        @sitemap
+      end
+
+      def to_path
+        Pathname(@app_dir).join('public/sitemap.xml')
+      end
+    end
+
     def initialize(logger, app_dir: nil)
       @logger = logger
       @app_dir = app_dir || raise('Spiders must be initialized with an app directory.')
@@ -18,16 +38,12 @@ module Bookbinder
 
       sieve = Sieve.new domain: "http://#{temp_host}"
       links = crawl_from "http://#{temp_host}/index.html", sieve
-      @broken_links, working_links = links
-
-      announce_broken_links @broken_links
+      broken_links, working_links = links
 
-      write_sitemap(target_host, temp_host, working_links)
-      working_links
-    end
+      announce_broken_links broken_links
 
-    def has_broken_links?
-      @broken_links.any? { |link| !link.include?('#') } if @broken_links
+      sitemap_links = substitute_hostname(temp_host, target_host, working_links)
+      Result.new(broken_links, SitemapGenerator.new.generate(sitemap_links), @app_dir)
     end
 
     def self.prepend_location(location, url)
@@ -36,12 +52,6 @@ module Bookbinder
 
     private
 
-    def write_sitemap(host, port, working_links)
-      sitemap_file = File.join(@app_dir, 'public', 'sitemap.xml')
-      sitemap_links = substitute_hostname(host, port, working_links)
-      SitemapGenerator.new.generate(sitemap_links, sitemap_file)
-    end
-
     def announce_broken_links(broken_links)
       if broken_links.any?
         @logger.error "\nFound #{broken_links.count} broken links!"
@@ -84,7 +94,7 @@ module Bookbinder
       anemone.focus_crawl { |page| page.links.reject { |link| link.to_s.match(/%23/) } }
     end
 
-    def substitute_hostname(target_host, temp_host, links)
+    def substitute_hostname(temp_host, target_host, links)
       links.map { |l| l.gsub(/#{Regexp.escape(temp_host)}/, target_host) }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Mike Grafton
@@ -15,20 +15,20 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
@@ -49,70 +49,70 @@ dependencies:
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.5
 - !ruby/object:Gem::Dependency
   name: middleman-syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -147,154 +147,154 @@ dependencies:
   name: anemone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: popen4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: license_finder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A command line utility to be run in Book repositories to stitch together
@@ -355,6 +355,7 @@ files:
 - lib/bookbinder/local_file_system_accessor.rb
 - lib/bookbinder/middleman_runner.rb
 - lib/bookbinder/pdf_generator.rb
+- lib/bookbinder/post_production/sitemap_writer.rb
 - lib/bookbinder/publisher.rb
 - lib/bookbinder/pusher.rb
 - lib/bookbinder/remote_dita_section_gatherer.rb
@@ -403,12 +404,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []