royw-dvdprofiler2xbmc 0.0.17 → 0.0.18

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 17
+:patch: 18
 :major: 0
 :minor: 0

data/lib/dvdprofiler2xbmc/app_config.rb

@@ -14,52 +14,65 @@ module AppConfig
   # are mashes that share the same keys.  For example @help.foo would be
   # the help text for @config.foo
 
+  # == Synopsis
   # the current config values
   @config    = Mash.new
 
+  # == Synopsis
   # help about the config item
   @help      = Mash.new
 
+  # == Synopsis
   # initial (default) config values
   @initial   = Mash.new
 
+  # == Synopsis
   # data type constants used in the editor
   @data_type = Mash.new
 
+  # == Synopsis
   # validate the config item
   @validate  = Mash.new
 
+  # == Synopsis
   # validate an entry for a config item, note usually need to allow
   # empty string for either array entry termination or to accept
   # a default value
   @validate_item = Mash.new
 
+  # == Synopsis
   # the @navigation array contains hashes where each hash is a "page"
   # that contains an array of @config keys.  This provides a natural
   # organization for UIs.
   @navigation = []
 
+  # make class variables readable
   class << self
     attr_reader :help, :initial, :navigation, :config, :data_type, :validate, :validate_item
   end
 
+  # the user's config file
   @yaml_filespec = File.join(ENV['HOME'], '.dvdprofiler2xbmcrc')
 
+  # == Synopsis
   # shortcut accessor for @config items
   def self.[](k)
     @config[k]
   end
 
+  # == Synopsis
   # shortcut accessor for @config items
   def self.[]=(k,v)
     @config[k] = v
   end
 
+  # == Synopsis
   # does the config file exist?
   def self.exist?
     File.exist?(@yaml_filespec)
   end
 
+  # == Synopsis
   # load the config file, overwriting current values
   def self.load
     begin
@@ -88,6 +101,7 @@ module AppConfig
     end
   end
 
+  # == Synopsis
   # save the config file
   def self.save
     begin
@@ -105,6 +119,7 @@ module AppConfig
     end
   end
 
+  # == Synopsis
   # generate a string for displaying the current config
   def self.to_s
     buf = []
@@ -127,6 +142,7 @@ module AppConfig
     buf.join("\n")
   end
 
+  # == Synopsis
   # is the current config valid?
   def self.valid?
     valid = true
@@ -138,6 +154,7 @@ module AppConfig
     valid
   end
 
+  # == Synopsis
   # set the config to the default values
   def self.default
     # Note, all paths and extensions are case sensitive
@@ -330,7 +347,6 @@ module AppConfig
         :no_tmdb_lookup   => 'no_tmdb_lookup',
       }
     @config.extensions  = @initial.extensions
-#     @data_type.extensions = :HASH_FIXED_SYMBOL_KEYS_STRING_VALUES
 
     # substitutions:
     #  %t  => movie title

data/lib/dvdprofiler2xbmc/controllers/app.rb

@@ -8,15 +8,34 @@
 class DvdProfiler2Xbmc
   include Singleton
 
+  protected
+
+  # == Synopsis
+  # protected initializer because it is a Singleton class
+  def initialize
+    @media_files = nil
+    @multiple_profiles = []
+  end
+
+  public
+
+  # == Synopsis
+  # An Array of Strings that the external processing my write to to
+  # indicate that a given title has multiple ISBNs.
+  # HACK, this is a hack because I didn't see a way to cleanly pass
+  # the data up from the processing.
   attr_accessor :multiple_profiles
 
   @interrupted = false
   @interrupt_message = "control-C detected, finishing current task"
 
   class << self
+    # == Synopsis
+    # When ^C is pressed, this message is sent to stdout
     attr_accessor :interrupt_message
   end
 
+  # == Synopsis
   # A trap("INT") in the Runner calls this to indicate that a ^C has been detected.
   # Note, once set, it is never cleared
   def self.interrupt
