bookbindery 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4186b0031cc1db33f20038d884a71624f845d175
-  data.tar.gz: 439d522cdaba03d005039b45e44b9b3917dab82d
+  metadata.gz: 9f6a8e4eb39aa0fd160b3172ba64ea6b9235cf00
+  data.tar.gz: 336570ec41b4e7ba131acab5565a9c210e122227
 SHA512:
-  metadata.gz: 384fc6c0bf881e81cc2fd34040af92eae6b83150cbdd14b441d72d84355d2a8ce4dcb0044a892de797eec4f20b3660739fbb99529a0a7b0d57a8295fa827a0a6
-  data.tar.gz: 3310d764be0a0d8063e9142ccff2c55046f4378b255a8e5fe63ceb8919a5eb5ddbf10cf8d24584810f5b78678365654a931a2fc66df3f11b9649f54255fbacaf
+  metadata.gz: e6b3d8dbd2a9b312574024ff56ed8669de906b7290b1de9a5de3e2bb1ea372fc2b6d11bdf7f7f8239153dac485135e4c8993ed814ca3ef6ebe5d62e1ae815848
+  data.tar.gz: a6bcdfcc72d5a57a090a88bc60cddcd74d2f0bb5715b34db798310104181843c25feb50089aaf5d2e7b6f06169226c02dfb2e36a40f80ae0aced02a663c622bf

data/lib/bookbinder/cli.rb

@@ -3,7 +3,6 @@ require_relative 'command_runner'
 require_relative 'command_validator'
 require_relative 'commands/collection'
 require_relative 'config/cf_credentials'
-require_relative 'config/configuration'
 require_relative 'terminal'
 
 module Bookbinder
@@ -16,7 +15,11 @@ module Bookbinder
       command_name, *command_arguments = args
 
       logger = DeprecatedLogger.new
-      commands = Commands::Collection.new(logger, version_control_system)
+      commands = Commands::Collection.new(
+        logger,
+        {out: $stdout, err: $stderr},
+        version_control_system
+      )
 
       command_validator = CommandValidator.new(commands, commands.help.usage_message)
       command_runner = CommandRunner.new(logger, commands)

data/lib/bookbinder/commands/bind.rb

@@ -120,7 +120,6 @@ module Bookbinder
                                   subnavs)
         file_system_accessor.copy output_locations.build_dir, output_locations.public_dir
 
