nametrainer 0.2.0 → 0.2.1

data/README.md

@@ -57,8 +57,6 @@ Please note:
 
 -   Do not use special characters in file names; use underscore instead of space.
 -   Use UTF-8 encoding for TXT files.
--   **On Windows, JPG files might not be supported** (depending on the Qt version).
-    In this case use PNG images instead.
 
 Installation
 ------------

data/bin/nametrainer

@@ -8,6 +8,13 @@ module Nametrainer
 
   ERRORCODE = {:general => 1, :usage => 2}
 
+  # Prints an error message, then exits with +code+
+  # (<tt>:general</tt> or <tt>:usage</tt>).
+  def self.fail(message, code = :general) #
+    warn "#{PROGNAME}: #{message}"
+    exit ERRORCODE[code]
+  end
+
   # Prints an error message and a short help information, then exits.
   def self.usage_fail(message) # :nodoc:
     warn "#{PROGNAME}: #{message}"
@@ -25,6 +32,11 @@ rescue => e
   Nametrainer.usage_fail(e.message)
 end
 
+# exit gracefully for missing Qt bindings
+message =  "missing Ruby Qt bindings (LoadError)\n"
+message << "You should install the `qtbindings' gem."
+Nametrainer.fail(message)  if Nametrainer::QT_LOAD_ERROR
+
 # set up demo mode
 if options[:demo]
   options[:collection] = File.expand_path("#{SRCPATH}/../demo_collection")
@@ -32,5 +44,13 @@ end
 
 # start
 app = Qt::Application.new ARGV
+
+# try to add plugins path
+begin
+  qtbindings_path = Gem::Specification.find_by_name('qtbindings').gem_dir
+  app.add_library_path("#{qtbindings_path}/bin/plugins")
+rescue Gem::LoadError
+end
+
 Nametrainer::GUI.new(options)
 app.exec

data/lib/nametrainer.rb

@@ -2,28 +2,17 @@
 #
 # nametrainer - name learning trainer
 #
-# == Synopsis
-#
-#    nametrainer [options] [collection]
-#
 # == Description
 #
 # +nametrainer+ is a name learning trainer using Ruby and the Qt GUI toolkit.
 # It will assist you in learning people's names from a collection of images.
 #
-# See the project home page for additional information:
-# https://github.com/stomar/nametrainer/
-#
-# == Options
-#
-# -d, --[no-]demo:: Start the application with a demo collection.
+# == See also
 #
-# -l, --[no-]learning-mode:: Start the application in `learning-mode':
-#                            use non-random order, display names at once.
+# Use <tt>nametrainer --help</tt> to display a brief help message.
 #
-# -h, --help:: Prints a brief help message and exits.
-#
-# -v, --version:: Prints a brief version information and exits.
+# The full documentation for +nametrainer+ is available on the
+# project home page.
 #
 # == Author
 #
@@ -31,7 +20,16 @@
 #
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 
-require 'nametrainer/gui'
+module Nametrainer; end
+
+begin
+  require 'Qt'
+  Nametrainer::QT_LOAD_ERROR = false
+rescue LoadError => e
+  Nametrainer::QT_LOAD_ERROR = e
+end
+
+require 'nametrainer/gui'  unless Nametrainer::QT_LOAD_ERROR
 require 'nametrainer/person'
 require 'nametrainer/collection'
 require 'nametrainer/optionparser'

data/lib/nametrainer/gui.rb

@@ -1,4 +1,3 @@
-require 'Qt'
 require 'iconv'  if RUBY_VERSION < '1.9' # utf-8 -> latin1 for QLabel
 
 module Nametrainer
@@ -223,7 +222,11 @@ module Nametrainer
 
     # Displays the image, scaled as large as possible.
     def show_image
-      @image_label.set_pixmap @image.scaled(@image_label.size, Qt::KeepAspectRatio)
+      if @image.null?
+        @image_label.set_text "<i>Unable to display `#{File.basename(@person.image)}'.</i>"
+      else
+        @image_label.set_pixmap @image.scaled(@image_label.size, Qt::KeepAspectRatio)
+      end
     end
 
     # Chooses and displays the next person,

data/lib/nametrainer/optionparser.rb

@@ -36,14 +36,14 @@ module Nametrainer
 
         # process --version and --help first,
         # exit successfully (GNU Coding Standards)
-        opt.on_tail('-h', '--help', 'Prints a brief help message and exits.') do
+        opt.on_tail('-h', '--help', 'Print a brief help message and exit.') do
           puts opt_parser
           puts "\nReport bugs on the #{PROGNAME} home page: <#{HOMEPAGE}>"
           exit
         end
 
         opt.on_tail('-v', '--version',
-                    'Prints a brief version information and exits.') do
+                    'Print a brief version information and exit.') do
           puts "#{PROGNAME} #{VERSION}"
           puts COPYRIGHT
           exit

data/lib/nametrainer/version.rb

@@ -1,8 +1,8 @@
 module Nametrainer
 
   PROGNAME = 'nametrainer'
-  VERSION  = '0.2.0'
-  DATE     = '2012-09-22'
+  VERSION  = '0.2.1'
+  DATE     = '2012-10-03'
   HOMEPAGE = 'https://github.com/stomar/nametrainer/'
 
   COPYRIGHT = "Copyright (C) 2012 Marcus Stollsteimer.\n" +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nametrainer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &72380950 !ruby/object:Gem::Requirement
+  requirement: &80165180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72380950
+  version_requirements: *80165180
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &72379800 !ruby/object:Gem::Requirement
+  requirement: &80164650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72379800
+  version_requirements: *80164650
 description: nametrainer is a name learning trainer using the Qt GUI toolkit. It will
   assist you in learning people's names from a collection of images.
 email: sto.mar@web.de