@@ -24,18 +43,15 @@ class DvdProfiler2Xbmc
     @interrupted = true
   end
 
+  # == Synopsis
   # Long loops should poll this method to see if they should abort
   # Returns:: true if the application has trapped an "INT", false otherwise
   def self.interrupted?
     @interrupted
   end
 
-  def initialize
-    @media_files = nil
-    @multiple_profiles = []
-  end
-
-  # the application's main execution loop
+  # == Synopsis
+  # the application's main execution loop that processes all of the media
   def execute
     AppConfig[:logger].info { "Media Directories:\n  #{AppConfig[:directories].join("\n  ")}" }
 
@@ -58,6 +74,7 @@ class DvdProfiler2Xbmc
     AppConfig[:directories].each { |dir| set_permissions(dir) }
   end
 
+  # == Synopsis
   # generate the report.
   # Note, must be ran after execute()
   # returns an array of lines
@@ -75,21 +92,12 @@ class DvdProfiler2Xbmc
     buf
   end
 
-  def gen_report(name, heading='')
-    buf = []
-    begin
-      lines = send("#{name}_report")
-      unless lines.empty?
-        buf << ''
-        buf << heading
-        buf += lines
-      end
-    rescue Exception => e
-      AppConfig[:logger].error { "Error generating #{name} report - #{e.to_s}" }
-    end
-    buf
-  end
-
+  # == Synopsis
+  # utility method that saves the given data to the filespec safely by:
+  # 1) writes the data to a new file,
+  # 2) deletes any previous backup file,
+  # 3) renames the old file to a backup,
+  # 4) renames the new file to the original filename.
   def self.save_to_file(filespec, data)
     new_filespec = filespec + AppConfig[:extensions][:new]
     File.open(new_filespec, "w") do |file|
@@ -102,6 +110,7 @@ class DvdProfiler2Xbmc
     File.delete(new_filespec) if File.exist?(new_filespec)
   end
 
+  # == Synopsis
   # options hash may have the following:
   #  :extension  - an extension to append to the generated filespec
   #  :year       - the production year
@@ -144,6 +153,23 @@ class DvdProfiler2Xbmc
 
   protected
 
+  # == Synopsis
+  def gen_report(name, heading='')
+    buf = []
+    begin
+      lines = send("#{name}_report")
+      unless lines.empty?
+        buf << ''
+        buf << heading
+        buf += lines
+      end
+    rescue Exception => e
+      AppConfig[:logger].error { "Error generating #{name} report - #{e.to_s}" }
+    end
+    buf
+  end
+
+  # == Synopsis
   # set the directory and file permissions for all files and directories under
   # the given directory
   def set_permissions(dir)
@@ -160,6 +186,7 @@ class DvdProfiler2Xbmc
     end
   end
 
+  # == Synopsis
   # duplicate media file report
   def duplicates_report
     buf = []
@@ -175,6 +202,7 @@ class DvdProfiler2Xbmc
     buf
   end
 
+  # == Synopsis
   # unable to find ISBN for these titles report
   def missing_isbns_report
     buf = []
@@ -198,6 +226,7 @@ class DvdProfiler2Xbmc
     buf
   end
 
+  # == Synopsis
   def missing_imdb_ids_report
     buf = []
     @media_files.titles.each do |title, medias|
@@ -215,6 +244,7 @@ class DvdProfiler2Xbmc
     buf
   end
 
+  # == Synopsis
   def missing_thumbnails_report
     buf = []
     @media_files.titles.each do |title, medias|
@@ -232,6 +262,7 @@ class DvdProfiler2Xbmc
     buf
   end
 
+  # == Synopsis
   def multiple_profiles_report
     @multiple_profiles
   end

data/lib/dvdprofiler2xbmc/models/media.rb

@@ -1,9 +1,60 @@
 # == Synopsis
 # Media encapsulates information about a single media file
 class Media
-  attr_reader :media_path, :image_files, :fanart_files, :media_subdirs, :title, :title_with_year, :part, :extension
-  attr_accessor :isbn, :imdb_id, :resolution, :year
 
