bookbindery 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738c31dab5c4057b6f486aef21926f603615651c
-  data.tar.gz: 3a149c514e408ff32ba77c6835dbd7b315646cd7
+  metadata.gz: e569c8b49b909c17b4b30acd65b3986b07ab304b
+  data.tar.gz: a55e74657a1f9e2e12c13de88fb9ae7e53d069d2
 SHA512:
-  metadata.gz: b9f7024799d3f9318cdcc19d5a42653614a6f70bc1577d70cc796a8115ceae219ce29fef032f15c920581fbe9a35445e102ad436ce61c8fbbf5be6aecdbe1413
-  data.tar.gz: e3cc42e4d350875b1115348fba6aaa1e12c9c8c41306f65991e03474edd1cb2966a2853ac8aa653830fc7ecd3c9c05979d2fcd74f3f2c374e5763c5964ac0ae6
+  metadata.gz: 19a3737931f428d599b991f09422bb307fb4749aa28729dcf8139a89e3b175c583497cafa28a0c68fcdd26baf0421318b05840d30d8dd16d4d29a9d7aab26b60
+  data.tar.gz: b3e5e09c41cf9db7dae8b231176b1ede5efa7a1e41c2472d01511ff54c44fb80be9a4540d6aee995df113151c944651577ca7d1c6c5e4363032738ba196f67fc

data/lib/bookbinder/cli.rb

@@ -39,7 +39,7 @@ module Bookbinder
       begin
         command_runner.run command_name, command_arguments
 
-      rescue Commands::Bind::VersionUnsupportedError => e
+      rescue Config::RemoteBindConfiguration::VersionUnsupportedError => e
         logger.error "config.yml at version '#{e.message}' has an unsupported API."
         1
       rescue Configuration::CredentialKeyError => e
@@ -58,7 +58,7 @@ module Bookbinder
     end
 
     private
-    
+
     attr_reader :version_control_system
 
   end

data/lib/bookbinder/command_runner.rb

@@ -1,5 +1,5 @@
 require_relative 'errors/cli_error'
-require_relative 'local_dita_to_html_converter'
+require_relative 'dita_to_html_converter'
 require_relative 'sheller'
 
 module Bookbinder

data/lib/bookbinder/commands/bind.rb

@@ -1,24 +1,22 @@
+require_relative '../dita_section_gatherer_factory'
 require_relative '../archive_menu_configuration'
-require_relative '../book'
+require_relative '../values/output_locations'
+require_relative '../values/dita_section'
 require_relative '../errors/cli_error'
-require_relative '../directory_helpers'
-require_relative '../publisher'
 require_relative '../values/section'
-require_relative '../values/dita_section'
-require_relative '../dita_section_gatherer'
-require_relative '../values/output_locations'
+require_relative '../publisher'
+require_relative '../book'
 require_relative 'naming'
 
 module Bookbinder
   module Commands
     class Bind
-      VersionUnsupportedError = Class.new(RuntimeError)
-
       include Bookbinder::DirectoryHelperMethods
       include Commands::Naming
 
       def initialize(logger,
                      config_fetcher,
+                     config_factory,
                      archive_menu_config,
                      version_control_system,
                      file_system_accessor,
@@ -28,9 +26,11 @@ module Bookbinder
                      server_director,
                      context_dir,
                      dita_preprocessor,
-                     cloner_factory)
+                     cloner_factory,
+                     dita_section_gatherer_factory)
         @logger = logger
         @config_fetcher = config_fetcher
+        @config_factory = config_factory
         @archive_menu_config = archive_menu_config
         @version_control_system = version_control_system
         @file_system_accessor = file_system_accessor
@@ -41,6 +41,7 @@ module Bookbinder
         @context_dir = context_dir
         @dita_preprocessor = dita_preprocessor
         @cloner_factory = cloner_factory
+        @dita_section_gatherer_factory = dita_section_gatherer_factory
       end
 
       def usage
@@ -61,74 +62,39 @@ 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_generator, static_site_generator, server_director, file_system_accessor)
 
         bind_source, *options = cli_arguments
 
-        bind_config = bind_config(bind_source)
+        bind_config = config_factory.produce(bind_source)
+
         @versions = bind_config.fetch(:versions, [])
         @book_repo = bind_config[:book_repo]
 
-        output_paths = output_directory_paths(bind_source)
-        master_middleman_dir = output_paths.fetch(:master_middleman_dir)
-        output_dir = output_paths.fetch(:output_dir)
-        master_dir = File.join output_dir, 'master_middleman'
-
         output_locations = OutputLocations.new(
-          workspace_dir = File.join(master_dir, 'source'),
-          dita_home_dir = File.join(output_dir, 'dita'),
-          cloned_dita_dir = File.join(dita_home_dir, 'dita_sections'),
-          html_from_dita_dir = File.join(dita_home_dir, 'html_from_dita'),
-          formatted_dir = File.join(dita_home_dir, 'site_generator_ready'),
-          subnavs_for_layout_dir = File.join(workspace_dir, 'subnavs'),
-          dita_subnav_template_path = File.join(workspace_dir, 'subnavs', '_dita_subnav_template.erb')
+          context_dir: context_dir,
+          final_app_dir: final_app_directory,
+          layout_repo_dir: layout_repo_path(generate_local_repo_dir(context_dir, bind_source)),
+          local_repo_dir: generate_local_repo_dir(context_dir, bind_source)
         )
 
