wikitext 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c61ab6467120d8def1be560fcb4604ee7c90454b
-  data.tar.gz: 1c7be94a73a1d038a18744775054910772a964f0
+  metadata.gz: ddabd2110e5aac5afaf4174532fa0140fef9ab78
+  data.tar.gz: 9f8921cf631c7f835e14b30bfc0efe5b913b0bac
 SHA512:
-  metadata.gz: df484b7d09e76c9b01a53cf4c8cb7b7bcea8fba56d6e7d1443e01259b3b41934e4f517a87cf0a4593ac33646c47a9b9b4c96accf4f810db83013d32a248dd3f7
-  data.tar.gz: 66d3a468c2d787a2ec572b24ff53e8210cc520f37fd4caab68fc3536c0640f01deaddbe59e22f892eea8f2872788ef2f50bc66bba363298c1e5cee7c655cd444
+  metadata.gz: 32743798b2dea9ae8733e0473b315d9e0fc801b0ecd46d45d03941b54c7e7095ab2f115b07c0d264863f0b66706ad6a7b7649be668e90552a0c48239234bf7ab
+  data.tar.gz: 4cf45c3fee66016ac479559b154629083e785617e6eda0da8c086b4698deaa4f64ab3f7124d7e602a36cdd1a4690d3dba0dcd28127d79163c70e4cc8e675fa24

data/bin/wikitext

@@ -1,16 +1,116 @@
 #!/usr/bin/env ruby
+# Copyright 2008-2013 Wincent Colaiuta. All rights reserved.
 #
-# This file was generated by Bundler.
-#
-# The application 'wikitext' is installed as part of a gem, and
-# this file is here to facilitate running it.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
 #
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+require 'wikitext'
+require 'wikitext/version'
+
+module Wikitext
+  module Tool
+    # Simple substitute for the HighLine library if it is not available.
+    class FakeHighLine
+      def color(str, _)
+        str
+      end
+
+      def output_cols
+        80
+      end
+    end
+
+    INPUT_FILES = []
+
+    def self.interactive?
+      STDOUT.tty? && STDIN.tty? && INPUT_FILES.empty?
+    end
+
+    def self.pretty_print tokens
+      tokens.each do |token|
+        puts <<-END
+    Token:          type: #{token.token_type}
+                    line: #{token.line_start}..#{token.line_stop}   column: #{token.column_start}..#{token.column_stop}
+                 pointer: #{token.start}..#{token.stop}
+              code_point: #{token.code_point}
+            string_value: #{token.string_value.inspect}
+
+    END
+      end
+    end
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+    method = :parse
+    ARGV.each do |arg|
+      if arg =~ /\A--tok/
+        method = :tokenize
+      else
+        INPUT_FILES << arg
+      end
+    end
 
-require 'rubygems'
-require 'bundler/setup'
+    if interactive?
+      begin
+        require 'highline'
+      rescue LoadError
+        begin
+          require 'rubygems'
+          require 'highline'
+        rescue LoadError
+        end
+      end
+      puts "wikitext #{Wikitext::VERSION}"
+      highline = (defined?(HighLine) ? HighLine : FakeHighLine).new
+    end
 
-load Gem.bin_path('wikitext', 'wikitext')
+    parser = Parser.new
+    if INPUT_FILES.empty?
+      begin
+        while true
+          puts highline.color('(Ctrl+D to process, Ctrl+C to exit)>>', :bold) if interactive?
+          input = STDIN.read
+          puts '-' * highline.output_cols if interactive?
+          if method == :tokenize
+            pretty_print parser.tokenize(input)
+          else
+            puts parser.parse(input)
+          end
+          puts '-' * highline.output_cols if interactive?
+          exit unless interactive?
+        end
+      rescue Interrupt
+      end
+    else # we have INPUT_FILES
+      exit_status = 0
+      INPUT_FILES.each do |file|
+        begin
+          puts parser.parse(File.new(file).read)
+        rescue Errno::ENOENT
+          STDERR.puts "error: no such file or directory: #{file}"
+          exit_status |= 1
+        rescue Errno::EACCES
+          STDERR.puts "error: permission denied: #{file}"
+          exit_status |= 2
+        end
+      end
+      exit exit_status
+    end
+  end # module Tool
+end # module Wikitext

data/ext/wikitext/extconf.rb

@@ -28,10 +28,7 @@ def missing item
   exit 1
 end
 
-case RUBY_VERSION
-when /\A2\.0/
-  $CFLAGS += ' -DRUBY_2_0_x'
-else
+if RUBY_VERSION !~ /\A2\.[01]\./
   raise "unsupported Ruby version: #{RUBY_VERSION}"
 end
 

data/lib/wikitext/version.rb

@@ -22,5 +22,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Wikitext
-  VERSION = '4.0.2'
+  VERSION = '4.0.3'
 end # module Wikitext

data/spec/spec_helper.rb

@@ -52,7 +52,7 @@ end
 
 # prepend local directories to search path if not already present
 basedir     = Pathname.new(__dir__) + '..'
-extdir      = (basedir + 'ext').realpath
+extdir      = (basedir + 'ext' + 'wikitext').realpath
 libdir      = (basedir + 'lib').realpath
 normalized  = $:.map { |path| Pathname.new(path).realpath rescue path }
 [libdir, extdir].each { |d| $:.unshift(d) unless normalized.include?(d) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wikitext
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Wincent Colaiuta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wikitext
-rubygems_version: 2.0.0
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Wikitext-to-HTML translator