Merge pull request #24 from jgarber/4.3-devel

4.3 devel

Author: joshuasiler

.travis.yml

@@ -3,21 +3,14 @@ cache: bundler
 sudo: false
 rvm:
   - 2.0.0
+  - 2.2.3
   - 1.9.3
   - 1.9.2
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-2
   - ruby-head
-  - jruby-head
   - 1.8.7
   - ree
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
-    - rvm: jruby-head
 compiler:
   - clang
   - gcc

CHANGELOG

@@ -1,4 +1,7 @@
-== Head
+== 4.3.0 / April 29th, 2016
+
+* Remove JRuby and Windows cross compilation and support
+* Add Ruby 2.2.3 testing and support
 
 * include CVE-2012-6684 fix [Tomas Pospisek]
   * fix by [Antonio Terceiro] 

Gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :compilation do
-  gem 'rvm', '~> 1.2.6'
+  gem 'rvm', '~> 1.11.3.9'
   gem 'rake-compiler', '~> 0.7.1'
 end

README.rdoc

@@ -1,8 +1,8 @@
 = RedCloth - Textile parser for Ruby
 
 Homepage::  http://redcloth.org
-Author::    Jason Garber
 Maintainer:: Joshua Siler https://github.com/joshuasiler
+Author::    Jason Garber
 Copyright:: (c) 2011 Jason Garber
 License::   MIT
 
@@ -14,68 +14,36 @@ License::   MIT
 
 RedCloth is a Ruby library for converting Textile into HTML.
 
-== RedCloth needs new maintainers
-
-The {owner of this gem since 2007}[https://github.com/jgarber] is unable to
-keep fixing bugs or work on the next major release, {RedCloth
-5}[https://github.com/jgarber/redcloth-parslet]. He's looking for one or more
-developers who can:
-
-<b>Current version</b>
-
-* Fix any urgent {bugs}[http://jgarber.lighthouseapp.com/projects/13054-redcloth/overview] in RedCloth 4.x. You'll probably need to know Ragel and understand Ruby extensions in C and perhaps Java.
-* Precompile the gem for Windows and JRuby or fix broken cross-compilation to automate the process
-* Cut releases on the 4.x series.
+== Attention - Deprecating JRuby and Windows support in version 4.3
 
-<b>Future version</b>
-
-* Complete {redcloth-parslet}[https://github.com/jgarber/redcloth-parslet], which will be a major release and replace this repository when finished. You need to understand the Parslet DSL, which can be learned in a couple hours.
-* Meet or exceed the current level of unit and integration testing. Unit testing of the individual patterns makes it much easier to develop and maintain than the old parser.
-* Release RedCloth 5.0 to much fanfare.
+In order to prioritize merging a fix for the long standing vulnerability *CVE-2012-6684*, our {new maintainer}[https://github.com/joshuasiler] has elected to stop maintaining the precompiled versions for Windows and JRuby. 
 
 == Installing
 
 RedCloth can be installed via RubyGems:
 
   gem install RedCloth
 
-It will install the appropriate Ruby, JRuby, or Win32 gem. If using JRuby,
-version 1.1.5 or greater is required.
-
 == Compiling
 
 If you just want to use RedCloth, you do NOT need to build/compile it. It is
 compiled from C sources automatically when you install the gem on the ruby
-platform. Precompiled binary gems are provided for JRuby and Win32 platforms.
+platform. Precompiled binary gems are provided for JRuby and Win32 platforms prior to version 4.3.
 
 RedCloth can be compiled with <tt>rake compile</tt>. Ragel 6.3 or greater is
 required. Again, Ragel is NOT needed to simply use RedCloth.
 
 === Supported platforms
 
-By default, the rake compile task builds a native C extension (MRI 1.8 or 1.9)
-or Java extension (JRuby 1.3). A pure Ruby version can also be generated, but
-it's super slow and Ruby 1.8-only. The JRuby and pure-Ruby extensions don't
-support multi-byte characters. Cross-compiling for win32 uses rake-compiler.
+By default, the rake compile task builds a native C extension (MRI 1.8 or 1.9). A pure Ruby version can also be generated, but it's super slow and Ruby 1.8-only, and doesn't
+support multi-byte characters. 
 
 The RedCloth::EXTENSION_LANGUAGE constant indicates in which language your
 copy of RedCloth is compiled.
 
-=== Compiling gems
-
-To compile MRI, JRuby, and win32 gems, you need rvm and rake-compiler. These
-and other dependencies can be installed with bundler. Then rake build:all
-takes care of compiling and packaging all gems.
-
-  1. gem install bundler
-  2. bundle install
-  3. rake-compiler cross-ruby VERSION=1.8.6-p398
-  4. rake-compiler cross-ruby VERSION=1.9.1-p243
-  5. rake build:all
-
 == Bugs
 
-Please submit bugs to http://jgarber.lighthouseapp.com/projects/13054-redcloth/overview
+Please submit bugs as issues to this repo.
 
 == Using RedCloth
 

lib/redcloth/version.rb

@@ -1,8 +1,8 @@
 module RedCloth
   module VERSION
     MAJOR = 4
-    MINOR = 2
-    TINY  = 9
+    MINOR = 3
+    TINY  = 0
     RELEASE_CANDIDATE = 1
 
     STRING = [MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')