-        prepare_directories(final_app_directory,
-                            output_dir,
-                            workspace_dir,
-                            master_middleman_dir,
-                            master_dir,
-                            dita_home_dir)
-
-        dita_section_config_hash = config.dita_sections || {}
-        dita_sections = dita_section_config_hash.map do |dita_section_config|
-          relative_path_to_dita_map = dita_section_config['ditamap_location']
-          full_name = dita_section_config.fetch('repository', {}).fetch('name')
-          target_ref = dita_section_config.fetch('repository', {})['ref']
-          directory = dita_section_config['directory']
-
-          DitaSection.new(nil, relative_path_to_dita_map, full_name, target_ref, directory, output_locations)
-        end
-
-        if bind_source == 'github'
-          dita_section_gatherer = DitaSectionGatherer.new(version_control_system, output_locations, logger)
-          gathered_dita_sections = dita_section_gatherer.gather(dita_sections, to: cloned_dita_dir)
-        else
-          gathered_dita_sections = dita_sections.map do |dita_section|
-            relative_path_to_dita_map = dita_section.ditamap_location
-            full_name = dita_section.full_name
-            target_ref = dita_section.target_ref
-            directory = dita_section.directory
+        prepare_directories(output_locations)
 
-            path_to_local_copy = File.join output_paths[:local_repo_dir], directory
-
-            DitaSection.new(path_to_local_copy, relative_path_to_dita_map, full_name, target_ref, directory, output_locations)
-          end
-        end
+        dita_gatherer = dita_section_gatherer_factory.produce(bind_source, output_locations)
+        gathered_dita_sections = dita_gatherer.gather(config.dita_sections)
 
         gathered_dita_sections.each do |dita_section|
           dita_preprocessor.preprocess(dita_section,
-                                       subnavs_for_layout_dir,
-                                       dita_subnav_template_path)
+                                       output_locations.subnavs_for_layout_dir,
+                                       output_locations.dita_subnav_template_path)
         end
 
         cloner = cloner_factory.produce(
           bind_source,
-          output_paths[:local_repo_dir]
+          output_locations.local_repo_dir
         )
         sections = gather_sections(
-          workspace_dir,
+          output_locations.source_for_site_generator,
           cloner,
           ('master' if options.include?('--ignore-section-refs'))
         )
@@ -138,7 +104,7 @@ module Bookbinder
         success = publisher.publish(
           subnavs,
           {verbose: cli_arguments.include?('--verbose')},
-          output_paths,
+          output_locations,
           archive_menu_config.generate(bind_config, sections)
         )
 
@@ -147,9 +113,9 @@ module Bookbinder
 
       private
 
-      attr_reader :publisher,
-                  :version_control_system,
+      attr_reader :version_control_system,
                   :config_fetcher,
+                  :config_factory,
                   :archive_menu_config,
                   :logger,
                   :file_system_accessor,
@@ -159,7 +125,12 @@ module Bookbinder
                   :server_director,
                   :context_dir,
                   :dita_preprocessor,
-                  :cloner_factory
+                  :cloner_factory,
+                  :dita_section_gatherer_factory
+
+      def generate_local_repo_dir(context_dir, bind_source)
+        File.expand_path('..', context_dir) if bind_source == 'local'
+      end
 
       def gather_sections(workspace, cloner, ref_override)
         config.sections.map do |attributes|
@@ -172,36 +143,24 @@ module Bookbinder
                                  ref: target_ref,
                                  parent_dir: workspace,
                                  dir_name: directory)
-          @section_repository.get_instance(attributes,
-                                           vcs_repo: vcs_repo,
-                                           destination_dir: workspace,
-                                           build: ->(*args) { Section.new(*args) })
+          @section_repository.get_instance(
+            attributes,
+            vcs_repo: vcs_repo,
+            destination_dir: workspace
+          ) { |*args| Section.new(*args) }
         end
       end
 
-      def prepare_directories(final_app,
-                              output_dir,
-                              middleman_source,
-                              master_middleman_dir,
-                              middleman_dir,
-                              dita_processing_dir)
-        forget_sections(output_dir)
-        file_system_accessor.remove_directory File.join final_app, '.'
-        file_system_accessor.remove_directory dita_processing_dir
-
-        copy_directory_from_gem 'template_app', final_app
-        copy_directory_from_gem 'master_middleman', middleman_dir
-        file_system_accessor.copy File.join(master_middleman_dir, '.'), middleman_dir
-
-        copy_version_master_middleman(middleman_source)
-      end
+      def prepare_directories(locations)
+        forget_sections(locations.output_dir)
+        file_system_accessor.remove_directory(File.join(locations.final_app_dir, '.'))
+        file_system_accessor.remove_directory(locations.dita_home_dir)
 
