Skip to content

Commit

Permalink
Drop safe_yaml dependency (via cyclops) in favour of stdlib.
Browse files Browse the repository at this point in the history
  • Loading branch information
blackwinter committed Jun 16, 2018
1 parent ba29ae2 commit 4fd5de0
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ language:
ruby

rvm:
- '2.0'
- '2.1'
- '2.2'
- '2.3'
- '2.4'
- '2.5'
- ruby-head
- jruby-9.1
- jruby-head
Expand Down
10 changes: 5 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ The main functions of Lingo are:
].to_a,

dependencies: {
'cyclops' => '~> 0.2',
'cyclops' => '~> 0.3',
'nuggets' => '~> 1.5',
'rubyzip' => '~> 1.2',
'sinatra-bells' => '~> 0.4',
'unicode' => '~> 0.4'
},

development_dependencies: {
'diff-lcs' => '~> 1.2',
'nokogiri' => '~> 1.6',
'diff-lcs' => '~> 1.3',
'nokogiri' => '~> 1.8',
'open4' => '~> 1.3',
'pdf-reader' => '~> 1.4'
'pdf-reader' => '~> 2.1'
},

required_ruby_version: '>= 2.0'
required_ruby_version: '>= 2.1'
},
test: {
pattern: %w[test/ts_*.rb test/attendee/ts_*.rb]
Expand Down
6 changes: 3 additions & 3 deletions lib/lingo/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Lingo -- A full-featured automatic indexing system #
# #
# Copyright (C) 2005-2007 John Vorhauer #
# Copyright (C) 2007-2016 John Vorhauer, Jens Wille #
# Copyright (C) 2007-2018 John Vorhauer, Jens Wille #
# #
# Lingo is free software; you can redistribute it and/or modify it under the #
# terms of the GNU Affero General Public License as published by the Free #
Expand All @@ -24,7 +24,7 @@
###############################################################################
#++

require 'safe_yaml/load'
require 'psych'
require_relative 'cli'

class Lingo
Expand Down Expand Up @@ -129,7 +129,7 @@ def load_config(key, type = key.to_sym)
instance_variable_set("@#{type}_file", file)

File.open(file, encoding: ENCODING) { |f|
@opts.update(SafeYAML.load(f)) }
@opts.update(Psych.safe_load(f.read)) }
rescue Psych::SyntaxError => err
err.message << " (in #{file})"
raise
Expand Down
Loading

0 comments on commit 4fd5de0

Please sign in to comment.