From 5663387ee4e359b3724855e8574fea620fa2b3b1 Mon Sep 17 00:00:00 2001 From: Jens Wille Date: Tue, 7 Oct 2014 10:49:00 +0200 Subject: [PATCH] Use `require_relative`, drop `autoload`. --- README | 4 ++-- Rakefile | 19 ++++++++++--------- bin/bconv | 4 +++- bin/cinderella | 4 +++- bin/decode_entities | 4 +++- bin/guess_encoding | 4 +++- lib/cmess.rb | 10 ++-------- lib/cmess/bconv.rb | 5 +++-- lib/cmess/cinderella.rb | 4 ++-- lib/cmess/cli.rb | 6 +++--- lib/cmess/decode_entities.rb | 5 +++-- lib/cmess/guess_encoding.rb | 12 ++++++------ lib/cmess/guess_encoding/automatic.rb | 2 -- lib/cmess/guess_encoding/encoding.rb | 4 +--- lib/cmess/guess_encoding/manual.rb | 4 +--- 15 files changed, 45 insertions(+), 46 deletions(-) diff --git a/README b/README index 95695c5..85c09b7 100644 --- a/README +++ b/README @@ -25,8 +25,8 @@ there are: == SUPPORTED PLATFORMS -Requires Ruby version 1.9.2 or higher; use the latest 0.3.x release on older -Ruby versions. CMess has been tested with ruby 2.0.0p247 on x86_64-linux. +Requires Ruby version 1.9.3 or higher; use the latest 0.3.x release on older +Ruby versions. CMess has been tested with ruby 2.1.3p242 on x86_64-linux. == LINKS diff --git a/Rakefile b/Rakefile index e4212e0..57a8eb1 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,4 @@ -$:.unshift(File.expand_path('../lib', __FILE__)) - -require 'cmess' +require_relative 'lib/cmess/version' begin require 'hen' @@ -20,7 +18,7 @@ following tools: #{Dir['bin/*'].map { |e| File.basename(e) }.sort.join(', ')}) extra_files: FileList['data/**/*'].to_a, dependencies: %w[htmlentities nuggets safe_yaml], - required_ruby_version: '>= 1.9.2' + required_ruby_version: '>= 1.9.3' } }} rescue LoadError => err @@ -29,19 +27,22 @@ end namespace :guess_encoding do - desc "Compare actual encoding and automatic guess of example files" + desc 'Compare actual encoding and automatic guess of example files' task :check_examples do - E = CMess::GuessEncoding::Encoding + require_relative 'lib/cmess' + require_relative 'lib/cmess/guess_encoding' + + e = CMess::GuessEncoding::Encoding - Dir[File.join(File.dirname(__FILE__), 'example', 'guess_encoding', '??.*.txt')].sort.each { |example| + Dir[File.expand_path('../example/guess_encoding/??.*.txt', __FILE__)].sort.each { |example| language, encoding = File.basename(example, '.txt').split('.') encoding.upcase! result = CMess::GuessEncoding::Automatic.guess(File.open(example)) puts '%s %s/%-11s => %s' % [case result - when E::UNKNOWN then '?' - when E::ASCII then '#' + when e::UNKNOWN then '?' + when e::ASCII then '#' when encoding then '+' else '-' end, language, encoding, result] diff --git a/bin/bconv b/bin/bconv index b0c5f48..74e6b7f 100755 --- a/bin/bconv +++ b/bin/bconv @@ -10,7 +10,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -32,6 +32,8 @@ #++ require 'cmess/bconv' +require 'cmess/cli' + include CMess::CLI options = { diff --git a/bin/cinderella b/bin/cinderella index d8e8fd0..7e075e8 100755 --- a/bin/cinderella +++ b/bin/cinderella @@ -10,7 +10,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -32,6 +32,8 @@ #++ require 'cmess/cinderella' +require 'cmess/cli' + include CMess::CLI progname = File.basename($0) diff --git a/bin/decode_entities b/bin/decode_entities index 609eefc..71e3617 100755 --- a/bin/decode_entities +++ b/bin/decode_entities @@ -10,7 +10,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -32,6 +32,8 @@ #++ require 'cmess/decode_entities' +require 'cmess/cli' + include CMess::CLI options = { diff --git a/bin/guess_encoding b/bin/guess_encoding index 74f6bb0..601ef3b 100755 --- a/bin/guess_encoding +++ b/bin/guess_encoding @@ -10,7 +10,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -32,6 +32,8 @@ #++ require 'cmess/guess_encoding' +require 'cmess/cli' + include CMess::CLI options = { diff --git a/lib/cmess.rb b/lib/cmess.rb index 804f85f..001617f 100644 --- a/lib/cmess.rb +++ b/lib/cmess.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -28,18 +28,12 @@ ############################################################################### #++ -require 'cmess/version' +require_relative 'cmess/version' # See README for more information. module CMess - autoload :BConv, 'cmess/bconv' - autoload :Cinderella, 'cmess/cinderella' - autoload :CLI, 'cmess/cli' - autoload :DecodeEntities, 'cmess/decode_entities' - autoload :GuessEncoding, 'cmess/guess_encoding' - DATA_DIR = ENV['CMESS_DATA'] || File.expand_path('../../data', __FILE__) class << self diff --git a/lib/cmess/bconv.rb b/lib/cmess/bconv.rb index 34df621..028559a 100644 --- a/lib/cmess/bconv.rb +++ b/lib/cmess/bconv.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -28,9 +28,10 @@ ############################################################################### #++ -require 'cmess' require 'safe_yaml/load' +require 'cmess' unless Object.const_defined?(:CMess) + # Convert between bibliographic (and other) encodings. class CMess::BConv diff --git a/lib/cmess/cinderella.rb b/lib/cmess/cinderella.rb index 769cf80..ccbcddd 100644 --- a/lib/cmess/cinderella.rb +++ b/lib/cmess/cinderella.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -28,7 +28,7 @@ ############################################################################### #++ -require 'cmess' +require 'cmess' unless Object.const_defined?(:CMess) # Find (and possibly repair) doubly encoded characters. Here's how it's done: # diff --git a/lib/cmess/cli.rb b/lib/cmess/cli.rb index d3518d1..5e11081 100644 --- a/lib/cmess/cli.rb +++ b/lib/cmess/cli.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -28,8 +28,6 @@ ############################################################################### #++ -require 'cmess' - require 'optparse' require 'tempfile' require 'nuggets/env/user_encoding' @@ -38,6 +36,8 @@ module CMess::CLI + extend self + # How to split list of arguments. SPLIT_ARG_LIST_RE = %r{\s*[,\s]\s*} diff --git a/lib/cmess/decode_entities.rb b/lib/cmess/decode_entities.rb index ad7434e..ff4a6a4 100644 --- a/lib/cmess/decode_entities.rb +++ b/lib/cmess/decode_entities.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -28,9 +28,10 @@ ############################################################################### #++ -require 'cmess' require 'htmlentities' +require 'cmess' unless Object.const_defined?(:CMess) + module CMess::DecodeEntities extend self diff --git a/lib/cmess/guess_encoding.rb b/lib/cmess/guess_encoding.rb index 66b1db0..e85fcb0 100644 --- a/lib/cmess/guess_encoding.rb +++ b/lib/cmess/guess_encoding.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -32,7 +32,7 @@ ############################################################################### #++ -require 'cmess' +require 'cmess' unless Object.const_defined?(:CMess) # Allows to guess an input's encoding either manually or automatically. # Works actually pretty good -- for the supported encodings. See Manual @@ -42,10 +42,6 @@ module CMess::GuessEncoding VERSION = '0.2.0' - autoload :Encoding, 'cmess/guess_encoding/encoding' - autoload :Manual, 'cmess/guess_encoding/manual' - autoload :Automatic, 'cmess/guess_encoding/automatic' - class << self def manual(*args) @@ -63,3 +59,7 @@ def automatic(*args) end end + +require_relative 'guess_encoding/encoding' +require_relative 'guess_encoding/manual' +require_relative 'guess_encoding/automatic' diff --git a/lib/cmess/guess_encoding/automatic.rb b/lib/cmess/guess_encoding/automatic.rb index 8b99e74..ae60f54 100644 --- a/lib/cmess/guess_encoding/automatic.rb +++ b/lib/cmess/guess_encoding/automatic.rb @@ -34,8 +34,6 @@ ############################################################################### #++ -require 'cmess/guess_encoding' - require 'stringio' require 'forwardable' require 'safe_yaml/load' diff --git a/lib/cmess/guess_encoding/encoding.rb b/lib/cmess/guess_encoding/encoding.rb index 9c94829..b358b1e 100644 --- a/lib/cmess/guess_encoding/encoding.rb +++ b/lib/cmess/guess_encoding/encoding.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -32,8 +32,6 @@ ############################################################################### #++ -require 'cmess/guess_encoding' - # Namespace for our encodings. module CMess::GuessEncoding::Encoding diff --git a/lib/cmess/guess_encoding/manual.rb b/lib/cmess/guess_encoding/manual.rb index 3fab7c0..28dd89a 100644 --- a/lib/cmess/guess_encoding/manual.rb +++ b/lib/cmess/guess_encoding/manual.rb @@ -7,7 +7,7 @@ # Albertus-Magnus-Platz, # # 50923 Cologne, Germany # # # -# Copyright (C) 2013 Jens Wille # +# Copyright (C) 2013-2014 Jens Wille # # # # Authors: # # Jens Wille # @@ -32,8 +32,6 @@ ############################################################################### #++ -require 'cmess/guess_encoding' - require 'nuggets/array/runiq' require 'nuggets/array/in_order' require 'nuggets/enumerable/minmax'