-      def forget_sections(middleman_scratch)
-        file_system_accessor.remove_directory File.join middleman_scratch, '.'
-      end
+        copy_directory_from_gem('template_app', locations.final_app_dir)
+        copy_directory_from_gem('master_middleman', locations.site_generator_home)
+        file_system_accessor.copy(File.join(locations.layout_repo_dir, '.'), locations.site_generator_home)
 
-      def copy_directory_from_gem(dir, output_dir)
-        file_system_accessor.copy File.join(@gem_root, "#{dir}/."), output_dir
+        copy_version_master_middleman(locations.source_for_site_generator)
       end
 
       # Copy the index file from each version into the version's directory. Because version
@@ -226,61 +185,18 @@ module Bookbinder
         end
       end
 
-      def output_directory_paths(bind_source)
-        local_repo_dir = (bind_source == 'local') ? File.expand_path('..', context_dir) : nil
-
-        {
-          final_app_dir: final_app_directory,
-          local_repo_dir: local_repo_dir,
-          output_dir: File.join(context_dir, output_dir_name),
-          master_middleman_dir: layout_repo_path(local_repo_dir)
-        }
+      def forget_sections(middleman_scratch)
+        file_system_accessor.remove_directory File.join middleman_scratch, '.'
       end
 
-      def bind_config(bind_source)
-        arguments = {
-            sections: config.sections,
-            book_repo: config.book_repo,
-            host_for_sitemap: config.public_host,
-            archive_menu: config.archive_menu
-        }
-
-        optional_arguments = {}
-        optional_arguments.merge!(template_variables: config.template_variables) if config.respond_to?(:template_variables)
-        if binding_from_github? bind_source
-          config.versions.each { |version| arguments[:sections].concat sections_from version }
-          optional_arguments.merge!(versions: config.versions)
-        end
-
-        arguments.merge! optional_arguments
+      def copy_directory_from_gem(dir, output_dir)
+        file_system_accessor.copy File.join(@gem_root, "#{dir}/."), output_dir
       end
 
       def config
         config_fetcher.fetch_config
       end
 
-      def sections_from(version)
-        Dir.mktmpdir('book_checkout') do |temp_workspace|
-          book = Book.from_remote(logger: logger,
-                                  full_name: config.book_repo,
-                                  destination_dir: temp_workspace,
-                                  ref: version,
-                                  git_accessor: version_control_system,
-          )
-
-          book_checkout_value = File.join temp_workspace, book.directory
-          config_file = File.join book_checkout_value, 'config.yml'
-          attrs = YAML.load(File.read(config_file))['sections']
-          raise VersionUnsupportedError.new(version) if attrs.nil?
-
-          attrs.map do |section_hash|
-            section_hash['repository']['ref'] = version
-            section_hash['directory'] = File.join(version, section_hash['directory'])
-            section_hash
-          end
-        end
-      end
-
       def layout_repo_path(local_repo_dir)
         if config.has_option?('layout_repo')
           if local_repo_dir

data/lib/bookbinder/config/bind_config_factory.rb

@@ -0,0 +1,30 @@
+require_relative 'local_bind_configuration'
+require_relative 'remote_bind_configuration'
+
+module Bookbinder
+  module Config
+    class BindConfigFactory
+      def initialize(logger, version_control_system, config_fetcher)
+        @logger = logger
+        @version_control_system = version_control_system
+        @config_fetcher = config_fetcher
+      end
+
+      def produce(bind_source)
+        if bind_source == 'github' && config.has_option?('versions')
+          RemoteBindConfiguration.new(logger, version_control_system, config).to_h
+        else
+          LocalBindConfiguration.new(config).to_h
+        end
+      end
+
+      private
+
+      def config
+        config_fetcher.fetch_config
+      end
+
+      attr_reader :logger, :version_control_system, :config_fetcher
+    end
+  end
+end

data/lib/bookbinder/config/local_bind_configuration.rb

@@ -0,0 +1,23 @@
+module Bookbinder
+  module Config
+    class LocalBindConfiguration
+      def initialize(base_config)
+        @base_config = base_config
+      end
+
+      def to_h
+        {
+          sections: base_config.sections,
+          book_repo: base_config.book_repo,
+          host_for_sitemap: base_config.public_host,
+          archive_menu: base_config.archive_menu,
+          template_variables: base_config.template_variables
+        }
+      end
+
+      private
+
+      attr_reader :base_config
+    end
+  end
+end

data/lib/bookbinder/config/remote_bind_configuration.rb

