bookbindery 1.0.3 → 2.0.0

data/lib/bookbinder/shell_out.rb

@@ -4,6 +4,7 @@ module Bookbinder
   module ShellOut
     def shell_out(command, failure_okay = false)
       Open3.popen3(command) do |input, stdout, stderr, wait_thr|
+
         command_failed = (wait_thr.value != 0)
         announce_failure(failure_okay, stderr, stdout) if command_failed
         stdout.read

data/lib/bookbinder/sheller.rb

@@ -0,0 +1,19 @@
+module Bookbinder
+  class Sheller
+    ShelloutFailure = Class.new(RuntimeError)
+
+    def initialize(view_updater)
+      @view_updater = view_updater
+    end
+
+    def run_command(command)
+      IO.popen(command) do |stdout|
+        stdout.each { |line| view_updater.log line }
+      end
+
+      raise ShelloutFailure.new "Shelling out failed." unless $?.success?
+    end
+
+    attr_reader :view_updater
+  end
+end

data/lib/bookbinder/sieve.rb

@@ -1,3 +1,5 @@
+require_relative 'spider'
+
 module Bookbinder
   class Sieve
     def initialize(domain: ->(){ raise 'You must supply a domain parameter.' }.call)
@@ -6,9 +8,12 @@ module Bookbinder
     end
 
     def links_from(page, is_first_pass)
-      if page.not_found?
+      if page.not_found? && page.referer
         working = []
         broken  = [Spider.prepend_location(page.referer, page.url)]
+      elsif page.not_found?
+        working = []
+        broken  = []
       else
         working = [page.url.to_s]
         broken  = broken_fragments_targeting(page, is_first_pass)

data/lib/bookbinder/terminal.rb

@@ -0,0 +1,10 @@
+require_relative 'command_validator'
+require_relative 'colorizer'
+
+module Bookbinder
+  class Terminal
+    def update(user_message)
+      puts user_message
+    end
+  end
+end

data/lib/bookbinder/user_message.rb

@@ -0,0 +1,6 @@
+module Bookbinder
+
+  UserMessage = Struct.new(:message, :escalation_type)
+  EscalationType = OpenStruct.new(success: 0, error: 1, warn: 2)
+
+end

data/lib/bookbinder/user_message_presenter.rb

@@ -0,0 +1,21 @@
+require_relative 'colorizer'
+
+module Bookbinder
+  class UserMessagePresenter
+    def initialize(colorizer)
+      @colorizer = colorizer
+    end
+
+    def get_error(user_message)
+      colorizer.colorize(user_message.message, Colorizer::Colors.red)
+    end
+
+    def get_warning(user_message)
+      colorizer.colorize(user_message.message, Colorizer::Colors.yellow)
+    end
+
+    private
+
+    attr_reader :colorizer
+  end
+end

data/lib/bookbinder/yaml_loader.rb

@@ -1,22 +1,33 @@
-module Bookbinder
+require 'yaml'
 
+module Bookbinder
   FileNotFoundError = Class.new(RuntimeError)
   InvalidSyntaxError = Class.new(RuntimeError)
 
   class YAMLLoader
     def load(path)
-      unless File.exist? path
+      if File.exist?(path)
+        config(path)
+      else
         raise FileNotFoundError.new, "YAML"
       end
+    rescue Psych::SyntaxError => e
+      raise InvalidSyntaxError.new e
+    end
 
-      begin
-        YAML.load_file(path)
-      rescue Psych::SyntaxError => e
-        raise InvalidSyntaxError.new e
+    def load_key(path, key)
+      if File.exist?(path)
+        config(path)[key]
       end
+    rescue Psych::SyntaxError => e
+      raise InvalidSyntaxError.new e
+    end
+
+    private
 
+    def config(path)
+      YAML.load_file(path) || {}
     end
   end
-
 end
 

data/master_middleman/archive_drop_down_menu.rb

@@ -0,0 +1,46 @@
+module Bookbinder
+  class ArchiveDropDownMenu
+    def initialize(config, current_path: nil)
+      @config = config || default_config
+      @current_path = current_path
+    end
+
+    def title
+      directory_config.first
+    end
+
+    def dropdown_links
+      versions_to_paths.map { |version_path|
+        {version_path.keys.first => "/#{version_path.values.first}"}
+      }
+    end
+
+    private
+
+    attr_reader :config, :current_path
+
+    def versions_to_paths
+      directory_config[1..-1]
+    end
+
+    def directory_config
+      config.fetch(directory, config.fetch(root_menu_reference)) || empty_menu
+    end
+
+    def directory
+      File.dirname(current_path)
+    end
+
+    def default_config
+      { root_menu_reference => empty_menu }
+    end
+
+    def empty_menu
+      [nil]
+    end
+
+    def root_menu_reference
+      '.'
+    end
+  end
+end

