bookbindery 4.1.0 → 4.1.1

data/lib/bookbinder/deploy/distributor.rb

@@ -0,0 +1,76 @@
+require_relative '../cf_command_runner'
+require_relative '../ingest/destination_directory'
+require_relative '../sheller'
+require_relative 'app_fetcher'
+require_relative 'archive'
+require_relative 'artifact'
+require_relative 'pusher'
+
+module Bookbinder
+  module Deploy
+    class Distributor
+      EXPIRATION_HOURS = 2
+
+      def self.build(streams, archive, deployment)
+        cf_command_runner = CfCommandRunner.new(streams, Sheller.new, deployment.cf_credentials, deployment.artifact_full_path)
+        cf_app_fetcher = AppFetcher.new(deployment.flat_routes, cf_command_runner)
+        pusher = Pusher.new(cf_command_runner, cf_app_fetcher)
+        new(streams, archive, pusher, deployment)
+      end
+
+      def initialize(streams, archive, pusher, deployment)
+        @streams = streams
+        @archive = archive
+        @pusher = pusher
+        @deployment = deployment
+      end
+
+      def distribute
+        push_app
+        nil
+      rescue => e
+        streams[:err].puts(<<-ERROR.chomp)
+  [ERROR] #{e.message}
+  [DEBUG INFO]
+  CF organization: #{cf_credentials.organization}
+  CF space: #{cf_credentials.space}
+  CF account: #{cf_credentials.username}
+  routes: #{cf_credentials.routes}
+        ERROR
+        raise
+      ensure
+        upload_trace
+      end
+
+      private
+
+      attr_reader :archive, :deployment, :pusher, :streams
+
+      def push_app
+        pusher.push(deployment.app_dir)
+      end
+
+      def upload_trace
+        uploaded_file = archive.upload_file(deployment.green_builds_bucket, deployment.artifact_filename, deployment.artifact_full_path)
+        log_success(
+          ["Your cf trace file is available at: #{uploaded_file.url(Time.now.to_i + EXPIRATION_HOURS*60*60)}",
+           "This URL will expire in #{EXPIRATION_HOURS} hours, so if you need to share it, make sure to save a copy now."]
+        )
+      rescue Errno::ENOENT
+        log_error("Could not find CF trace file: #{deployment.artifact_full_path}")
+      end
+
+      def cf_credentials
+        deployment.cf_credentials
+      end
+
+      def log_success(message)
+        streams[:success].puts(message)
+      end
+
+      def log_error(message)
+        streams[:err].puts(message)
+      end
+    end
+  end
+end

data/lib/bookbinder/deploy/failure.rb

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

data/lib/bookbinder/deploy/pusher.rb

@@ -0,0 +1,34 @@
+module Bookbinder
+  module Deploy
+    class Pusher
+      def initialize(cf_cli, app_fetcher)
+        @cf_cli = cf_cli
+        @app_fetcher = app_fetcher
+      end
+
+      def push(app_dir)
+        Dir.chdir(app_dir) do
+          cf_cli.login
+
+          old_app = app_fetcher.fetch_current_app
+
+          if old_app
+            new_app = old_app.with_flipped_name
+            cf_cli.start(new_app)
+            cf_cli.push(new_app)
+            cf_cli.map_routes(new_app)
+            cf_cli.takedown_old_target_app(old_app)
+          else
+            new_app = cf_cli.new_app
+            cf_cli.push(new_app)
+            cf_cli.map_routes(new_app)
+          end
+        end
+      end
+
+      private
+
+      attr_reader :cf_cli, :app_fetcher
+    end
+  end
+end

data/lib/bookbinder/deploy/success.rb

@@ -0,0 +1,16 @@
+module Bookbinder
+  module Deploy
+    class Success
+      attr_reader :reason
+
+      def initialize(reason)
+        @reason = reason
+      end
+
+      def success?
+        true
+      end
+    end
+  end
+end
+

data/lib/bookbinder/ingest/cloner_factory.rb

@@ -4,15 +4,15 @@ require_relative 'local_filesystem_cloner'
 module Bookbinder
   module Ingest
     class ClonerFactory
-      def initialize(logger, filesystem, version_control_system)
-        @logger = logger
+      def initialize(streams, filesystem, version_control_system)
+        @streams = streams
         @filesystem = filesystem
         @version_control_system = version_control_system
       end
 
       def produce(user_repo_dir)
         if user_repo_dir
-          LocalFilesystemCloner.new(logger, filesystem, user_repo_dir)
+          LocalFilesystemCloner.new(streams, filesystem, user_repo_dir)
         else
           GitCloner.new(version_control_system)
         end