@@ -0,0 +1,52 @@
+module Bookbinder
+  module Config
+    class RemoteBindConfiguration
+      VersionUnsupportedError = Class.new(RuntimeError)
+
+      def initialize(logger, version_control_system, base_config)
+        @logger = logger
+        @version_control_system = version_control_system
+        @base_config = base_config
+      end
+
+      def to_h
+        sections = base_config.sections
+        base = {
+          sections: sections,
+          book_repo: base_config.book_repo,
+          host_for_sitemap: base_config.public_host,
+          archive_menu: base_config.archive_menu,
+          versions: base_config.versions,
+          template_variables: base_config.template_variables
+        }
+        base_config.versions.each { |version| sections.concat(sections_from(version)) }
+        base
+      end
+
+      private
+
+      attr_reader :logger, :version_control_system, :base_config
+
+      def sections_from(version)
+        Dir.mktmpdir('book_checkout') do |temp_workspace|
+          book = Book.from_remote(logger: logger,
+                                  full_name: base_config.book_repo,
+                                  destination_dir: temp_workspace,
+                                  ref: version,
+                                  git_accessor: version_control_system)
+
+          book_checkout_value = File.join temp_workspace, book.directory
+          config_file = File.join book_checkout_value, 'config.yml'
+          attrs = YAML.load(File.read(config_file))['sections']
+          raise VersionUnsupportedError.new(version) if attrs.nil?
+
+          attrs.map do |section_hash|
+            section_hash['repository']['ref'] = version
+            section_hash['directory'] = File.join(version, section_hash['directory'])
+            section_hash
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bookbinder/configuration.rb

@@ -132,7 +132,7 @@ module Bookbinder
     end
 
     CONFIG_REQUIRED_KEYS = %w(book_repo public_host)
-    CONFIG_OPTIONAL_KEYS = %w(archive_menu dita_sections layout_repo versions pdf_index cred_repo pdf)
+    CONFIG_OPTIONAL_KEYS = %w(archive_menu layout_repo versions pdf_index cred_repo pdf)
 
     CONFIG_REQUIRED_KEYS.each do |method_name|
       define_method(method_name) do
@@ -150,6 +150,10 @@ module Bookbinder
       config.fetch('sections', [])
     end
 
+    def dita_sections
+      config.fetch('dita_sections', {})
+    end
+
     def has_option?(key)
       @config.has_key?(key)
     end

data/lib/bookbinder/dita_html_to_middleman_formatter.rb

@@ -10,7 +10,7 @@ module Bookbinder
     end
 
     def format_html(src, dest)
-      all_files_with_ext = file_system_accessor.find_files_with_ext('.html', src)
+      all_files_with_ext = file_system_accessor.find_files_with_ext('html', src)
 
       all_files_with_ext.map do |filepath|
         file_text = file_system_accessor.read filepath

data/lib/bookbinder/dita_preprocessor.rb

@@ -0,0 +1,66 @@
+require_relative 'values/subnav'
+
+module Bookbinder
+  class DitaPreprocessor
+
+    ACCEPTED_IMAGE_FORMATS = %w(png jpeg jpg svg gif bmp tif tiff eps)
+
+    def initialize(dita_converter, dita_formatter, local_fs_accessor)
+      @dita_converter = dita_converter
+      @dita_formatter = dita_formatter
+      @local_fs_accessor = local_fs_accessor
+    end
+
+    def preprocess(dita_section,
+                   subnavs_dir,
+                   dita_subnav_template_path)
+      if dita_section.ditamap_location
+        dita_converter.convert_to_html dita_section, write_to: dita_section.html_from_dita_section_dir
+
+        generate_subnav(dita_section, dita_subnav_template_path, subnavs_dir)
+      end
+
+      dita_formatter.format_html dita_section.html_from_dita_section_dir, dita_section.formatted_section_dir
+
+      copy_images(dita_section)
+
+     local_fs_accessor.copy_contents(dita_section.formatted_section_dir,
+                                     dita_section.section_source_for_site_generator)
+    end
+
+    private
+
+    attr_reader :dita_converter, :dita_formatter, :local_fs_accessor
+
+    def generate_subnav(dita_section, dita_subnav_template_path, subnavs_dir)
+      dita_subnav_template_text = local_fs_accessor.read(dita_subnav_template_path)
+
+      tocjs_text = local_fs_accessor.read(File.join dita_section.html_from_dita_section_dir, 'index.html')
+      json_props_location = File.join('dita-subnav-props.json')
+      props_file_location = File.join(subnavs_dir, json_props_location)
+
+      subnav = dita_formatter.format_subnav(dita_section,
+                                            dita_subnav_template_text,
+                                            json_props_location,
+                                            tocjs_text)
+
+     local_fs_accessor.write text: subnav.json_links, to: props_file_location
+
+     local_fs_accessor.write text: subnav.text,
+                                       to: File.join(subnavs_dir, "dita_subnav.erb")
+    end
+
+    def copy_images(dita_section)
+      image_paths = ACCEPTED_IMAGE_FORMATS.map do |format|
+        local_fs_accessor.find_files_with_ext(format, dita_section.path_to_local_repo)
+      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)
+      end
+    end
+
+  end
+end

data/lib/bookbinder/dita_section_gatherer_factory.rb

