Skip to content

Commit 14adce7

Browse files
committed
Remove sdoc and upgrade dependencies
1 parent 6b1e528 commit 14adce7

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed

Rakefile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ class UndocumentedTestTask < Rake::TestTask
2323
def desc(*) end
2424
end
2525

26-
def skip_sdoc(src)
27-
src.gsub(/^.*sdoc.*/) { |s| s + ' if RUBY_VERSION > "1.8.6"' }
28-
end
29-
3026
MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
3127
BUNDLE = ENV['BUNDLE'] || %w[bundle].find { |c| system(c, '-v') }
3228
PKG_NAME = 'json'
@@ -88,8 +84,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
8884

8985
s.require_path = 'lib'
9086
s.add_development_dependency 'permutation'
91-
s.add_development_dependency 'sdoc', '~>0.3.16'
92-
s.add_development_dependency 'rake', '~>0.9.2'
87+
s.add_development_dependency 'rake'
9388

9489
s.extra_rdoc_files << 'README.rdoc'
9590
s.rdoc_options <<
@@ -105,7 +100,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
105100
desc 'Creates a json_pure.gemspec file'
106101
task :gemspec_pure => :version do
107102
File.open('json_pure.gemspec', 'w') do |gemspec|
108-
gemspec.write skip_sdoc(spec_pure.to_ruby)
103+
gemspec.write spec_pure.to_ruby
109104
end
110105
end
111106

@@ -126,7 +121,6 @@ if defined?(Gem) and defined?(Gem::PackageTask)
126121

127122
s.require_path = 'lib'
128123
s.add_development_dependency 'permutation'
129-
s.add_development_dependency 'sdoc', '~>0.3.16'
130124

131125
s.extra_rdoc_files << 'README.rdoc'
132126
s.rdoc_options <<
@@ -142,7 +136,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
142136
desc 'Creates a json.gemspec file'
143137
task :gemspec_ext => :version do
144138
File.open('json.gemspec', 'w') do |gemspec|
145-
gemspec.write skip_sdoc(spec_ext.to_ruby)
139+
gemspec.write spec_ext.to_ruby
146140
end
147141
end
148142

@@ -341,11 +335,6 @@ else
341335
t.options = '-v'
342336
end
343337

344-
desc "Create RDOC documentation"
345-
task :doc => [ :version, EXT_PARSER_SRC ] do
346-
sh "sdoc -o doc -t '#{PKG_TITLE}' -m README.rdoc README.rdoc lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
347-
end
348-
349338
desc "Generate parser with ragel"
350339
task :ragel => EXT_PARSER_SRC
351340

json.gemspec

-272 Bytes
Binary file not shown.

json_pure.gemspec

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# -*- encoding: utf-8 -*-
2-
# stub: json_pure 1.8.3 ruby lib
2+
# stub: json_pure 1.8.4 ruby lib
33

44
Gem::Specification.new do |s|
55
s.name = "json_pure"
6-
s.version = "1.8.3"
6+
s.version = "1.8.4"
77

