bookbindery 3.1.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0253fb2ff70df7454081ccad6222b3cd61ac6e
-  data.tar.gz: 12281076319eae008bad526b376bba7348007722
+  metadata.gz: 4186b0031cc1db33f20038d884a71624f845d175
+  data.tar.gz: 439d522cdaba03d005039b45e44b9b3917dab82d
 SHA512:
-  metadata.gz: 137791f967ff0fc2df6728d215ce6cd072f9a617e2461a05cc4e55c17affb2fbe932b147b40cd901cf89f891f8b7aa41b2de4ab005f60efa4d3d7de69b0eeb4a
-  data.tar.gz: 53af686a48cfc52f35b87a825aea6870f1cbe5da92e4e9a7e7b31624e5156e09193b83722fce212c48005a6986c190227371c919db394da92e99fe8d617649d8
+  metadata.gz: 384fc6c0bf881e81cc2fd34040af92eae6b83150cbdd14b441d72d84355d2a8ce4dcb0044a892de797eec4f20b3660739fbb99529a0a7b0d57a8295fa827a0a6
+  data.tar.gz: 3310d764be0a0d8063e9142ccff2c55046f4378b255a8e5fe63ceb8919a5eb5ddbf10cf8d24584810f5b78678365654a931a2fc66df3f11b9649f54255fbacaf

data/install_bin/bookbinder

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/bookbinder/cli'
-require_relative '../lib/bookbinder/git_accessor'
+require_relative '../lib/bookbinder/ingest/git_accessor'
 
-return_code = Bookbinder::Cli.new(Bookbinder::GitAccessor.new).run ARGV
+return_code = Bookbinder::Cli.new(Bookbinder::Ingest::GitAccessor.new).run ARGV
 exit return_code.to_i

data/lib/bookbinder/command_runner.rb

@@ -11,7 +11,7 @@ module Bookbinder
       command = commands.detect { |known_command| known_command.command_for?(command_name) }
       command.run(command_arguments)
     rescue CliError::InvalidArguments
-      logger.log command.usage
+      logger.log ["bookbinder #{command.usage[0]}", command.usage[1]]
       1
     end
 

data/lib/bookbinder/command_validator.rb

@@ -20,7 +20,7 @@ module Bookbinder
       elsif candidate.deprecated_match
         UserMessage.new(
           "Use of #{command_name} is deprecated. " +
-          "The preferred usage is below: \n#{candidate.deprecated_match.usage}",
+          "The preferred usage is below: \nbookbinder #{candidate.deprecated_match.usage[0]}",
           EscalationType.warn
         )
       else

data/lib/bookbinder/commands/bind.rb

@@ -71,10 +71,12 @@ module Bookbinder
           ref_override: bind_options.ref_override
         )
 
-        preprocessor.preprocess(sections,
-                                output_locations,
-                                options: options,
-                                output_streams: bind_options.streams)
+        preprocessor.preprocess(
+          sections,
+          output_locations,
+          options: options,
+          output_streams: bind_options.streams
+        )
 
         success = publish(
           sections.map(&:subnav).reduce({}, :merge),
@@ -118,19 +120,18 @@ module Bookbinder
                                   subnavs)
         file_system_accessor.copy output_locations.build_dir, output_locations.public_dir
 
-
-        result = generate_sitemap(host_for_sitemap)
+        raise "Your public host must be a single String." unless host_for_sitemap.is_a?(String)
+        result = sitemap_writer.write(
+          host_for_sitemap,
+          streams,
+          publish_config.broken_link_exclusions
+        )
 
         streams[:success].puts "Bookbinder bound your book into #{output_locations.final_app_dir}"
 
         !result.has_broken_links?
       end
 
-      def generate_sitemap(host_for_sitemap)
-        raise "Your public host must be a single String." unless host_for_sitemap.is_a?(String)
-        sitemap_writer.write(host_for_sitemap)
-      end
-
       def generate_local_repo_dir(context_dir, bind_source)
         File.expand_path('..', context_dir) if bind_source == 'local'
       end

data/lib/bookbinder/commands/bind/bind_options.rb

@@ -19,11 +19,9 @@ module Bookbinder
         end
 
         def streams
