redsnow 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593662a85851831a3b095d96bc7a554f9ff8781c
-  data.tar.gz: 499408dcd96ff25598541f43e34407c00d06229a
+  metadata.gz: a7a42395c3a357bc8d783eeafe217eb8169bf802
+  data.tar.gz: c3272147eb4b1ac934b7b675e38f216e5011941b
 SHA512:
-  metadata.gz: 23e1b9a29c418f5e76161845382929d8f5a491341c550e0d603ae8625ad8bf9aec846ba01fad8ce2b7396a8a33d7a13feb4c673abfef2096f891b993667d87f5
-  data.tar.gz: 00c0ac7a6770c385e93233903f240eb243a03c7b7b60456c574c81f754a856f090537f239bfdd7c6133985c6449feec53e7bbfeba7b9a6330d94bcdcba7844b3
+  metadata.gz: d4afc5e2fe580a75423a59ea58a8c5846562f23f73d20a6657d6f09c9c953599af1783304be443daa0619613e2969e66481f8173fac83e64cb19ff75ac284f8d
+  data.tar.gz: 1125f2f86362bd272e5da418e7b3cca2462a52a05dd0374c91d3042f9341b8b38e769289bc1f85f7d1f5a514502f9827bf629cd682ede49b4b7bc371385d8b70

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redsnow (0.3.7)
+    redsnow (0.4.0)
       bundler (>= 1.7.0)
       ffi (~> 1.9.3)
       rake (>= 10.3.2)

data/Rakefile

@@ -27,16 +27,16 @@ task default: :compile
 desc 'Compile extension'
 task :compile do
   prefix = FFI::Platform.mac? ? '' : 'lib.target/'
-  # Path to compiled snowcrash library
-  path = File.expand_path("ext/snowcrash/build/out/Release/#{prefix}libsnowcrash.#{FFI::Platform::LIBSUFFIX}", File.dirname(__FILE__))
+  # Path to compiled drafter library
+  path = File.expand_path("ext/drafter/build/out/Release/#{prefix}libdrafter.#{FFI::Platform::LIBSUFFIX}", File.dirname(__FILE__))
   puts "Path to library #{path}"
   if !File.exist?(path) || ENV['RECOMPILE']
-    unless File.directory?(File.expand_path('ext/snowcrash/src'))
+    unless File.directory?(File.expand_path('ext/drafter/src'))
       puts 'Initializing submodules (if required)...'
       `git submodule update --init --recursive 2>/dev/null`
     end
     puts 'Compiling extension...'
-    `cd #{File.expand_path('ext/snowcrash/')} && ./configure --shared && make`
+    `cd #{File.expand_path('ext/drafter/')} && ./configure --shared && make`
     status = $CHILD_STATUS.to_i
     if status == 0
       puts 'Compiling done.'

data/ext/drafter/Makefile

@@ -0,0 +1,54 @@
+-include config.mk
+
+BUILDTYPE ?= Release
+BUILD_DIR ?= ./build
+PYTHON ?= python
+GYP ?= ./ext/snowcrash/tools/gyp/gyp
+DESTDIR ?= /usr/local/bin
+
+# Default to verbose builds
+V ?= 1
+
+# Targets
+all: drafter
+
+libdrafter: config.gypi $(BUILD_DIR)/Makefile
+	$(MAKE) -C $(BUILD_DIR) V=$(V) $@
+
+test-libdrafter: config.gypi $(BUILD_DIR)/Makefile
+	$(MAKE) -C $(BUILD_DIR) V=$(V) $@
+	mkdir -p ./bin
+	cp -f $(BUILD_DIR)/out/$(BUILDTYPE)/$@ ./bin/$@
+
+drafter: config.gypi $(BUILD_DIR)/Makefile
+	$(MAKE) -C $(BUILD_DIR) V=$(V) $@
+	mkdir -p ./bin
+	cp -f $(BUILD_DIR)/out/$(BUILDTYPE)/$@ ./bin/$@
+
+install: drafter
+	cp -f $(BUILD_DIR)/out/$(BUILDTYPE)/drafter $(DESTDIR)/drafter
+
+config.gypi: configure
+	$(PYTHON) ./configure
+
+$(BUILD_DIR)/Makefile:
+	$(GYP) -f make --generator-output $(BUILD_DIR) --depth=.
+
+clean:
+	rm -rf $(BUILD_DIR)/out
+	rm -rf ./bin
+
+distclean:
+	rm -rf ./build
+	rm -f ./config.mk
+	rm -f ./config.gypi
+	rm -rf ./bin
+
+test: libdrafter test-libdrafter drafter
+	./bin/test-libdrafter
+
+ifdef INTEGRATION_TESTS
+	bundle exec cucumber
+endif
+
+.PHONY: all libdrafter drafter test test-libdrafter install

