linebreak 1.3.0 → 1.3.1

data/History.txt

@@ -1,12 +1,22 @@
+=== 1.3.1 / 2009-09-14
+
+* 1 major bugfix
+
+  * Fixed issues with loading the gem in some situations
+
+* 1 minor enhancement
+
+  * Implemented autoloading
+
 === 1.3.0 / 2009-08-11
 
-* major enhancements
+* 3 major enhancements
 
   * Included methods for linebreak system detection and ensuring
   * Overhauled commandline tool to support detection and ensuring
   * BreakVerter renamed to Linebreak for better recognition
 
-* minor enhancements
+* 4 minor enhancements
 
   * String extension now loadable via require
   * Most of the specifications now run on JRuby

data/Manifest.txt

@@ -11,7 +11,6 @@ lib/aef/linebreak/commands/encodings.rb
 lib/aef/linebreak/commands/version.rb
 lib/aef/linebreak/pathname_conversion.rb
 lib/aef/linebreak/linebreak.rb
-lib/aef.rb
 spec/spec_helper.rb
 spec/linebreak_spec.rb
 spec/spec.opts

data/README.rdoc

@@ -185,7 +185,7 @@ is no way to install the gem securely. Therefore this is not recommended.
 You can test this package through rspec on your system. First find the path
 where the gem was installed to:
 
-  gem which linebreak
+  gem which aef/linebreak
 
 Go into the root directory of the installed gem and run the following command
 to start the test runner:

data/Rakefile

@@ -15,6 +15,7 @@ Hoe.spec('linebreak') do
     :rdoc_options => ['--main', 'README.rdoc', '--inline-source', '--line-numbers', '--title', 'Linebreak']
   }
   self.rspec_options = ['--options', 'spec/spec.opts']
+  self.remote_rdoc_dir = ''
 end
 
 # vim: syntax=Ruby

data/bin/linebreak

@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
+require 'aef/linebreak'
 
 # User friendly message if user-choices is not available
 begin
@@ -26,8 +27,6 @@ rescue LoadError
   warn "This command needs the user-choices gem to be installed.\n\nSolution: gem install user-choices"; exit false
 end
 
