bookbindery 8.5.0 → 9.0.0

data/lib/bookbinder/commands/punch.rb

@@ -1,24 +1,13 @@
-require_relative '../errors/cli_error'
-require_relative 'naming'
-
 module Bookbinder
   module Commands
     class Punch
-      include Commands::Naming
-
       def initialize(streams, configuration_fetcher, version_control_system)
         @streams = streams
         @configuration_fetcher = configuration_fetcher
         @version_control_system = version_control_system
       end
 
-      def usage
-        ["punch <git tag>", "Apply the specified <git tag> to your book, sections, and layout repo"]
-      end
-
       def run((tag, *))
-        raise CliError::InvalidArguments unless tag
-
         urls(config).each do |url|
           version_control_system.remote_tag(url, tag, 'HEAD')
         end

data/lib/bookbinder/commands/update_local_doc_repos.rb

@@ -1,23 +1,15 @@
 require_relative '../ingest/destination_directory'
-require_relative 'naming'
 
 module Bookbinder
   module Commands
     class UpdateLocalDocRepos
-      include Commands::Naming
-
       def initialize(streams, configuration_fetcher, version_control_system)
         @streams = streams
         @configuration_fetcher = configuration_fetcher
         @version_control_system = version_control_system
       end
 
-      def usage
-        [command_name,
-         "Run `git pull` on all sections that exist at the same directory level as your book directory"]
-      end
-
-      def run(_)
+      def run
         urls = configuration_fetcher.fetch_config.sections.map(&:repo_url)
         paths(urls).each do |path|
           streams[:out] << "\nUpdating #{path}:"

data/lib/bookbinder/commands/watch.rb

@@ -1,10 +1,6 @@
-require_relative 'naming'
-
 module Bookbinder
   module Commands
     class Watch
