bookbindery 4.2.0 → 5.0.0

data/lib/bookbinder/preprocessing/preprocessor.rb

@@ -10,11 +10,11 @@ module Bookbinder
         @processes = processes
       end
 
-      def preprocess(objs, *args)
-        objs.group_by { |obj|
-          processes.detect ->{ NullProcess.new } { |process| process.applicable_to?(obj) }
-        }.each do |process, objs|
-          process.preprocess(objs, *args)
+      def preprocess(sections, *args)
+        sections.group_by { |section|
+          processes.detect ->{ NullProcess.new } { |process| process.applicable_to?(section) }
+        }.each do |process, grouped_sections|
+          process.preprocess(grouped_sections, *args)
         end
       end
 

data/master_middleman/bookbinder_helpers.rb

@@ -1,3 +1,7 @@
+require 'bookbinder/code_example_reader'
+require 'bookbinder/ingest/cloner_factory'
+require 'bookbinder/ingest/git_accessor'
+require 'bookbinder/local_file_system_accessor'
 require 'date'
 require_relative 'archive_drop_down_menu'
 require_relative 'quicklinks_renderer'
@@ -17,11 +21,16 @@ module Bookbinder
     module HelperMethods
 
       def yield_for_code_snippet(from: nil, at: nil)
-        code_example_reader = CodeExampleReader.new(out: $stdout)
-
-        working_copy = config[:cloner].call(source_repo_name: from,
-                                            source_ref: 'master',
-                                            destination_parent_dir: config[:workspace])
+        cloner_factory = Ingest::ClonerFactory.new({out: $stdout},
+                                                   LocalFileSystemAccessor.new,
+                                                   Ingest::GitAccessor.new)
+
+        cloner = cloner_factory.produce(config[:local_repo_dir])
+        code_example_reader = CodeExampleReader.new({out: $stdout},
+                                                    LocalFileSystemAccessor.new)
+        working_copy = cloner.call(source_repo_name: from,
+                                   source_ref: 'master',
+                                   destination_parent_dir: config[:workspace])
 
         snippet, language = code_example_reader.get_snippet_and_language_at(at, working_copy)
 

data/master_middleman/config.rb

@@ -1,5 +1,12 @@
 require 'bookbinder_helpers'
-require 'submodule_aware_assets'
+require 'middleman-syntax'
+require 'middleman-livereload'
+require 'subdirectory_aware_assets'
+
+config = YAML.load_file('bookbinder_config.yml')
+config.each do |k, v|
+  set k, v
+end
 
 set :markdown_engine, :redcarpet
 set :markdown, :layout_engine => :erb,
@@ -14,10 +21,12 @@ set :js_dir, 'javascripts'
 
 set :images_dir, 'images'
 
-set :relative_links, true
+set :relative_links, false
 
-activate :submodule_aware_assets
+activate :subdirectory_aware_assets
 
 activate :navigation
 
-activate :syntax
+activate :syntax
+
+activate :livereload

data/master_middleman/{submodule_aware_assets.rb → subdirectory_aware_assets.rb}

@@ -1,4 +1,4 @@
-class SubmoduleAwareAssets < ::Middleman::Extension
+class SubdirectoryAwareAssets < ::Middleman::Extension
   def initialize(app, options_hash={}, &block)
     super
 
@@ -9,15 +9,15 @@ class SubmoduleAwareAssets < ::Middleman::Extension
   end
 
   helpers do
-    def asset_url(path, prefix="")
-      url = super(path, prefix)
+    def asset_url(path, prefix="", options={})
+      url = super(path, prefix, options)
 
       unless global_asset_at? url
         current_dir = Pathname('/' + current_resource.destination_path)
         url = Pathname(url).relative_path_from(current_dir.dirname).to_s
       end
 
-      # middleman assumes your assets live at the top level, but they may be in the subrepo instead
+      # middleman assumes your assets live at the top level, but they may be in the nested repos instead
       # here we start at top level and dive down until we find the real asset
       current_page_path_parts = current_resource.destination_path.split('/')
       current_page_path_parts.pop
@@ -42,4 +42,6 @@ class SubmoduleAwareAssets < ::Middleman::Extension
 
 end
 
-::Middleman::Extensions.register(:submodule_aware_assets, SubmoduleAwareAssets)
+::Middleman::Extensions.register(:subdirectory_aware_assets, SubdirectoryAwareAssets)
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -65,14 +65,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: middleman-livereload
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: middleman-syntax
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +101,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '!='
+      - !ruby/object:Gem::Version
+        version: 1.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '!='
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -284,9 +312,9 @@ files:
 - lib/bookbinder/commands/tag.rb
 - lib/bookbinder/commands/update_local_doc_repos.rb
 - lib/bookbinder/commands/version.rb