data/master_middleman/bookbinder_helpers.rb

@@ -1,15 +1,9 @@
 require 'date'
-# mostly from https://github.com/multiscan/middleman-navigation but modified slightly
+require_relative 'archive_drop_down_menu'
 require_relative 'quicklinks_renderer'
 
 I18n.enforce_available_locales = false
 
-class ArchiveMenuTemplateNotFound < StandardError;
-end
-
-class ArchiveConfigFormatError < StandardError;
-end
-
 module Bookbinder
   module Navigation
     class << self
@@ -23,8 +17,44 @@ module Bookbinder
     module HelperMethods
 
       def yield_for_code_snippet(from: nil, at: nil)
-        example = CodeExample.get_instance(bookbinder_logger, section_hash: {'repository' => {'name' => from}}, local_repo_dir: config[:local_repo_dir], git_accessor: config[:git_accessor])
-        snippet, language = example.get_snippet_and_language_at(at)
+        git_accessor = config[:git_accessor]
+        local_repo_dir = config[:local_repo_dir]
+        attributes = {'repository' => {'name' => from}}
+        workspace = config[:workspace]
+        code_example_reader = CodeExampleReader.new(bookbinder_logger)
+
+        vcs_repo =
+          if local_repo_dir
+            GitHubRepository.
+              build_from_local(bookbinder_logger,
+                               attributes,
+                               local_repo_dir,
+                               git_accessor).
+              tap { |repo| repo.copy_from_local(workspace) }
+          else
+            GitHubRepository.
+              build_from_remote(bookbinder_logger, attributes, nil, git_accessor).
+              tap { |repo| repo.copy_from_remote(workspace) }
+          end
+        example = code_example_repo.get_instance(attributes,
+                                                 vcs_repo: vcs_repo,
+                                                 build: ->(path_to_repository,
+                                                     full_name,
+                                                     copied,
+                                                     _,
+                                                     destination_dir,
+                                                     directory_name) {
+                                                   CodeExample.new(path_to_repository,
+                                                                   full_name,
+                                                                   copied,
+                                                                   destination_dir,
+                                                                   directory_name)
+        })
+        snippet, language = code_example_reader.get_snippet_and_language_at(at,
+                                                                            example.path_to_repository,
+                                                                            example.copied,
+                                                                            example.full_name)
+
         delimiter = '```'
 
         snippet.prepend("#{delimiter}#{language}\n").concat("\n#{delimiter}")
@@ -43,20 +73,13 @@ module Bookbinder
       end
 
       def yield_for_archive_drop_down_menu
-        if config.respond_to?(:archive_menu)
-          title = config[:archive_menu].first
-          links = config[:archive_menu][1..-1]
-
-          new_links_based_from_root = links.map do |link|
-            link_from_root = link.dup
-            link_from_root.map do |k, v|
-              link_from_root[k] = "/#{v}"
-            end
-            link_from_root
-          end
+        menu = ArchiveDropDownMenu.new(
+          config[:archive_menu],
+          current_path: current_page.path
+        )
 
-          partial 'archive_menus/default', locals: { menu_title: title, dropdown_links: new_links_based_from_root }
-        end
+        partial 'archive_menus/default', locals: { menu_title: menu.title,
+                                                   dropdown_links: menu.dropdown_links }
       end
 
       def breadcrumbs
@@ -72,13 +95,6 @@ module Bookbinder
         OpenStruct.new config[:template_variables]
       end
 
-      def modified_date(format=nil)
-        current_file_in_repo = current_path.dup.gsub(File.basename(current_path), File.basename(current_page.source_file))
-        current_section = get_section_or_book_for(current_file_in_repo)
-        modified_time = current_section.get_modification_date_for(file: current_file_in_repo, full_path: current_page.source_file)
-        (format.nil? ? modified_time : modified_time.strftime(format))
-      end
-
       def quick_links
         page_src = File.read(current_page.source_file)
         quicklinks_renderer = QuicklinksRenderer.new(vars)
@@ -87,17 +103,8 @@ module Bookbinder
 
       private
 