88
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
99
s.require_paths = ["lib"]
1010
s.authors = ["Florian Frank"]
11-
s.date = "2015-06-01"
11+
s.date = "2015-09-11"
1212
s.description = "This is a JSON implementation in pure Ruby."
1313
s.email = "[email protected]"
1414
s.extra_rdoc_files = ["README.rdoc"]
15-
s.files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb", ".gitignore", ".travis.yml", "CHANGES", "COPYING", "COPYING-json-jruby", "GPL", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/depend", "ext/json/ext/generator/extconf.rb", "ext/json/ext/generator/generator.c", "ext/json/ext/generator/generator.h", "ext/json/ext/parser/depend", "ext/json/ext/parser/extconf.rb", "ext/json/ext/parser/parser.c", "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "ext/json/extconf.rb", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb"]
15+
s.files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb", ".gitignore", ".travis.yml", "CHANGES", "Gemfile", "README-json-jruby.markdown", "README.rdoc", "Rakefile", "TODO", "VERSION", "data/example.json", "data/index.html", "data/prototype.js", "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/depend", "ext/json/ext/generator/extconf.rb", "ext/json/ext/generator/generator.c", "ext/json/ext/generator/generator.h", "ext/json/ext/parser/depend", "ext/json/ext/parser/extconf.rb", "ext/json/ext/parser/parser.c", "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "ext/json/extconf.rb", "install.rb", "java/src/json/ext/ByteListTranscoder.java", "java/src/json/ext/Generator.java", "java/src/json/ext/GeneratorMethods.java", "java/src/json/ext/GeneratorService.java", "java/src/json/ext/GeneratorState.java", "java/src/json/ext/OptionsReader.java", "java/src/json/ext/Parser.java", "java/src/json/ext/Parser.rl", "java/src/json/ext/ParserService.java", "java/src/json/ext/RuntimeInfo.java", "java/src/json/ext/StringDecoder.java", "java/src/json/ext/StringEncoder.java", "java/src/json/ext/Utils.java", "json-java.gemspec", "json.gemspec", "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", "lib/json/add/core.rb", "lib/json/add/date.rb", "lib/json/add/date_time.rb", "lib/json/add/exception.rb", "lib/json/add/ostruct.rb", "lib/json/add/range.rb", "lib/json/add/rational.rb", "lib/json/add/regexp.rb", "lib/json/add/struct.rb", "lib/json/add/symbol.rb", "lib/json/add/time.rb", "lib/json/common.rb", "lib/json/ext.rb", "lib/json/ext/.keep", "lib/json/generic_object.rb", "lib/json/pure.rb", "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", "tests/fixtures/fail1.json", "tests/fixtures/fail10.json", "tests/fixtures/fail11.json", "tests/fixtures/fail12.json", "tests/fixtures/fail13.json", "tests/fixtures/fail14.json", "tests/fixtures/fail18.json", "tests/fixtures/fail19.json", "tests/fixtures/fail2.json", "tests/fixtures/fail20.json", "tests/fixtures/fail21.json", "tests/fixtures/fail22.json", "tests/fixtures/fail23.json", "tests/fixtures/fail24.json", "tests/fixtures/fail25.json", "tests/fixtures/fail27.json", "tests/fixtures/fail28.json", "tests/fixtures/fail3.json", "tests/fixtures/fail4.json", "tests/fixtures/fail5.json", "tests/fixtures/fail6.json", "tests/fixtures/fail7.json", "tests/fixtures/fail8.json", "tests/fixtures/fail9.json", "tests/fixtures/pass1.json", "tests/fixtures/pass15.json", "tests/fixtures/pass16.json", "tests/fixtures/pass17.json", "tests/fixtures/pass2.json", "tests/fixtures/pass26.json", "tests/fixtures/pass3.json", "tests/setup_variant.rb", "tests/test_json.rb", "tests/test_json_addition.rb", "tests/test_json_encoding.rb", "tests/test_json_fixtures.rb", "tests/test_json_generate.rb", "tests/test_json_generic_object.rb", "tests/test_json_string_matching.rb", "tests/test_json_unicode.rb", "tools/fuzz.rb", "tools/server.rb"]
1616
s.homepage = "http://flori.github.com/json"
1717
s.licenses = ["Ruby"]
1818
s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.rdoc"]
19-
s.rubygems_version = "2.4.6"
19+
s.rubygems_version = "2.4.8"
2020
s.summary = "JSON Implementation for Ruby"
2121
s.test_files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
2222

@@ -25,16 +25,13 @@ Gem::Specification.new do |s|
2525

2626
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
2727
s.add_development_dependency(%q<permutation>, [">= 0"])
28-
s.add_development_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
29-
s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
28+
s.add_development_dependency(%q<rake>, [">= 0"])
3029
else
3130
s.add_dependency(%q<permutation>, [">= 0"])
32-
s.add_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
33-
s.add_dependency(%q<rake>, ["~> 0.9.2"])
31+
s.add_dependency(%q<rake>, [">= 0"])
3432
end
3533
else
3634
s.add_dependency(%q<permutation>, [">= 0"])
37-
s.add_dependency(%q<sdoc>, ["~> 0.3.16"]) if RUBY_VERSION > "1.8.6"
38-
s.add_dependency(%q<rake>, ["~> 0.9.2"])
35+
s.add_dependency(%q<rake>, [">= 0"])
3936
end
4037
end

0 commit comments

Comments
 (0)