data/ext/drafter/appveyor.yml

@@ -0,0 +1,10 @@
+version: 1.0.{build}
+
+build_script:
+  - git submodule update --init --recursive
+  - gem install bundler
+  - vcbuild.bat MSVC2013
+
+test_script:
+  - vcbuild.bat MSVC2013 test
+  - vcbuild.bat MSVC2013 inttest

data/ext/{snowcrash → drafter}/build/Makefile

@@ -329,38 +329,53 @@ $(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
 
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,libmarkdownparser.target.mk)))),)
-  include libmarkdownparser.target.mk
+                 $(join ^,drafter.target.mk)))),)
+  include drafter.target.mk
 endif
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,libsnowcrash.target.mk)))),)
-  include libsnowcrash.target.mk
+                 $(join ^,ext/snowcrash/libmarkdownparser.target.mk)))),)
+  include ext/snowcrash/libmarkdownparser.target.mk
 endif
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,libsundown.target.mk)))),)
-  include libsundown.target.mk
+                 $(join ^,ext/snowcrash/libsnowcrash.target.mk)))),)
+  include ext/snowcrash/libsnowcrash.target.mk
 endif
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,perf-libsnowcrash.target.mk)))),)
-  include perf-libsnowcrash.target.mk
+                 $(join ^,ext/snowcrash/libsundown.target.mk)))),)
+  include ext/snowcrash/libsundown.target.mk
 endif
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,snowcrash.target.mk)))),)
-  include snowcrash.target.mk
+                 $(join ^,ext/snowcrash/perf-libsnowcrash.target.mk)))),)
+  include ext/snowcrash/perf-libsnowcrash.target.mk
 endif
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,test-libsnowcrash.target.mk)))),)
-  include test-libsnowcrash.target.mk
+                 $(join ^,ext/snowcrash/test-libsnowcrash.target.mk)))),)
+  include ext/snowcrash/test-libsnowcrash.target.mk
+endif
+ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
+    $(findstring $(join ^,$(prefix)),\
+                 $(join ^,libdrafter.target.mk)))),)
+  include libdrafter.target.mk
+endif
+ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
+    $(findstring $(join ^,$(prefix)),\
+                 $(join ^,libsos.target.mk)))),)
+  include libsos.target.mk
+endif
+ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
+    $(findstring $(join ^,$(prefix)),\
+                 $(join ^,test-libdrafter.target.mk)))),)
+  include test-libdrafter.target.mk
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); ./tools/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/abtris/Sites/redsnow/ext/snowcrash/config.gypi "--depth=." "--generator-output=build"
-Makefile: $(srcdir)/snowcrash.gyp $(srcdir)/common.gypi $(srcdir)/config.gypi
+cmd_regen_makefile = cd $(srcdir); ./ext/snowcrash/tools/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/Users/abtris/Sites/redsnow/ext/drafter/config.gypi "--depth=." "--generator-output=build"
+Makefile: $(srcdir)/ext/snowcrash/common.gypi $(srcdir)/ext/snowcrash/snowcrash.gyp $(srcdir)/config.gypi $(srcdir)/drafter.gyp
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

data/ext/{snowcrash/build/snowcrash.Makefile → drafter/build/drafter.Makefile}

@@ -3,4 +3,4 @@
 export builddir_name ?= ././build/out
 .PHONY: all
 all:
-	$(MAKE) libsundown libmarkdownparser libsnowcrash perf-libsnowcrash snowcrash test-libsnowcrash
+	$(MAKE) libsos libdrafter drafter test-libdrafter

data/ext/{snowcrash/build/snowcrash.target.mk → drafter/build/drafter.target.mk}

@@ -1,7 +1,7 @@
 # This file is generated by gyp; do not edit.
 
 TOOLSET := target
-TARGET := snowcrash
+TARGET := drafter
 DEFS_Debug := \
 	'-DBUILDING_SNOWCRASH=1' \
 	'-D_DARWIN_USE_64_BIT_INODE=1' \
@@ -35,11 +35,11 @@ CFLAGS_OBJC_Debug :=
 CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I$(srcdir)/src \
-	-I$(srcdir)/src/snowcrash \
-	-I$(srcdir)/ext/markdown-parser/src \
-	-I$(srcdir)/ext/markdown-parser/ext/sundown/src \
-	-I$(srcdir)/ext/cmdline
+	-I$(srcdir)/ext/cmdline \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/sos/src \
+	-I$(srcdir)/ext/snowcrash/src
 
 DEFS_Release := \
 	'-DBUILDING_SNOWCRASH=1' \
