Rakefile in json_pure-1.8.6 vs Rakefile in json_pure-2.0.0

@@ -86,11 +86,11 @@
     s.add_development_dependency 'rake'
     s.add_development_dependency 'test-unit', '~> 2.0'
 
     s.extra_rdoc_files << 'README.md'
     s.rdoc_options <<
-      '--title' <<  'JSON implemention for Ruby' << '--main' << 'README.md'
+      '--title' <<  'JSON implemention for ruby' << '--main' << 'README.md'
     s.test_files.concat Dir['./tests/test_*.rb']
 
     s.author = "Florian Frank"
     s.email = "[e-mail]"
     s.homepage = "http://flori.github.com/#{PKG_NAME}"
@@ -130,10 +130,11 @@
 
     s.author = "Florian Frank"
     s.email = "[e-mail]"
     s.homepage = "http://flori.github.com/#{PKG_NAME}"
     s.license = 'Ruby'
+    s.required_ruby_version = '~> 2.0'
   end
 
   desc 'Creates a json.gemspec file'
   task :gemspec_ext => :version do
     File.open('json.gemspec', 'w') do |gemspec|
@@ -154,10 +155,11 @@
 desc m = "Writing version information for #{PKG_VERSION}"
 task :version do
   puts m
   File.open(File.join('lib', 'json', 'version.rb'), 'w') do |v|
     v.puts <<EOT
+# frozen_string_literal: false
 module JSON
   # JSON version
   VERSION         = '#{PKG_VERSION}'
   VERSION_ARRAY   = VERSION.split(/\\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
@@ -166,17 +168,21 @@
 end
 EOT
   end
 end
 
+task :check_env do
+  ENV.key?('JSON') or fail "JSON env var is required"
+end
+
 desc "Testing library (pure ruby)"
-task :test_pure => [ :clean, :do_test_pure ]
+task :test_pure => [ :clean, :check_env, :do_test_pure ]
 
 UndocumentedTestTask.new do |t|
   t.name = 'do_test_pure'
-  t.libs << 'lib'
-  t.test_files = FileList['tests/test_*.rb']
+  t.libs << 'lib' << 'tests'
+  t.test_files = FileList['tests/*_test.rb']
   t.verbose = true
   t.options = '-v'
 end
 
 desc "Testing library (pure ruby and extension)"
@@ -250,16 +256,16 @@
     mkdir_p 'pkg'
     mv "json-#{PKG_VERSION}-java.gem", 'pkg'
   end
 
   desc "Testing library (jruby)"
-  task :test_ext => [ :create_jar, :do_test_ext ]
+  task :test_ext => [ :create_jar, :check_env, :do_test_ext ]
 
   UndocumentedTestTask.new do |t|
     t.name = 'do_test_ext'
-    t.libs << 'lib'
-    t.test_files = FileList['tests/test_*.rb']
+    t.libs << 'lib' << 'tests'
+    t.test_files = FileList['tests/*_test.rb']
     t.verbose = true
     t.options = '-v'
   end
 
   file JRUBY_PARSER_JAR => :compile do
@@ -324,16 +330,16 @@
     end
     cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
   end
 
   desc "Testing library (extension)"
-  task :test_ext => [ :compile, :do_test_ext ]
+  task :test_ext => [ :compile, :check_env, :do_test_ext ]
 
   UndocumentedTestTask.new do |t|
     t.name = 'do_test_ext'
-    t.libs << 'ext' << 'lib'
-    t.test_files = FileList['tests/test_*.rb']
+    t.libs << 'ext' << 'lib' << 'tests'
+    t.test_files = FileList['tests/*_test.rb']
     t.verbose = true
     t.options = '-v'
   end
 
   desc "Generate parser with ragel"
@@ -355,9 +361,10 @@
         sh "ragel parser.rl -G2 -o parser.c"
       else
         sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
       end
       src = File.read("parser.c").gsub(/[ \t]+$/, '')
+      src.gsub!(/^static const int (JSON_.*=.*);$/, 'enum {\1};')
       File.open("parser.c", "w") {|f| f.print src}
     end
   end
 
   desc "Generate diagrams of ragel parser (ps)"