bookbindery 2.1.5 → 3.0.1

data/lib/bookbinder/values/output_locations.rb

@@ -2,17 +2,40 @@ require_relative '../directory_helpers'
 
 module Bookbinder
   class OutputLocations
-    attr_reader :final_app_dir, :layout_repo_dir
+    attr_reader :layout_repo_dir
 
     include DirectoryHelperMethods
 
-    def initialize(final_app_dir: nil, layout_repo_dir: nil, context_dir: nil, local_repo_dir: nil)
+    def initialize(final_app_dir: nil,
+                   layout_repo_dir: nil,
+                   context_dir: nil,
+                   local_repo_dir: nil)
       @final_app_dir = final_app_dir
       @layout_repo_dir = layout_repo_dir
       @context_dir = context_dir
       @local_repo_dir = local_repo_dir
     end
 
+    def final_app_dir
+      Pathname(@final_app_dir)
+    end
+
+    def public_dir
+      final_app_dir.join('public')
+    end
+
+    def build_dir
+      master_dir.join('build/.')
+    end
+
+    def workspace_dir
+      master_dir.join('source')
+    end
+
+    def master_dir
+      output_dir.join('master_middleman')
+    end
+
     def output_dir
       context_dir.join(output_dir_name)
     end

data/lib/bookbinder/values/user_message.rb

@@ -1,5 +1,6 @@
-module Bookbinder
+require 'ostruct'
 
+module Bookbinder
   UserMessage = Struct.new(:message, :escalation_type) do
     def error?
       escalation_type == EscalationType.error
@@ -11,5 +12,4 @@ module Bookbinder
   end
 
   EscalationType = OpenStruct.new(success: 0, error: 1, warn: 2)
-
 end

data/master_middleman/bookbinder_helpers.rb

@@ -18,25 +18,15 @@ module Bookbinder
 
       def yield_for_code_snippet(from: nil, at: nil)
         git_accessor = config[:git_accessor]
-        local_repo_dir = config[:local_repo_dir]
+        cloner = config[:cloner]
         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, git_accessor).
-              tap { |repo| repo.copy_from_remote(workspace, 'master') }
-          end
-        example = code_example_repo.get_instance(attributes, vcs_repo: vcs_repo) {
+        working_copy = cloner.call(source_repo_name: from,
+                                   source_ref: 'master',
+                                   destination_parent_dir: workspace)
+        example = code_example_repo.get_instance(attributes, working_copy: working_copy) {
           |path, name, copied, _, dest, directory|
           CodeExample.new(path, name, copied, dest, directory)
         }

data/template_app/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    libv8 (3.16.14.3)
+    libv8 (3.16.14.7)
     rack (1.5.2)
     rack-rewrite (1.5.0)
     ref (1.0.5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 3.0.1
 platform: ruby
 authors:
 - Mike Grafton
@@ -15,20 +15,20 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
@@ -49,72 +49,72 @@ dependencies:
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.5
 - !ruby/object:Gem::Dependency
   name: middleman-syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: vienna
   requirement: !ruby/object:Gem::Requirement
@@ -129,172 +129,144 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: wkhtmltopdf-binary-cf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: anemone
   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: css_parser
   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: puma
   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: popen4
-  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: rack-rewrite
   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
     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: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: license_finder
   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'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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
@@ -305,6 +277,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- install_bin/bookbinder
+- lib/bookbinder.rb
 - lib/bookbinder/app_fetcher.rb
 - lib/bookbinder/archive.rb
 - lib/bookbinder/archive_menu_configuration.rb
@@ -317,10 +291,10 @@ files:
 - lib/bookbinder/command_runner.rb
 - lib/bookbinder/command_validator.rb
 - lib/bookbinder/commands/bind.rb
+- lib/bookbinder/commands/bind/directory_preparer.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/push_from_local.rb
@@ -329,7 +303,9 @@ files:
 - lib/bookbinder/commands/tag.rb
 - lib/bookbinder/commands/update_local_doc_repos.rb
 - lib/bookbinder/commands/version.rb
+- lib/bookbinder/config/aws_credentials.rb
 - lib/bookbinder/config/bind_config_factory.rb
+- lib/bookbinder/config/cf_credentials.rb
 - lib/bookbinder/config/local_bind_configuration.rb
 - lib/bookbinder/config/remote_bind_configuration.rb
 - lib/bookbinder/configuration.rb
@@ -339,24 +315,24 @@ files:
 - lib/bookbinder/deprecated_logger.rb
 - lib/bookbinder/directory_helpers.rb
 - lib/bookbinder/distributor.rb
+- lib/bookbinder/dita_command_creator.rb
 - lib/bookbinder/dita_html_to_middleman_formatter.rb
 - lib/bookbinder/dita_preprocessor.rb
 - lib/bookbinder/dita_section_gatherer_factory.rb
-- lib/bookbinder/dita_to_html_converter.rb
 - lib/bookbinder/errors/cli_error.rb
 - lib/bookbinder/git_accessor.rb
 - lib/bookbinder/git_client.rb
 - lib/bookbinder/git_hub_repository.rb
 - lib/bookbinder/html_document_manipulator.rb
 - lib/bookbinder/ingest/cloner_factory.rb
+- lib/bookbinder/ingest/destination_directory.rb
 - lib/bookbinder/ingest/git_hub_repository_cloner.rb
 - lib/bookbinder/ingest/local_filesystem_cloner.rb
+- lib/bookbinder/ingest/working_copy.rb
 - lib/bookbinder/local_dita_section_gatherer.rb
 - lib/bookbinder/local_file_system_accessor.rb
 - lib/bookbinder/middleman_runner.rb
-- lib/bookbinder/pdf_generator.rb
 - lib/bookbinder/post_production/sitemap_writer.rb
-- lib/bookbinder/publisher.rb
 - lib/bookbinder/pusher.rb
 - lib/bookbinder/remote_dita_section_gatherer.rb
 - lib/bookbinder/remote_yaml_credential_provider.rb
@@ -369,9 +345,15 @@ files:
 - lib/bookbinder/sitemap_generator.rb
 - lib/bookbinder/spider.rb
 - lib/bookbinder/stabilimentum.rb
+- lib/bookbinder/streams/switchable_stdout_and_red_stderr.rb
 - lib/bookbinder/subnav_formatter.rb
 - lib/bookbinder/terminal.rb
-- lib/bookbinder/user_message_presenter.rb
+- lib/bookbinder/validation_checkers/archive_menu_checker.rb
+- lib/bookbinder/validation_checkers/config_version_checker.rb
+- lib/bookbinder/validation_checkers/dita_section_checker.rb
+- lib/bookbinder/validation_checkers/duplicate_section_name_checker.rb
+- lib/bookbinder/validation_checkers/repository_name_presence_checker.rb
+- lib/bookbinder/validation_checkers/required_keys_checker.rb
 - lib/bookbinder/values/blue_green_app.rb
 - lib/bookbinder/values/cf_routes.rb
 - lib/bookbinder/values/code_example.rb
@@ -381,19 +363,17 @@ files:
 - lib/bookbinder/values/subnav.rb
 - lib/bookbinder/values/user_message.rb
 - lib/bookbinder/yaml_loader.rb
-- 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
+- template_app/Gemfile
+- template_app/Gemfile.lock
+- template_app/app.rb
+- template_app/config.ru
+- template_app/lib/rack_static.rb
+- template_app/lib/vienna_application.rb
 homepage: https://github.com/cloudfoundry-incubator/bookbinder
 licenses:
 - MIT
@@ -404,17 +384,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Markdown to Rackup application documentation generator