+  # == Synopsis
+  # filespec to the media file
+  attr_reader :media_path
+
+  # == Synopsis
+  # Array of image filenames associated with the media
+  attr_reader :image_files
+
+  # == Synopsis
+  # Array of fanart filenames associated with the media
+  attr_reader :fanart_files
+
+  # == Synopsis
+  # The realative pathspec from the top level directory to the
+  # directory that contains the media
+  attr_reader :media_subdirs
+
+  # == Synopsis
+  # The media's title String
+  attr_reader :title
+
+  # == Synopsis
+  # The media's title and year String ("title (year)")
+  attr_reader :title_with_year
+
+  # == Synopsis
+  # nil or a String contain the media part (ex: cd1, disk2)
+  attr_reader :part
+
+  # == Synopsis
+  # The file extension for the media
+  attr_reader :extension
+
+  # == Synopsis
+  # The ISBN number in a String for the media
+  attr_accessor :isbn
+
+  # == Synopsis
+  # The IMDB ID in a String for the media
+  attr_accessor :imdb_id
+
+  # == Synopsis
+  # The video resolution as a String
+  attr_accessor :resolution
+
+  # == Synopsis
+  # The media's production year
+  attr_accessor :year
+
+  # == Synopsis
+  # directory  => String containing pathspec to the top level directory of the media
+  # media_file => String containing relative pathspec from the top level
+  #               directory of the media to the media file
   def initialize(directory, media_file)
     @media_subdirs = File.dirname(media_file)
     @media_path = File.expand_path(File.join(directory, media_file))
@@ -26,6 +77,7 @@ class Media
     @title_with_year = find_title_with_year(@title, @year)
   end
 
+  # == Synopsis
   # return a path to a file file based on the media's filespec
   # but without any stacking parts and with the given extension
   # instead of the media's extension.
@@ -39,6 +91,7 @@ class Media
     DvdProfiler2Xbmc.generate_filespec(@media_path, type, :year => @year, :resolution => @resolution)
   end
 
+  # == Synopsis
   # parse the given filespec into a hash the consists of the
   # found parts with keys:
   #  :title       required
@@ -65,6 +118,8 @@ class Media
     result
   end
 
+  # == Synopsis
+  # return human readable string representation
   def to_s
     buf = []
     buf << @media_path
@@ -75,11 +130,13 @@ class Media
 
   protected
 
+  # == Synopsis
   # return the media's title extracted from the filename and cleaned up
   def find_title(media_path)
     Media.parse(media_path)[:title] rescue nil
   end
 
+  # == Synopsis
   # return the media's title but with the (year) appended
   def find_title_with_year(title, year)
     name = title

data/lib/dvdprofiler2xbmc/models/media_files.rb

@@ -3,8 +3,8 @@
 class MediaFiles
   attr_reader :medias, :titles, :duplicate_titles
 
-  # given:
-  # directories Array of String directory pathspecs
+  # == Synopsis
+  # directories => Array of String directory pathspecs
   def initialize(directories)
     @medias = find_medias(directories)
     @titles = find_titles(@medias)
@@ -13,6 +13,7 @@ class MediaFiles
 
   protected
 
+  # == Synopsis
   # find all the media files in the given set of directories
   def find_medias(directories)
     medias = []
@@ -25,6 +26,7 @@ class MediaFiles
     medias
   end
 
+  # == Synopsis
   # return a hash where the key is the media's title and
   # the value is an Array of Media instances
   def find_titles(medias)
@@ -37,6 +39,7 @@ class MediaFiles
     titles
   end
 
+  # == Synopsis
   # find duplicate titles and return them in a hash
   # where the key is the title and the value is an
   # array of Media objects

data/lib/dvdprofiler2xbmc/models/xbmc_info.rb

@@ -1,3 +1,4 @@
+# == Synopsis
 # This is the model for the XBMC's Info profile which is used
 # to manage a .nfo file
 #