@@ -20,7 +20,7 @@ module Bookbinder
 
       private
 
-      attr_reader :logger, :filesystem, :version_control_system
+      attr_reader :streams, :filesystem, :version_control_system
     end
   end
 end

data/lib/bookbinder/ingest/local_filesystem_cloner.rb

@@ -1,4 +1,3 @@
-require_relative '../deprecated_logger'
 require_relative 'destination_directory'
 require_relative 'working_copy'
 require_relative 'missing_working_copy'
@@ -6,8 +5,8 @@ require_relative 'missing_working_copy'
 module Bookbinder
   module Ingest
     class LocalFilesystemCloner
-      def initialize(logger, filesystem, user_repo_dir)
-        @logger = logger
+      def initialize(streams, filesystem, user_repo_dir)
+        @streams = streams
         @user_repo_dir = user_repo_dir
         @filesystem = filesystem
       end
@@ -25,7 +24,7 @@ module Bookbinder
 
       private
 
-      attr_reader :logger, :filesystem, :user_repo_dir
+      attr_reader :streams, :filesystem, :user_repo_dir
 
       def copy!(source_repo_name, source_dir, dest_dir)
         source_exists = filesystem.file_exist?(source_dir)
@@ -44,13 +43,13 @@ module Bookbinder
             full_name: source_repo_name,
           )
         else
-          logger.log '  skipping (not found) '.magenta + source_dir.to_s
+          streams[:out].puts "  skipping (not found) #{source_dir}"
           MissingWorkingCopy.new(source_repo_name)
         end
       end
 
       def announce_copy(source_dir)
-        logger.log '  copying '.yellow + source_dir.to_s
+        streams[:out].puts "  copying #{source_dir}"
       end
     end
   end

data/lib/bookbinder/local_file_system_accessor.rb

@@ -24,6 +24,10 @@ module Bookbinder
       File.read(path)
     end
 
+    def empty_directory(path)
+      FileUtils.rm_rf(File.join(path, '.'))
+    end
+
     def remove_directory(path)
       FileUtils.rm_rf(path)
     end
@@ -48,6 +52,11 @@ module Bookbinder
       copy file, extended_dest
     end
 
+    def link_creating_intermediate_dirs(src, dst)
+      FileUtils.mkdir_p(File.dirname(dst))
+      File.symlink(src, dst)
+    end
+
     def rename_file(path, new_name)
       new_path = File.expand_path File.join path, '..', new_name
       File.rename(path, new_path)

data/lib/bookbinder/{post_production → postprocessing}/sitemap_writer.rb

@@ -1,13 +1,18 @@
 require_relative '../server_director'
 require_relative '../spider'
+require_relative '../../../template_app/rack_app'
 
 module Bookbinder
-  module PostProduction
+  module Postprocessing
     class SitemapWriter
       def self.build(logger, final_app_directory, port)
         new(
           Spider.new(app_dir: final_app_directory),
-          ServerDirector.new(directory: final_app_directory, port: port)
+          ServerDirector.new(
+            app: RackApp.new(Pathname('redirects.rb')).app,
+            directory: final_app_directory,
+            port: port
+          )
         )
       end
 

data/lib/bookbinder/preprocessing/{copy_to_site_gen_dir.rb → link_to_site_gen_dir.rb}

@@ -1,6 +1,6 @@
 module Bookbinder
   module Preprocessing
-    class CopyToSiteGenDir
+    class LinkToSiteGenDir
       def initialize(filesystem)
         @filesystem = filesystem
       end
@@ -11,7 +11,7 @@ module Bookbinder
 
       def preprocess(sections, output_locations, *_)
         sections.each do |section|
