github-markup 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9cdb298d9ec9756e7fab1f948d1025957a5059c8
-  data.tar.gz: 2ca9f9e7c1c07111d389c242f1bbf7a8d163b051
+SHA256:
+  metadata.gz: 75e98a420bcda4902275853fc8190048077725dc7950ad685b2061a031e9b2d0
+  data.tar.gz: 2bdba5ce8edbd5887fa262c48e1adf41c54dc4695886daf303fcf6fa103d3c81
 SHA512:
-  metadata.gz: 8f9556d901900d9a930879aa1722af0465130797d7e80461ddf7af5618988b560c445f6a7db90f2aeaa5f28d7334b55255c1e8ad3dbca9577ba9770382263596
-  data.tar.gz: 6657b245fd58d141fef0a72b6e88dc46a9943cf19d676cb1a367dcb38bc1c225a30956897da7e5e3ed0928b7a8b10f99ffe29c4e08bbccabb006475d28c9bc08
+  metadata.gz: f70a33ad3658dc853c688f99dc75eaf7f643a6c43480a255b7fa8a00a9fa464d252867016a59e1c9281292390ed48ccc9baf86608f9bb24d681126bff7de10f0
+  data.tar.gz: 84c0610b905918cb1ea480b281a664fc6e50da90c1fb6753c9070b03fe2e4bd8afa44a3cfd4a2bd356ea87a8141e33873526db08ea60ca793bd08d598668af1f

data/.travis.yml

@@ -2,7 +2,6 @@ dist: trusty
 sudo: required
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.10
   - 2.2.7
   - 2.3.4

data/CONTRIBUTING.md

@@ -23,6 +23,10 @@ Anything else - [search open issues](https://github.com/github/markup/issues) or
 5. Open a [Pull Request][1]
 6. Enjoy a refreshing Diet Coke and wait
 
+**dependencies**
+
+You can run `script/bootstrap.contrib` to fetch them all.
+
 ## Testing
 
 To run the tests:

data/Gemfile

@@ -10,5 +10,6 @@ gem "rdoc", "~>3.6"
 gem "org-ruby", "= 0.9.9"
 gem "creole", "~>0.3.6"
 gem "wikicloth", "=0.8.3"
+gem "twitter-text", "~> 1.14"
 gem "asciidoctor", "= 1.5.6.1"
 gem "rake"

data/HISTORY.md

@@ -1,3 +1,10 @@
+## 1.7.0 - 2018-01-30
+
+### Changed
+
+* Updates for Linguist v6 [#1139](https://github.com/github/markup/pull/1139)
+* Update to Nokogiri ~> 1.8; drop support for Ruby 2.0 [#1156](https://github.com/github/markup/pull/1156)
+
 ## 1.6.2 - 2017-11-27
 
 ### Changed

data/github-markup.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
   s.add_development_dependency 'html-pipeline', '~> 1.0'
   s.add_development_dependency 'sanitize', '~> 2.1', '>= 2.1.0'
-  s.add_development_dependency 'nokogiri', '1.6.8.1'
+  s.add_development_dependency 'nokogiri', '~> 1.8.1'
   s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
-  s.add_development_dependency "github-linguist", "~> 5.0", ">= 5.0.8"
+  s.add_development_dependency "github-linguist", "~> 6.0"
 end

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '1.6.2'
+    VERSION = '1.7.0'
     Version = VERSION
   end
 end

data/lib/github/markup.rb

@@ -40,10 +40,11 @@ module GitHub
       end
     end
 
-    def render(filename, content = nil)
+    def render(filename, content = nil, symlink = nil)
       content ||= File.read(filename)
+      symlink = (File.symlink?(filename) rescue false) if symlink.nil?
 
-      if impl = renderer(filename, content)
+      if impl = renderer(filename, content, symlink)
         impl.render(filename, content)
       else
         content
@@ -79,20 +80,20 @@ module GitHub
       markup_impl(symbol, CommandImplementation.new(regexp, languages, command, name, &block))
     end
 
-    def can_render?(filename, content)
-      !!renderer(filename, content)
+    def can_render?(filename, content, symlink = false)
+      !!renderer(filename, content, symlink)
     end
 
-    def renderer(filename, content)
-      language = language(filename, content)
+    def renderer(filename, content, symlink = false)
+      language = language(filename, content, symlink)
       markup_impls.find { |impl|
         impl.match?(filename, language)
       }
     end
 
-    def language(filename, content)
+    def language(filename, content, symlink = false)
       if defined?(::Linguist)
-        blob = Linguist::Blob.new(filename, content)
+        blob = Linguist::Blob.new(filename, content, symlink: symlink)
         return Linguist.detect(blob, allow_empty: true)
       end
     end

data/script/bootstrap.contrib

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+cd $(dirname "$0")/..
+
+bundle install --path vendor/bundle
+virtualenv vendor/python && source vendor/python/bin/activate
+pip install docutils
+
+echo ""
+echo "*** DONE ***"
+echo ""
+echo "activate python environment with 'source vendor/python/bin/activate'"
+echo "run tests with 'bundle exec rake'"

data/test/markup_test.rb

@@ -104,7 +104,7 @@ message
     GitHub::Markup.command(:doesntmatter, 'test/fixtures/fail.sh', /fail/, ['Java'], 'fail')
     assert GitHub::Markup.can_render?('README.java', 'stop swallowing errors')
     begin
-      GitHub::Markup.render('README.java', "stop swallowing errors")
+      GitHub::Markup.render('README.java', "stop swallowing errors", false)
     rescue GitHub::Markup::CommandError => e
       assert_equal "failure message", e.message
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-markup
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Chris Wanstrath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,16 +96,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8.1
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8.1
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: nokogiri-diff
   requirement: !ruby/object:Gem::Requirement
@@ -126,20 +126,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '6.0'
 description: This gem is used by GitHub to render any fancy markup such as Markdown,
   Textile, Org-Mode, etc. Fork it and add your own!
 email: chris@ozmm.org
@@ -170,6 +164,7 @@ files:
 - lib/github/markup/rdoc.rb
 - lib/github/markups.rb
 - script/bootstrap
+- script/bootstrap.contrib
 - script/cibuild
 - test/fixtures/fail.sh
 - test/markup_test.rb
@@ -225,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: The code GitHub uses to render README.markup