-require 'lib/aef/linebreak/pathname_conversion' rescue LoadError require 'aef/linebreak/pathname_conversion'
-
 commands_available = {
   :encode => 'Convert all linebreak encodings of a file',
   :encodings => 'Detect linebreak encoding systems of a file',
@@ -57,12 +56,6 @@ else
     command_name = commands_available[command_name]
   end
 
-  begin
-    require "lib/aef/linebreak/commands/#{command_name}"
-  rescue LoadError
-    require "aef/linebreak/commands/#{command_name}"
-  end
-
   command = Aef::Linebreak.const_get("#{command_name.to_s.capitalize}Command").new
   S4tUtils.with_pleasant_exceptions {command.execute}
 end

data/lib/aef/linebreak.rb

@@ -15,4 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'lib/aef/linebreak/linebreak' rescue LoadError require 'aef/linebreak/linebreak'
+# Namespace for projects of Alexander E. Fischer <aef@raxys.net>
+#
+# If you want to be able to simply type Example instead of Aef::Example to
+# address classes in this namespace simply write the following before using the
+# classes:
+#
+#  include Aef
+module Aef
+  autoload :Linebreak, 'aef/linebreak/linebreak'
+end

data/lib/aef/linebreak/commands/encode.rb

@@ -17,7 +17,7 @@
 
 # TODO: If user-choices patch gets accepted, use :upcase for environment variables
 
-require 'lib/aef/linebreak' rescue LoadError require 'aef/linebreak'
+require 'aef/linebreak/pathname_conversion'
 
 class Aef::Linebreak::EncodeCommand < UserChoices::Command
   include UserChoices

data/lib/aef/linebreak/commands/encodings.rb

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'lib/aef/linebreak' rescue LoadError require 'aef/linebreak'
+require 'aef/linebreak/pathname_conversion'
 
 class Aef::Linebreak::EncodingsCommand < UserChoices::Command
   include UserChoices

data/lib/aef/linebreak/commands/version.rb

@@ -15,15 +15,15 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'lib/aef/linebreak' rescue LoadError require 'aef/linebreak'
+require 'aef/linebreak/pathname_conversion'
 
 class Aef::Linebreak::VersionCommand
   def execute
     name = 'Linebreak'
     puts "#{name} #{Aef::Linebreak::VERSION}"
     puts
-    puts 'Project: https://rubyforge.org/projects/aef/'
-    puts "RDoc: http://aef.rubyforge.org/#{name.downcase}/"
+    puts 'Project: https://rubyforge.org/projects/linebreak/'
+    puts "RDoc: http://#{name.downcase}.rubyforge.org/"
     puts "Github: http://github.com/aef/#{name.downcase}/"
     puts
     puts 'Copyright 2009 Alexander E. Fischer <aef@raxys.net>'

data/lib/aef/linebreak/linebreak.rb

@@ -17,9 +17,6 @@
 
 require 'pathname'
 require 'set'
-require 'rubygems'
-
-require 'lib/aef' rescue LoadError require 'aef'
 
 # Linebreak is Ruby library and commandline tool for conversion of text
 # between linebreak encoding formats of unix, windows or mac.
@@ -29,7 +26,12 @@ require 'lib/aef' rescue LoadError require 'aef'
 #
 #   require 'aef/linebreak/string_extension'
 module Aef::Linebreak
-  VERSION = '1.3.0'
+  autoload :ConversionToPathname, 'aef/linebreak/pathname_conversion'
+  autoload :EncodeCommand,        'aef/linebreak/commands/encode'
+  autoload :EncodingsCommand,     'aef/linebreak/commands/encodings'
+  autoload :VersionCommand,       'aef/linebreak/commands/version'
+
+  VERSION = '1.3.1'
   
   BREAK_BY_SYSTEM = {
     :unix => "\n",

data/lib/aef/linebreak/pathname_conversion.rb

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This class adds the type :pathname to user-choices
-class ConversionToPathname < UserChoices::Conversion
+class Aef::Linebreak::ConversionToPathname < UserChoices::Conversion
   def self.described_by?(conversion_tag)
     conversion_tag == :pathname
   end

data/lib/aef/linebreak/string_extension.rb

@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'rubygems'
-
-require 'lib/aef/linebreak' rescue LoadError require 'aef/linebreak'
+require 'aef/linebreak'
 
 class String
   include Aef::Linebreak

data/spec/spec_helper.rb

@@ -20,14 +20,16 @@ require 'rbconfig'
 require 'rubygems'
 require 'popen4'
 
-require 'lib/aef/linebreak/string_extension'
+$LOAD_PATH.unshift('lib')
+
+require 'aef/linebreak/string_extension'
 
 module LinebreakSpecHelper
   INTERPRETER = Pathname(RbConfig::CONFIG['bindir']) + RbConfig::CONFIG['ruby_install_name']
   FIXTURES_DIR = Pathname('spec/fixtures')
 
   def executable_path
-    "#{INTERPRETER} bin/linebreak"
+    "#{INTERPRETER} -Ilib bin/linebreak"
   end
 
   def fixture_path(name)
@@ -78,8 +80,8 @@ module LinebreakSpecHelper
     <<-EOS
 Linebreak #{Aef::Linebreak::VERSION}
 
-Project: https://rubyforge.org/projects/aef/
-RDoc: http://aef.rubyforge.org/linebreak/
+Project: https://rubyforge.org/projects/linebreak/
+RDoc: http://linebreak.rubyforge.org/
 Github: http://github.com/aef/linebreak/
 
 Copyright 2009 Alexander E. Fischer <aef@raxys.net>
@@ -135,4 +137,4 @@ end
 
 Spec::Runner.configure do |config|
   config.include LinebreakSpecHelper
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: linebreak
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Alexander E. Fischer
@@ -29,7 +29,7 @@ cert_chain:
   55akF+N8NbO6tpVDy6TMagqa10LfEpiQH6dvDHe/xdAqYOCrXKpmqzwu2PI=
   -----END CERTIFICATE-----
 
-date: 2009-08-21 00:00:00 +02:00
+date: 2009-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,6 @@ files:
 - lib/aef/linebreak/commands/version.rb
 - lib/aef/linebreak/pathname_conversion.rb
 - lib/aef/linebreak/linebreak.rb
-- lib/aef.rb
 - spec/spec_helper.rb
 - spec/linebreak_spec.rb
 - spec/spec.opts
@@ -140,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: linebreak
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Linebreak is a Ruby library and commandline tool for conversion of text between linebreak encoding formats of unix, windows or mac.

data/lib/aef.rb

@@ -1,27 +0,0 @@
-# Copyright 2009 Alexander E. Fischer <aef@raxys.net>
-#
-# This file is part of Linebreak.
-#
-# Linebreak is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Namespace for projects of Alexander E. Fischer <aef@raxys.net>
-#
-# If you want to be able to simply type Example instead of Aef::Example to
-# address classes in this namespace simply write the following before using the
-# classes:
-#
-#  include Aef
-module Aef
-
-end