@@ -12,8 +13,8 @@
 #
 class XbmcInfo
 
-  FILTER_HTML = /<[^>]*>/
-
+  # == Synopsis
+  # filespec => String pathspec to the .nfo file
   def initialize(filespec)
     @nfo_filespec = filespec
     @movie = nil
@@ -21,28 +22,26 @@ class XbmcInfo
     load
   end
 
+  # == Synopsis
+  # return the movie hash that contains the media meta data
   def movie
     @movie ||= Hash.new
     @movie
   end
 
+  # == Synopsis
+  # set the movie hash
   def movie=(other)
     @movie = other
   end
 
+  # == Synopsis
   # convert the @movie hash into xml and return the xml as a String
   def to_xml
     xml = ''
     begin
       unless @movie.blank?
-        data = @movie.dup
-        data.delete_if { |key, value| value.nil? }
-        %w(plot tagline overview).each do |key|
-          if data[key].respond_to?('first')
-            data[key] = data[key].first
-          end
-          data[key] = data[key].gsub(FILTER_HTML, '') unless data[key].blank?
-        end
+        data = filter(@movie.dup)
         xml = XmlSimple.xml_out(data, 'NoAttr' => true, 'RootName' => 'movie')
       end
     rescue Exception => e
@@ -52,6 +51,8 @@ class XbmcInfo
     xml
   end
 
+  # == Synopsis
+  # save the profile to the .nfo file, but only if it has changed
   def save
     begin
       if dirty?
@@ -68,6 +69,24 @@ class XbmcInfo
 
   protected
 
+  FILTER_HTML = /<[^>]*>/
+
+  # == Synopsis
+  # filter the given movie hash first collapsing (removing from Array)
+  # the plot, tagline, and overview values by removing, then removing
+  # any HTML tags such as <b></b>, <i></i>,...
+  def filter(data)
+    data.delete_if { |key, value| value.nil? }
+    %w(plot tagline overview).each do |key|
+      if data[key].respond_to?('first')
+        data[key] = data[key].first
+      end
+      data[key] = data[key].gsub(FILTER_HTML, '') unless data[key].blank?
+    end
+    data
+  end
+
+  # == Synopsis
   # load the .nfo file into the @movie hash
   def load
     begin
@@ -83,6 +102,7 @@ class XbmcInfo
     end
   end
 
+  # == Synopsis
   # has any of the data changed?
   def dirty?
     result = false

data/lib/dvdprofiler2xbmc/views/cli.rb

@@ -1,7 +1,8 @@
 require File.join(File.dirname(__FILE__), 'config_editor')
 require 'commandline/optionparser'
-# include CommandLine
+# can't include CommandLine thanks to HighLine polluting the namespace
 
+# == Synopsis
 # Command Line interface for the Dvdprofiler2Xbmc application.
 # All application output is via AppConfig[:logger] so we have
 # to set up the logger here.
@@ -19,9 +20,13 @@ module Dvdprofiler2xbmc
     OK = 0
   end
 
+  # == Synopsis
+  # The Command Line Interface
   class CLI
     include AppConfig
 
+    # == Synopsis
+    # Here's the main execution loop
     def self.execute(stdout, arguments=[])
       exit_code = ExitCode::OK
 
@@ -46,12 +51,15 @@ module Dvdprofiler2xbmc
 
         if run_editor || od["--edit_config"]
           editor = ConfigEditor.new
+          @saved_interrupt_message = DvdProfiler2Xbmc.interrupt_message
+          DvdProfiler2Xbmc.interrupt_message = ''
           editor.execute
+          DvdProfiler2Xbmc.interrupt_message = @saved_interrupt_message
         end
 
         skip_execution = false
-        %w(--help --version --show_config --edit_config).each {|flag| skip_execution = true if od[flag] || run_editor}
-        unless skip_execution
+        %w(--help --version --show_config --edit_config).each {|flag| skip_execution = true if od[flag] }
+        unless skip_execution || run_editor
           # create and execute class instance here
           app = DvdProfiler2Xbmc.instance
           app.execute
