bookbindery 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cb870420c8d260fe02e262c3d8db416a668a3fa
-  data.tar.gz: c2b4a7842bcdbcba9006096c7f5b4e08c04eff33
+  metadata.gz: fcd1dc76ec62824fab802bbb5e08808386ef14c7
+  data.tar.gz: 8ff5324ec2299c32efb456ce6790bfc4e01f0b60
 SHA512:
-  metadata.gz: a45300da2301b2e37ea278f03d221d52592f9a6ad42429b349fe7169f75ae9b15aade134740f9c17a0effd101e807f00476f73970a8a4573ffea1a3ce0210e50
-  data.tar.gz: 1b3fa518acaa00628b2115d4c166df2272d08ca564416565a36e3d60aa69c82404d8dd97de84f2ed939eb2a04b608b11d8e4dfce8eadcb37f0d042f0a607c8e6
+  metadata.gz: b48e8514aa4342a99e7c1baf6e4bd63db7c853b6a98a5ee7023c20e0bb25c8fdccf4ed7b7b3d91362972cb1f9e0faa2e6489fbc3003df285bbf8237b58f7a30d
+  data.tar.gz: 2be9a7261db512afdf22020be057ceaae5b5395567e8c2f613a6342fc9eefd5d6ea33dae69549c02b194ddc5ab191848ac4d2ea4b5207eaabbf25aef0029c741

data/bookbinder.gemspec

@@ -2,7 +2,7 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '8.1.0'
+  s.version     = '8.2.0'
   s.summary     = 'Markdown to Rackup application documentation generator'
   s.description = 'A command line utility to be run in Book repositories to stitch together their constituent Markdown repos into a static-HTML-serving application'
   s.authors     = ['Mike Grafton', 'Lucas Marks', 'Gavin Morgan', 'Nikhil Gajwani', 'Dan Wendorf', 'Brenda Chan', 'Matthew Boedicker', 'Frank Kotsianas', 'Elena Sharma', 'Christa Hartsock', 'Michael Trestman']

data/lib/bookbinder/commands/bind.rb

@@ -58,6 +58,7 @@ module Bookbinder
           cloner,
           ref_override: bind_options.ref_override
         )
+
         sections = section_repository.fetch(
           configured_sections: bind_config.sections,
           destination_dir: output_locations.cloned_preprocessing_dir,
@@ -75,13 +76,15 @@ module Bookbinder
         if file_system_accessor.file_exist?('redirects.rb')
           file_system_accessor.copy('redirects.rb', output_locations.final_app_dir)
         end
+
         generation_result = middleman_runner.run(
           ["build", bind_options.verbosity].compact.join(" "),
           streams: bind_options.streams,
           output_locations: output_locations,
           config: config_decorator.generate(bind_config, sections),
           local_repo_dir: bind_options.local_repo_dir,
-          subnavs: subnavs(sections)
+          subnavs: subnavs(sections),
+          product_info: product_infos(sections)
         )
         if generation_result.success?
           file_system_accessor.copy(output_locations.build_dir, output_locations.public_dir)
@@ -118,6 +121,14 @@ module Bookbinder
       def subnavs(sections)
         sections.map(&:subnav).reduce({}, :merge)
       end
+
+      def product_infos(sections)
+        temp = Hash.new
+        sections.each do |section|
+          temp[section.namespace] = section.product_info
+        end
+        temp
+      end
     end
   end
 end

data/lib/bookbinder/config/fetcher.rb

@@ -17,6 +17,8 @@ module Bookbinder
         @base_config ||= read_config_file
         @optional_configs ||= read_optional_configs
 
+        # require 'pry'; binding.pry
+
         @config ||= validate(@base_config, @optional_configs)
       end
 

data/lib/bookbinder/config/section_config.rb

@@ -60,8 +60,20 @@ module Bookbinder
       def inspect
         config.inspect
       end
+
       alias_method :subnav_name, :product_id
 
+      def product_info
+        return '' if config['product_info'].nil?
+        {'use_local_header' => config['product_info']['use_local_header'],
+          'latest_stable_version' => config['product_info']['latest_stable_version'],
+          'changelog_href' => config['product_info']['changelog_href'],
+          'local_header_img' => config['product_info']['local_header_img'],
+          'local_header_title' => config['product_info']['local_header_title'],
+          'local_header_links' => config['product_info']['local_header_links'],
+          'local_header_version_list' => config['product_info']['local_header_version_list']}
+      end
+
       private
 
       def repo

data/lib/bookbinder/ingest/section_repository.rb

@@ -1,4 +1,5 @@
 require_relative '../values/section'
+require_relative '../values/product_info'
 
 module Bookbinder
   module Ingest
@@ -10,6 +11,7 @@ module Bookbinder
                 streams: nil)
         configured_sections.map do |section_config|
           streams[:success].puts("Gathering #{section_config.repo_name}")