@@ -72,20 +72,22 @@ CFLAGS_OBJC_Release :=
 CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I$(srcdir)/src \
-	-I$(srcdir)/src/snowcrash \
-	-I$(srcdir)/ext/markdown-parser/src \
-	-I$(srcdir)/ext/markdown-parser/ext/sundown/src \
-	-I$(srcdir)/ext/cmdline
+	-I$(srcdir)/ext/cmdline \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/sos/src \
+	-I$(srcdir)/ext/snowcrash/src
 
 OBJS := \
-	$(obj).target/$(TARGET)/src/snowcrash/snowcrash.o
+	$(obj).target/$(TARGET)/src/main.o \
+	$(obj).target/$(TARGET)/src/config.o \
+	$(obj).target/$(TARGET)/src/reporting.o
 
 # Add to the list of files we specially track dependencies for.
 all_deps += $(OBJS)
 
 # Make sure our dependencies are built before any of us.
-$(OBJS): | $(builddir)/libsnowcrash.dylib $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a
+$(OBJS): | $(builddir)/libdrafter.dylib $(builddir)/libsos.a $(builddir)/libsnowcrash.a $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a
 
 # CFLAGS et al overrides must be target-local.
 # See "Target-specific Variable Values" in the GNU Make manual.
@@ -130,20 +132,20 @@ LIBTOOLFLAGS_Release := \
 
 LIBS :=
 
-$(builddir)/snowcrash: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
-$(builddir)/snowcrash: LIBS := $(LIBS)
-$(builddir)/snowcrash: GYP_LIBTOOLFLAGS := $(LIBTOOLFLAGS_$(BUILDTYPE))
-$(builddir)/snowcrash: LD_INPUTS := $(OBJS) $(builddir)/libsnowcrash.dylib $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a
-$(builddir)/snowcrash: TOOLSET := $(TOOLSET)
-$(builddir)/snowcrash: $(OBJS) $(builddir)/libsnowcrash.dylib $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a FORCE_DO_CMD
+$(builddir)/drafter: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(builddir)/drafter: LIBS := $(LIBS)
+$(builddir)/drafter: GYP_LIBTOOLFLAGS := $(LIBTOOLFLAGS_$(BUILDTYPE))
+$(builddir)/drafter: LD_INPUTS := $(OBJS) $(builddir)/libdrafter.dylib $(builddir)/libsos.a $(builddir)/libsnowcrash.a $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a
+$(builddir)/drafter: TOOLSET := $(TOOLSET)
+$(builddir)/drafter: $(OBJS) $(builddir)/libdrafter.dylib $(builddir)/libsos.a $(builddir)/libsnowcrash.a $(builddir)/libmarkdownparser.a $(builddir)/libsundown.a FORCE_DO_CMD
 	$(call do_cmd,link)
 
-all_deps += $(builddir)/snowcrash
+all_deps += $(builddir)/drafter
 # Add target alias
-.PHONY: snowcrash
-snowcrash: $(builddir)/snowcrash
+.PHONY: drafter
+drafter: $(builddir)/drafter
 
 # Add executable to "all" target.
 .PHONY: all
-all: $(builddir)/snowcrash
+all: $(builddir)/drafter
 

data/ext/{snowcrash/build → drafter/build/ext/snowcrash}/libmarkdownparser.target.mk

@@ -35,8 +35,8 @@ CFLAGS_OBJC_Debug :=
 CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I$(srcdir)/ext/markdown-parser/ext/sundown/src \
-	-I$(srcdir)/ext/markdown-parser/ext/sundown/htmlext/markdown-parser/src
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/htmlext/markdown-parser/src
 
 DEFS_Release := \
 	'-DBUILDING_SNOWCRASH=1' \
@@ -69,13 +69,13 @@ CFLAGS_OBJC_Release :=
 CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I$(srcdir)/ext/markdown-parser/ext/sundown/src \
-	-I$(srcdir)/ext/markdown-parser/ext/sundown/htmlext/markdown-parser/src
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/htmlext/markdown-parser/src
 
 OBJS := \
-	$(obj).target/$(TARGET)/ext/markdown-parser/src/ByteBuffer.o \
-	$(obj).target/$(TARGET)/ext/markdown-parser/src/MarkdownNode.o \
-	$(obj).target/$(TARGET)/ext/markdown-parser/src/MarkdownParser.o
+	$(obj).target/$(TARGET)/ext/snowcrash/ext/markdown-parser/src/ByteBuffer.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/ext/markdown-parser/src/MarkdownNode.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/ext/markdown-parser/src/MarkdownParser.o
 
 # Add to the list of files we specially track dependencies for.
 all_deps += $(OBJS)