@@ -66,14 +74,14 @@ module Dvdprofiler2xbmc
       exit_code
     end
 
+    # == Synopsis
+    # the first reinitialize_logger adds the command line logging options to the default config
+    # then we load the config files
+    # then we run reinitialize_logger again to modify the logger for any logging options from the config files
     def self.setup_app_config(od, logger)
       # load config values
       AppConfig.default
 
-      # the first reinitialize_logger adds the command line logging options to the default config
-      # then we load the config files
-      # then we run reinitialize_logger again to modify the logger for any logging options from the config files
-
       reinitialize_logger(logger, od["--quiet"], od["--debug"])
       AppConfig.load
       AppConfig.save
@@ -88,6 +96,7 @@ module Dvdprofiler2xbmc
       AppConfig[:logger].info { "logfile_level => #{AppConfig[:logfile_level].inspect}" } unless AppConfig[:logfile_level].nil?
     end
 
+    # == Synopsis
     # Setup the command line option parser
     # Returns:: OptionParser instances
     def self.setup_parser()
@@ -152,6 +161,7 @@ module Dvdprofiler2xbmc
       options
     end
 
+    # == Synopsis
     # Initial setup of logger
     def self.setup_logger
       logger = Log4r::Logger.new('dvdprofiler2xbmc')
@@ -161,6 +171,7 @@ module Dvdprofiler2xbmc
       logger
     end
 
+    # == Synopsis
     # Reinitialize the logger using the loaded config.
     # logger:: logger for any user messages
     # config:: is the application's config hash.

data/lib/dvdprofiler2xbmc/views/config_editor.rb

@@ -1,6 +1,7 @@
 # require 'highline'
 require "highline/import"
 
+# == Synopsis
 # monkey patch HighLine to get rid of the ugly message:
 #  Your answer isn't valid (must match #<Proc:0xb76cb378@/home/royw/views/dvdprofiler2xbmc/lib/dvdprofiler2xbmc/app_config.rb:180>)
 # basically the problem is with inspecting a lambda validator, so just don't do it...
@@ -30,37 +31,51 @@ class HighLine
   end
 end
 
+# == Synopsis
+# This is a command line config editor
+# == Usage
+# editor = ConfigEditor.new
+# editor.execute
 class ConfigEditor
 
+  # == Synopsis
   def initialize
   end
 
+  # == Synopsis
+  # main execution loop for the config editor
   def execute
-    @saved_interrupt_message = DvdProfiler2Xbmc.interrupt_message
-    DvdProfiler2Xbmc.interrupt_message = ''
     report_invalid_config_items
     begin
       AppConfig[:logger].info('Configuration Editor')
 
+      # get the list of config fields
       fields = AppConfig.navigation.collect do |page|
         page.values.flatten.select do|field|
           AppConfig.data_type[field]
         end
       end.flatten.uniq.compact
+
+      # edit the fields
       while(field = menu_select('field', fields))
         begin
           edit_field(field)
         rescue
         end
       end
+
+      # save changes?
       if agree("Save? yes/no") {|q| q.default = 'yes'}
         AppConfig.save
       end
     rescue
     end
-    DvdProfiler2Xbmc.interrupt_message = @saved_interrupt_message
   end
 
+  protected
+
+  # == Synopsis
+  # Reports the config items that are not valid
   def report_invalid_config_items
     buf = []
     AppConfig.validate.each do |field, value|
@@ -74,6 +89,8 @@ class ConfigEditor
     end
   end
 
+  # == Synopsis
+  # Give a field name, let the use edit it via menus
   def edit_field(field)
     result = true
     while(result)
@@ -105,6 +122,8 @@ class ConfigEditor
     result
   end
 
+  # == Synopsis
+  # display field information
   def field_header(field)
     say "\n"
     say "-------------------------------"
