ascii_binder 0.1.15.3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc01789783fe028afe52c42c2e7d224bcaf9b638
-  data.tar.gz: 13fa9863c7b492468fc9b3f5cc2343fa0bb53a15
+SHA256:
+  metadata.gz: ea737534633232eae04d4210d6898488aa16833da1b6e0300ee7bd5a343bcdad
+  data.tar.gz: 6b14f4acc528b4bfb7d3170c0b80831ffb8475f7c8a7f5f41f9fb0aa78ef3ff1
 SHA512:
-  metadata.gz: 4aaae00d7d9a643442177a08a27463d3c05e19100e7cdc355b2ad14263aa8cedcd2952538329385241f000c21e09ec31de99be7700e0eaf956d80659bf39911c
-  data.tar.gz: b8c5df7a27b5184c3671fb110bd6892ed24269162cf055ce8b97cc0f35701299b61c7d544c4100b1c3666b88c230063b8511cdb13dd735ea2972ef9b2c16ae1d
+  metadata.gz: ff840bec755cf9124dfc6c16845b92ac2af3cb3bebd6fe812adae4b1888b2bb31af577d797f41f326c3511b79dd4f5f1f80e06b133e000167c8b50c137384573
+  data.tar.gz: 74c3b5c8e7c03073473987bba0607974299fd3e243c292e7e6c4371a6c8e0d9c5c71664574ac820c63c51aeb6d9af8f1d95bfa46165cd755606b326542efd4d7

data/ascii_binder.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "cucumber", "~> 2.3.3"
   spec.add_development_dependency "diff_dirs", "~> 0.1.2"
   spec.add_dependency "rake", "~> 12.3.3"
 
-  spec.add_dependency 'asciidoctor', '~> 1.5.6'
-  spec.add_dependency 'asciidoctor-diagram', '~> 1.5.5'
+  spec.add_dependency 'asciidoctor', '~> 2.0.10'
+  spec.add_dependency 'asciidoctor-diagram', '~> 2.0.2'
+  spec.add_dependency 'rouge', '~> 3.18.0'
   spec.add_dependency 'git'
   spec.add_dependency 'guard'
   spec.add_dependency 'guard-shell'

data/bin/ascii_binder

@@ -1 +1 @@
-asciibinder
+bin/asciibinder

data/bin/asciibinder

@@ -183,11 +183,9 @@ Description:
   ...except that the Guardfile automatically detects and runs this as
   you work.
 
-  This is meant to be used in conjunction with a web browser that is
-  running a LiveReload plugin. If you are viewing the output HTML page
-  in a browser where LiveReload is active, then every time you save a
-  new version of the .adoc file, the new HTML is automatically
-  regenerated and your page view is automatically refreshed.
+  This is meant to be used in conjunction with a web browser that is viewing the
+  output HTML page. Every time you save a new version of the .adoc file, you can
+  manually refresh your page to view the newly-generated HTML.
 EOF
       opt :log_level, "Set the logging output level for this operation.", :default => 'warn'
     end
@@ -302,7 +300,7 @@ if cmd == 'clone'
     Dir.chdir(docs_basedir)
     puts "Tracking branch setup:"
     cloned_map.distro_branches.each do |doc_branch|
-      next if doc_branch == 'master'
+      next if doc_branch == 'main'
       puts "- #{doc_branch}"
       system("git branch #{doc_branch} origin/#{doc_branch}")
     end

data/features/support/env.rb

@@ -299,9 +299,9 @@ module Helpers
       end
       system("cd #{working_dir} && git add . > /dev/null && git commit -am 'test commit' > /dev/null")
       if multiple_distros
-        system("cd #{working_dir} && git checkout -b branch1 > /dev/null 2>&1 && git checkout -b branch2 > /dev/null 2>&1 && git checkout master > /dev/null 2>&1")
+        system("cd #{working_dir} && git checkout -b branch1 > /dev/null 2>&1 && git checkout -b branch2 > /dev/null 2>&1 && git checkout main > /dev/null 2>&1")
       end
-      set_initial_working_branch('master')
+      set_initial_working_branch('main')
     end
     working_dir
   end
