bookbindery 8.3.2 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6dcbf563b76d259abb7e45182c623fe03a3f1c1
-  data.tar.gz: 15a3e3a8154bf626d6a0d301eb959129afee3aa3
+  metadata.gz: 866257f1ac572c2ed61712aa26c5d31f99694787
+  data.tar.gz: 77c580150aaac488956edea1beebee0fee7846a3
 SHA512:
-  metadata.gz: 4f0e93744de2133b328cb7dd27cf571f32c809cf774af9411a2dbad803422835f7e3873eccbc477e08df96f741269bcfc79ddeff77b1c1eddf5b8b043c73b0ed
-  data.tar.gz: ab12374a08a7cd83c38f0393bee58078149e41fefaa5b51c48bd3e08d154be9f565fc4ea71d78b3bc06e649f2fd1c43af74640badea4230950f55f138044d0bf
+  metadata.gz: e6eecd24ba2a2204eeb517412e487447ad09e103459212c0bb18c6bdf87ab65472a286492828e1bdd410abc62be703472059d9782a0145f488467eb80fa18240
+  data.tar.gz: 9861881d93cd8256c7be097cf9091810bacfce6b4015c68cfa231fa224717e50773b9bad1bb5fa7e6004f992a6a4822ae4b6cfef6ad1744f0ab6750eb36a03da

data/bookbinder.gemspec

@@ -2,7 +2,7 @@ require 'base64'
 
 Gem::Specification.new do |s|
   s.name        = 'bookbindery'
-  s.version     = '8.3.2'
+  s.version     = '8.4.0'
   s.summary     = 'Markdown to Rackup application documentation generator'
   s.description = 'A command line utility to be run in Book repositories to stitch together their constituent Markdown repos into a static-HTML-serving application'
   s.authors     = ['Mike Grafton', 'Lucas Marks', 'Gavin Morgan', 'Nikhil Gajwani', 'Dan Wendorf', 'Brenda Chan', 'Matthew Boedicker', 'Andrew Bruce', 'Frank Kotsianas', 'Elena Sharma', 'Christa Hartsock', 'Michael Trestman', 'Alpha Chen', 'Sarah McAlear', 'Gregg Van Hove']
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '~> 2.3.0'
   s.add_runtime_dependency 'fog-aws', ['~> 0.7.1']
   s.add_runtime_dependency 'ansi', ['~> 1.4']
-  s.add_runtime_dependency 'unf', ['~> 0.1']
   s.add_runtime_dependency 'middleman', ['~> 3.4.0']
   s.add_runtime_dependency 'middleman-livereload', ['~> 3.4.3']
   s.add_runtime_dependency 'middleman-syntax', ['~> 2.0']
@@ -27,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'css_parser'
   s.add_runtime_dependency 'puma'
   s.add_runtime_dependency 'rack-rewrite'
-  s.add_runtime_dependency 'therubyracer'
   s.add_runtime_dependency 'git', '~> 1.2.8'
   s.add_runtime_dependency 'nokogiri', ['1.6.7.2']
   s.add_runtime_dependency 'thor'

data/lib/bookbinder/commands/bind.rb

@@ -78,7 +78,7 @@ module Bookbinder
         end
 
         generation_result = middleman_runner.run(
-          ["build", bind_options.verbosity].compact.join(" "),
+          'build --verbose',
           streams: bind_options.streams,
           output_locations: output_locations,
           config: config_decorator.generate(bind_config, sections),

data/lib/bookbinder/commands/components/command_options.rb

@@ -1,4 +1,7 @@
 require_relative '../../sheller'
+require_relative '../../colorizer'
+require_relative '../../streams/colorized_stream'
+require_relative '../../streams/filter_stream'
 
 module Bookbinder
   module Commands
@@ -31,7 +34,8 @@ module Bookbinder
 
         def streams
           base_streams.merge(
-            out: verbosity ? base_streams[:out] : Sheller::DevNull.new,
+            out: verbosity ? base_streams[:out] :
+              Streams::FilterStream.new(/^\s*error/i, Streams::ColorizedStream.new(Colorizer::Colors.red, base_streams[:out])),
           )
         end
 

data/lib/bookbinder/streams/filter_stream.rb

@@ -0,0 +1,22 @@
+module Bookbinder
+  module Streams
+    class FilterStream
+      def initialize(matcher_regex, stream)
+        @matcher_regex = matcher_regex
+        @stream = stream
+      end
+
+      def puts(line)
+        stream.puts(line) if line.match(matcher_regex)
+      end
+
+      def <<(line)
+        stream << line if line.match(matcher_regex)
+      end
+
+      private
+
+      attr_reader :matcher_regex, :stream
+    end
+  end
+end

data/template_app/Gemfile

@@ -4,5 +4,6 @@ ruby '2.3.0'
 
 gem 'rack'
 gem 'rack-rewrite'
+gem 'puma'
 gem 'therubyracer'
 gem 'sendgrid-ruby'

data/template_app/Gemfile.lock

@@ -6,6 +6,7 @@ GEM
     libv8 (3.16.14.7)
     mimemagic (0.3.0)
     multipart-post (2.0.0)
+    puma (3.3.0)
     rack (1.5.2)
     rack-rewrite (1.5.0)
     ref (1.0.5)
@@ -22,6 +23,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  puma
   rack
   rack-rewrite
   sendgrid-ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookbindery
 version: !ruby/object:Gem::Version
-  version: 8.3.2
+  version: 8.4.0
 platform: ruby
 authors:
 - Mike Grafton
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: install_bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !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
@@ -192,20 +178,6 @@ dependencies:
     - - ">="
       - !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
@@ -416,6 +388,7 @@ files:
 - lib/bookbinder/spider.rb
 - lib/bookbinder/stabilimentum.rb
 - lib/bookbinder/streams/colorized_stream.rb
+- lib/bookbinder/streams/filter_stream.rb
 - lib/bookbinder/subnav/json_from_html_toc.rb
 - lib/bookbinder/subnav/json_from_markdown_toc.rb
 - lib/bookbinder/subnav/json_props_creator.rb