asciidoctor-jenkins-extensions 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70e7c7a38724a7df258c5cc39dbf677ce8e406f09dc57e306dea62189f6d8a50
-  data.tar.gz: f61bfea245012ffd3745fe57746136ebd81a2aa57d9b1484b49908e651e162c7
+  metadata.gz: ec8a17619c5b65ec7ed332a59bf905de294e5b7cd1d950422072eccdd7b4092e
+  data.tar.gz: 6009a6ccd33eea49ba3f85e078d1fbe9c902632923c46c11af607d9537fa9df0
 SHA512:
-  metadata.gz: c6c27234b41610333750e834e2a8bb9cb85c5741cd358db962a3a31f13cc00397e6b338d55598c50b8dc4c0c0042f47120c67c1ac0e4d41f11545bf1a20b86fc
-  data.tar.gz: a5a24f20aa2b22c6cdff1cb526f3cad92b84d0e9f21679b9cd57cb0e45832d17617a6c195df7ede6bb1f3cb60baa35bfe3205140867003c06cb6886df05e26ea
+  metadata.gz: db7430bcc95d49d7354d81b3bdc107c66c98891b4e8b93acb59db32245735cc5a24fc812569b51c477e9bfa55c853259295a90679da07a37b4c92940d9ba0e91
+  data.tar.gz: c271f1b1ff2ef9793a30ba6503057aa245634b90d9c83eaa60b9a97ea0bdc007822b18fae11acf6908b47f5c9d682dd26ddf0427cdd23d0d9165d734fe918a98

data/asciidoctor-jenkins-extensions.gemspec

@@ -30,7 +30,7 @@ formatting in Jenkins-related content.
   spec.add_dependency 'coderay', '~> 1.1.1'
   spec.add_dependency 'colorize', '~> 0.8.1'
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"

data/lib/asciidoctor/jenkins/extensions/javadoc-link.rb

@@ -20,6 +20,14 @@ require 'asciidoctor/extensions'
 # jenkinsdoc:git:hudson.plugins.git.GitSCM[some label]
 # jenkinsdoc:git:hudson.plugins.git.GitSCM#anchor[]
 # jenkinsdoc:git:hudson.plugins.git.GitSCM#anchor[some label]
+#
+#
+# For component Javadoc:
+#
+# jenkinsdoc:component:remoting:hudson.remoting.Channel[]
+# jenkinsdoc:component:remoting:hudson.remoting.Channel[some label]
+# jenkinsdoc:component:remoting:hudson.remoting.Channel#anchor[]
+# jenkinsdoc:component:remoting:hudson.remoting.Channel#anchor[some label]
 
 Asciidoctor::Extensions.register do
   inline_macro do
@@ -29,8 +37,13 @@ Asciidoctor::Extensions.register do
     process do |parent, target, attrs|
 
       if target.include? ":"
-        parts = target.split(':', 2)
-        plugin = parts.first
+        parts = target.split(':', 3)
+
+        if parts.first == "component"
+          component = parts[1]
+        else
+          plugin = parts.first
+        end
         target = parts.last
       end
       classname = label = title = target
@@ -43,6 +56,13 @@ Asciidoctor::Extensions.register do
       classname.split('.').each do |part|
         if is_package && /[[:lower:]]/.match(part[0])
           package_parts.push(part)
+        elsif match = /(.*)#/.match(part)
+          class_part = match.captures
+          simpleclass_parts.push(class_part)
+          is_package = false
+
+          # escape once fragment has been found, required for complex fragments that contain a '.'
+          break
         else
           is_package = false
           simpleclass_parts.push(part)
@@ -52,22 +72,25 @@ Asciidoctor::Extensions.register do
       package = package_parts.join('.')
       simpleclass = simpleclass_parts.join('.')
 