-          filesystem.copy_contents(
+          filesystem.link_creating_intermediate_dirs(
             section.path_to_repository,
             output_locations.source_for_site_generator.join(section.destination_directory)
           )

data/lib/bookbinder/server_director.rb

@@ -1,10 +1,9 @@
 require 'puma'
-require 'rack/rewrite'
-require 'vienna'
 
 module Bookbinder
   class ServerDirector
-    def initialize(directory: nil, port: 41722)
+    def initialize(app: app, directory: nil, port: 41722)
+      @app = app
       @directory = directory
       @port = port
     end
@@ -26,12 +25,6 @@ module Bookbinder
 
     private
 
-    def app
-      if File.exists?('redirects.rb')
-        Rack::Rewrite.new(Vienna) { eval(File.read('redirects.rb')) }
-      else
-        Vienna
-      end
-    end
+    attr_reader :app
   end
 end

data/lib/bookbinder/sheller.rb

@@ -43,6 +43,10 @@ module Bookbinder
       exit_status
     end
 
-    attr_reader :view_updater
+    def get_stdout(command)
+      out = StringIO.new
+      run_command(command, out: out)
+      out.tap(&:rewind).read.chomp
+    end
   end
 end

data/master_middleman/bookbinder_helpers.rb

@@ -17,15 +17,11 @@ module Bookbinder
     module HelperMethods
 
       def yield_for_code_snippet(from: nil, at: nil)
-        git_accessor = config[:git_accessor]
-        cloner = config[:cloner]
-        attributes = {'repository' => {'name' => from}}
-        workspace = config[:workspace]
-        code_example_reader = CodeExampleReader.new(bookbinder_logger)
+        code_example_reader = CodeExampleReader.new(out: $stdout)
 
-        working_copy = cloner.call(source_repo_name: from,
-                                   source_ref: 'master',
-                                   destination_parent_dir: workspace)
+        working_copy = config[: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)
 
@@ -104,10 +100,6 @@ module Bookbinder
         end
         content_tag :li, link, :class => css_class
       end
-
-      def bookbinder_logger
-        DeprecatedLogger.new
-      end
     end
   end
 end

data/template_app/config.ru

@@ -1,9 +1,5 @@
+require 'pathname'
 require 'vienna'
-
-if File.exists?('redirects.rb')
-  require 'rack/rewrite'
-  use(Rack::Rewrite) { eval File.read('redirects.rb') }
-end
-
+require './rack_app'
 require './app'
-run Vienna
+run Bookbinder::RackApp.new(Pathname('redirects.rb')).app

data/template_app/rack_app.rb

@@ -0,0 +1,23 @@
+require 'rack/rewrite'
+require 'vienna'
+
+module Bookbinder
+  class RackApp
+    def initialize(redirect_pathname)
+      @redirect_pathname = redirect_pathname
+    end
+
+    def app
+      if redirect_pathname.exist?
+        p = redirect_pathname
+        Rack::Rewrite.new(Vienna) { eval(p.read) }
+      else
+        Vienna
+      end
+    end
+
+    private
+
+    attr_reader :redirect_pathname
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Mike Grafton
@@ -15,90 +15,90 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-30 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
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   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.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.3
 - !ruby/object:Gem::Dependency
@@ -119,140 +119,140 @@ dependencies:
   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: 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
@@ -263,19 +263,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/bookbinder/app_fetcher.rb
-- lib/bookbinder/archive.rb
-- lib/bookbinder/artifact_namer.rb
+- 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/bind/bind_options.rb
 - lib/bookbinder/commands/bind/directory_preparer.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/collection.rb
@@ -305,9 +302,18 @@ files:
 - 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/distributor.rb
 - lib/bookbinder/dita_command_creator.rb
 - lib/bookbinder/dita_html_to_middleman_formatter.rb
 - lib/bookbinder/errors/cli_error.rb
@@ -327,11 +333,10 @@ files:
 - lib/bookbinder/ingest/working_copy.rb
 - lib/bookbinder/local_file_system_accessor.rb
 - lib/bookbinder/middleman_runner.rb
-- lib/bookbinder/post_production/sitemap_writer.rb
-- lib/bookbinder/preprocessing/copy_to_site_gen_dir.rb
+- lib/bookbinder/postprocessing/sitemap_writer.rb
 - lib/bookbinder/preprocessing/dita_preprocessor.rb
+- lib/bookbinder/preprocessing/link_to_site_gen_dir.rb
 - lib/bookbinder/preprocessing/preprocessor.rb
-- lib/bookbinder/pusher.rb
 - lib/bookbinder/server_director.rb
 - lib/bookbinder/sheller.rb
 - lib/bookbinder/sieve.rb
@@ -341,25 +346,22 @@ files:
 - lib/bookbinder/streams/colorized_stream.rb
 - lib/bookbinder/subnav_formatter.rb
 - lib/bookbinder/terminal.rb
-- lib/bookbinder/time_fetcher.rb
-- lib/bookbinder/values/blue_green_app.rb
-- lib/bookbinder/values/cf_routes.rb
 - lib/bookbinder/values/output_locations.rb
 - lib/bookbinder/values/section.rb
 - lib/bookbinder/values/subnav.rb
 - lib/bookbinder/values/user_message.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
+- template_app/rack_app.rb
 homepage: https://github.com/pivotal-cf/bookbinder
 licenses:
 - MIT
@@ -370,17 +372,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.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.5
 signing_key: 
 specification_version: 4
 summary: Markdown to Rackup application documentation generator