data/ext/drafter/build/ext/snowcrash/libsnowcrash.target.mk

@@ -0,0 +1,152 @@
+# This file is generated by gyp; do not edit.
+
+TOOLSET := target
+TARGET := libsnowcrash
+DEFS_Debug := \
+	'-DBUILDING_SNOWCRASH=1' \
+	'-D_DARWIN_USE_64_BIT_INODE=1' \
+	'-DDEBUG' \
+	'-D_DEBUG'
+
+# Flags passed to all source files.
+CFLAGS_Debug := \
+	-O0 \
+	-gdwarf-2 \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-Wall \
+	-Wendif-labels \
+	-W \
+	-Wno-unused-parameter
+
+# Flags passed to only C files.
+CFLAGS_C_Debug := \
+	-fno-strict-aliasing
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Debug := \
+	-fno-threadsafe-statics \
+	-fno-strict-aliasing
+
+# Flags passed to only ObjC files.
+CFLAGS_OBJC_Debug :=
+
+# Flags passed to only ObjC++ files.
+CFLAGS_OBJCC_Debug :=
+
+INCS_Debug := \
+	-I$(srcdir)/ext/snowcrash/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/html
+
+DEFS_Release := \
+	'-DBUILDING_SNOWCRASH=1' \
+	'-D_DARWIN_USE_64_BIT_INODE=1'
+
+# Flags passed to all source files.
+CFLAGS_Release := \
+	-Os \
+	-gdwarf-2 \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-Wall \
+	-Wendif-labels \
+	-W \
+	-Wno-unused-parameter
+
+# Flags passed to only C files.
+CFLAGS_C_Release := \
+	-fno-strict-aliasing
+
+# Flags passed to only C++ files.
+CFLAGS_CC_Release := \
+	-fno-threadsafe-statics \
+	-fno-strict-aliasing
+
+# Flags passed to only ObjC files.
+CFLAGS_OBJC_Release :=
+
+# Flags passed to only ObjC++ files.
+CFLAGS_OBJCC_Release :=
+
+INCS_Release := \
+	-I$(srcdir)/ext/snowcrash/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/src \
+	-I$(srcdir)/ext/snowcrash/ext/markdown-parser/ext/sundown/html
+
+OBJS := \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/HTTP.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/MSON.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/MSONOneOfParser.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/MSONSourcemap.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/MSONTypeSectionParser.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/MSONValueMemberParser.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/Blueprint.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/BlueprintSourcemap.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/Section.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/Signature.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/snowcrash.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/UriTemplateParser.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/HeadersParser.o \
+	$(obj).target/$(TARGET)/ext/snowcrash/src/posix/RegexMatch.o
+
+# Add to the list of files we specially track dependencies for.
+all_deps += $(OBJS)
+
+# CFLAGS et al overrides must be target-local.
+# See "Target-specific Variable Values" in the GNU Make manual.
+$(OBJS): TOOLSET := $(TOOLSET)
+$(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
+$(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
+$(OBJS): GYP_OBJCFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) $(CFLAGS_OBJC_$(BUILDTYPE))
+$(OBJS): GYP_OBJCXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) $(CFLAGS_OBJCC_$(BUILDTYPE))
+
+# Suffix rules, putting all outputs into $(obj).
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(srcdir)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+
+# Try building from generated source, too.
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj).$(TOOLSET)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+
+$(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
+	@$(call do_cmd,cxx,1)
+
+# End of this set of suffix rules
+### Rules for final target.
+LDFLAGS_Debug := \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-L$(builddir)
+
+LIBTOOLFLAGS_Debug :=
+
+LDFLAGS_Release := \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-L$(builddir)
+
+LIBTOOLFLAGS_Release :=
+
+LIBS :=
+
+$(builddir)/libsnowcrash.a: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(builddir)/libsnowcrash.a: LIBS := $(LIBS)
+$(builddir)/libsnowcrash.a: GYP_LIBTOOLFLAGS := $(LIBTOOLFLAGS_$(BUILDTYPE))
+$(builddir)/libsnowcrash.a: TOOLSET := $(TOOLSET)
+$(builddir)/libsnowcrash.a: $(OBJS) FORCE_DO_CMD
+	$(call do_cmd,alink)
+
+all_deps += $(builddir)/libsnowcrash.a
+# Add target alias
+.PHONY: libsnowcrash
+libsnowcrash: $(builddir)/libsnowcrash.a
+
+# Add target alias to "all" target.
+.PHONY: all
+all: libsnowcrash
+