-          {
+          base_streams.merge(
             out: opts.include?('--verbose') ? base_streams[:out] : Sheller::DevNull.new,
-            success: Streams::ColorizedStream.new(Colorizer::Colors.green, base_streams[:out]),
-            err: Streams::ColorizedStream.new(Colorizer::Colors.red, base_streams[:err]),
-          }
+          )
         end
 
         private

data/lib/bookbinder/commands/collection.rb

@@ -65,7 +65,12 @@ module Bookbinder
           Commands::PushToProd.new(logger, configuration_fetcher),
           Commands::RunPublishCI.new(bind, push_local_to_staging, build_and_push_tarball),
           Commands::Tag.new(logger, configuration_fetcher, version_control_system),
-          Commands::UpdateLocalDocRepos.new(logger, configuration_fetcher, version_control_system, local_file_system_accessor),
+          Commands::UpdateLocalDocRepos.new(
+            colored_streams,
+            configuration_fetcher,
+            version_control_system,
+            local_file_system_accessor
+          ),
         ]
       end
 
@@ -75,7 +80,7 @@ module Bookbinder
 
       def bind
         @bind ||= Commands::Bind.new(
-          {out: $stdout, err: $stderr},
+          colored_streams,
           OutputLocations.new(final_app_dir: final_app_directory, context_dir: File.absolute_path('.')),
           Config::BindConfigFactory.new(version_control_system, configuration_fetcher),
           Config::ArchiveMenuConfiguration.new(loader: config_loader, config_filename: 'bookbinder.yml'),
@@ -112,10 +117,15 @@ module Bookbinder
         )
       end
 
+      def colored_streams
+        { out: $stdout,
+          success: Streams::ColorizedStream.new(Colorizer::Colors.green, $stdout),
+          err: Streams::ColorizedStream.new(Colorizer::Colors.red, $stderr) }
+      end
+
       def configuration_fetcher
         @configuration_fetcher ||= Config::Fetcher.new(
-          logger,
-          Config::Validator.new(logger, local_file_system_accessor),
+          Config::Validator.new(local_file_system_accessor),
           config_loader,
           Config::RemoteYamlCredentialProvider.new(logger, version_control_system)
         ).tap do |fetcher|

data/lib/bookbinder/commands/update_local_doc_repos.rb

@@ -7,8 +7,8 @@ module Bookbinder
     class UpdateLocalDocRepos
       include Commands::Naming
 
-      def initialize(logger, configuration_fetcher, version_control_system, filesystem)
-        @logger = logger
+      def initialize(streams, configuration_fetcher, version_control_system, filesystem)
+        @streams = streams
         @configuration_fetcher = configuration_fetcher
         @version_control_system = version_control_system
         @filesystem = filesystem
@@ -22,19 +22,28 @@ module Bookbinder
       def run(_)
         urls = configuration_fetcher.fetch_config.sections.map(&:repo_url)
         paths(urls).each do |path|
-          if filesystem.file_exist?(path)
-            logger.log 'Updating ' + path.cyan
-            version_control_system.update(path)
-          else
-            logger.log '  skipping (not found) '.magenta + path
-          end
+          streams[:out] << "\nUpdating #{path}:"
+          report(version_control_system.update(path))
         end
+        streams[:out].puts
         0
       end
 
       private
 
-      attr_reader :logger, :configuration_fetcher, :version_control_system, :filesystem
+      attr_reader(:streams,
+                  :configuration_fetcher,
+                  :version_control_system,
+                  :filesystem)
+
+      def report(result)
+        messages = { true => "updated", false => "skipping (#{result.reason})" }
+        streams[stream_types[result.success?]] << " #{messages[result.success?]}"
+      end
+
+      def stream_types
+        { true => :success, false => :out }
+      end
 
       def paths(urls)
         urls.map {|url| File.absolute_path("../#{Ingest::DestinationDirectory.new(url)}")}

data/lib/bookbinder/config/checkers/archive_menu_checker.rb

@@ -12,11 +12,9 @@ module Bookbinder
 
         def check(config)
           partial_location = './master_middleman/source/archive_menus/_default.erb'
-          if config.has_key?("archive_menu") && config["archive_menu"].nil?
-            ArchiveMenuNotDefinedError.new 'Did you mean to provide an archive menu value to display? If you use the archive_menu key, you must provide at least one value.'
-          elsif archive_items(config).include?(nil)
+          if config.archive_menu && config.archive_menu.include?(nil)
             EmptyArchiveItemsError.new 'Did you forget to add a value to the archive_menu?'