@@ -120,11 +139,15 @@ class ConfigEditor
     say "\n"
   end
 
+  # == Synopsis
+  # wrapper for editing most objects
   def object_edit(field)
     value = data_type_editor(field, AppConfig.data_type[field], AppConfig.initial[field])
     AppConfig.config[field] = value unless value.nil?
   end
 
+  # == Synopsis
+  # wrapper for editing hashes
   def hash_add(field)
     value = data_type_editor(field, AppConfig.data_type[field], AppConfig.initial[field])
     if value =~ /([^,]+)\s*,\s*(\S.*)/
@@ -132,6 +155,8 @@ class ConfigEditor
     end
   end
 
+  # == Synopsis
+  # delete a key/pair from a hash field
   def hash_delete(field)
     choose do |menu|
       menu.prompt = "Please select to remove: "
@@ -150,12 +175,16 @@ class ConfigEditor
     end
   end
 
+  # == Synopsis
+  # add a value to an array field
   def array_add(field)
     value = data_type_editor(field, AppConfig.data_type[field], AppConfig.initial[field])
     AppConfig.config[field] += [value].flatten unless value.nil?
     AppConfig.config[field].uniq!
   end
 
+  # == Synopsis
+  # delete a value from an array field
   def array_delete(field)
     choose do |menu|
       menu.prompt = "Please select to remove: "
@@ -168,14 +197,23 @@ class ConfigEditor
     end
   end
 
+  # == Synopsis
+  # Get string containing pretty inspection of the given object.
+  # Some objects look better when inspected with pretty_inspect than
+  # with inspect and vice versa.
   def prettify(obj)
+    # Most look best with pretty_inspect
     str = obj.pretty_inspect
+    # Mashes need to be first converted to Hashes then pretty_inspect
     if obj.kind_of? Mash
       str = obj.to_hash.pretty_inspect
     end
+    # For Arrays, pretty_inspect displays one value per line which
+    # uses up too much real estate
     if obj.kind_of? Array
       str = obj.inspect
     end
+    # Manually format Hashes so keys and values each display in columns
     if obj.kind_of? Hash
       key_length = 0
       obj.keys.each do |key|
@@ -190,6 +228,8 @@ class ConfigEditor
     str
   end
 
+  # == Synopsis
+  # data type specific editing of fields
   def data_type_editor(field, data_type, default_value=nil)
     value = nil
     case data_type
@@ -246,6 +286,8 @@ class ConfigEditor
 
   VALUE_LENGTH = 60
 
+  # == Synopsis
+  # a generic selection menu
   def menu_select(name, values)
     result = false
     say("\n#{name.capitalize} Selection")
@@ -261,6 +303,9 @@ class ConfigEditor
     result
   end
 
+  # == Synopsis
+  # When displaying the fields to chose from, optionally display the
+  # fields data validity using color
   def field_name_choice(value)
     value_str = sprintf("%-#{VALUE_LENGTH}.#{VALUE_LENGTH}s", first_line(value))
     if AppConfig.config[:color_enabled]
@@ -274,6 +319,9 @@ class ConfigEditor
     str
   end
 
+  # == Synopsis
+  # limit the length of a string to VALUE_LENGTH and append ellipses if the string
+  # is abbreviated.
   def first_line(value)
     config_value = AppConfig.config[value]
     if config_value.kind_of? Mash

data/spec/config_editor_spec.rb

@@ -32,42 +32,42 @@ describe "ConfigEditor" do
   it "should return true for boolean data type edits that recieve y" do
     @input << "y\n"
     @input.rewind
-    value = @editor.data_type_editor('field_name', :BOOLEAN, false)
+    value = @editor.send('data_type_editor', 'field_name', :BOOLEAN, false)
     value.should be_true
   end
 
   it "should return false for boolean data type edits that recieve n" do
     @input << "n\n"
     @input.rewind
