bookbindery 9.11.2 → 9.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd5e2f139245d235d3e225698f2985b6458ba73
-  data.tar.gz: 9e4a26c0cf99324f2a201cd801ec4d5ab0f4bfcb
+  metadata.gz: bfa7154a06a317f1b9334f00c2f37c2fe43e0b23
+  data.tar.gz: f12a6feab16e8db591ecd9fe2759dcc04837e67c
 SHA512:
-  metadata.gz: 309ebaec04b27d5b89075c79cc1c735fbfc444646289436d6aa5a12e025526538e8e70c8e6a97bf377da8b003991d6a473a3d4306b88c7ebb1397989e1b04fc2
-  data.tar.gz: c8260a429816001b1c12bf883a37ae259d965a1c82f6a368d72f2a3bf932056972e693ce273266867183eea1454f69ab7cad53edba64b21a8a4cfe84d2c138e4
+  metadata.gz: 064ea8ecc10fb4610496ffdaafc26280a0238f7d914efa0fafebaa131a329dc5975aa3aaba37bde9c26146aa29a2f497fffa78ab80c63705a6edcf5778a6fe44
+  data.tar.gz: 7881c57485aeae0b6e17f9409f4cdba0b9425b0c2b895c3107d78ea437a20c7cb8dadc5a9b8694a26b24b027529cb3fe15fb076fb0f15832e9c46637f6030ce8

data/bookbinder.gemspec

@@ -2,7 +2,7 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '9.11.2'
+  s.version     = '9.12.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', 'Andrew Bruce', 'Frank Kotsianas', 'Elena Sharma', 'Christa Hartsock', 'Michael Trestman', 'Alpha Chen', 'Sarah McAlear', 'Gregg Van Hove']

data/lib/bookbinder/config/section_config.rb

@@ -39,6 +39,10 @@ module Bookbinder
         repo['at_path']
       end
 
+      def no_docs?
+        config.fetch('no_docs', false)
+      end
+
       def dependent_sections
         @sections ||= (config['dependent_sections'] || []).map do |dep_section|
           SectionConfig.new(dep_section)

data/lib/bookbinder/ingest/local_filesystem_cloner.rb

@@ -19,7 +19,8 @@ module Bookbinder
           source_repo_name,
           Pathname(user_repo_dir).join(source_repo_name.split('/').last),
           Pathname(destination_parent_dir).join(DestinationDirectory.new(source_repo_name, destination_dir_name)),
-          source_ref
+          source_ref,
+          source_repo_name.split('/').first
         )
       end
 
@@ -27,12 +28,20 @@ module Bookbinder
 
       attr_reader :streams, :filesystem, :user_repo_dir
 
-      def link!(source_repo_name, source_dir, dest_dir, source_ref)
+      def link!(source_repo_name, source_dir, dest_dir, source_ref, source_org)
         source_exists = filesystem.file_exist?(source_dir)
         unless source_exists
           source_dir_with_ref = "#{source_dir}-#{source_ref}"
           source_exists = filesystem.file_exist?(source_dir_with_ref)
-          source_dir = source_dir_with_ref if source_exists
+
+          if source_exists
+            source_dir = source_dir_with_ref
+          else
+            source_dir_with_org_and_ref = "#{source_dir}-#{source_org}-#{source_ref}"
+            source_exists = filesystem.file_exist?(source_dir_with_org_and_ref)
+
+            source_dir = source_dir_with_org_and_ref if source_exists
+          end
         end
 
         if !source_exists

data/lib/bookbinder/ingest/section_repository.rb

@@ -19,11 +19,13 @@ module Bookbinder
 
           if section_config.dependent_sections.any?
             section_config.dependent_sections.map do |dependent_config|
-              streams[:success].puts("Gathering #{dependent_config.repo_name}")
-              cloner.call(source_repo_name: dependent_config.repo_name,
-                          source_ref: ref_override || dependent_config.repo_ref,
-                          destination_parent_dir: "#{destination_dir}/#{section_config.desired_directory_name}",
-                          destination_dir_name: dependent_config.desired_directory_name)
+              unless dependent_config.no_docs?
+                streams[:success].puts("Gathering #{dependent_config.repo_name}")
+                cloner.call(source_repo_name: dependent_config.repo_name,
+                            source_ref: ref_override || dependent_config.repo_ref,
+                            destination_parent_dir: "#{destination_dir}/#{section_config.desired_directory_name}",
+                            destination_dir_name: dependent_config.desired_directory_name)
+              end
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 9.11.2
+  version: 9.12.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws