commonmarker 0.14.14 → 0.14.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6d4aa63cc2e20379e7fc57e8fafd87fc0d3d004
-  data.tar.gz: 7bb2af43330702e69f2aede9b9f6442d88e61e85
+  metadata.gz: e5aa294a8cff2fc4d0911affd928255c95527435
+  data.tar.gz: 53d8b570256340398dae12c4deaa7dbbc78f4594
 SHA512:
-  metadata.gz: 47615b3ee50b0213f9113a8d305e1697d1d7551551e43796077099146952156e3fdb837da704b69e1a8ed0aee6ba7a16933ad68556a7659b2e06f1a064513632
-  data.tar.gz: f7b3761ee08eecbe5d365bf07340a560b8117b398028d2fa7a414bace3792f86bb6c13c44a757a2973ac5e08b12a28ffb4ccada7c5c75b38a0857d4c0a0196db
+  metadata.gz: 542cabd09f0368b0e3b68727bcc7652d12322735edf3d60be4c203711e824888d60e8738db8495077a892bec9599cd057e626417e07346a562638b02a05809cc
+  data.tar.gz: 66145f96d41641c4dae783698abd5753e7eabed5f626d829523d9c26bc0cae02692f91fb0187c53cc89300b14dbd7172fe81c12f3567000d59238e671e9c9c12

data/commonmarker.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   s.executables = ['commonmarker']
   s.require_paths = %w(lib ext)
 
+  s.rdoc_options += ['-x', 'ext/commonmarker/cmark/.*']
+
   s.add_dependency 'ruby-enum', '~> 0.5'
 
   s.add_development_dependency 'minitest', '~> 5.6'

data/ext/commonmarker/cmark/Makefile

@@ -15,7 +15,7 @@ BENCHSAMPLES=$(wildcard $(BENCHDIR)/samples/*.md)
 BENCHFILE=$(BENCHDIR)/benchinput.md
 ALLTESTS=alltests.md
 NUMRUNS?=20
-CMARK=$(BUILDDIR)/src/cmark
+CMARK=$(BUILDDIR)/src/cmark-gfm
 PROG?=$(CMARK)
 VERSION?=$(SPECVERSION)
 RELEASE?=CommonMark-$(VERSION)
@@ -24,9 +24,9 @@ CLANG_CHECK?=clang-check
 CLANG_FORMAT=clang-format -style llvm -sort-includes=0 -i
 AFL_PATH?=/usr/local/bin
 
-.PHONY: all cmake_build leakcheck clean fuzztest test debug ubsan asan mingw archive newbench bench format update-spec afl clang-check
+.PHONY: all cmake_build leakcheck clean fuzztest test debug ubsan asan mingw archive newbench bench format update-spec afl clang-check docker
 
-all: cmake_build man/man3/cmark.3
+all: cmake_build man/man3/cmark-gfm.3
 
 $(CMARK): cmake_build
 
@@ -92,7 +92,7 @@ mingw:
 	cmake .. -DCMAKE_TOOLCHAIN_FILE=../toolchain-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$(MINGW_INSTALLDIR) ;\
 	$(MAKE) && $(MAKE) install
 
-man/man3/cmark.3: src/cmark.h | $(CMARK)
+man/man3/cmark-gfm.3: src/cmark.h | $(CMARK)
 	python man/make_man_page.py $< > $@ \
 
 archive:
@@ -156,7 +156,7 @@ $(ALLTESTS): $(SPEC) $(EXTENSIONS_SPEC)
 leakcheck: $(ALLTESTS)
 	for format in html man xml latex commonmark; do \
 	  for opts in "" "--smart" "--normalize"; do \
-	     echo "cmark -t $$format -e table -e strikethrough -e autolink -e tagfilter $$opts" ; \
+	     echo "cmark-gfm -t $$format -e table -e strikethrough -e autolink -e tagfilter $$opts" ; \
 	     valgrind -q --leak-check=full --dsymutil=yes --suppressions=suppressions --error-exitcode=1 $(PROG) -t $$format -e table -e strikethrough -e autolink -e tagfilter $$opts $(ALLTESTS) >/dev/null || exit 1;\
 	  done; \
 	done;
@@ -211,3 +211,7 @@ distclean: clean
 	-rm -rf *.dSYM
 	-rm -f README.html
 	-rm -rf $(BENCHFILE) $(ALLTESTS) progit
+
+docker:
+	docker build -t cmark $(CURDIR)/tools
+	docker run --privileged -t -i -v $(CURDIR):/src/cmark -w /src/cmark cmark /bin/bash

data/ext/commonmarker/cmark/api_test/CMakeLists.txt

@@ -8,7 +8,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/src
   ${PROJECT_BINARY_DIR}/src
 )
-target_link_libraries(api_test libcmark ${CMAKE_DL_LIBS})
+target_link_libraries(api_test libcmark-gfm ${CMAKE_DL_LIBS})
 
 # Compiler flags
 if(MSVC)

data/ext/commonmarker/cmark/extensions/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
-set(LIBRARY "libcmarkextensions")
-set(STATICLIBRARY "libcmarkextensions_static")
+set(LIBRARY "libcmark-gfmextensions")
+set(STATICLIBRARY "libcmark-gfmextensions_static")
 set(LIBRARY_SOURCES
     core-extensions.c
     table.c
@@ -38,7 +38,7 @@ if (CMARK_SHARED)
   add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
 
   set_target_properties(${LIBRARY} PROPERTIES
-  OUTPUT_NAME "cmarkextensions"
+  OUTPUT_NAME "cmark-gfmextensions"
   SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
   VERSION ${PROJECT_VERSION})
 
@@ -46,10 +46,10 @@ if (CMARK_SHARED)
     APPEND PROPERTY MACOSX_RPATH true)
 
   # Avoid name clash between PROGRAM and LIBRARY pdb files.
-  set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmarkextensions_dll)
+  set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfmextensions_dll)
 
   list(APPEND CMARK_INSTALL ${LIBRARY})
-  target_link_libraries(${LIBRARY} libcmark)
+  target_link_libraries(${LIBRARY} libcmark-gfm)
 
   generate_export_header(${LIBRARY} BASE_NAME cmarkextensions)
 endif()
@@ -63,11 +63,11 @@ if (CMARK_STATIC)
 
   if (MSVC)
     set_target_properties(${STATICLIBRARY} PROPERTIES
-      OUTPUT_NAME "cmarkextensions_static"
+      OUTPUT_NAME "cmark-gfmextensions_static"
       VERSION ${PROJECT_VERSION})
   else()
     set_target_properties(${STATICLIBRARY} PROPERTIES
-      OUTPUT_NAME "cmarkextensions"
+      OUTPUT_NAME "cmark-gfmextensions"
       VERSION ${PROJECT_VERSION})
   endif(MSVC)
 endif()

data/ext/commonmarker/cmark/man/make_man_page.py

@@ -21,9 +21,9 @@ from ctypes import CDLL, c_char_p, c_long, c_void_p
 sysname = platform.system()
 
 if sysname == 'Darwin':
-    cmark = CDLL("build/src/libcmark.dylib")
+    cmark = CDLL("build/src/libcmark-gfm.dylib")
 else:
-    cmark = CDLL("build/src/libcmark.so")
+    cmark = CDLL("build/src/libcmark-gfm.so")
 
 parse_document = cmark.cmark_parse_document
 parse_document.restype = c_void_p

data/ext/commonmarker/cmark/man/man3/{cmark.3 → cmark-gfm.3}

@@ -1,4 +1,4 @@
-.TH cmark 3 "March 22, 2017" "LOCAL" "Library Functions Manual"
+.TH cmark 3 "March 28, 2017" "LOCAL" "Library Functions Manual"
 .SH
 NAME
 .PP

data/ext/commonmarker/cmark/src/CMakeLists.txt

@@ -2,8 +2,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.3")
     cmake_policy(SET CMP0063 NEW)
 endif()
 
-set(LIBRARY "libcmark")
-set(STATICLIBRARY "libcmark_static")
+set(LIBRARY "libcmark-gfm")
+set(STATICLIBRARY "libcmark-gfm_static")
 set(HEADERS
   cmark.h
   cmark_extension_api.h
@@ -52,7 +52,7 @@ set(LIBRARY_SOURCES
   ${HEADERS}
   )
 
-set(PROGRAM "cmark")
+set(PROGRAM "cmark-gfm")
 set(PROGRAM_SOURCES
   main.c
   )
@@ -70,10 +70,10 @@ include (GenerateExportHeader)
 add_executable(${PROGRAM} ${PROGRAM_SOURCES})
 add_compiler_export_flags()
 
-target_link_libraries(${PROGRAM} libcmark_static)
+target_link_libraries(${PROGRAM} libcmark-gfm_static)
 
-add_dependencies(${PROGRAM} libcmarkextensions_static)
-target_link_libraries(${PROGRAM} libcmarkextensions_static)
+add_dependencies(${PROGRAM} libcmark-gfmextensions_static)
+target_link_libraries(${PROGRAM} libcmark-gfmextensions_static)
 
 # Disable the PUBLIC declarations when compiling the executable:
 set_target_properties(${PROGRAM} PROPERTIES
@@ -99,7 +99,7 @@ if (CMARK_SHARED)
   add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES})
   # Include minor version and patch level in soname for now.
   set_target_properties(${LIBRARY} PROPERTIES
-  OUTPUT_NAME "cmark"
+  OUTPUT_NAME "cmark-gfm"
   SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
   VERSION ${PROJECT_VERSION})
 
@@ -107,7 +107,7 @@ if (CMARK_SHARED)
     APPEND PROPERTY MACOSX_RPATH true)
 
   # Avoid name clash between PROGRAM and LIBRARY pdb files.
-  set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark_dll)
+  set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfm_dll)
 
   generate_export_header(${LIBRARY}
     BASE_NAME ${PROJECT_NAME})
@@ -123,15 +123,15 @@ if (CMARK_STATIC)
 
   if (MSVC)
   set_target_properties(${STATICLIBRARY} PROPERTIES
-    OUTPUT_NAME "cmark_static"
+    OUTPUT_NAME "cmark-gfm_static"
     VERSION ${PROJECT_VERSION})
   else()
   set_target_properties(${STATICLIBRARY} PROPERTIES
-    OUTPUT_NAME "cmark"
+    OUTPUT_NAME "cmark-gfm"
     VERSION ${PROJECT_VERSION})
 endif(MSVC)
 
-target_link_libraries(cmark ${CMAKE_DL_LIBS})
+target_link_libraries(cmark-gfm ${CMAKE_DL_LIBS})
 
   list(APPEND CMARK_INSTALL ${STATICLIBRARY})
 endif()
@@ -139,7 +139,7 @@ set_property(TARGET ${LIBRARY}
   APPEND PROPERTY MACOSX_RPATH true)
 
 # Avoid name clash between PROGRAM and LIBRARY pdb files.
-set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark_dll)
+set_target_properties(${LIBRARY} PROPERTIES PDB_NAME cmark-gfm_dll)
 
 generate_export_header(${LIBRARY}
     BASE_NAME ${PROJECT_NAME})
@@ -160,9 +160,9 @@ install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
   )
 
 if(CMARK_SHARED OR CMARK_STATIC)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark.pc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc @ONLY)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark-gfm.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc @ONLY)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcmark-gfm.pc
     DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
   install(FILES

data/ext/commonmarker/cmark/src/{libcmark.pc.in → libcmark-gfm.pc.in}

@@ -3,8 +3,8 @@ exec_prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@CMAKE_INSTALL_PREFIX@/lib
 includedir=@CMAKE_INSTALL_PREFIX@/include
 
-Name: libcmark
-Description: CommonMark parsing, rendering, and manipulation
+Name: libcmark-gfm
+Description: CommonMark parsing, rendering, and manipulation with GitHub Flavored Markdown extensions
 Version: @PROJECT_VERSION@
-Libs: -L${libdir} -lcmark
+Libs: -L${libdir} -lcmark-gfm
 Cflags: -I${includedir}

data/ext/commonmarker/cmark/src/main.c

@@ -28,7 +28,7 @@ typedef enum {
 } writer_format;
 
 void print_usage() {
-  printf("Usage:   cmark [FILE*]\n");
+  printf("Usage:   cmark-gfm [FILE*]\n");
   printf("Options:\n");
   printf("  --to, -t FORMAT   Specify output format (html, xml, man, "
          "commonmark, latex)\n");

data/ext/commonmarker/cmark/test/CMakeLists.txt

@@ -55,22 +55,22 @@ IF (PYTHONINTERP_FOUND)
   endif()
 
   add_test(spectest_executable
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
+    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm"
     )
 
   add_test(smartpuncttest_executable
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/smart_punct.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark --smart"
+    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/smart_punct.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm --smart"
     )
 
   add_test(extensions_executable
-    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/extensions.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark" "--extensions" "table strikethrough autolink tagfilter"
+    ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/extensions.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm" "--extensions" "table strikethrough autolink tagfilter"
     )
 
   add_test(roundtrip_extensions_executable
     ${PYTHON_EXECUTABLE}
     "${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py"
     "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/extensions.txt"
-    "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
+    "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm"
     "--extensions" "table strikethrough autolink tagfilter"
     )
 
@@ -78,7 +78,7 @@ IF (PYTHONINTERP_FOUND)
     ${PYTHON_EXECUTABLE}
     "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
     "${CMAKE_CURRENT_SOURCE_DIR}/regression.txt" "--program"
-    "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
+    "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark-gfm"
     )
 
 

data/ext/commonmarker/cmark/test/cmark.py

@@ -94,13 +94,13 @@ class CMark:
             if not library_dir:
                 library_dir = os.path.join("build", "src")
             for prefix, suffix in libnames:
-                candidate = os.path.join(library_dir, prefix + "cmark" + suffix)
+                candidate = os.path.join(library_dir, prefix + "cmark-gfm" + suffix)
                 if os.path.isfile(candidate):
                     libpath = candidate
                     break
             cmark = CDLL(libpath)
             extlib = CDLL(os.path.join(
-                library_dir, "..", "extensions", prefix + "cmarkextensions" + suffix))
+                library_dir, "..", "extensions", prefix + "cmark-gfmextensions" + suffix))
             self.to_html = lambda x, exts=[]: to_html(cmark, extlib, x, exts + self.extensions)
             self.to_commonmark = lambda x, exts=[]: to_commonmark(cmark, extlib, x, exts + self.extensions)
 

data/ext/commonmarker/cmark/tools/Dockerfile

@@ -0,0 +1,24 @@
+FROM debian:jessie
+
+RUN apt-get update && apt-get install -y \
+  build-essential autoconf libtool \
+  git \
+  pkg-config \
+  && apt-get clean
+
+RUN apt-get install -y \
+  cmake \
+  gdb \
+  valgrind \
+  python3
+
+RUN apt-get install -y \
+  wget \
+  clang
+
+RUN wget http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz && \
+	tar xf afl-latest.tgz && \
+	cd afl-* && \
+	make install && \
+	cd .. && \
+	rm -rf afl-*

data/ext/commonmarker/extconf.rb

@@ -28,8 +28,8 @@ Dir.chdir(CMARK_BUILD_DIR) do
   else
   system 'cmake .. -DCMAKE_C_FLAGS=-fPIC'
   end
-  system "make libcmark_static" or abort "make libcmark_static failed"
-  system "make libcmarkextensions_static" or abort "make libcmarkextensions_static failed"
+  system "make libcmark-gfm_static" or abort "make libcmark-gfm_static failed"
+  system "make libcmark-gfmextensions_static" or abort "make libcmark-gfmextensions_static failed"
   # rake-compiler seems to complain about this line, not sure why it's messing with it
   FileUtils.rm_rf(File.join(CMARK_BUILD_DIR, 'Testing', 'Temporary'))
 end
@@ -41,11 +41,11 @@ dir_config('cmark', HEADER_DIRS, LIB_DIRS)
 
 # don't even bother to do this check if using OS X's messed up system Ruby: http://git.io/vsxkn
 unless sitearch =~ /^universal-darwin/
-  abort 'libcmark is missing.' unless find_library('cmark', 'cmark_parse_document')
-  abort 'cmarkextensions is missing.' unless find_library('cmarkextensions', 'core_extensions_registration')
+  abort 'libcmark-gfm is missing.' unless find_library('cmark-gfm', 'cmark_parse_document')
+  abort 'libcmark-gfmextensions is missing.' unless find_library('cmark-gfmextensions', 'core_extensions_registration')
 end
 
-$LDFLAGS << " -L#{CMARK_BUILD_DIR}/src -L#{CMARK_BUILD_DIR}/extensions -lcmark -lcmarkextensions"
+$LDFLAGS << " -L#{CMARK_BUILD_DIR}/src -L#{CMARK_BUILD_DIR}/extensions -lcmark-gfm -lcmark-gfmextensions"
 $CFLAGS << " -O2 -I#{CMARK_DIR}/src -I#{CMARK_DIR}/extensions -I#{CMARK_BUILD_DIR}/src -I#{CMARK_BUILD_DIR}/extensions"
 $CFLAGS << " -DCMARK_STATIC_DEFINE -DCMARKEXTENSIONS_STATIC_DEFINE"
 

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.14.14'.freeze
+  VERSION = '0.14.15'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.14.14
+  version: 0.14.15
 platform: ruby
 authors:
 - Garen Torikian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
@@ -183,7 +183,7 @@ files:
 - ext/commonmarker/cmark/man/CMakeLists.txt
 - ext/commonmarker/cmark/man/make_man_page.py
 - ext/commonmarker/cmark/man/man1/cmark.1
-- ext/commonmarker/cmark/man/man3/cmark.3
+- ext/commonmarker/cmark/man/man3/cmark-gfm.3
 - ext/commonmarker/cmark/nmake.bat
 - ext/commonmarker/cmark/src/CMakeLists.txt
 - ext/commonmarker/cmark/src/arena.c
@@ -212,7 +212,7 @@ files:
 - ext/commonmarker/cmark/src/iterator.c
 - ext/commonmarker/cmark/src/iterator.h
 - ext/commonmarker/cmark/src/latex.c
-- ext/commonmarker/cmark/src/libcmark.pc.in
+- ext/commonmarker/cmark/src/libcmark-gfm.pc.in
 - ext/commonmarker/cmark/src/linked_list.c
 - ext/commonmarker/cmark/src/main.c
 - ext/commonmarker/cmark/src/man.c
@@ -298,6 +298,7 @@ files:
 - ext/commonmarker/cmark/test/spec.txt
 - ext/commonmarker/cmark/test/spec_tests.py
 - ext/commonmarker/cmark/toolchain-mingw32.cmake
+- ext/commonmarker/cmark/tools/Dockerfile
 - ext/commonmarker/cmark/tools/appveyor-build.bat
 - ext/commonmarker/cmark/tools/make_entities_inc.py
 - ext/commonmarker/cmark/tools/mkcasefold.pl
@@ -337,7 +338,9 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "-x"
+- ext/commonmarker/cmark/.*
 require_paths:
 - lib
 - ext