@@ -325,7 +325,7 @@ module Helpers
     if run_command('create',[],remote_dir)[:status].exitstatus == 0
       clone_map = File.join(gem_root,'features','support','_clone_distro_map.yml')
       FileUtils.cp(clone_map,File.join(remote_dir,'_distro_map.yml'))
-      system("cd #{remote_dir} && git add . > /dev/null && git commit -am 'remote commit' > /dev/null && git checkout -b branch1 > /dev/null 2>&1 && git checkout master > /dev/null 2>&1")
+      system("cd #{remote_dir} && git add . > /dev/null && git commit -am 'remote commit' > /dev/null && git checkout -b branch1 > /dev/null 2>&1 && git checkout main > /dev/null 2>&1")
     else
       puts "ERROR: Could not initialize remote repo"
       exit 1

data/lib/ascii_binder/engine.rb

@@ -238,8 +238,7 @@ module AsciiBinder
 
     def asciidoctor_page_attrs(more_attrs=[])
       [
-        'source-highlighter=coderay',
-        'coderay-css=style',
+        'source-highlighter=rouge',
         'linkcss!',
         'icons=font',
         'idprefix=',
@@ -452,7 +451,7 @@ module AsciiBinder
 
     def configure_and_generate_page(topic,branch_config,navigation)
       distro = branch_config.distro
-      topic_adoc = File.open(topic.source_path,'r').read
+      # topic_adoc = File.open(topic.source_path,'r').read
 
       page_attrs = asciidoctor_page_attrs([
         "imagesdir=#{File.join(topic.parent.source_path,'images')}",
@@ -460,61 +459,71 @@ module AsciiBinder
         "product-title=#{branch_config.distro_name}",
         "product-version=#{branch_config.name}",
         "product-author=#{branch_config.distro_author}",
-        "repo_path=#{topic.repo_path}"
+        "repo_path=#{topic.repo_path}",
+        "allow-uri-read="
       ])
 
-      doc = without_warnings { Asciidoctor.load topic_adoc, :header_footer => false, :safe => :unsafe, :attributes => page_attrs }
-      article_title = doc.doctitle || topic.name
-
-      topic_html = doc.render
-
-      # This is logic bridges newer arbitrary-depth-tolerant code to
-      # older depth-limited code. Truly removing depth limitations will
-      # require changes to page templates in user docs repos.
-      breadcrumb     = topic.breadcrumb
-      group_title    = breadcrumb[0][:name]
-      group_id       = breadcrumb[0][:id]
-      topic_title    = breadcrumb[-1][:name]
-      topic_id       = breadcrumb[-1][:id]
-      subgroup_title = nil
-      subgroup_id    = nil
-      if breadcrumb.length == 3
-        subgroup_title = breadcrumb[1][:name]
-        subgroup_id    = breadcrumb[1][:id]
-      end
-      dir_depth = '../' * topic.breadcrumb[-1][:id].split('::').length
-      dir_depth = '' if dir_depth.nil?
+      File.open topic.source_path, 'r' do |topic_file|
+
+        doc = without_warnings { Asciidoctor.load topic_file, :header_footer => false, :safe => :unsafe, :attributes => page_attrs, :base_dir => "." }
+        article_title = doc.doctitle || topic.name
+                
+        topic_html = doc.render
+
+        # This is logic bridges newer arbitrary-depth-tolerant code to
+        # older depth-limited code. Truly removing depth limitations will
+        # require changes to page templates in user docs repos.
+        breadcrumb     = topic.breadcrumb
+        group_title    = breadcrumb[0][:name]
+        group_id       = breadcrumb[0][:id]
+        topic_title    = breadcrumb[-1][:name]
+        topic_id       = breadcrumb[-1][:id]
+        subgroup_title = nil
+        subgroup_id    = nil
+        if breadcrumb.length == 3
+          subgroup_title = breadcrumb[1][:name]
+          subgroup_id    = breadcrumb[1][:id]
+        end
+        dir_depth = '../' * topic.breadcrumb[-1][:id].split('::').length
+        dir_depth = '' if dir_depth.nil?
+
+        preview_path = topic.preview_path(distro.id,branch_config.dir)
+        topic_publish_url = topic.topic_publish_url(distro.site.url,branch_config.dir)
+
+        page_args = {
+          :distro_key        => distro.id,
+          :distro            => branch_config.distro_name,
+          :branch            => branch_config.id,
+          :site_name         => distro.site.name,
+          :site_url          => distro.site.url,
+          :topic_url         => preview_path,
+          :topic_publish_url => topic_publish_url,
+          :version           => branch_config.name,
+          :group_title       => group_title,
+          :subgroup_title    => subgroup_title,
+          :topic_title       => topic_title,
+          :article_title     => article_title,
+          :content           => topic_html,
+          :navigation        => navigation,
+          :group_id          => group_id,
+          :subgroup_id       => subgroup_id,
+          :topic_id          => topic_id,
+          :css_path          => "#{dir_depth}#{branch_config.dir}/#{STYLESHEET_DIRNAME}/",
+          :javascripts_path  => "#{dir_depth}#{branch_config.dir}/#{JAVASCRIPT_DIRNAME}/",
+          :images_path       => "#{dir_depth}#{branch_config.dir}/#{IMAGE_DIRNAME}/",
+          :site_home_path    => "#{dir_depth}index.html",
+          :template_path     => template_dir,
+          :repo_path         => topic.repo_path,
+        }
+        full_file_text = page(page_args)
+
+
+        File.open(preview_path, 'w') { |file| file.write(full_file_text) }
+
+
+        # File.write(preview_path,full_file_text)
 
-      preview_path = topic.preview_path(distro.id,branch_config.dir)
-      topic_publish_url = topic.topic_publish_url(distro.site.url,branch_config.dir)
-
-      page_args = {
-        :distro_key        => distro.id,
-        :distro            => branch_config.distro_name,
-        :branch            => branch_config.id,
-        :site_name         => distro.site.name,
-        :site_url          => distro.site.url,
-        :topic_url         => preview_path,
-        :topic_publish_url => topic_publish_url,
-        :version           => branch_config.name,
-        :group_title       => group_title,
-        :subgroup_title    => subgroup_title,
-        :topic_title       => topic_title,
-        :article_title     => article_title,
-        :content           => topic_html,
-        :navigation        => navigation,
-        :group_id          => group_id,
-        :subgroup_id       => subgroup_id,
-        :topic_id          => topic_id,
-        :css_path          => "#{dir_depth}#{branch_config.dir}/#{STYLESHEET_DIRNAME}/",
-        :javascripts_path  => "#{dir_depth}#{branch_config.dir}/#{JAVASCRIPT_DIRNAME}/",
-        :images_path       => "#{dir_depth}#{branch_config.dir}/#{IMAGE_DIRNAME}/",
-        :site_home_path    => "#{dir_depth}index.html",
-        :template_path     => template_dir,
-        :repo_path         => topic.repo_path,
-      }
-      full_file_text = page(page_args)
-      File.write(preview_path,full_file_text)
+      end
     end
 
     # package_docs

data/lib/ascii_binder/site_info.rb

@@ -7,7 +7,7 @@ module AsciiBinder
       @name     = distro.site.name
       @url      = distro.site.url
       @distros  = {}
-      @branches = ['master']
+      @branches = ['main']
       add_distro(distro)
     end
 

data/lib/ascii_binder/version.rb

@@ -1,3 +1,3 @@
 module AsciiBinder
-  VERSION = "0.1.15.3"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ascii_binder
 version: !ruby/object:Gem::Version
-  version: 0.1.15.3
+  version: 0.2.3
 platform: ruby
 authors:
 - N. Harrison Ripps
@@ -9,25 +9,25 @@ authors:
 - Carlos Munoz
 - Brian Exelbierd
 - Vikram Goyal
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -76,28 +76,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: asciidoctor-diagram
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 3.18.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -337,7 +351,7 @@ homepage: https://github.com/redhataccess/ascii_binder
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -352,9 +366,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: AsciiBinder is an AsciiDoc-based system for authoring and publishing closely
   related documentation sets from a single source.