+
           working_copy = cloner.call(source_repo_name: section_config.repo_name,
                                      source_ref: ref_override || section_config.repo_ref,
                                      destination_parent_dir: destination_dir,
@@ -35,7 +37,8 @@ module Bookbinder
             section_config.at_repo_path,
             section_config.repo_name,
             working_copy.ref,
-            section_config.pdf_output_filename
+            section_config.pdf_output_filename,
+            section_config.product_info
           )
         end
       end

data/lib/bookbinder/middleman_runner.rb

@@ -15,7 +15,8 @@ module Bookbinder
             output_locations: nil,
             config: nil,
             local_repo_dir: nil,
-            subnavs: nil)
+            subnavs: nil,
+            product_info: nil)
       streams[:out].puts "\nRunning middleman...\n\n"
       Dir.chdir(output_locations.master_dir) do
         config = {
@@ -27,8 +28,10 @@ module Bookbinder
           workspace: output_locations.workspace_dir,
           feedback_enabled: config.feedback_enabled,
           repo_link_enabled: config.repo_link_enabled,
-          repo_links: config.repo_links
+          repo_links: config.repo_links,
+          product_info: product_info
         }
+
         fs.write(to: "bookbinder_config.yml", text: YAML.dump(config))
         sheller.run_command({'MM_ROOT' => output_locations.master_dir.to_s},
                             "middleman #{command}",

data/lib/bookbinder/values/product_info.rb

@@ -0,0 +1,11 @@
+module Bookbinder
+  ProductInfo = Struct.new(
+  :use_local_header,
+    :latest_stable_version,
+    :changelog_href,
+    :local_header_img,
+    :local_header_title
+  ) do
+
+  end
+end

data/lib/bookbinder/values/section.rb

@@ -2,16 +2,18 @@ require_relative '../errors/programmer_mistake'
 require_relative '../ingest/destination_directory'
 
 module Bookbinder
-  Section = Struct.new(:path_to_repository,
-                       :full_name,
-                       :desired_directory_name,
-                       :subnav_templ,
-                       :desired_subnav_name,
-                       :preprocessor_config,
-                       :at_repo_path,
-                       :repo_name,
-                       :source_ref,
-                       :pdf_output_filename) do
+  Section = Struct.new(
+    :path_to_repository,
+    :full_name,
+    :desired_directory_name,
+    :subnav_templ,
+    :desired_subnav_name,
+    :preprocessor_config,
+    :at_repo_path,
+    :repo_name,
+    :source_ref,
+    :pdf_output_filename,
+    :product_info) do
 
     def path_to_repo_dir
       at_repo_path.nil? ? path_to_repository : path_to_repository.join(at_repo_path)
@@ -26,10 +28,13 @@ module Bookbinder
     end
 
     def subnav
-      namespace = destination_directory.to_s.gsub('/', '_')
       {namespace => subnav_name}
     end
 
+    def namespace
+      destination_directory.to_s.gsub('/', '_')
+    end
+
     def subnav_name
       subnav_template || desired_subnav_name || 'default'
     end
@@ -39,7 +44,7 @@ module Bookbinder
     rescue NoMethodError => e
       raise Errors::ProgrammerMistake.new(
         "path_to_preprocessor_attribute assumes preprocessor_config is available, got nil.\n" +
-        "Original exception:\n\n#{e.inspect}\n\n#{e.backtrace.join("\n")}"
+          "Original exception:\n\n#{e.inspect}\n\n#{e.backtrace.join("\n")}"
       )
     end
 

data/master_middleman/bookbinder_helpers.rb

@@ -104,6 +104,17 @@ module Bookbinder
         OpenStruct.new config[:template_variables]
       end
 
+      def product_info
+        temp_template_key = template_key
+        if config[:product_info][temp_template_key] == ''
+          default = {use_local_header: false, changelog_href: '', local_header_img: '', local_header_title: '',
+            local_header_links: [''], local_header_version_list: ['']}
+          OpenStruct.new default
+        else
+          OpenStruct.new config[:product_info][temp_template_key]
+        end
+      end
+
       def quick_links
         page_src = File.read(current_page.source_file)
         quicklinks_renderer = QuicklinksRenderer.new(vars)
@@ -117,12 +128,15 @@ module Bookbinder
         }
       end
 
+      def template_key
+        decreasingly_specific_namespaces.detect { |ns|
+          config[:subnav_templates].has_key?(ns)
+        }
+      end
+
       private
 
       def subnav_template_name
-        template_key = decreasingly_specific_namespaces.detect { |ns|
-          config[:subnav_templates].has_key?(ns)
-        }
         config[:subnav_templates][template_key] || 'default'
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -421,6 +421,7 @@ files:
 - lib/bookbinder/subnav/template_creator.rb
 - lib/bookbinder/terminal.rb
 - lib/bookbinder/values/output_locations.rb
+- lib/bookbinder/values/product_info.rb
 - lib/bookbinder/values/section.rb
 - lib/bookbinder/values/subnav_template.rb
 - lib/bookbinder/values/user_message.rb