-          elsif config.has_key?("archive_menu") && !file_system_accessor.file_exist?(partial_location)
+          elsif config.archive_menu && !file_system_accessor.file_exist?(partial_location)
             MissingArchiveMenuPartialError.new "You must provide a template partial named at #{partial_location}"
           end
         end
@@ -25,10 +23,6 @@ module Bookbinder
 
         attr_reader :file_system_accessor
 
-        def archive_items(config)
-          config.fetch('archive_menu', [])
-        end
-
       end
     end
   end

data/lib/bookbinder/config/checkers/dita_section_checker.rb

@@ -5,18 +5,25 @@ module Bookbinder
         DitamapLocationError = Class.new(RuntimeError)
 
         def check(config)
-          dita_sections = config['dita_sections'].to_a
-
-          sum = 0
-          dita_sections.each do |section|
-            if section['ditamap_location']
-              sum += 1
-            end
+          if none_with_pred?(dita_sections(config)) { |s|
+            s.preprocessor_config['ditamap_location']
+          }
+            DitamapLocationError.new(
+              "You must have at least one 'ditamap_location' key in dita_sections."
+            )
           end
+        end
 
-          if !dita_sections.empty? && (sum < 1)
-            DitamapLocationError.new "You must have at least one 'ditamap_location' key in dita_sections."
-          end
+        private
+
+        def none_with_pred?(coll, &block)
+          coll.any? && coll.none?(&block)
+        end
+
+        def dita_sections(config)
+          config.sections.select {|s|
+            s.preprocessor_config.has_key?('ditamap_location')
+          }
         end
       end
     end

data/lib/bookbinder/config/checkers/duplicate_section_name_checker.rb

@@ -1,3 +1,5 @@
+require_relative '../../ingest/destination_directory'
+
 module Bookbinder
   module Config
     module Checkers
@@ -13,8 +15,10 @@ module Bookbinder
         private
 
         def duplicate_section_names?(config)
-          sections = config['sections'].to_a + config['dita_sections'].to_a
-          directory_names = sections.map {|section| section['directory']}
+          directory_names = config.sections.map {|section|
+            Ingest::DestinationDirectory.new(section.repo_name,
+                                             section.desired_directory_name)
+          }
           directory_names.length != directory_names.uniq.length
         end
 

data/lib/bookbinder/config/checkers/repository_name_presence_checker.rb

@@ -5,14 +5,11 @@ module Bookbinder
         MissingRepositoryNameError = Class.new(RuntimeError)
 
         def check(config)
-          all_sections = config['sections'].to_a + config['dita_sections'].to_a
-          failures = all_sections.map do |section|
-            if !section['repository'] || !section['repository']['name']
-              true
-            end
+          failures = config.sections.reject do |section|
+            section.repo_name
           end
 
-          if failures.compact.empty?
+          if failures.empty?
             nil
           else
             MissingRepositoryNameError.new error_message

data/lib/bookbinder/config/checkers/required_keys_checker.rb

@@ -5,42 +5,22 @@ module Bookbinder
     module Checkers
       class RequiredKeysChecker
         MissingRequiredKeyError = Class.new(RuntimeError)
-        SectionAbsenceError = Class.new(RuntimeError)
 
         def check(config)
           missing_keys = []
 
-          Config::Configuration::CONFIG_REQUIRED_KEYS.map do |required_key|
-            config_keys = config.keys
-            unless config_keys.include?(required_key)
+          Config::Configuration::CONFIG_REQUIRED_KEYS.each do |required_key|
+            begin
+              config.public_send(required_key)
+            rescue KeyError
               missing_keys.push(required_key)
             end
           end
 
           if missing_keys.length > 0
             MissingRequiredKeyError.new("Your config.yml is missing required key(s). Required keys are #{missing_keys.join(", ")}.")
-          elsif !config['sections'] && !config['dita_sections']
-            SectionAbsenceError.new error_message
           end
         end
-
-        private
-
-        def error_message
-          <<-ERROR
-    Cannot locate your sections.
-    Must specify at least one of 'sections' and/or 'dita_sections' in config.yml:
-
-    sections:
-      - repository:
-          name: 'your-org/your-repo'
-
-    dita_sections:
-      - repository:
-          name: 'dita-org/dita-repo'
-        ditamap_location: 'example.ditamap'
-          ERROR
-        end
       end
     end
   end

data/lib/bookbinder/config/configuration.rb

@@ -65,6 +65,10 @@ module Bookbinder
         end
       end
 
+      def broken_link_exclusions
+        config.fetch(:broken_link_exclusions, /(?!.*)/)
+      end
+
       def template_variables
         config.fetch(:template_variables, {})
       end

data/lib/bookbinder/config/fetcher.rb

@@ -6,9 +6,8 @@ require_relative 'yaml_loader'
 module Bookbinder
   module Config
     class Fetcher
-      def initialize(logger, configuration_validator, loader, credentials_provider)
+      def initialize(configuration_validator, loader, credentials_provider)
         @loader = loader
-        @logger = logger
         @configuration_validator = configuration_validator
         @credentials_provider = credentials_provider
       end
@@ -36,7 +35,7 @@ module Bookbinder
 
       private
 
-      attr_reader(:loader, :logger, :configuration_validator, :config, :config_file_path,
+      attr_reader(:loader, :configuration_validator, :config, :config_file_path,
                   :credentials_provider)
 
       def read_config_file
@@ -51,10 +50,10 @@ module Bookbinder
       def validate(config_hash)
         raise 'Your config.yml appears to be empty. Please check and try again.' unless config_hash
 
-        errors = configuration_validator.exceptions(config_hash)
-        raise errors.first if errors.any?
-
-        Configuration.parse(config_hash)
+        Configuration.parse(config_hash).tap do |config|
+          errors = configuration_validator.exceptions(config)
+          raise errors.first if errors.any?
+        end
       end
     end
   end

data/lib/bookbinder/config/section_config.rb

@@ -28,7 +28,7 @@ module Bookbinder
       end
 
       def preprocessor_config
-        config['preprocessor_config']
+        config.fetch('preprocessor_config', {})
       end
 
       def ==(other)
@@ -46,7 +46,7 @@ module Bookbinder
       private
 
       def repo
-        config['repository']
+        config.fetch('repository', {})
       end
 
       attr_reader :config

data/lib/bookbinder/config/validator.rb

@@ -7,12 +7,11 @@ require_relative 'checkers/dita_section_checker'
 module Bookbinder
   module Config
     class Validator
-      def initialize(logger, file_system_accessor)
-        @logger = logger
+      def initialize(file_system_accessor)
         @file_system_accessor = file_system_accessor
       end
 
-      def exceptions(config_hash)
+      def exceptions(config)
         exceptions = [
           Checkers::RequiredKeysChecker.new,
           Checkers::DuplicateSectionNameChecker.new,
@@ -20,7 +19,7 @@ module Bookbinder
           Checkers::DitaSectionChecker.new,
           Checkers::ArchiveMenuChecker.new(@file_system_accessor)
         ].map do |checker|
-          checker.check(config_hash)
+          checker.check(config)
         end
 
         exceptions.compact

data/lib/bookbinder/ingest/git_accessor.rb

@@ -0,0 +1,84 @@
+require 'git'
+require_relative 'update_failure'
+require_relative 'update_success'
+
+module Bookbinder
+  module Ingest
+    class GitAccessor
+      TagExists = Class.new(RuntimeError)
+      InvalidTagRef = Class.new(RuntimeError)
+
+      def initialize
+        @cache = {}
+      end
+
+      def clone(url, name, path: nil, checkout: 'master')
+        cached_clone(url, name, path).tap do |git|
+          git.checkout(checkout)
+        end
+      end
+
+      def update(cloned_path)
+        Git.open(cloned_path).pull
+        Ingest::UpdateSuccess.new
+      rescue ArgumentError, Git::GitExecuteError => e
+        case e.message
+        when /overwritten by merge/
+          Ingest::UpdateFailure.new('merge error')
+        when /path does not exist/
+          Ingest::UpdateFailure.new('not found')
+        else
+          raise
+        end
+      end
+
+      def read_file(filename, from_repo: nil, checkout: 'master')
+        Dir.mktmpdir do |dir|
+          path = Pathname(dir)
+          git = _clone(from_repo, temp_name("read-file"), path)
+          git.checkout(checkout)
+          path.join(temp_name("read-file"), filename).read
+        end
+      end
+
+      def remote_tag(url, tagname, commit_or_object)
+        Dir.mktmpdir do |dir|
+          path = Pathname(dir)
+          git = _clone(url, temp_name("tag"), path)
+          git.config('user.name', 'Bookbinder')
+          git.config('user.email', 'bookbinder@cloudfoundry.org')
+          begin
+            git.add_tag(tagname, "origin/#{commit_or_object}",
+                        message: 'Tagged by Bookbinder')
+          rescue Git::GitExecuteError => e
+            case e.message
+            when /already exists/
+              raise TagExists
+            when /as a valid ref/
+              raise InvalidTagRef
+            else
+              raise
+            end
+          end
+          git.push("origin", "master", tags: true)
+        end
+      end
+
+      private
+
+      attr_reader :cache
+
+      def temp_name(purpose)
+        "bookbinder-git-accessor-#{purpose}"
+      end
+
+      def cached_clone(url, name, path)
+        cache[[url, name, path]] ||= _clone(url, name, path)
+      end
+
+      def _clone(url, name, path)
+        Git.clone(url, name, path: path)
+      end
+    end
+  end
+end

data/lib/bookbinder/ingest/update_failure.rb

@@ -0,0 +1,15 @@
+module Bookbinder
+  module Ingest
+    class UpdateFailure
+      attr_reader :reason
+
+      def initialize(reason)
+        @reason = reason
+      end
+
+      def success?
+        false
+      end
+    end
+  end
+end

data/lib/bookbinder/ingest/update_success.rb

@@ -0,0 +1,12 @@
+module Bookbinder
+  module Ingest
+    class UpdateSuccess
+      def reason
+      end
+
+      def success?
+        true
+      end
+    end
+  end
+end

data/lib/bookbinder/post_production/sitemap_writer.rb

@@ -6,8 +6,8 @@ module Bookbinder
     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)
+          Spider.new(app_dir: final_app_directory),
+          ServerDirector.new(directory: final_app_directory, port: port)
         )
       end
 
@@ -16,9 +16,14 @@ module Bookbinder
         @server_director = server_director
       end
 
-      def write(host_for_sitemap)
+      def write(host_for_sitemap, streams, broken_link_exclusions)
         server_director.use_server { |port|
-          spider.generate_sitemap(host_for_sitemap, port)
+          spider.generate_sitemap(
+            host_for_sitemap,
+            port,
+            streams,
+            broken_link_exclusions: broken_link_exclusions
+          )
         }.tap do |sitemap|
           File.write(sitemap.to_path, sitemap.to_xml)
         end

data/lib/bookbinder/server_director.rb

@@ -4,8 +4,7 @@ require 'vienna'
 
 module Bookbinder
   class ServerDirector
-    def initialize(logger, directory: nil, port: 41722)
-      @logger = logger
+    def initialize(directory: nil, port: 41722)
       @directory = directory
       @port = port
     end

data/lib/bookbinder/spider.rb

@@ -15,7 +15,7 @@ module Bookbinder
       end
 
       def has_broken_links?
-        @broken_links.any? { |link| !link.include?('#') }
+        @broken_links.any?
       end
 
       def to_xml
@@ -27,46 +27,46 @@ module Bookbinder
       end
     end
 
-    def initialize(logger, app_dir: nil)
-      @logger = logger
+    def self.prepend_location(location, url)
+      "#{URI(location).path} => #{url}"
+    end
+
+    def initialize(app_dir: nil)
       @app_dir = app_dir || raise('Spiders must be initialized with an app directory.')
-      @broken_links = []
     end
 
-    def generate_sitemap(target_host, port)
+    def generate_sitemap(target_host, port, streams,
+                         broken_link_exclusions: /(?!.*)/)
       temp_host = "localhost:#{port}"
 
       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
-
       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)
-      "#{URI(location).path} => #{url}"
+      public_broken_links = broken_links.reject {|l| l.match(broken_link_exclusions)}
+      announce_broken_links(public_broken_links, streams)
+      Result.new(
+        public_broken_links,
+        SitemapGenerator.new.generate(sitemap_links), app_dir
+      )
     end
 
     private
 
-    def announce_broken_links(broken_links)
-      if broken_links.any?
-        @logger.error "\nFound #{broken_links.count} broken links!"
-
-        broken_links.each do |link|
-          if link.include?('#')
-            @logger.warn(link)
-          else
-            @logger.notify(link)
-          end
-        end
+    attr_reader :app_dir
 