@@ -0,0 +1,23 @@
+require_relative 'local_dita_section_gatherer'
+require_relative 'remote_dita_section_gatherer'
+
+module Bookbinder
+  class DitaSectionGathererFactory
+    def initialize(version_control_system, view_updater)
+      @version_control_system = version_control_system
+      @view_updater = view_updater
+    end
+
+    def produce(source_location, output_locations)
+      if source_location == 'github'
+        RemoteDitaSectionGatherer.new(version_control_system, view_updater, output_locations)
+      else
+        LocalDitaSectionGatherer.new(output_locations)
+      end
+    end
+
+    private
+
+    attr_reader :version_control_system, :view_updater
+  end
+end

data/lib/bookbinder/{local_dita_to_html_converter.rb → dita_to_html_converter.rb}

@@ -1,7 +1,7 @@
 require_relative '../bookbinder/values/dita_section'
 
 module Bookbinder
-  class LocalDitaToHtmlConverter
+  class DitaToHtmlConverter
     DitaToHtmlLibraryFailure = Class.new(RuntimeError)
 
     def initialize(sheller, path_to_dita_ot_library)
@@ -10,7 +10,6 @@ module Bookbinder
     end
 
     def convert_to_html(dita_section, write_to: nil)
-      absolute_path_to_ditamap = File.join dita_section.path_to_local_repo, dita_section.ditamap_location
       classpath = "#{path_to_dita_ot_library}/lib/xercesImpl.jar:" +
                   "#{path_to_dita_ot_library}/lib/xml-apis.jar:" +
                   "#{path_to_dita_ot_library}/lib/resolver.jar:" +
@@ -27,7 +26,12 @@ module Bookbinder
                 "-Doutput.dir=#{write_to} " +
                 "-Dtranstype='tocjs' " +
                 "-Ddita.temp.dir='/tmp/bookbinder_dita' " +
-                "-Dargs.input=#{absolute_path_to_ditamap} "
+                "-Dgenerate.copy.outer='2' " +
+                "-Dargs.input=#{dita_section.absolute_path_to_ditamap} "
+
+      if dita_section.absolute_path_to_ditaval
+        command += "-Dargs.filter=#{dita_section.absolute_path_to_ditaval} "
+      end
 
       begin
         sheller.run_command(command)

data/lib/bookbinder/local_dita_section_gatherer.rb

@@ -0,0 +1,31 @@
+module Bookbinder
+  class LocalDitaSectionGatherer
+    def initialize(output_locations)
+      @output_locations = output_locations
+    end
+
+    def gather(dita_section_config_hash)
+      dita_section_config_hash.map do |dita_section_config|
+        relative_path_to_dita_map = dita_section_config['ditamap_location']
+        relative_path_to_dita_val = dita_section_config['ditaval_location']
+        full_name = dita_section_config.fetch('repository', {}).fetch('name')
+        target_ref = dita_section_config.fetch('repository', {})['ref']
+        directory = dita_section_config['directory']
+        path_to_local_copy = output_locations.local_repo_dir.join(directory)
+
+        DitaSection.new(path_to_local_copy,
+                        relative_path_to_dita_map,
+                        relative_path_to_dita_val,
+                        full_name,
+                        target_ref,
+                        directory,
+                        output_locations)
+      end
+    end
+
+    private
+
+    attr_reader :output_locations
+
+  end
+end

data/lib/bookbinder/local_file_system_accessor.rb

@@ -40,20 +40,20 @@ module Bookbinder
     end
 
     def copy_contents(src, dest)
-      contents = Dir.glob File.join(src, '**')
+      unless File.directory?(dest)
+        FileUtils.mkdir_p(dest)
+      end
+
+      contents = Dir.glob File.join(src, '**/*')
       contents.each do |dir|
         FileUtils.cp_r dir, dest
       end
     end
 
-    def copy_named_directory_with_path(dir_name, src, dest)
-      contents = Dir.glob File.join(src, "**/#{dir_name}")
-      contents.each do |dir|
-        relative_path_to_dir = relative_path_from(src, dir)
-        extended_dest = File.join dest, relative_path_to_dir
-        FileUtils.mkdir_p extended_dest
-        copy_contents dir, extended_dest
-      end
+    def copy_including_intermediate_dirs(file, root, dest)
+      path_within_destination = relative_path_from(root, file)
+      extended_dest = File.dirname(File.join dest, path_within_destination)
+      copy file, extended_dest
     end
 
     def rename_file(path, new_name)
@@ -62,7 +62,7 @@ module Bookbinder
     end
 
     def find_files_with_ext(ext, path)
-      Dir[File.join path, '**/*'].select { |file| File.basename(file).match(ext) }
+      Dir[File.join path, '**/*'].select { |file| File.basename(file).include?(".#{ext}") }
     end
 
     def relative_path_from(src, target)

data/lib/bookbinder/pdf_generator.rb

@@ -22,7 +22,7 @@ module Bookbinder
 
       command = <<-CMD
       wkhtmltopdf \
