kramdown-rfc2629 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae2b6bf131f870712854d26c556777f300ebb961
-  data.tar.gz: b9256d830f7d04b3ef36c7c126ed8b38532f727b
+  metadata.gz: 3eddcf63f4104b7055bb8a022ddb37c75d9c0e18
+  data.tar.gz: c8b2131d960d0e14149c5f1d61cf8165dc462009
 SHA512:
-  metadata.gz: 884f08d588fc0df4b4e1c65da4182113a491e347d5f9a17e8eb014b712382c08ba45accf98f8894205a6284539cdbdfb8e37989c63c507ed0f6cec946ccf1a8f
-  data.tar.gz: 32ccd7f29129e334981adb3caba507b9d72558a5e9b233a655b35cea33c66e048ad76fdf4e816bdc5681df3be868c6a3bf8073df5634c541a914099fb4b1c8c1
+  metadata.gz: b10a872278edda1366b90cb7d11265552e86e94f98a41ae16c2e5456b82e7cc49bddfd679fca7a1a83b0d9551df0002c2aba832bd95c6256bc13c38300ca15e2
+  data.tar.gz: 9e3550e46f1fd56959d716d9b6df7e16d9e0b396a2534337cfa7eae5cc38da3c335812571dcd769396fdd6f21f8784f0745947cd2002937c7d29078add9ba306

data/bin/kdrfc

@@ -0,0 +1,118 @@
+#!/usr/bin/env ruby -KU
+require 'uri'
+require 'net/http'
+require 'open3'
+
+def process_mkd(input, output)
+  warn "* converting locally from markdown #{input} to xml #{output}" if $options.verbose
+  o, s = Open3.capture2("kramdown-rfc2629", input)
+  if s.success?
+    File.open(output, "w") do |fo|
+      fo.print(o)
+    end
+    warn "* #{output} written" if $options.verbose
+  else
+    warn "*** kramdown-rfc failed, status #{s.exitstatus}"
+    exit 1
+  end
+end
+
+def process_xml(*args)
+  if $options.remote
+    process_xml_remotely(*args)
+  else
+    process_xml_locally(*args)
+  end
+end
+
+def process_xml_locally(input, output)
+  warn "* converting locally from xml #{input} to txt #{output}" if $options.verbose
+  begin
+    o, s = Open3.capture2("xml2rfc", input)
+    puts o
+    if s.success?
+      warn "* #{output} written" if $options.verbose
+    else
+      warn "*** xml2rfc failed, status #{s.exitstatus} (possibly try with -r)"
+      exit 1
+    end
+  rescue Errno::ENOENT
+    warn "*** falling back to remote processing" if $options.verbose
+    process_xml_remotely(input, output)
+  end
+end
+
+def process_xml_remotely(input, output)
+  warn "* converting remotely from xml #{input} to txt #{output}" if $options.verbose
+  url = URI('http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc.cgi')
+  req = Net::HTTP::Post.new(url)
+  req.set_form([["modeAsFormat", "txt/ascii"],
+                ["type", "binary"],
+                ["input", File.open(input),
+                 {filename: "input.xml",
+                  content_type: "text/plain"}]],
+               'multipart/form-data')
+  res = Net::HTTP::start(url.hostname, url.port,
+                         :use_ssl => url.scheme == 'https' ) {|http|
+    http.request(req)
+  }
+  case res
+  when Net::HTTPOK
+    case res.content_type
+    when 'application/octet-stream'
+      File.open(output, "w") do |fo|
+        fo.print(res.body)
+      end
+      warn "* #{output} written" if $options.verbose
+    else
+      warn "*** HTTP response has unexpected content_type #{res.content_type} with status #{res.code}"
+      warn res.body
+      exit 1
+    end
+  else
+    warn "*** HTTP response: #{res.code}"
+    exit 1
+  end
+end
+
+require 'optparse'
+require 'ostruct'
+
+$options = OpenStruct.new
+op = OptionParser.new do |opts|
+  opts.banner = "Usage: kdrfc [options] file.md|file.mkd|file.xml"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+    $options.verbose = v
+  end
+  opts.on("-r", "--[no-]remote", "Run xml2rfc remotely even if there is a local one") do |v|
+    $options.remote = v
+  end
+  opts.on("-x", "--[no-]xml", "Convert to xml only") do |v|
+    $options.xml_only = v
+  end
+end
+op.parse!
+
+case ARGV.size
+when 1
+  fn = ARGV[0]
+  case fn
+  when /(.*)\.xml\z/
+    if $options.xml_only
+      warn "*** You already have XML"
+    else
+      process_xml(fn, "#$1.txt")
+    end
+  when /(.*)\.mk?d\z/
+    xml = "#$1.xml"
+    process_mkd(fn, xml)
+    process_xml(xml, "#$1.txt") unless $options.xml_only
+  else
+    warn "Unknown file type: #{fn}"
+    exit 1
+  end
+else
+  puts op
+  exit 1
+end

data/bin/kramdown-rfc2629

@@ -259,7 +259,7 @@ end
 
 link_defs = {}
 if input =~ /\A---/        # this is a sectionized file
-  do_the_tls_dance
+  do_the_tls_dance unless ENV["KRAMDOWN_DONT_VERIFY_HTTPS"]
   input, target_coding, link_defs, smart_quotes = xml_from_sections(input)
 end
 if input =~ /\A<\?xml/          # if this is a whole XML file, protect it

data/kramdown-rfc2629.gemspec

@@ -1,14 +1,14 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.1.2'
+  s.version = '1.2.0'
   s.summary = "Kramdown extension for generating RFC 7749 XML."
   s.description = %{An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}
   s.add_dependency('kramdown', '~> 1.13.0')
   s.add_dependency('certified', '~> 1.0')
-  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt)
+  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt)
   s.require_path = 'lib'
-  s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown']
+  s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']
   s.default_executable = 'kramdown-rfc2629'
   s.required_ruby_version = '>= 1.9.2'
   # s.requirements = 'wget'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -46,12 +46,14 @@ executables:
 - kramdown-rfc2629
 - doilit
 - kramdown-rfc-extract-markdown
+- kdrfc
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - bin/doilit
+- bin/kdrfc
 - bin/kramdown-rfc-extract-markdown
 - bin/kramdown-rfc2629
 - data/encoding-fallbacks.txt