-        @logger.error "\nFound #{broken_links.count} broken links!"
+    def announce_broken_links(broken_links, streams)
+      if broken_links.none?
+        streams[:out].puts "\nNo broken links!"
       else
-        @logger.success "\nNo broken links!"
+        streams[:err].puts(<<-MESSAGE)
+
+Found #{broken_links.count} broken links!
+
+#{broken_links.sort.join("\n")}
+
+Found #{broken_links.count} broken links!
+        MESSAGE
       end
     end
 

data/lib/bookbinder/streams/colorized_stream.rb

@@ -13,6 +13,10 @@ module Bookbinder
         stream.puts(colorizer.colorize(line, color))
       end
 
+      def <<(text)
+        stream << colorizer.colorize(text, color)
+      end
+
       private
 
       attr_reader :color, :colorizer, :stream

data/master_middleman/bookbinder_helpers.rb

@@ -70,14 +70,10 @@ module Bookbinder
       private
 
       def subnav_template_name
-        if current_page.data.index_subnav
-          current_page.data.index_subnav
-        else
-          template_key = decreasingly_specific_namespaces.detect { |ns|
-            config[:subnav_templates].has_key?(ns)
-          }
-          config[:subnav_templates][template_key] || 'default'
-        end
+        template_key = decreasingly_specific_namespaces.detect { |ns|
+          config[:subnav_templates].has_key?(ns)
+        }
+        config[:subnav_templates][template_key] || 'default'
       end
 
       def decreasingly_specific_namespaces

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -311,16 +311,18 @@ files:
 - lib/bookbinder/dita_html_to_middleman_formatter.rb
 - lib/bookbinder/errors/cli_error.rb
 - lib/bookbinder/errors/programmer_mistake.rb
-- lib/bookbinder/git_accessor.rb
 - lib/bookbinder/html_document_manipulator.rb
 - lib/bookbinder/ingest/cloner_factory.rb
 - lib/bookbinder/ingest/destination_directory.rb
+- lib/bookbinder/ingest/git_accessor.rb
 - lib/bookbinder/ingest/git_cloner.rb
 - lib/bookbinder/ingest/local_filesystem_cloner.rb
 - 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
 - lib/bookbinder/local_file_system_accessor.rb
 - lib/bookbinder/middleman_runner.rb

data/lib/bookbinder/git_accessor.rb

@@ -1,70 +0,0 @@
-require 'git'
-
-module Bookbinder
-  class GitAccessor
-    TagExists = Class.new(RuntimeError)
-    InvalidTagRef = Class.new(RuntimeError)
-
-    def initialize
-      @cache = {}
-    end
-
-    def clone(url, name, path: nil, checkout: 'master')
-      cached_clone(url, name, path).tap do |git|
-        git.checkout(checkout)
-      end
-    end
-
-    def update(cloned_path)
-      Git.open(cloned_path).pull
-    end
-
-    def read_file(filename, from_repo: nil, checkout: 'master')
-      Dir.mktmpdir do |dir|
-        path = Pathname(dir)
-        git = _clone(from_repo, temp_name("read-file"), path)
-        git.checkout(checkout)
-        path.join(temp_name("read-file"), filename).read
-      end
-    end
-
-    def remote_tag(url, tagname, commit_or_object)
-      Dir.mktmpdir do |dir|
-        path = Pathname(dir)
-        git = _clone(url, temp_name("tag"), path)
-        git.config('user.name', 'Bookbinder')
-        git.config('user.email', 'bookbinder@cloudfoundry.org')
-        begin
-          git.add_tag(tagname, "origin/#{commit_or_object}",
-                      message: 'Tagged by Bookbinder')
-        rescue Git::GitExecuteError => e
-          case e.message
-          when /already exists/
-            raise TagExists
-          when /as a valid ref/
-            raise InvalidTagRef
-          else
-            raise
-          end
-        end
-        git.push("origin", "master", tags: true)
-      end
-    end
-
-    private
-
-    attr_reader :cache
-
-    def temp_name(purpose)
-      "bookbinder-git-accessor-#{purpose}"
-    end
-
-    def cached_clone(url, name, path)
-      cache[[url, name, path]] ||= _clone(url, name, path)
-    end
-
-    def _clone(url, name, path)
-      Git.clone(url, name, path: path)
-    end
-  end
-end