-      include Commands::Naming
-
       def initialize(streams,
                      middleman_runner: nil,
                      output_locations: nil,
@@ -27,12 +23,7 @@ module Bookbinder
         @directory_preparer = directory_preparer
       end
 
-      def usage
-        ["watch",
-         "Bind and serve a local book, watching for changes"]
-      end
-
-      def run(_)
+      def run
         watch_config = config_fetcher.fetch_config
 
         directory_preparer.prepare_directories(

data/lib/bookbinder/config/fetcher.rb

@@ -1,15 +1,12 @@
-require_relative 'aws_credentials'
-require_relative 'cf_credentials'
 require_relative 'configuration'
 require_relative 'yaml_loader'
 
 module Bookbinder
   module Config
     class Fetcher
-      def initialize(configuration_validator, loader, credentials_provider, config_class)
+      def initialize(configuration_validator, loader, config_class)
         @loader = loader
         @configuration_validator = configuration_validator
-        @credentials_provider = credentials_provider
         @config_class = config_class
       end
 
@@ -22,19 +19,6 @@ module Bookbinder
         @config ||= validate(@base_config, @optional_configs)
       end
 
-      def fetch_credentials(environment = 'null-environment')
-        @credentials ||= credentials_provider.credentials(fetch_config.cred_repo_url)
-        {
-          aws: Config::AwsCredentials.new(
-            @credentials.fetch('aws', {})
-          ),
-          cloud_foundry: Config::CfCredentials.new(
-            @credentials.fetch('cloud_foundry', {}),
-            environment
-          )
-        }
-      end
-
       def set_config_dir_path(config_dir_path)
         @config_dir_path = File.expand_path(config_dir_path)
       end
@@ -46,7 +30,7 @@ module Bookbinder
       private
 
       attr_reader(:loader, :configuration_validator, :config, :config_file_path, :config_dir_path,
-                  :credentials_provider, :config_class)
+                  :config_class)
 
       def read_config_file
         loader.load(config_file_path)

data/lib/bookbinder/preprocessing/dita_html_preprocessor.rb

@@ -1,10 +1,9 @@
 require_relative '../values/subnav_template'
 require_relative '../../../lib/bookbinder/subnav/json_from_html_toc'
-require_relative 'dita_preprocessor'
 
 module Bookbinder
   module Preprocessing
-    class DitaHTMLPreprocessor < DitaPreprocessor
+    class DitaHTMLPreprocessor
       DitaToHtmlLibraryFailure = Class.new(RuntimeError)
 
       ACCEPTED_IMAGE_FORMATS = %w(png jpeg jpg svg gif bmp tif tiff eps)
@@ -21,16 +20,14 @@ module Bookbinder
         section.subnav_template.include?('dita_subnav') if section.subnav_template
       end
 
-      def preprocess(sections, output_locations, options: [], output_streams: nil, **_)
+      def preprocess(sections, output_locations, options: {}, output_streams: nil, **_)
         @output_locations = output_locations
 
-        dita_options = dita_flags(options)
-
         sections.each do |section|
           if section.path_to_preprocessor_attribute('ditamap_location')
             convert_dita_files(section,
                                command_creator,
-                               dita_options,
+                               options[:dita_flags],
                                section_html_dir(section),
                                sheller,
                                output_streams)

data/lib/bookbinder/preprocessing/dita_pdf_preprocessor.rb

@@ -1,8 +1,6 @@
-require_relative 'dita_preprocessor'
-
 module Bookbinder
   module Preprocessing
-    class DitaPDFPreprocessor < DitaPreprocessor
+    class DitaPDFPreprocessor
       DitaToPDFLibraryFailure = Class.new(RuntimeError)
 
       def initialize(fs, command_creator, sheller)
@@ -15,11 +13,11 @@ module Bookbinder
         !!section.pdf_output_filename
       end
 
-      def preprocess(sections, output_locations, options: [], output_streams: nil, **_)
+      def preprocess(sections, output_locations, options: {}, output_streams: nil, **_)
         sections.each do |section|
           command = command_creator.convert_to_pdf_command(
             section,
-            dita_flags: dita_flags(options),
+            dita_flags: options[:dita_flags],
             write_to: output_locations.pdf_from_preprocessing_dir
           )
           status = sheller.run_command(command, output_streams.to_h)

data/lib/bookbinder/terminal.rb

@@ -1,4 +1,3 @@
-require_relative 'command_validator'
 require_relative 'colorizer'
 
 module Bookbinder

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 8.5.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -314,33 +314,20 @@ extra_rdoc_files: []
 files:
 - bookbinder.gemspec
 - install_bin/bookbinder
-- lib/bookbinder/cf_command_runner.rb
 - lib/bookbinder/cli.rb
 - lib/bookbinder/code_example_reader.rb
 - lib/bookbinder/colorizer.rb
-- lib/bookbinder/command_runner.rb
-- lib/bookbinder/command_validator.rb
 - lib/bookbinder/commands/bind.rb
-- lib/bookbinder/commands/build_and_push_tarball.rb
-- lib/bookbinder/commands/chain.rb
 - lib/bookbinder/commands/collection.rb
 - lib/bookbinder/commands/components/bind/directory_preparer.rb
 - lib/bookbinder/commands/components/bind/layout_preparer.rb
 - lib/bookbinder/commands/components/command_options.rb
 - lib/bookbinder/commands/components/imprint/directory_preparer.rb
 - lib/bookbinder/commands/generate.rb
-- lib/bookbinder/commands/help.rb
 - lib/bookbinder/commands/imprint.rb
-- lib/bookbinder/commands/naming.rb
 - lib/bookbinder/commands/punch.rb
-- lib/bookbinder/commands/push_from_local.rb
-- lib/bookbinder/commands/push_to_prod.rb
-- lib/bookbinder/commands/run_publish_ci.rb
 - lib/bookbinder/commands/update_local_doc_repos.rb
-- lib/bookbinder/commands/version.rb
 - lib/bookbinder/commands/watch.rb
-- lib/bookbinder/config/aws_credentials.rb
-- lib/bookbinder/config/cf_credentials.rb
 - lib/bookbinder/config/checkers/archive_menu_checker.rb
 - lib/bookbinder/config/checkers/ditamap_presence_checker.rb
 - lib/bookbinder/config/checkers/duplicate_section_name_checker.rb
@@ -354,26 +341,13 @@ files:
 - lib/bookbinder/config/fetcher.rb
 - lib/bookbinder/config/imprint/configuration.rb
 - lib/bookbinder/config/product_config.rb
-- lib/bookbinder/config/remote_yaml_credential_provider.rb
 - lib/bookbinder/config/section_config.rb
 - lib/bookbinder/config/validator.rb
 - lib/bookbinder/config/yaml_loader.rb
 - lib/bookbinder/css_link_checker.rb
-- lib/bookbinder/deploy/app_fetcher.rb
-- lib/bookbinder/deploy/archive.rb
-- lib/bookbinder/deploy/artifact.rb
-- lib/bookbinder/deploy/blue_green_app.rb
-- lib/bookbinder/deploy/cf_routes.rb
-- lib/bookbinder/deploy/deployment.rb
-- lib/bookbinder/deploy/distributor.rb
-- lib/bookbinder/deploy/failure.rb
-- lib/bookbinder/deploy/pusher.rb
-- lib/bookbinder/deploy/success.rb
-- lib/bookbinder/deprecated_logger.rb
 - lib/bookbinder/directory_helpers.rb
 - lib/bookbinder/dita_command_creator.rb
 - lib/bookbinder/dita_html_for_middleman_formatter.rb
-- lib/bookbinder/errors/cli_error.rb
 - lib/bookbinder/errors/programmer_mistake.rb
 - lib/bookbinder/html_document_manipulator.rb
 - lib/bookbinder/ingest/cloner_factory.rb
@@ -387,13 +361,11 @@ files:
 - lib/bookbinder/ingest/update_failure.rb
 - lib/bookbinder/ingest/update_success.rb
 - lib/bookbinder/ingest/working_copy.rb
-- lib/bookbinder/legacy/cli.rb
 - lib/bookbinder/local_filesystem_accessor.rb
 - lib/bookbinder/middleman_runner.rb
 - lib/bookbinder/postprocessing/broken_links_checker.rb
 - lib/bookbinder/preprocessing/dita_html_preprocessor.rb
 - lib/bookbinder/preprocessing/dita_pdf_preprocessor.rb
-- lib/bookbinder/preprocessing/dita_preprocessor.rb
 - lib/bookbinder/preprocessing/link_to_site_gen_dir.rb
 - lib/bookbinder/preprocessing/preprocessor.rb
 - lib/bookbinder/server_director.rb
@@ -449,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Markdown to Rackup application documentation generator

data/lib/bookbinder/cf_command_runner.rb

@@ -1,123 +0,0 @@
-require_relative 'deploy/blue_green_app'
-
-module Bookbinder
-  class CfCommandRunner
-    def initialize(streams, sheller, cf_credentials, trace_file)
-      @streams = streams
-      @sheller = sheller
-      @creds = cf_credentials
-      @trace_file = trace_file
-    end
-
-    def login
-      username = creds.username
-      password = creds.password
-      api_endpoint = creds.api_endpoint
-      organization = creds.organization
-      space = creds.space
-      creds_string = (username && password) ? "-u '#{username}' -p '#{password}'" : ''
-
-      result = sheller.run_command(
-        "#{cf_binary_path} login #{creds_string} -a '#{api_endpoint}' -o '#{organization}' -s '#{space}'",
-        streams
-      )
-      raise "Could not log in to #{creds.api_endpoint}" unless result.success?
-    end
-
-    def cf_routes_output
-      sheller.get_stdout("CF_COLOR=false #{cf_binary_path} routes").tap do |output|
-        raise 'failure executing cf routes' if output == ''
-      end
-    end
-
-    def new_app
-      Deploy::BlueGreenApp.new([creds.app_name, 'blue'].join('-'))
-    end
-
-    def start(deploy_target_app)
-      # Theoretically we shouldn't need this (and corresponding "stop" below), but we've seen CF pull files from both
-      # green and blue when a DNS redirect points to HOST.cfapps.io
-      # Also, shutting down the unused app saves $$
-      sheller.run_command("#{cf_binary_path} start #{deploy_target_app}", streams)
-    end
-
-    def push(deploy_target_app)
-      # Currently --no-routes is used to blow away all existing routes from a newly deployed app.
-      # The routes will then be recreated from the creds repo.
-      result = sheller.run_command(
-        environment_variables,
-        "#{cf_binary_path} push #{deploy_target_app} -b ruby_buildpack -s cflinuxfs2 --no-route -m 256M -i 3",
-        streams
-      )
-      raise "Could not deploy app to #{deploy_target_app}" unless result.success?
-    end
-
-    def unmap_routes(app)
-      creds.flat_routes.each do |domain, host|
-        unmap_route(app, domain, host)
-      end
-    end
-
-    def map_routes(app)
-      succeeded = []
-
-      creds.flat_routes.each do |domain, name|
-        begin
-          map_route(app, domain, name)
-          succeeded << [app, domain, name]
-        rescue RuntimeError
-          succeeded.each { |app, domain, host| unmap_route(app, domain, host) }
-          raise
-        end
-      end
-    end
-
-    def takedown_old_target_app(app)
-      # Routers flush every 10 seconds (but not guaranteed), so wait a bit longer than that.
-      streams[:out].puts "waiting 15 seconds for routes to remap...\n\n"
-      (1..15).to_a.reverse.each do |seconds|
-        streams[:out] << "\r\r#{seconds}...    "
-        Kernel.sleep 1
-      end
-      stop(app)
-      unmap_routes(app)
-    end
-
-    private
-
-    attr_reader :creds, :sheller, :streams
-
-    def stop(app)
-      result = sheller.run_command("#{cf_binary_path} stop #{app}", streams)
-      raise "Failed to stop application #{app}" unless result.success?
-    end
-
-    def map_route(deploy_target_app, domain, host)
-      map_route_command = "#{cf_binary_path} map-route #{deploy_target_app} #{domain}"
-      map_route_command += " -n #{host}" unless host.empty?
-
-      result = sheller.run_command(map_route_command, streams)
-      raise "Deployed app to #{deploy_target_app} but failed to map hostname #{host}.#{domain} to it." unless result.success?
-    end
-
-    def unmap_route(deploy_target_app, domain, host)
-      unmap_route_command = "#{cf_binary_path} unmap-route #{deploy_target_app} #{domain}"
-      unmap_route_command += " -n #{host}" unless host.empty?
-
-      result = sheller.run_command(unmap_route_command, streams)
-      raise "Failed to unmap route #{host} on #{deploy_target_app}." unless result.success?
-    end
-
-    def cf_binary_path
-      @cf_binary_path ||= sheller.get_stdout("which cf").tap do |path|
-        if path == ''
-          raise "CF CLI could not be found in your PATH. Please make sure cf cli is in your PATH."
-        end
-      end
-    end
-
-    def environment_variables
-      {'CF_TRACE' => @trace_file}
-    end
-  end
-end

data/lib/bookbinder/command_runner.rb

@@ -1,23 +0,0 @@
-require_relative 'errors/cli_error'
-
-module Bookbinder
-  class CommandRunner
-    def initialize(logger, commands)
-      @logger = logger
-      @commands = commands
-    end
-
-    def run(command_name, command_arguments)
-      command = commands.detect { |known_command| known_command.command_for?(command_name) }
-      command.run(command_arguments)
-    rescue CliError::InvalidArguments
-      logger.log ["bookbinder #{command.usage[0]}", command.usage[1]]
-      1
-    end
-
-    private
-
-    attr_reader :logger, :commands
-  end
-end
-

data/lib/bookbinder/command_validator.rb

@@ -1,51 +0,0 @@
-require 'ostruct'
-require_relative 'errors/cli_error'
-require_relative 'commands/naming'
-require_relative 'values/user_message'
-
-module Bookbinder
-  class CommandValidator
-    def initialize(commands, usage_text)
-      @commands = commands
-      @usage_text = usage_text
-    end
-
-    def validate(command_name)
-      candidate = Candidate.new(command_name, commands)
-      if candidate.unrecognized?
-        UserMessage.new(
-          "Unrecognized #{candidate.command_type} '#{command_name}'\n#{usage_text}",
-          EscalationType.error
-        )
-      elsif candidate.deprecated_match
-        UserMessage.new(
-          "Use of #{command_name} is deprecated. " +
-          "The preferred usage is below: \nbookbinder #{candidate.deprecated_match.usage[0]}",
-          EscalationType.warn
-        )
-      else
-        UserMessage.new "Success", EscalationType.success
-      end
-    end
-
-    Candidate = Struct.new(:command_name, :commands) do
-      include Bookbinder::Commands::Naming
-
-      def unrecognized?
-        commands.none? { |command| command.command_for?(command_name) }
-      end
-
-      def deprecated_match
-        @deprecated_match ||= commands.find { |command|
-          command.respond_to?(:deprecated_command_for?) &&
-            command.deprecated_command_for?(command_name)
-        }
-      end
-    end
-
-    private
-
-    attr_reader :commands, :usage_text
-  end
-end
-