moviesort 0.1.4 → 0.1.5

data/Rakefile

@@ -1,4 +1,5 @@
 require 'jeweler'
+require 'rake/testtask'
 
 Jeweler::Tasks.new do |gemspec|
   gemspec.name = "moviesort"
@@ -6,6 +7,7 @@ Jeweler::Tasks.new do |gemspec|
   gemspec.email = "luke@lukeredpath.co.uk"
   gemspec.authors = ["Luke Redpath"]
   gemspec.executables << 'moviesort'
+  gemspec.add_dependency('trollop')
 end
 
 Jeweler::GemcutterTasks.new
@@ -13,3 +15,9 @@ Jeweler::GemcutterTasks.new
 task :push_tiny  => ['version:bump:patch', 'gemcutter:release']
 task :push_minor => ['version:bump:minor', 'gemcutter:release']
 task :push_major => ['version:bump:major', 'gemcutter:release']
+
+Rake::TestTask.new('test') do |t|
+  t.libs << "test" << "lib"
+  t.pattern = "test/**/*_test.rb"
+end
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/features/step_definitions/sorting_tv_shows_steps.rb

@@ -11,12 +11,6 @@ Given /^a folder "([^\"]*)" containing the folder "([^\"]*)"$/ do |parent, folde
   FileUtils.mkdir_p(File.join(parent, folder))
 end
 
-## whens
-
-When /^I run Moviesort with the options "([^\"]*)"$/ do |options|
-  Moviesort::CommandLine.parse(options).run
-end
-
 ## thens
 
 Then /^the movie should be moved to "([^\"]*)"$/ do |path|

data/features/support/env.rb

@@ -1,13 +1,21 @@
 require 'test/unit/assertions'
 require 'fakefs/safe'
+require 'mocha'
 
 World(Test::Unit::Assertions)
+World(Mocha::API)
 
 Before do
   FakeFS.activate!
+  mocha_setup
 end
 
 After do
+  begin
+    mocha_verify
+  ensure
+    mocha_teardown
+  end
   FakeFS::FileSystem.clear
   FakeFS.deactivate!
 end

data/lib/moviesort/command_line.rb

@@ -1,14 +1,15 @@
 require 'trollop'
 require 'moviesort/sorter'
+require 'moviesort/notifiers/twitter'
 
 module Moviesort
   class CommandLine
+    attr_reader :options
+    
     def self.parse(options)
       new(options.split)
     end
     
-    MOVIE_EXTENSIONS = %w{avi mkv mov mp4}
-    
     def initialize(argv = ARGV)
       @options = Trollop.options(argv) do
         banner <<-EOS.gsub(/^ {8}/, '')
@@ -19,17 +20,24 @@ module Moviesort
 
         opt :source, "Source directory", :default => '.'
         opt :target, "Target directory", :default => '.'
+        opt :notifiers, "Notifiers", :type => :string, :multi => true
+        opt :twitteruser
+        opt :twitterpass
       end
     end
     
     def run
       sorter = Sorter::TV.new(@options[:target])
-      movie_files = Dir[File.join(@options[:source], '*')].select do |file|
-        MOVIE_EXTENSIONS.include?(File.extname(file)[1..-1])
-      end
-      movie_files.each do |file|
-        sorter.sort_file(file)
+      notifiers.each { |note| sorter.add_notifier(note) }
+      sorter.sort_directory(@options[:source])
+    end
+    
+    def notifiers
+      notifiers = []
+      if @options[:notifiers].include?('twitter')
+        notifiers << Moviesort::Notifiers::Twitter.new(@options[:twitteruser], @options[:twitterpass])
       end
+      return notifiers
     end
   end
 end

data/lib/moviesort/sorter.rb

@@ -3,8 +3,22 @@ require 'moviesort/tv_show'
 module Moviesort
   module Sorter
     class TV
+      VALID_FILE_TYPES = %w{avi mkv mov mp4}
+      
       def initialize(output_dir)
         @output_dir = output_dir