-      if package.length > 0 || plugin
+      if package.length > 0 || plugin || component
         classname = classname.gsub(/#.*/, '')
         classurl = package.gsub(/\./, '/') + '/' + simpleclass + ".html"
 
-        classfrag = (target.include? "#") ? '#' + target.gsub(/.*#/, '') : ''
+        classfrag = (target.include? "#") ? '#' + target.gsub(/.*#/, '').gsub(/\(\)/, '--') : ''
 
         if plugin
           label = (attrs.has_key? 'label') ? attrs['label'] : %(#{classname} in #{plugin})
-          target = %(http://javadoc.jenkins.io/plugin/#{plugin}/#{classurl}#{classfrag})
+          target = %(https://javadoc.jenkins.io/plugin/#{plugin}/#{classurl}#{classfrag})
+        elsif component
+          label = (attrs.has_key? 'label') ? attrs['label'] : %(#{classname} in #{component})
+          target = %(https://javadoc.jenkins.io/component/#{component}/#{classurl}#{classfrag})
         else
           label = (attrs.has_key? 'label') ? attrs['label'] : classname
-          target = %(http://javadoc.jenkins.io/#{classurl}#{classfrag})
+          target = %(https://javadoc.jenkins.io/#{classurl}#{classfrag})
         end
       else
         label = (attrs.has_key? 'label') ? attrs['label'] : classname
-        target = %(http://javadoc.jenkins.io/byShortName/#{classname})
+        target = %(https://javadoc.jenkins.io/byShortName/#{classname})
       end
 
       title = %(Javadoc for #{classname})
@@ -92,8 +115,16 @@ Asciidoctor::Extensions.register do
       is_package = true
 
       classname.split('.').each do |part|
+        match = /(.*)#/.match(part)
         if is_package && /[[:lower:]]/.match(part[0])
           package_parts.push(part)
+        elsif match = /(.*)#/.match(part)
+          class_part = match.captures
+          simpleclass_parts.push(class_part)
+          is_package = false
+
+          # escape once fragment has been found, required for complex fragments that contain a '.'
+          break
         else
           is_package = false
           simpleclass_parts.push(part)
@@ -106,9 +137,9 @@ Asciidoctor::Extensions.register do
       classname = target.gsub(/#.*/, '')
       classurl = package.gsub(/\./, '/') + '/' + simpleclass + ".html"
 
-      classfrag = (target.include? "#") ? '#' + target.gsub(/.*#/, '') : ''
+      classfrag = (target.include? "#") ? '#' + target.gsub(/.*#/, '').gsub(/\(\)/, '--') : ''
       label = (attrs.has_key? 'label') ? attrs['label'] : classname
-      target = %(http://stapler.kohsuke.org/apidocs/#{classurl}#{classfrag})
+      target = %(https://stapler.kohsuke.org/apidocs/#{classurl}#{classfrag})
 
       title = %(Javadoc for #{classname})
 
@@ -135,6 +166,13 @@ Asciidoctor::Extensions.register do
       classname.split('.').each do |part|
         if is_package && /[[:lower:]]/.match(part[0])
           package_parts.push(part)
+        elsif match = /(.*)#/.match(part)
+          class_part = match.captures
+          simpleclass_parts.push(class_part)
+          is_package = false
+
+          # escape once fragment has been found, required for complex fragments that contain a '.'
+          break
         else
           is_package = false
           simpleclass_parts.push(part)
@@ -147,9 +185,9 @@ Asciidoctor::Extensions.register do
       classname = target.gsub(/#.*/, '')
       classurl = package.gsub(/\./, '/') + '/' + simpleclass + ".html"
 
-      classfrag = (target.include? "#") ? '#' + target.gsub(/.*#/, '') : ''
+      classfrag = (target.include? "#") ? '#' + target.gsub(/.*#/, '').gsub(/\(\)/, '--') : ''
       label = (attrs.has_key? 'label') ? attrs['label'] : classname
-      target = %(http://docs.oracle.com/javase/7/docs/api/#{classurl}#{classfrag})
+      target = %(https://docs.oracle.com/javase/8/docs/api/#{classurl}#{classfrag})
 
       title = %(Javadoc for #{classname})
 

data/lib/asciidoctor/jenkins/extensions/version.rb

@@ -1,7 +1,7 @@
 module Asciidoctor
   module Jenkins
     module Extensions
-      VERSION = "0.5.1"
+      VERSION = "0.6.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-jenkins-extensions
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - R. Tyler Croy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement