ascii_binder 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1c17e7e823c6e76b3bfd18786cc3a4c4d097a2
-  data.tar.gz: b667bd45eb3b75101bfceaf998ad90df7980dfa2
+  metadata.gz: 212faa11c6800de991285d33ab3e538a3dda1e19
+  data.tar.gz: 22ea55e36faa743586e736de2c8eb862a6ee04b8
 SHA512:
-  metadata.gz: 31c88dba1a43101330cab85e0acac0fe26fe50e60d2d8aa814e1ba3cd0e8707180c1259be0ebdc047ea0765c78416c7b9d4236288bb9e664ea2febf3c091b79d
-  data.tar.gz: 800c57816abf2fa0d9fb106f9789ed84f6142ef9b52b66d97713bf4c9fc2ffcc4dae5c1c2eaebe394da97f3af18d9c62ea1c79e598e5ff904ee06512e0281c09
+  metadata.gz: '076619a219d12c97890f8dfee5ee97574b78d9cab9af8979a75b93061df651a53752ecff217ee69f037ec2759efc5aa5f6ad5d7f43e8fc398a18e8fd1fa72375'
+  data.tar.gz: 6fbffc6bc4aa5be720e995fdce8cd7e72ea5afef70da9362c0b129c9ea48ba4295139ebd413c64e73841541de196269ec2406949aa70bdc0c45bcd750bc5ab1b

data/ascii_binder.gemspec

@@ -6,8 +6,8 @@ require 'ascii_binder/version'
 Gem::Specification.new do |spec|
   spec.name          = "ascii_binder"
   spec.version       = AsciiBinder::VERSION
-  spec.authors       = ["N. Harrison Ripps", "Jason Frey"]
-  spec.email         = ["nhr@redhat.com", "jfrey@redhat.com"]
+  spec.authors       = ["N. Harrison Ripps", "Jason Frey", "Carlos Munoz", "Brian Exelbierd"]
+  spec.email         = ["nhr@redhat.com", "jfrey@redhat.com", "chavo16@hotmail.com", "bex@pobox.com"]
   spec.summary       = %q{AsciiBinder is an AsciiDoc-based system for authoring and publishing closely related documentation sets from a single source.}
   spec.description   = spec.summary
   spec.homepage      = "http://asciibinder.org/"
@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'guard-livereload'
   spec.add_dependency 'haml'
   spec.add_dependency 'json'
-  spec.add_dependency 'pandoc-ruby'
   spec.add_dependency 'sitemap_generator', '~> 5.1.0'
   spec.add_dependency 'trollop', '~> 2.1.2'
   spec.add_dependency 'yajl-ruby', '~> 1.3.0'

data/features/command_help.feature

@@ -3,6 +3,6 @@ Feature: asciibinder help
   Displays help information for the asciibinder utility
 
   Scenario: A user wants to see help information for the utility
-    Given a nonexistant repo directory
+    Given a nonexistent repo directory
     When the user runs `asciibinder help` on that repo directory
     Then the program displays help information

data/features/command_version.feature

@@ -3,6 +3,6 @@ Feature: asciibinder version
   This command returns the version of the installed utility
 
   Scenario: A user wants to display the version of the asciibinder utility
-    Given a nonexistant repo directory
+    Given a nonexistent repo directory
     When the user runs `asciibinder version` on that repo directory
     Then the program prints the current version of the utility

data/features/repo_build.feature

@@ -13,7 +13,7 @@ Feature: asciibinder build
     When the user runs `asciibinder build` on that repo directory
     Then the program generates preview content for all distros in the current branch
 
-  Scenario: A user wants to do a build in a repo with alias that points to a nonexistant topic
+  Scenario: A user wants to do a build in a repo with alias that points to a nonexistent topic
     Given a valid AsciiBinder docs repo with an invalid alias
     When the user runs `asciibinder build` on that repo directory
     Then the program exits with a warning

data/features/repo_clone.feature

@@ -3,9 +3,9 @@ Feature: asciibinder clone
   This command clones a remote docs repo to a local directory and
   sets up tracking branches for each branch listed in the distro map
 
-  Scenario: A user tries to clone a nonexistant remote repo
-    Given a nonexistant remote repo
-    And a nonexistant repo directory
+  Scenario: A user tries to clone a nonexistent remote repo
+    Given a nonexistent remote repo
+    And a nonexistent repo directory
     When the user runs `asciibinder clone` on that repo directory
     Then the program exits with a warning
 