-      def get_section_or_book_for(path)
-        sections = config[:sections]
-        book = config[:book]
-
-        raise "Book or Selections are incorrectly specified for Middleman." if book.nil? || sections.nil?
-
-        current_section = nil
-        sections.each { |section| current_section = section if File.dirname(current_path).match(/^#{section.directory}/) }
-
-        return book if current_section.nil?
-        return current_section
+      def code_example_repo
+        @code_example_repo ||= Repositories::SectionRepository.new(bookbinder_logger)
       end
 
       def index_subnav

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -13,24 +13,24 @@ authors:
 - Matthew Boedicker
 - Frank Kotsianas
 autorequire: 
-bindir: bin
+bindir: install_bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -73,20 +73,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: padrino-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
@@ -157,34 +143,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.12.3
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: anemone
   requirement: !ruby/object:Gem::Requirement
@@ -255,20 +213,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -353,20 +297,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A command line utility to be run in Book repositories to stitch together
   their constituent Markdown repos into a static-HTML-serving application
 email: gmorgan@gopivotal.com
@@ -375,10 +305,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/bookbinder
-- lib/bookbinder.rb
 - lib/bookbinder/app_fetcher.rb
 - lib/bookbinder/archive.rb
+- lib/bookbinder/archive_menu_configuration.rb
 - lib/bookbinder/artifact_namer.rb
 - lib/bookbinder/blue_green_app.rb
 - lib/bookbinder/book.rb
@@ -388,14 +317,17 @@ files:
 - lib/bookbinder/cli.rb
 - lib/bookbinder/cli_error.rb
 - lib/bookbinder/code_example.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/bookbinder_command.rb
 - lib/bookbinder/commands/build_and_push_tarball.rb
+- lib/bookbinder/commands/chain.rb
 - lib/bookbinder/commands/generate_pdf.rb
 - lib/bookbinder/commands/help.rb
 - lib/bookbinder/commands/naming.rb
-- lib/bookbinder/commands/publish.rb
 - lib/bookbinder/commands/push_local_to_staging.rb
 - lib/bookbinder/commands/push_to_prod.rb
 - lib/bookbinder/commands/run_publish_ci.rb
@@ -408,33 +340,47 @@ files:
 - lib/bookbinder/css_link_checker.rb
 - lib/bookbinder/directory_helpers.rb
 - lib/bookbinder/distributor.rb
+- lib/bookbinder/dita_html_to_middleman_formatter.rb
+- lib/bookbinder/dita_section.rb
+- lib/bookbinder/dita_section_gatherer.rb
+- lib/bookbinder/git_accessor.rb
 - lib/bookbinder/git_client.rb
 - lib/bookbinder/git_hub_repository.rb
+- lib/bookbinder/local_dita_preprocessor.rb
+- lib/bookbinder/local_dita_to_html_converter.rb
 - lib/bookbinder/local_file_system_accessor.rb
 - lib/bookbinder/middleman_runner.rb
 - lib/bookbinder/pdf_generator.rb
 - lib/bookbinder/publisher.rb
 - lib/bookbinder/pusher.rb
 - lib/bookbinder/remote_yaml_credential_provider.rb
+- lib/bookbinder/repositories/command_repository.rb
+- lib/bookbinder/repositories/section_repository.rb
 - lib/bookbinder/section.rb
 - lib/bookbinder/server_director.rb
 - lib/bookbinder/shell_out.rb
+- lib/bookbinder/sheller.rb
 - lib/bookbinder/sieve.rb
 - lib/bookbinder/sitemap_generator.rb
 - lib/bookbinder/spider.rb
 - lib/bookbinder/stabilimentum.rb
-- lib/bookbinder/usage_messenger.rb
+- lib/bookbinder/terminal.rb
+- lib/bookbinder/user_message.rb
+- lib/bookbinder/user_message_presenter.rb
 - lib/bookbinder/yaml_loader.rb
-- master_middleman/bookbinder_helpers.rb
-- master_middleman/config.rb
-- master_middleman/quicklinks_renderer.rb
-- master_middleman/submodule_aware_assets.rb
-- template_app/Gemfile
-- template_app/Gemfile.lock
+- lib/bookbinder.rb
 - template_app/app.rb
 - template_app/config.ru
+- template_app/Gemfile
+- template_app/Gemfile.lock
 - template_app/lib/rack_static.rb
 - template_app/lib/vienna_application.rb
+- master_middleman/archive_drop_down_menu.rb
+- master_middleman/bookbinder_helpers.rb
+- master_middleman/config.rb
+- master_middleman/quicklinks_renderer.rb
+- master_middleman/submodule_aware_assets.rb
+- install_bin/bookbinder
 homepage: https://github.com/cloudfoundry-incubator/bookbinder
 licenses:
 - MIT
@@ -455,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Markdown to Rackup application documentation generator