-        raise "Your public host must be a single String." unless host_for_sitemap.is_a?(String)
         result = sitemap_writer.write(
           host_for_sitemap,
           streams,

data/lib/bookbinder/commands/collection.rb

@@ -28,8 +28,9 @@ module Bookbinder
     class Collection
       include Enumerable
 
-      def initialize(logger, version_control_system)
+      def initialize(logger, base_streams, version_control_system)
         @logger = logger
+        @base_streams = base_streams
         @version_control_system = version_control_system
       end
 
@@ -46,7 +47,7 @@ module Bookbinder
 
       private
 
-      attr_reader :logger, :version_control_system
+      attr_reader :logger, :base_streams, :version_control_system
 
       def list
         standard_commands + flags
@@ -58,6 +59,12 @@ module Bookbinder
 
       def standard_commands
         @standard_commands ||= [
+          Commands::Generate.new(
+            local_file_system_accessor,
+            Sheller.new,
+            Dir.pwd,
+            colored_streams
+          ),
           build_and_push_tarball,
           bind,
           Commands::PushFromLocal.new(logger, configuration_fetcher, 'acceptance'),
@@ -68,8 +75,7 @@ module Bookbinder
           Commands::UpdateLocalDocRepos.new(
             colored_streams,
             configuration_fetcher,
-            version_control_system,
-            local_file_system_accessor
+            version_control_system
           ),
         ]
       end
@@ -118,9 +124,9 @@ module Bookbinder
       end
 
       def colored_streams
-        { out: $stdout,
-          success: Streams::ColorizedStream.new(Colorizer::Colors.green, $stdout),
-          err: Streams::ColorizedStream.new(Colorizer::Colors.red, $stderr) }
+        { out: base_streams[:out],
+          success: Streams::ColorizedStream.new(Colorizer::Colors.green, base_streams[:out]),
+          err: Streams::ColorizedStream.new(Colorizer::Colors.red, base_streams[:err]) }
       end
 
       def configuration_fetcher

data/lib/bookbinder/commands/generate.rb

@@ -0,0 +1,94 @@
+module Bookbinder
+  module Commands
+    class Generate
+      include Commands::Naming
+
+      def initialize(fs, sheller, context_dir, streams)
+        @fs = fs
+        @sheller = sheller
+        @context_dir = context_dir
+        @streams = streams
+      end
+
+      def command_for?(name)
+        name == 'generate'
+      end
+
+      def usage
+        ["generate <book-name>",
+         "Generate a skeleton book that can be bound with 'bookbinder bind'"]
+      end
+
+      def run((name))
+        path = context_dir.join(name)
+        streams[:out].puts "Generating book at #{path}…"
+        if fs.file_exist?(path)
+          streams[:err].puts "Cannot generate book: directory already exists"
+          1
+        elsif install(path).success?
+          streams[:success].puts "Successfully generated book at #{path}"
+          0
+        else
+          1
+        end
+      end
+
+      private
+
+      attr_reader :fs, :sheller, :streams
+
+      def install(path)
+        make_middleman_dir(path)
+        init_gemfile(path)
+        init_config(path)
+        init_index(path)
+        bundle_install(path)
+      end
+
+      def make_middleman_dir(path)
+        fs.make_directory(path.join('master_middleman/build'))
+      end
+
+      def init_gemfile(path)
+        fs.write(
+          text: <<-GEMFILE,
+source "https://rubygems.org"
+
+gem "bookbindery"
+          GEMFILE
+          to: path.join('Gemfile')
+        )
+      end
+
+      def init_config(path)
+        fs.write(
+          text: YAML.dump(
+            'book_repo' => '',
+            'public_host' => '',
+          ),
+          to: path.join('config.yml')
+        )
+      end
+
+      def init_index(path)
+        fs.write(
+          text: '# Empty book',
+          to: path.join('master_middleman/source/index.md.erb')
+        )
+      end
+
+      def bundle_install(path)
+        Bundler.with_clean_env do
+          sheller.run_command(
+            "bundle install --binstubs --gemfile=#{path.join('Gemfile')}",
+            out: streams[:out], err: streams[:err]
+          )
+        end
+      end
+
+      def context_dir
+        Pathname(@context_dir)
+      end
+    end
+  end
+end

data/lib/bookbinder/commands/update_local_doc_repos.rb

@@ -7,11 +7,10 @@ module Bookbinder
     class UpdateLocalDocRepos
       include Commands::Naming
 
-      def initialize(streams, configuration_fetcher, version_control_system, filesystem)
+      def initialize(streams, configuration_fetcher, version_control_system)
         @streams = streams
         @configuration_fetcher = configuration_fetcher
         @version_control_system = version_control_system
-        @filesystem = filesystem
       end
 
       def usage
@@ -33,8 +32,7 @@ module Bookbinder
 
       attr_reader(:streams,
                   :configuration_fetcher,
-                  :version_control_system,
-                  :filesystem)
+                  :version_control_system)
 
       def report(result)
         messages = { true => "updated", false => "skipping (#{result.reason})" }

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

@@ -7,17 +7,8 @@ module Bookbinder
         MissingRequiredKeyError = Class.new(RuntimeError)
 
         def check(config)
-          missing_keys = []
-
-          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
+          missing_keys = Config::Configuration::CONFIG_REQUIRED_KEYS.reject { |key| config.has_option?(key) }
+          if missing_keys.any?
             MissingRequiredKeyError.new("Your config.yml is missing required key(s). Required keys are #{missing_keys.join(", ")}.")
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -279,6 +279,7 @@ files:
 - lib/bookbinder/commands/build_and_push_tarball.rb
 - lib/bookbinder/commands/chain.rb
 - lib/bookbinder/commands/collection.rb
+- lib/bookbinder/commands/generate.rb
 - lib/bookbinder/commands/help.rb
 - lib/bookbinder/commands/naming.rb
 - lib/bookbinder/commands/push_from_local.rb