+        @notifiers = []
+      end
+      
+      def add_notifier(notifier)
+        raise "Notifier object must respond to notify" unless notifier.respond_to?(:notify)
+        @notifiers << notifier
+      end
+      
+      def sort_directory(path)
+        movie_files_in_directory(path).each do |file|
+          sort_file(file)
+        end
       end
       
       def sort_file(path)
@@ -12,6 +26,19 @@ module Moviesort
         target_path = File.join(@output_dir, tv_show.target_path)
         FileUtils.mkdir_p(target_path)
         FileUtils.mv(path, File.join(target_path, tv_show.target_filename))
+        notify(tv_show)
+      end
+      
+      private
+      
+      def notify(tv_show)
+        @notifiers.each { |note| note.notify(tv_show) }
+      end
+      
+      def movie_files_in_directory(path)
+        Dir[File.join(path, '*')].select do |file|
+          VALID_FILE_TYPES.include?(File.extname(file)[1..-1])
+        end
       end
     end
   end

data/lib/moviesort/tv_show.rb

@@ -13,7 +13,9 @@ module Moviesort
     
     def self.parse(filename)
       parser = Parser.new(filename)
-      new(filename, *parser.parse)
+      if components = parser.parse
+        new(filename, *components)
+      end
     end
     
     def target_path
@@ -38,7 +40,7 @@ module Moviesort
           /(.*)\s(\d{1})(\d{2})/
         ]
         match = patterns.map { |regex| @filename.match(regex) }.compact.first
-        extract_data_from_pattern_match(match)
+        extract_data_from_pattern_match(match) if match
       end
 
       def extract_data_from_pattern_match(match)
@@ -50,4 +52,4 @@ module Moviesort
       end
     end
   end
-end
+end

data/test/sorter_test.rb

@@ -4,11 +4,17 @@ require 'moviesort/sorter'
 class SorterTest < Test::Unit::TestCase
   
   def setup
+    FakeFS.activate!
     @output_path   = "/output"
     @download_path = "/downloads"
     FileUtils.mkpath(@output_path)
     FileUtils.mkpath(@download_path)
   end
+  
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
 
   context "TV show sorter" do
     setup do
@@ -20,6 +26,21 @@ class SorterTest < Test::Unit::TestCase
       @sorter.sort_file("/downloads/The Sopranos - S02E04.avi")
       assert File.exist?("/output/The Sopranos/Season 2/The.Sopranos.S02E04.avi")
     end
+    
+    should "sort all valid movie files in a given directory" do
+      %w{avi mp4 mov mkv}.each { |ext| FileUtils.touch("/downloads/movie.#{ext}") }
+      @sorter.expects(:sort_file).with("/downloads/movie.avi")
+      @sorter.expects(:sort_file).with("/downloads/movie.mkv")
+      @sorter.expects(:sort_file).with("/downloads/movie.mp4")
+      @sorter.expects(:sort_file).with("/downloads/movie.mov")
+      @sorter.sort_directory(@download_path)
+    end
+    
+    should "ignore non-valid movie files in a given directory" do
+      FileUtils.touch("/downloads/movie.mp3")
+      @sorter.expects(:sort_file).with("/downloads/movie.mp3").never
+      @sorter.sort_directory(@download_path)
+    end
   end  
   
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[.. lib]))
 require 'test/unit'
 require 'shoulda'
-require 'fakefs'
+require 'mocha'
+require 'fakefs/safe'

data/test/tv_show_test.rb

@@ -45,6 +45,10 @@ class TvShowTest < Test::Unit::TestCase
       assert_equal 1, @tv_show.season
       assert_equal 2, @tv_show.episode                  
     end
+    
+    should "return nil if format is unrecognized" do
+      assert_nil Moviesort::TVShow.parse("dont know what to do with this!.txt")
+    end
   end
   
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: moviesort
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Luke Redpath
@@ -9,10 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +00:00
+date: 2010-03-08 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: trollop
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: luke@lukeredpath.co.uk
 executables: 
@@ -50,18 +66,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Small command-line utility for sorting downloaded TV shows and movies