+- lib/bookbinder/commands/watch.rb
 - lib/bookbinder/config/archive_menu_configuration.rb
 - lib/bookbinder/config/aws_credentials.rb
-- lib/bookbinder/config/bind_config_factory.rb
 - lib/bookbinder/config/cf_credentials.rb
 - lib/bookbinder/config/checkers/archive_menu_checker.rb
 - lib/bookbinder/config/checkers/dita_section_checker.rb
@@ -295,7 +323,6 @@ files:
 - lib/bookbinder/config/checkers/required_keys_checker.rb
 - lib/bookbinder/config/configuration.rb
 - lib/bookbinder/config/fetcher.rb
-- lib/bookbinder/config/remote_bind_configuration.rb
 - lib/bookbinder/config/remote_yaml_credential_provider.rb
 - lib/bookbinder/config/section_config.rb
 - lib/bookbinder/config/validator.rb
@@ -326,7 +353,6 @@ files:
 - lib/bookbinder/ingest/missing_working_copy.rb
 - lib/bookbinder/ingest/repo_identifier.rb
 - lib/bookbinder/ingest/section_repository.rb
-- lib/bookbinder/ingest/section_repository_factory.rb
 - lib/bookbinder/ingest/update_failure.rb
 - lib/bookbinder/ingest/update_success.rb
 - lib/bookbinder/ingest/working_copy.rb
@@ -360,7 +386,7 @@ files:
 - master_middleman/bookbinder_helpers.rb
 - master_middleman/config.rb
 - master_middleman/quicklinks_renderer.rb
-- master_middleman/submodule_aware_assets.rb
+- master_middleman/subdirectory_aware_assets.rb
 - install_bin/bookbinder
 homepage: https://github.com/pivotal-cf/bookbinder
 licenses:

data/lib/bookbinder/config/bind_config_factory.rb

@@ -1,28 +0,0 @@
-require_relative 'remote_bind_configuration'
-
-module Bookbinder
-  module Config
-    class BindConfigFactory
-      def initialize(version_control_system, config_fetcher)
-        @version_control_system = version_control_system
-        @config_fetcher = config_fetcher
-      end
-
-      def produce(bind_source)
-        if %w(remote github).include?(bind_source) && config.has_option?('versions')
-          RemoteBindConfiguration.new(version_control_system, config).fetch
-        else
-          config
-        end
-      end
-
-      private
-
-      def config
-        config_fetcher.fetch_config
-      end
-
-      attr_reader :version_control_system, :config_fetcher
-    end
-  end
-end

data/lib/bookbinder/config/remote_bind_configuration.rb

@@ -1,44 +0,0 @@
-require 'yaml'
-require_relative '../ingest/destination_directory'
-
-module Bookbinder
-  module Config
-    class RemoteBindConfiguration
-      VersionUnsupportedError = Class.new(RuntimeError)
-
-      def initialize(version_control_system, base_config)
-        @version_control_system = version_control_system
-        @base_config = base_config
-      end
-
-      def fetch
-        base_config.merge_sections(base_config.versions.flat_map { |version| sections_from(version) })
-      end
-
-      private
-
-      attr_reader :version_control_system, :base_config
-
-      def sections_from(version)
-        sections = Configuration.parse(
-          YAML.load(
-          version_control_system.read_file(
-            'config.yml',
-            from_repo: base_config.book_repo_url,
-            checkout: version
-          )
-        )).sections
-        raise VersionUnsupportedError.new(version) if sections.empty?
-
-        sections.map do |section|
-          section.merge(
-            Config::SectionConfig.new(
-              'repository' => { 'name' => section.repo_name, 'ref' => version },
-              'directory' => File.join(version, section.desired_directory_name)
-            )
-          )
-        end
-      end
-    end
-  end
-end

data/lib/bookbinder/ingest/section_repository_factory.rb

@@ -1,19 +0,0 @@
-require_relative 'section_repository'
-
-module Bookbinder
-  module Ingest
-    class SectionRepositoryFactory
-      def initialize(logger)
-        @logger = logger
-      end
-
-      def produce(cloner)
-        SectionRepository.new(logger, cloner)
-      end
-
-      private
-
-      attr_reader :logger
-    end
-  end
-end