-    value = @editor.data_type_editor('field_name', :BOOLEAN, true)
+    value = @editor.send('data_type_editor', 'field_name', :BOOLEAN, true)
     value.should be_false
   end
 
   it "should return true for boolean data type edits that recieve yes" do
     @input << "yes\n"
     @input.rewind
-    value = @editor.data_type_editor('field_name', :BOOLEAN, false)
+    value = @editor.send('data_type_editor', 'field_name', :BOOLEAN, false)
     value.should be_true
   end
 
   it "should return false for boolean data type edits that recieve no" do
     @input << "no\n"
     @input.rewind
-    value = @editor.data_type_editor('field_name', :BOOLEAN, true)
+    value = @editor.send('data_type_editor', 'field_name', :BOOLEAN, true)
     value.should be_false
   end
 
   it "should return false for boolean data type edits that default to false" do
     @input << "\n\n"
     @input.rewind
-    value = @editor.data_type_editor('field_name', :BOOLEAN, false)
+    value = @editor.send('data_type_editor', 'field_name', :BOOLEAN, false)
     value.should be_false
   end
 
   it "should return true for boolean data type edits that default to true" do
     @input << "\n"
     @input.rewind
-    value = @editor.data_type_editor('field_name', :BOOLEAN, true)
+    value = @editor.send('data_type_editor', 'field_name', :BOOLEAN, true)
     value.should be_true
   end
 
@@ -95,7 +95,7 @@ describe "ConfigEditor" do
     default_pathspec = File.expand_path(File.join(File.dirname(__FILE__), '..'))
     @input << pathspec << "\n"
     @input.rewind
-    value = @editor.data_type_editor('images_dir', :PATHSPEC, default_pathspec)
+    value = @editor.send('data_type_editor', 'images_dir', :PATHSPEC, default_pathspec)
     value.should == pathspec
   end
 
@@ -103,7 +103,7 @@ describe "ConfigEditor" do
     default_pathspec = File.expand_path(File.join(File.dirname(__FILE__), '..'))
     @input << "\n"
     @input.rewind
-    value = @editor.data_type_editor('images_dir', :PATHSPEC, default_pathspec)
+    value = @editor.send('data_type_editor', 'images_dir', :PATHSPEC, default_pathspec)
     value.should == default_pathspec
   end
 
@@ -113,7 +113,7 @@ describe "ConfigEditor" do
     default_pathspec = File.expand_path(File.join(File.dirname(__FILE__), '..'))
     @input << badpathspec << "\n" << goodpathspec << "\n"
     @input.rewind
-    value = @editor.data_type_editor('images_dir', :PATHSPEC, default_pathspec)
+    value = @editor.send('data_type_editor', 'images_dir', :PATHSPEC, default_pathspec)
     value.should == goodpathspec
   end
 
@@ -122,7 +122,7 @@ describe "ConfigEditor" do
     default_filespec = File.expand_path(File.join(File.dirname(__FILE__), 'ruby_dragon'))
     @input << filespec << "\n"
     @input.rewind
-    value = @editor.data_type_editor('collection_filespec', :FILESPEC, default_filespec)
+    value = @editor.send('data_type_editor', 'collection_filespec', :FILESPEC, default_filespec)
     value.should == filespec
   end
 
@@ -132,28 +132,28 @@ describe "ConfigEditor" do
     default_filespec = File.expand_path(File.join(File.dirname(__FILE__), 'ruby_dragon'))
     @input << badfilespec << "\n" << goodfilespec << "\n"
     @input.rewind
-    value = @editor.data_type_editor('collection_filespec', :FILESPEC, default_filespec)
+    value = @editor.send('data_type_editor', 'collection_filespec', :FILESPEC, default_filespec)
     value.should == goodfilespec
   end
 
   it "should accept valid permission 0" do
     @input << "0" << "\n"
     @input.rewind
-    value = @editor.data_type_editor('file_permissions', :PERMISSIONS, 0644.to_s(8))
+    value = @editor.send('data_type_editor', 'file_permissions', :PERMISSIONS, 0644.to_s(8))
     value.should == 0.to_s(8)
   end
 
   it "should accept valid permission 7777" do
     @input << "7777" << "\n"
     @input.rewind