-      --disable-external-links \
+      --enable-external-links \
       --disable-javascript \
       --load-error-handling ignore \
       --margin-top 26mm \

data/lib/bookbinder/publisher.rb

@@ -17,8 +17,8 @@ module Bookbinder
     end
 
     def publish(subnavs, cli_options, output_paths, publish_config)
-      intermediate_directory = output_paths.fetch(:output_dir)
-      final_app_dir = output_paths.fetch(:final_app_dir)
+      intermediate_directory = output_paths.output_dir
+      final_app_dir = output_paths.final_app_dir
       master_dir = File.join intermediate_directory, 'master_middleman'
       workspace_dir = File.join master_dir, 'source'
       build_directory = File.join master_dir, 'build/.'
@@ -50,7 +50,7 @@ module Bookbinder
       @static_site_generator.run(middleman_dir,
                                  workspace_dir,
                                  publish_config.fetch(:template_variables, {}),
-                                 output_paths[:local_repo_dir],
+                                 output_paths.local_repo_dir,
                                  cli_options[:verbose],
                                  subnavs,
                                  publish_config[:host_for_sitemap],

data/lib/bookbinder/remote_dita_section_gatherer.rb

@@ -0,0 +1,35 @@
+require_relative '../../lib/bookbinder/deprecated_logger'
+require_relative '../../lib/bookbinder/values/dita_section'
+
+module Bookbinder
+  class RemoteDitaSectionGatherer
+    def initialize(version_control_system, view_updater, output_locations)
+      @version_control_system = version_control_system
+      @view_updater = view_updater
+      @cloned_dita_dir = output_locations.cloned_dita_dir
+      @output_locations = output_locations
+    end
+
+    def gather(dita_section_config_hash)
+      dita_section_config_hash.map do |dita_section_config|
+        view_updater.log "Gathering " + "#{dita_section_config.fetch('repository', {}).fetch('name')}".cyan
+        version_control_system.clone("git@github.com:#{dita_section_config.fetch('repository', {}).fetch('name')}",
+                                     dita_section_config['directory'],
+                                     path: cloned_dita_dir)
+
+        DitaSection.new(cloned_dita_dir.join(dita_section_config['directory']),
+                        dita_section_config['ditamap_location'],
+                        dita_section_config['ditaval_location'],
+                        dita_section_config.fetch('repository', {}).fetch('name'),
+                        dita_section_config.fetch('repository', {})['ref'],
+                        dita_section_config['directory'],
+                        output_locations)
+      end
+    end
+
+    private
+
+    attr_reader :version_control_system, :view_updater, :cloned_dita_dir, :output_locations
+
+  end
+end

data/lib/bookbinder/repositories/command_repository.rb

@@ -4,15 +4,16 @@ end
 require_relative '../configuration_fetcher'
 require_relative '../configuration_validator'
 require_relative '../dita_html_to_middleman_formatter'
+require_relative '../dita_preprocessor'
 require_relative '../html_document_manipulator'
 require_relative '../ingest/cloner_factory'
-require_relative '../local_dita_preprocessor'
-require_relative '../local_dita_to_html_converter'
+require_relative '../dita_to_html_converter'
 require_relative '../local_file_system_accessor'
 require_relative '../middleman_runner'
 require_relative '../spider'
 require_relative '../subnav_formatter'
 require_relative '../yaml_loader'
+require_relative '../config/bind_config_factory'
 
 module Bookbinder
   module Repositories
@@ -69,6 +70,7 @@ module Bookbinder
         @bind ||= Commands::Bind.new(
           logger,
           configuration_fetcher,
+          bind_config_factory,
           ArchiveMenuConfiguration.new(
             loader: config_loader,
             config_filename: 'bookbinder.yml'
@@ -81,7 +83,8 @@ module Bookbinder
           server_director,
           File.absolute_path('.'),
           dita_preprocessor,
-          Ingest::ClonerFactory.new(logger, version_control_system)
+          Ingest::ClonerFactory.new(logger, version_control_system),
+          DitaSectionGathererFactory.new(version_control_system, logger)
         )
       end
 
@@ -135,14 +138,14 @@ module Bookbinder
 
       def dita_preprocessor
         @dita_preprocessor ||=
-            LocalDitaPreprocessor.new(local_dita_processor,
+            DitaPreprocessor.new(local_dita_processor,
                                  dita_html_to_middleman_formatter,
                                  local_file_system_accessor)
       end
 
       def local_dita_processor
         @local_dita_processor ||=
-            LocalDitaToHtmlConverter.new(Sheller.new(logger),
+            DitaToHtmlConverter.new(Sheller.new(logger),
                                          ENV['PATH_TO_DITA_OT_LIBRARY'])
       end
 
@@ -163,6 +166,10 @@ module Bookbinder
       def local_file_system_accessor
         @local_file_system_accessor ||= LocalFileSystemAccessor.new
       end
+
+      def bind_config_factory
+        @bind_config_factory  ||= Config::BindConfigFactory.new(logger, version_control_system, configuration_fetcher)
+      end
     end
   end
 end

data/lib/bookbinder/repositories/section_repository.rb

@@ -10,7 +10,7 @@ module Bookbinder
       def get_instance(attributes,
                        vcs_repo: nil,
                        destination_dir: Dir.mktmpdir,
-                       build: nil)
+                       &build)
         repository_config = attributes['repository']
         raise "section repository '#{repository_config}' is not a hash" unless repository_config.is_a?(Hash)
         raise "section repository '#{repository_config}' missing name key" unless repository_config['name']

data/lib/bookbinder/values/dita_section.rb

@@ -1,13 +1,14 @@
 module Bookbinder
   DitaSection = Struct.new(:path_to_local_repo,
                            :ditamap_location,
+                           :ditaval_location,
                            :full_name,
                            :target_ref,
                            :directory,
                            :output_locations) do
                              def subnav
                                namespace = directory.gsub('/', '_')
-                               template = "#{directory}_subnav"
+                               template = "dita_subnav"
                                {namespace => template}
                              end
 
@@ -22,5 +23,13 @@ module Bookbinder
                              def section_source_for_site_generator
                                File.join(output_locations.source_for_site_generator, directory)
                              end
+
+                             def absolute_path_to_ditamap
+                               ditamap_location ? File.join(path_to_local_repo, ditamap_location) : nil
+                             end
+
+                             def absolute_path_to_ditaval
+                               ditaval_location ? File.join(path_to_local_repo, ditaval_location) : nil
+                             end
                            end
 end

data/lib/bookbinder/values/output_locations.rb

@@ -1,11 +1,62 @@
+require_relative '../directory_helpers'
+
 module Bookbinder
-  OutputLocations = Struct.new(
-      :source_for_site_generator,
-      :dita_home_dir,
-      :cloned_dita_dir,
-      :html_from_dita_dir,
-      :formatted_dir,
-      :subnavs_for_layout_dir,
-      :dita_subnav_template_path
-  )
-end
+  class OutputLocations
+    attr_reader :final_app_dir, :layout_repo_dir
+
+    include DirectoryHelperMethods
+
+    def initialize(final_app_dir: nil, layout_repo_dir: nil, context_dir: nil, local_repo_dir: nil)
+      @final_app_dir = final_app_dir
+      @layout_repo_dir = layout_repo_dir
+      @context_dir = context_dir
+      @local_repo_dir = local_repo_dir
+    end
+
+    def output_dir
+      context_dir.join(output_dir_name)
+    end
+
+    def local_repo_dir
+      Pathname(@local_repo_dir) if @local_repo_dir
+    end
+
+    def dita_home_dir
+      output_dir.join('dita')
+    end
+
+    def cloned_dita_dir
+      dita_home_dir.join('dita_sections')
+    end
+
+    def html_from_dita_dir
+      dita_home_dir.join('html_from_dita')
+    end
+
+    def formatted_dir
+      dita_home_dir.join('site_generator_ready')
+    end
+
+    def site_generator_home
+      output_dir.join('master_middleman')
+    end
+
+    def source_for_site_generator
+      site_generator_home.join('source')
+    end
+
+    def subnavs_for_layout_dir
+      source_for_site_generator.join('subnavs')
+    end
+
+    def dita_subnav_template_path
+      source_for_site_generator.join('subnavs', '_dita_subnav_template.erb')
+    end
+
+    private
+
+    def context_dir
+      Pathname(@context_dir)
+    end
+  end
+end

data/master_middleman/bookbinder_helpers.rb

@@ -30,26 +30,16 @@ module Bookbinder
                                attributes,
                                local_repo_dir,
                                git_accessor).
-              tap { |repo| repo.copy_from_local(workspace) }
+                               tap { |repo| repo.copy_from_local(workspace) }
           else
             GitHubRepository.
               build_from_remote(bookbinder_logger, attributes, git_accessor).
               tap { |repo| repo.copy_from_remote(workspace, 'master') }
           end
-        example = code_example_repo.get_instance(attributes,
-                                                 vcs_repo: vcs_repo,
-                                                 build: ->(path_to_repository,
-                                                     full_name,
-                                                     copied,
-                                                     _,
-                                                     destination_dir,
-                                                     directory_name) {
-                                                   CodeExample.new(path_to_repository,
-                                                                   full_name,
-                                                                   copied,
-                                                                   destination_dir,
-                                                                   directory_name)
-        })
+        example = code_example_repo.get_instance(attributes, vcs_repo: vcs_repo) {
+          |path, name, copied, _, dest, directory|
+          CodeExample.new(path, name, copied, dest, directory)
+        }
         snippet, language = code_example_reader.get_snippet_and_language_at(at,
                                                                             example.path_to_repository,
                                                                             example.copied,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Mike Grafton
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -329,6 +329,9 @@ files:
 - lib/bookbinder/commands/tag.rb
 - lib/bookbinder/commands/update_local_doc_repos.rb
 - lib/bookbinder/commands/version.rb
+- lib/bookbinder/config/bind_config_factory.rb
+- lib/bookbinder/config/local_bind_configuration.rb
+- lib/bookbinder/config/remote_bind_configuration.rb
 - lib/bookbinder/configuration.rb
 - lib/bookbinder/configuration_fetcher.rb
 - lib/bookbinder/configuration_validator.rb
@@ -337,7 +340,9 @@ files:
 - lib/bookbinder/directory_helpers.rb
 - lib/bookbinder/distributor.rb
 - lib/bookbinder/dita_html_to_middleman_formatter.rb
-- lib/bookbinder/dita_section_gatherer.rb
+- lib/bookbinder/dita_preprocessor.rb
+- lib/bookbinder/dita_section_gatherer_factory.rb
+- lib/bookbinder/dita_to_html_converter.rb
 - lib/bookbinder/errors/cli_error.rb
 - lib/bookbinder/git_accessor.rb
 - lib/bookbinder/git_client.rb
@@ -346,13 +351,13 @@ files:
 - lib/bookbinder/ingest/cloner_factory.rb
 - lib/bookbinder/ingest/git_hub_repository_cloner.rb
 - lib/bookbinder/ingest/local_filesystem_cloner.rb
-- lib/bookbinder/local_dita_preprocessor.rb
-- lib/bookbinder/local_dita_to_html_converter.rb
+- lib/bookbinder/local_dita_section_gatherer.rb
 - lib/bookbinder/local_file_system_accessor.rb
 - lib/bookbinder/middleman_runner.rb
 - lib/bookbinder/pdf_generator.rb
 - lib/bookbinder/publisher.rb
 - lib/bookbinder/pusher.rb
+- lib/bookbinder/remote_dita_section_gatherer.rb
 - lib/bookbinder/remote_yaml_credential_provider.rb
 - lib/bookbinder/repositories/command_repository.rb
 - lib/bookbinder/repositories/section_repository.rb

data/lib/bookbinder/dita_section_gatherer.rb

@@ -1,30 +0,0 @@
-module Bookbinder
-  class DitaSectionGatherer
-    def initialize(version_control_system, output_locations, view_updater)
-      @version_control_system = version_control_system
-      @output_locations = output_locations
-      @view_updater = view_updater
-    end
-
-    def gather(dita_sections, to: nil)
-      dita_sections.map do |dita_section|
-        view_updater.log "Gathering " + "#{dita_section.full_name}".cyan
-        version_control_system.clone("git@github.com:#{dita_section.full_name}",
-                                     dita_section.directory,
-                                     path: to)
-
-        DitaSection.new(File.join(to, dita_section.directory),
-                        dita_section.ditamap_location,
-                        dita_section.full_name,
-                        dita_section.target_ref,
-                        dita_section.directory,
-                        output_locations)
-        end
-    end
-
-    private
-
-    attr_reader :version_control_system, :view_updater, :output_locations
-
-  end
-end

data/lib/bookbinder/local_dita_preprocessor.rb

@@ -1,50 +0,0 @@
-require_relative 'values/subnav'
-
-module Bookbinder
-  class LocalDitaPreprocessor
-
-    def initialize(dita_converter, dita_formatter, local_file_system_accessor)
-      @dita_converter = dita_converter
-      @dita_formatter = dita_formatter
-      @local_file_system_accessor = local_file_system_accessor
-    end
-
-    def preprocess(dita_section,
-                   subnavs_dir,
-                   dita_subnav_template_path)
-      dita_converter.convert_to_html dita_section, write_to: dita_section.html_from_dita_section_dir
-
-      dita_formatter.format_html dita_section.html_from_dita_section_dir, dita_section.formatted_section_dir
-
-      dita_subnav_template_text = local_file_system_accessor.read(dita_subnav_template_path)
-      tocjs_text = local_file_system_accessor.read(File.join dita_section.html_from_dita_section_dir, 'index.html')
-
-      json_props_location = File.join(dita_section.directory + '-props.json')
-      props_file_location = File.join(subnavs_dir, json_props_location)
-
-      subnav = dita_formatter.format_subnav(dita_section,
-                                            dita_subnav_template_text,
-                                            json_props_location,
-                                            tocjs_text)
-
-      local_file_system_accessor.write text: subnav.json_links, to: props_file_location
-
-      local_file_system_accessor.write text: subnav.text,
-                                       to: File.join(subnavs_dir,
-                                                     filename="#{dita_section.directory}_subnav.erb")
-
-      local_file_system_accessor.copy_named_directory_with_path('images',
-                                                                dita_section.html_from_dita_section_dir,
-                                                                dita_section.section_source_for_site_generator)
-
-      local_file_system_accessor.copy_contents(dita_section.formatted_section_dir,
-                                               dita_section.section_source_for_site_generator)
-    end
-
-
-    private
-
-    attr_reader :dita_converter, :dita_formatter, :local_file_system_accessor
-
-  end
-end