@@ -15,8 +15,8 @@ Feature: asciibinder clone
     When the user runs `asciibinder clone` on that repo directory
     Then the program exits with a warning
 
-  Scenario: A user tries to clone a remote repo into a nonexistant directory
+  Scenario: A user tries to clone a remote repo into a nonexistent directory
     Given an existing remote repo
-    And a nonexistant repo directory
+    And a nonexistent repo directory
     When the user runs `asciibinder clone` on that repo directory
     Then the program clones the remote repo into the local directory

data/features/repo_create.feature

@@ -7,7 +7,7 @@ Feature: asciibinder create
     When the user runs `asciibinder create` on that repo directory
     Then the program exits with a warning
 
-  Scenario: A user tries to create a repo in a nonexistant directory
-    Given a nonexistant repo directory
+  Scenario: A user tries to create a repo in a nonexistent directory
+    Given a nonexistent repo directory
     When the user runs `asciibinder create` on that repo directory
     Then the program generates a new base docs repo

data/features/step_definitions/steps.rb

@@ -8,7 +8,7 @@ Given(/^an existing repo directory$/) do
   Dir.mkdir(working_dir)
 end
 
-Given(/^a nonexistant repo directory$/) do
+Given(/^a nonexistent repo directory$/) do
   working_dir
 end
 
@@ -66,7 +66,7 @@ Given(/^the docs repo contains no generated content$/) do
   end
 end
 
-Given(/^a nonexistant remote repo$/) do
+Given(/^a nonexistent remote repo$/) do
   @remote_repo_url = 'http://example.com/repo.git'
 end
 

data/lib/ascii_binder/engine.rb

@@ -10,7 +10,6 @@ require 'asciidoctor-diagram'
 require 'fileutils'
 require 'find'
 require 'git'
-require 'pandoc-ruby'
 require 'pathname'
 require 'sitemap_generator'
 require 'trollop'
@@ -134,7 +133,7 @@ module AsciiBinder
         next if src_path.split('/').length < 3
         file_list << src_path
       end
-      file_list.map{ |path| File.join(File.dirname(path),File.basename(path,'.adoc')) }
+      file_list.map{ |path| File.join(File.dirname(path),File.basename(path,'.adoc'))[1..-1] }
     end
 
     def remove_found_topic_files(branch,branch_topic_map,branch_topic_files)
@@ -489,29 +488,32 @@ module AsciiBinder
       end
 
       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,
-        :site_name        => distro.site.name,
-        :site_url         => distro.site.url,
-        :topic_url        => preview_path,
-        :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,
+        :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)

data/lib/ascii_binder/topic_entity.rb

@@ -59,6 +59,10 @@ module AsciiBinder
       File.join(preview_dir,distro_key,branch_dir,repo_path_html)
     end
 
+    def topic_publish_url(distro_url,branch_dir)
+      File.join(distro_url,branch_dir,repo_path_html)
+    end
+
     def package_path(site_id,branch_dir)
       File.join(package_dir,site_id,branch_dir,repo_path_html)
     end

data/lib/ascii_binder/topic_map.rb

@@ -96,7 +96,7 @@ module AsciiBinder
           end
           next if valid_url?(alias_map[:redirect_path])
           if not distro_paths.include?(alias_map[:redirect_path])
-            errors << "Topic alias '#{alias_map[:alias_path]}' points to a nonexistant topic '#{alias_map[:redirect_path]}' for distro '#{distro_key}'"
+            errors << "Topic alias '#{alias_map[:alias_path]}' points to a nonexistent topic '#{alias_map[:redirect_path]}' for distro '#{distro_key}'"
           end
         end
       end

data/lib/ascii_binder/version.rb

@@ -1,3 +1,3 @@
 module AsciiBinder
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ascii_binder
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - N. Harrison Ripps
 - Jason Frey
+- Carlos Munoz
+- Brian Exelbierd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,20 +181,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pandoc-ruby
-  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: sitemap_generator
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +242,8 @@ description: AsciiBinder is an AsciiDoc-based system for authoring and publishin
 email:
 - nhr@redhat.com
 - jfrey@redhat.com
+- chavo16@hotmail.com
+- bex@pobox.com
 executables:
 - ascii_binder
 - asciibinder
@@ -359,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: AsciiBinder is an AsciiDoc-based system for authoring and publishing closely