-    value = @editor.data_type_editor('file_permissions', :PERMISSIONS, 0644.to_s(8))
+    value = @editor.send('data_type_editor', 'file_permissions', :PERMISSIONS, 0644.to_s(8))
     value.should == 07777.to_s(8)
   end
 
   it "should reject permission > 7777" do
     @input << "65432" << "\n" << "6543" << "\n"
     @input.rewind
-    value = @editor.data_type_editor('file_permissions', :PERMISSIONS, 0644.to_s(8))
+    value = @editor.send('data_type_editor', 'file_permissions', :PERMISSIONS, 0644.to_s(8))
     value.should == 06543.to_s(8)
   end
 
@@ -161,7 +161,7 @@ describe "ConfigEditor" do
     strings = %w(foo bar howdy)
     @input << strings.join("\n") << "\n\n"
     @input.rewind
-    value = @editor.data_type_editor('image_extensions', :ARRAY_OF_STRINGS)
+    value = @editor.send('data_type_editor', 'image_extensions', :ARRAY_OF_STRINGS)
     value.should == strings
   end
 
@@ -169,7 +169,7 @@ describe "ConfigEditor" do
     strings = []
     @input << strings.join("\n") << "\n\n"
     @input.rewind
-    value = @editor.data_type_editor('image_extensions', :ARRAY_OF_STRINGS)
+    value = @editor.send('data_type_editor', 'image_extensions', :ARRAY_OF_STRINGS)
     value.should == strings
   end
 
@@ -178,7 +178,7 @@ describe "ConfigEditor" do
     pathspecs = [cwd, File.join(cwd, '..')]
     @input << pathspecs.join("\n") << "\n\n\n\n"
     @input.rewind
-    value = @editor.data_type_editor('directories', :ARRAY_OF_PATHSPECS)
+    value = @editor.send('data_type_editor', 'directories', :ARRAY_OF_PATHSPECS)
     value.should == pathspecs
   end
 
@@ -186,7 +186,7 @@ describe "ConfigEditor" do
     pathspecs = []
     @input << pathspecs.join("\n") << "\n\n\n"
     @input.rewind
-    value = @editor.data_type_editor('directories', :ARRAY_OF_PATHSPECS)
+    value = @editor.send('data_type_editor', 'directories', :ARRAY_OF_PATHSPECS)
     value.should == pathspecs
   end
 

data/spec/fanart_controller_spec.rb

@@ -121,7 +121,7 @@ describe "FanartController" do
     buf = []
     %w(mid original thumb).each do |size|
       filespec = File.join(TMPDIR, "Die Hard - 1988-fanart.#{size}.0.jpg")
-      buf << filespec unless (File.exist?(filespec).should be_true) && (File.size(filespec).should > 0)
+      buf << "Missing: \"#{filespec}\"" unless File.exist?(filespec) && (File.size(filespec) > 0)
     end
     puts buf.join("\n") unless buf.empty?
     buf.empty?.should be_true
@@ -141,7 +141,7 @@ describe "FanartController" do
       controller.send('fetch_fanart', imdb_id)
       %w(mid original thumb).each do |size|
         filespec = File.join(TMPDIR, "#{title}-fanart.#{size}.0.jpg")
-        buf << filespec unless (File.exist?(filespec).should be_true) && (File.size(filespec).should > 0)
+        buf << filespec unless File.exist?(filespec) && (File.size(filespec) > 0)
       end
     end
     puts buf.join("\n") unless buf.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-dvdprofiler2xbmc
 version: !ruby/object:Gem::Version 
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors: 
 - Roy Wright
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-18 00:00:00 -07:00
+date: 2009-04-19 00:00:00 -07:00
 default_executable: dvdprofiler2xbmc
 dependencies: 
 - !ruby/object:Gem::Dependency