ascii_binder 0.1.3.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c8644fe48f791b2f5ba0fcaf2d25da36f665b7d
-  data.tar.gz: c14c1da016dc7b1541d06cbf25c57423092449ae
+  metadata.gz: bcf4ffd260a5287efafd4fb3cc50fcf11d113a1a
+  data.tar.gz: 4e60310acce7c1481c773831bb8c32c3d95e29ba
 SHA512:
-  metadata.gz: cfbe463b19be63661fbcbd2a6568ed1dfb09263074278fd2746602776f83167cb283f81fe193a1d0d9189610f002ee2f209ee5346af19b7125cec221c08f6231
-  data.tar.gz: 8273e7ceaf0db790770810dc6501798234913ae8f9442c29ace030969246e0b49acb9cff89025cf435dcfe815aa70e540692978b50098170830160d17abe36df
+  metadata.gz: d9917eaeb2fb1630066889ea8d74fa55ea399ad54706da7ae1a7bbb6e00343628fd4b97bfc731e2f3aaca93e71eaa8b8bbd6a3016ca31057c715c7e2ec965087
+  data.tar.gz: de6dde4b4042a3690a7ac2dd6440ae981cb031a2391fa262257150af1159e409e368fbd20aeb47c5128d6dcf9164d980a1d561a6b9cbe833901ec79f52fd2a2d

data/Dockerfile

@@ -1,5 +1,6 @@
 FROM centos/ruby-22-centos7
 
+RUN scl enable rh-ruby22 -- gem install listen -v 3.0.8
 RUN scl enable rh-ruby22 -- gem install ascii_binder
 USER root
 RUN yum install -y java-1.7.0-openjdk && \

data/ascii_binder.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'asciidoctor'
+  spec.add_dependency 'asciidoctor', '~> 1.5.4'
   spec.add_dependency 'asciidoctor-diagram'
   spec.add_dependency 'git'
   spec.add_dependency 'guard'

data/lib/ascii_binder/helpers.rb

@@ -85,6 +85,22 @@ module AsciiBinder
       Time.now.utc
     end
 
+    def notice(hey,message,newline = false)
+      # TODO: (maybe) redirect everything to stderr
+      if newline
+        puts "\n"
+      end
+      puts "#{hey}: #{message}"
+    end
+
+    def warning(message,newline = false)
+      notice("WARNING",message,newline)
+    end
+
+    def nl_warning(message)
+      warning(message,true)
+    end
+
     def git
       @git ||= Git.open(source_dir)
     end
@@ -138,7 +154,7 @@ module AsciiBinder
         # The new filename '_topic_map.yml' couldn't be found;
         # switch to the old one and warn the user.
         use_file = BUILD_FILENAME
-        puts "WARNING: '#{BUILD_FILENAME}' is a deprecated filename. Rename this to '#{TOPIC_MAP_FILENAME}'."
+        warning "'#{BUILD_FILENAME}' is a deprecated filename. Rename this to '#{TOPIC_MAP_FILENAME}'."
       end
       use_file
     end
@@ -215,7 +231,7 @@ module AsciiBinder
         end
       end
       if nonexistent_topics.length > 0
-        puts "\nWARNING: The #{build_config_file} file on branch '#{branch}' references nonexistant topics:\n" + nonexistent_topics.map{ |topic| "- #{topic}" }.join("\n")
+        nl_warning "The #{build_config_file} file on branch '#{branch}' references nonexistant topics:\n" + nonexistent_topics.map{ |topic| "- #{topic}" }.join("\n")
       end
     end
 
@@ -471,6 +487,7 @@ module AsciiBinder
         'idprefix=',
         'idseparator=-',
         'sectanchors',
+        'data-uri',
       ].concat(more_attrs)
     end
 
@@ -546,7 +563,7 @@ module AsciiBinder
         remove_found_config_files(local_branch,branch_build_config,branch_orphan_files)
 
         if branch_orphan_files.length > 0 and single_page.nil?
-          puts "\nWARNING: Branch '#{local_branch}' includes the following .adoc files that are not referenced in the #{build_config_file} file:\n" + branch_orphan_files.map{ |file| "- #{file}" }.join("\n")
+          nl_warning "Branch '#{local_branch}' includes the following .adoc files that are not referenced in the #{build_config_file} file:\n" + branch_orphan_files.map{ |file| "- #{file}" }.join("\n")
         end
 
         # Run all distros.
@@ -743,17 +760,10 @@ module AsciiBinder
         "product-author=#{distro_config["author"]}"
       ])
 
-      # Because we render only the body of the article with AsciiDoctor, the full article title
-      # would be lost in conversion. So, use the _build_cfg.yml 'Name' as a fallback but try
-      # to read the full article title out of the file itself.
-      file_lines    = topic_adoc.split("\n")
-      article_title = topic['Name']
-      if file_lines.length > 0
-        article_title  = file_lines[0].gsub(/^\=\s+/, '').gsub(/\s+$/, '').gsub(/\{product-title\}/, distro_config["name"]).gsub(/\{product-version\}/, branch_config["name"])
-      end
-      topic_adoc = file_lines.join("\n")
+      doc = Asciidoctor.load topic_adoc, :header_footer => false, :safe => :unsafe, :attributes => page_attrs
+      article_title = doc.doctitle || topic['Name']
 
-      topic_html = Asciidoctor.render topic_adoc, :header_footer => false, :safe => :unsafe, :attributes => page_attrs
+      topic_html = doc.render
       dir_depth  = ''
       if branch_config['dir'].split('/').length > 1
         dir_depth = '../' * (branch_config['dir'].split('/').length - 1)

data/lib/ascii_binder/version.rb

@@ -1,3 +1,3 @@
 module AsciiBinder
-  VERSION = "0.1.3.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ascii_binder
 version: !ruby/object:Gem::Version
-  version: 0.1.3.2
+  version: 0.1.4
 platform: ruby
 authors:
 - N. Harrison Ripps
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,16 +43,16 @@ dependencies:
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: asciidoctor-diagram
   requirement: !ruby/object:Gem::Requirement