convertr 0.0.2 → 0.1.0

data/Rakefile

@@ -44,6 +44,7 @@ rescue LoadError
   end
 end
 
+task :rcov => ['convertr:prepare_test']
 task :test => [:check_dependencies, 'convertr:prepare_test']
 
 task :default => :test

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/convertr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convertr}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Lityuga", "Alexander Svetkin"]
-  s.date = %q{2010-10-13}
+  s.date = %q{2010-10-14}
   s.default_executable = %q{convertr}
   s.description = %q{Convertr works with database and handles converting tasks. It fetches files from remote sources and converts them to appropriate formats with ffmpeg}
   s.email = %q{ilya.lityuga@gmail.com}

data/lib/convertr/convertor.rb

@@ -21,7 +21,7 @@ module Convertr
     CONVERTOR_PAUSE_DELAY = 120
     CONVERTOR_MAX_FETCH_TIME = 600
 
-    attr_accessor :scheduler, :max_tasks, :hostname, :initial_dir, :file, :task, :file_path, :work_path, :tasks
+    attr_accessor :scheduler, :max_tasks, :hostname, :initial_dir, :file, :task, :tasks, :logger
 
     def initialize(max_tasks = 0, scheduler = nil) # инициализация конертера {{{
       @max_tasks = max_tasks
@@ -37,11 +37,11 @@ module Convertr
       loop do
         break if File.exists? CONVERTOR_STOPFILE
         if !File.exists?(CONVERTOR_PAUSEFILE) and @task = @scheduler.schedule_next_task(@hostname)
-          task.update_attributes(
+          @task.update_attributes(
             :convert_status => process_task,
             :convert_stopped_at => Time.now
           )
-          break if @max_tasks > 0 && (@tasks += 1) > @max_tasks
+          break if @max_tasks > 0 && (@tasks += 1) >= @max_tasks
         else
           sleep(CONVERTOR_PAUSE_DELAY) && next
         end
@@ -52,19 +52,17 @@ module Convertr
 
     def process_task # выполнение конкретной задачи на конвертацию {{{
       @file = @task.file
-      @file_path = File.join(@conf.tmp_dir, @file.name)
-      @working_dir = File.join( File.dirname(@file_path), File.filename(@filepath) )
-      @logger.info("Started #@filepath")
+      @logger.info("Started #{original_file}")
       begin
-        fetch_file(@file.source_location, @file.name)
-        FileUtils.cd @working_dir
+        fetch_file(@file.location, @file.filename)
+        FileUtils.cd indir
         process_profile(profile_by_bitrate(@task.bitrate))
         if @task.bitrate == 600
           count = calc_thumbnails_count(@file.duration)
           interval = (@file.duration / count).to_i
-          system(make_thumbnails_cmd(count, interval, 150, 0, 2)) or raise "thumbnails generation failed #{$?}"
+          system(make_thumbnails_cmd(count, interval, 150, nil, 2)) or raise "thumbnails generation failed #{$?}"
         end
-        @logger.info("Done #@filepath")
+        @logger.info("Done #{original_file}")
       rescue StandardError => e
         @logger.error e.message
         return 'FAILURE'
@@ -75,13 +73,12 @@ module Convertr
     end # }}}
 
     def fetch_file(source_url, filename) # скачивание файла по FTP {{{
-      FileUtils.mkpath(@working_dir)
-      dst_file = File.join(@working_dir, File.basename(filename))
-      tmp_file = dst_file + ".part"
+      FileUtils.mkpath(indir)
+      tmp_file = work_name + ".part"
       started_at = Time.now
       loop do
-        return if File.exists? dst_file
-        if File.exists? tmp_file
+        return if ::File.exists? original_file
+        if ::File.exists? tmp_file
           sleep(CONVERTOR_PAUSE_DELAY)
           if Time.now > started_at + CONVERTOR_MAX_FETCH_TIME
             FileUtils.rm_f tmp_file
@@ -94,18 +91,17 @@ module Convertr
       end
 
       url = URI.parse(source_url)
-      begin
-        ftp = Net::Ftp.open(url.host)
-        ftp.login(@conf.ftp_user, @conf.ftp_pass)
-        ftp.getbinaryfile(url.path, tmp_file, 1024)
-      rescue StandardError => e
-        ftp.close
-        FileUtils.rm_f tmp_file
-        raise e
+      Net::FTP.open(url.host) do |ftp|
+        begin
+          ftp.login(@conf.ftp_user, @conf.ftp_pass)
+          ftp.getbinaryfile(url.path, tmp_file, 1024)
+        rescue StandardError => e
+          FileUtils.rm_f tmp_file
+          raise e
+        end
       end
-      ftp.close
 
-      FileUtils.rename tmp_file, dst_file
+      FileUtils.move tmp_file, original_file
     end # }}}
 
     def profile_by_bitrate(bitrate) # bitrate -> profile {{{
@@ -120,37 +116,35 @@ module Convertr
 
     def process_profile(pname) # конвертация, согласно профилю # {{{
       profile = @conf.enc_profiles[pname]
-      outfile = File.join(@working_dir, File.filename(@file.name), "-#{pname}-0.mp4")
-      infile = File.join(@working_dir, File.basename(@file.name))
-      output_dir = File.join(@conf.output_dir, @working_dir)
-      FileUtils.mkpath output_dir unless File.exists? output_dir
-      FileUtils.chdir output_dir
-      FileUtils.mkdir pname unless File.exists? pname
-      FileUtils.chdir pname
+      outfile = filename_with_suffix("-#{pname}-0.mp4") # => z-sd-0.mp4
+      FileUtils.mkdir(pname) && FileUtils.chdir(pname)
       
       @conf.enc_pass.each_with_index do |enc_pass_params, i|
-        cmd = mkcmd(enc_pass_params, pname, infile, i == 0 ? '/dev/null' : outfile, @file.aspect)
+        cmd = mkcmd(enc_pass_params, pname, original_file, i == 0 ? '/dev/null' : outfile, @file.aspect)
         @logger.info(cmd)
         system(cmd) or raise "system #{cmd} failed: #{$?}"
       end
 
-      outfile2 = File.join(@working_dir, File.filename(@file.name), "-#{pname}.mp4")
-      cmd = "#{@conv.qtfaststart} #{outfile} #{outfile2}"
+      outfile2 = filename_with_suffix("-#{pname}.mp4") # => z-sd.mp4
+      cmd = "#{@conf.qtfaststart} #{outfile} #{outfile2}"
       system(cmd) or FileUtils.rm_f(outfile) && raise("system #{cmd} failed: #{$?}")
+      FileUtils.rm_f(outfile)
+      FileUtils.mkpath outdir # => /var/x/y
+      FileUtils.move outfile2, outdir
       FileUtils.cd '..'
       FileUtils.rm_rf pname
     end # }}}
 
     def make_thumbnails_cmd(count, interval, w, h, postfix) # генерация тумбнейлов {{{
-      w = (h * @file.float_aspect).to_i if h && w.nil?
-      h = (w / @file.float_aspect).to_i if @file.aspect && w && h.nil?
+      file = task.file
+      w = (h * file.float_aspect).to_i if h && w.nil?
+      h = (w / file.float_aspect).to_i if file.aspect && w && h.nil?
       tstamps = (1..count).collect {|i| i * interval}
       params = ''
-      params += ' -c 20 ' if @task.crop?
-      params += ' -d ' if @task.deinterlace?
-      output_dir = File.join(@conf.output_dir, @working_dir)
-      pattern = File.join(@working_dir, File.filename(@file.name), "-%d-#{postfix}.jpg")
-      "#{@conf.tmaker} -i #{infile} #{params} -w #{w} -h #{h} -o #{output_dir} #{tstamps.join(' ')}"
+      params += ' -c 20 ' if task.crop?
+      params += ' -d ' if task.deinterlace?
+      pattern = filename_with_suffix("-%d-#{postfix}.jpg")
+      "#{@conf.tmaker} -i #{original_file} #{params} -w #{w} -h #{h} -o \"#{outdir}/#{pattern}\" #{tstamps.join(' ')}"
     end # }}}
 
     def mkcmd(enc_pass, pname, infile, outfile, aspect) # подготовка команды на конвертацию {{{
@@ -173,10 +167,10 @@ module Convertr
         (params['croptop'], params['cropbottom'], params['cropleft'], params['cropright']) =
           case aspect
           when '16:9'
-            w += 32 && h += 18
+            w += 32 ; h += 18
             [10, 8, 16, 16]
           else # '4:3', '5:3' etc
-            w += 32 && h += 24
+            w += 32 ; h += 24
             [20, 4, 16, 16]
           end
       end
@@ -195,5 +189,31 @@ module Convertr
       else 24
       end
     end # }}}
+
+    # тут чёрт ногу сломит с этими картами директорий
+    # /tmp/test.avi
+    def original_file
+      ::File.join(@conf.tmp_dir, ::File.basename(@file.filename))
+    end
+
+    # /tmp/test
+    def indir
+      ::File.join(@conf.tmp_dir, ::File.filename(@file.filename))
+    end
+
+    # /tmp/test/test
+    def work_name
+      ::File.join(@conf.tmp_dir, ::File.filename(@file.filename), ::File.filename(@file.filename))
+    end
+
+    # test + suffix
+    def filename_with_suffix(suffix)
+      ::File.filename(@file.filename) + suffix
+    end
+
+    # /var/x/y
+    def outdir
+      ::File.join(@conf.output_dir, ::File.dirname(@file.filename))
+    end
   end
 end

data/lib/convertr/migration.rb

@@ -20,11 +20,11 @@ module Convertr
         t.integer :file_id
         t.integer :bitrate
         t.string :convert_status, :limit => 20
-        t.boolean :convert_started
-        t.boolean :convert_stopped
+        t.datetime :convert_started_at
+        t.datetime :convert_stopped_at
         t.string :copy_status, :limit => 20
-        t.boolean :copy_started
-        t.boolean :copy_stopped
+        t.datetime :copy_started_at
+        t.datetime :copy_stopped_at
         t.boolean :crop
         t.boolean :deinterlace
       end

data/lib/convertr/scheduler.rb

@@ -21,7 +21,7 @@ module Convertr
       def schedule(task, convertor)
         Convertr::Task.transaction do
           task.update_attributes(:convert_status => 'PROGRESS', :convert_started_at => Time.now)
-          task.file.update_attribute(:convertor => convertor)
+          task.file.update_attribute(:convertor, convertor)
         end
       end
     end

data/lib/convertr/scheduler/all_bt_first.rb

@@ -2,8 +2,8 @@ module Convertr
   module Scheduler
     class AllBtFirst < Base
       def get_task_for_schedule(convertor)
-        Convertr::Task.for_convertor(convertor).first# ||
-#        Convertr::File.without_convertor.select {|f| !f.tasks.empty?}.tasks.first
+        Convertr::Task.for_convertor(convertor).first ||
+        Convertr::Task.without_convertor.first
       end
     end
   end

data/lib/convertr/task.rb

@@ -6,5 +6,6 @@ module Convertr
     scope :for_convertor, lambda { |convertor|
       not_completed.includes(:file).where('files.convertor' => convertor).order('files.broadcast_at asc')
     }
+    scope :without_convertor, not_completed.includes(:file).where('files.convertor is null').order('files.broadcast_at asc')
   end
 end

data/test/fixtures/files.yml

@@ -4,7 +4,7 @@ with_convertor1_1:
   location: /tmp
   enqueue_at: <%= Time.now %>
   convertor: convertor1
-  broadcast_at: <%= Time.now - 3600 * 24 %>
+  broadcast_at: <%= Time.now - 3600 * 24 * 2 %>
   src_size: 12345
   duration: 12345
   aspect: 3x4

data/test/settings.yml

@@ -33,6 +33,7 @@ development: &non_production_settings
       ar: 44100
     ffmpeg: /usr/bin/ffmpeg
     tmaker: /usr/local/bin/tmaker
+    output_dir: /tmp/output
 
 test:
   <<: *non_production_settings

data/test/test_convertor.rb

@@ -6,13 +6,18 @@ class TestConvertor < Test::Unit::TestCase
       @convertor = Convertr::Convertor.new
     end
 
-    should "be able to calculate thumbnails count" do
-      assert_equal 3, @convertor.instance_eval("calc_thumbnails_count(600)")
-      assert_equal 6, @convertor.instance_eval("calc_thumbnails_count(1200)")
-      assert_equal 9, @convertor.instance_eval("calc_thumbnails_count(1800)")
+    should "be able to calculate thumbnails count" do # {{{
+      assert_equal 3, @convertor.instance_eval { calc_thumbnails_count(600) }
+      assert_equal 6, @convertor.instance_eval { calc_thumbnails_count(1200) }
+      assert_equal 9, @convertor.instance_eval { calc_thumbnails_count(1800) }
+      assert_equal 12, @convertor.instance_eval { calc_thumbnails_count(2400) }
+      assert_equal 15, @convertor.instance_eval { calc_thumbnails_count(3000) }
+      assert_equal 18, @convertor.instance_eval { calc_thumbnails_count(3600) }
+      assert_equal 21, @convertor.instance_eval { calc_thumbnails_count(3700) }
+      assert_equal 24, @convertor.instance_eval { calc_thumbnails_count(4260) }
     end
-
-    should "find the right profile by bitrate" do
+    # }}}
+    should "find the right profile by bitrate" do # {{{
       assert_equal 'sd', @convertor.instance_eval("profile_by_bitrate(300)")
       assert_equal 'hd', @convertor.instance_eval("profile_by_bitrate(600)")
       assert_equal 'hdp', @convertor.instance_eval("profile_by_bitrate(1000)")
@@ -20,14 +25,14 @@ class TestConvertor < Test::Unit::TestCase
         @convertor.instance_eval("profile_by_bitrate(1234)")
       end
     end
-
-    context "for some task with crop and deinterlace" do
+    # }}}
+    context "for some task with crop and deinterlace" do # should prepare valid shell command for ffmpeg {{{ 
       setup do
         task = Factory.create(:task, :bitrate => 600, :crop => true, :deinterlace => true)
         @convertor.stubs(:task).returns(task)
       end
       should "prepare valid command for ffmpeg" do
-        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 1118x414 -ab 64k -ac 1 -acodec libfaac -ar 44100 -b 236k -bt 236k -cropbottom 8 -cropleft 16 -cropright 16 -croptop 10 -deinterlace  -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
+        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 736x414 -ab 64k -ac 1 -acodec libfaac -ar 44100 -b 236k -bt 236k -cropbottom 8 -cropleft 16 -cropright 16 -croptop 10 -deinterlace  -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
           @convertor.instance_eval { mkcmd({'vpre' => 'hq-flash', 'pass' => 2}, 'sd', 'infile.avi', 'outfile.mpg', '16:9') }
       end
     end
@@ -38,7 +43,7 @@ class TestConvertor < Test::Unit::TestCase
         @convertor.stubs(:task).returns(task)
       end
       should "prepare valid command for ffmpeg" do
-        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 1118x414 -ab 64k -ac 1 -acodec libfaac -ar 44100 -b 236k -bt 236k -cropbottom 8 -cropleft 16 -cropright 16 -croptop 10 -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
+        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 736x414 -ab 64k -ac 1 -acodec libfaac -ar 44100 -b 236k -bt 236k -cropbottom 8 -cropleft 16 -cropright 16 -croptop 10 -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
           @convertor.instance_eval { mkcmd({'vpre' => 'hq-flash', 'pass' => 2}, 'sd', 'infile.avi', 'outfile.mpg', '16:9') }
       end
     end
@@ -49,9 +54,164 @@ class TestConvertor < Test::Unit::TestCase
         @convertor.stubs(:task).returns(task)
       end
       should "prepare valid command for ffmpeg" do
-        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 704x396 -ab 64k -ac 1 -acodec libfaac -ar 44100 -b 236k -bt 236k -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
-          @convertor.instance_eval { mkcmd({'vpre' => 'hq-flash', 'pass' => 2}, 'sd', 'infile.avi', 'outfile.mpg', '16:9') }
+        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 640x480 -ab 64k -ac 1 -acodec libfaac -ar 44100 -b 236k -bt 236k -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
+          @convertor.instance_eval { mkcmd({'vpre' => 'hq-flash', 'pass' => 2}, 'sd', 'infile.avi', 'outfile.mpg', '4:3') }
+      end
+    end
+
+    context "for some task with unusual aspect (15:9) with crop" do
+      setup do
+        task = Factory.create(:task, :bitrate => 600, :crop => true, :deinterlace => false)
+        @convertor.stubs(:task).returns(task)
+      end
+      should "prepare valid command for ffmpeg" do
+        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 672x408 -ab 64k -ac 1 -acodec libfaac -ar 44100 -b 236k -bt 236k -cropbottom 4 -cropleft 16 -cropright 16 -croptop 20 -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
+          @convertor.instance_eval { mkcmd({'vpre' => 'hq-flash', 'pass' => 2}, 'sd', 'infile.avi', 'outfile.mpg', '15:9') }
+      end
+    end
+
+    context "for some task with very unusual aspect (3:3)" do
+      setup do
+        task = Factory.create(:task, :bitrate => 600, :crop => false, :deinterlace => false)
+        @convertor.stubs(:task).returns(task)
+      end
+      should "prepare valid command for ffmpeg" do
+        assert_equal '/usr/bin/ffmpeg -y -i infile.avi -s 640x480 -ab 64k -ac 1 -acodec libfaac -ar 44100 -aspect 1.33333333 -b 236k -bt 236k -pass 2 -threads 3 -vcodec libx264 -vpre hq-flash outfile.mpg',
+          @convertor.instance_eval { mkcmd({'vpre' => 'hq-flash', 'pass' => 2}, 'sd', 'infile.avi', 'outfile.mpg', '3:3') }
+      end
+    end
+    #}}}
+    context "for task with crop and deinterlace and file with aspect 4:3" do # {{{
+      setup do
+        @convertor.file = Factory(:file, :aspect => '4:3', :filename => 'x/y/test.avi')
+        @convertor.task = Factory(:task, :file => @convertor.file, :crop => true, :deinterlace => true)
       end
+      should "prepare valid shell command for thumbnail generation" do # {{{
+        assert_equal "/usr/local/bin/tmaker -i /tmp/test.avi  -c 20  -d  -w 150 -h 112 -o \"/tmp/output/x/y/test-%d-2.jpg\" 200 400 600",
+          @convertor.instance_eval { make_thumbnails_cmd(3, 200, 150, nil, 2) }
+      end # }}}
     end
+    #}}}
+    context "when source file is available locally" do # {{{
+      setup do
+        @convertor.file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi')
+        FileUtils.touch '/tmp/test.avi'
+        Net::FTP.expects(:open).never
+      end
+      should "return immediately on attempt to fetch file" do
+        assert_nil @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', 'test.avi') }
+      end
+    end
+    # }}}
+    context "when source file is not available locally" do # {{{
+      setup do
+        @convertor.file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi')
+        FileUtils.rm_rf '/tmp/test.avi'
+      end
+
+      context "and ftp server works fine" do
+        setup do
+          ftp = mock()
+          ftp.expects(:login).with('test','test')
+          ftp.expects(:getbinaryfile).with('test.avi', '/tmp/test/test.part', 1024)
+          ftp.expects(:close)
+          Net::FTP.expects(:new).with('example.com', nil, nil, nil).returns(ftp)
+        end
+        should "download file by FTP" do
+          assert_equal 0, @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', 'test.avi') }
+          assert !File.exists?('/tmp/test/test.avi.part')
+          assert File.exists?('/tmp/test.avi')
+        end
+      end
+
+      context "and ftp server doesn't work" do
+        setup do
+          ftp = mock()
+          ftp.expects(:login).with('test','test')
+          ftp.expects(:getbinaryfile).raises(Net::FTPError)
+          ftp.expects(:close)
+          Net::FTP.expects(:new).with('example.com', nil, nil, nil).returns(ftp)
+        end
+        should "remove tmp file and raise error" do
+          assert_raise Net::FTPError do
+            @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', 'test.avi') }
+          end
+          assert !File.exists?('/tmp/test/test.avi.part')
+        end
+      end
+    end
+    # }}}
+    context "processing file with some profile" do # {{{
+      setup do
+        @convertor.file = Factory(:file, :filename => 'x/y/test.avi')
+        @convertor.logger = Logger.new('/dev/null')
+        @convertor.expects(:mkcmd).twice.returns("echo OK > /dev/null").then.returns("echo OK > test-sd-0.mp4")
+        Convertr::Config.any_instance.stubs(:qtfaststart => 'mv')
+        @convertor.instance_eval { process_profile('sd') }
+      end
+      should "create converted file" do
+        assert File.exists?('/tmp/output/x/y/test-sd.mp4')
+      end
+      should "remove temporary dir" do
+        assert !File.exists?('sd')
+      end
+    end 
+    # }}}
+    context "successfuly processing some task" do
+      setup do
+        file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi', :duration => 600)
+        @convertor.task = Factory(:task, :file => file, :bitrate => 600)
+        @convertor.logger = Logger.new('/dev/null')
+        FileUtils.mkpath('/tmp/test')
+        processing = sequence('processing')
+        @convertor.expects(:fetch_file).with('ftp://example.com/test.avi', 'test.avi').in_sequence(processing).returns(true)
+        @convertor.expects(:process_profile).with('hd').in_sequence(processing).returns(true)
+        @convertor.expects(:make_thumbnails_cmd).with(3, 200, 150, nil, 2).in_sequence(processing).returns('echo OK>/dev/null')
+      end
+      should "return SUCCESS" do
+        assert_equal 'SUCCESS', @convertor.instance_eval { process_task }
+      end
+    end
+    context "getting ftp error on processing some task" do
+      setup do
+        file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi', :duration => 600)
+        @convertor.task = Factory(:task, :file => file, :bitrate => 600)
+        @convertor.logger = Logger.new('/dev/null')
+        FileUtils.mkpath('/tmp/test')
+        @convertor.expects(:fetch_file).with('ftp://example.com/test.avi', 'test.avi').raises(Net::FTPError)
+        @convertor.expects(:process_profile).never
+        @convertor.expects(:make_thumbnails_cmd).never
+      end
+      should "return FAILURE" do
+        assert_equal 'FAILURE', @convertor.instance_eval { process_task }
+      end
+    end
+  end
+
+  context "Convertor ran with max_tasks=2" do
+    setup do
+      @convertor = Convertr::Convertor.new(2)
+    end
+
+    context "after successful processing first and failure on second task" do # {{{
+      setup do
+        @task_success = Factory(:task)
+        @task_failure = Factory(:task)
+        @convertor.scheduler.stubs(:schedule_next_task).returns(@task_success).then.returns(@task_failure)
+        @convertor.stubs(:process_task).returns('SUCCESS').then.returns('FAILURE')
+        @convertor.run
+      end
+      should "exit" do
+        assert_equal 2, @convertor.tasks
+      end
+      should "update first task with success" do
+        assert_equal 'SUCCESS', @task_success.convert_status
+        assert_in_delta Time.now.to_i, @task_success.convert_stopped_at.to_i, 1
+      end
+      should "update second task with failure" do
+        assert_equal 'FAILURE', @task_failure.convert_status
+        assert_in_delta Time.now.to_i, @task_failure.convert_stopped_at.to_i, 1
+      end
+    end # }}}
   end
 end

data/test/test_file.rb

@@ -4,13 +4,11 @@ class TestFile < Test::Unit::TestCase
   context "File class" do
     should "have without_convertor scope" do
       files = Convertr::File.without_convertor
-      assert_equal 2, files.size
       assert_equal 3, files.first.id
     end
 
     should "have with_convertor scope" do
       files = Convertr::File.with_convertor('convertor1')
-      assert_equal 2, files.size
       assert_equal 1, files.first.id
     end
   end

data/test/test_scheduler.rb

@@ -5,10 +5,28 @@ class TestScheduler < Test::Unit::TestCase
     setup do
       @scheduler = Convertr::Scheduler::Base.new
     end
+
     should "raise exception on calling abstract methods" do
       assert_raise RuntimeError do
         @scheduler.instance_eval { get_task_for_schedule('convertor1') }
       end
     end
+
+    context "after scheduling next task" do
+      setup do
+        @task = Factory.build :task
+        @scheduler.expects(:get_task_for_schedule).with('convertor1').returns(@task)
+        @scheduler.schedule_next_task('convertor1')
+      end
+
+      should "update task accordingly" do
+        assert_equal 'PROGRESS', @task.convert_status
+        assert_in_delta Time.now.to_i, @task.convert_started_at.to_i, 1
+      end
+
+      should "update file accordingly" do
+        assert_equal "convertor1", @task.file.convertor
+      end
+    end
   end
 end

data/test/test_scheduler_allbtfirst.rb

@@ -6,7 +6,7 @@ class TestSchedulerAllbtfirst < Test::Unit::TestCase
       @scheduler = Convertr::SchedulerFactory.create('AllBtFirst')
     end
     should "find first task assigned for convertor" do
-      assert_equal 2, @scheduler.get_task_for_schedule('convertor1').id
+      assert_equal 3, @scheduler.get_task_for_schedule('convertor1').id
     end
   end
 end

data/test/test_task.rb

@@ -8,6 +8,9 @@ class TestTask < Test::Unit::TestCase
     should "have not_completed scope" do
       assert_equal 3, Convertr::Task.not_completed.size
     end
+    should "have without_convertor scope" do
+      assert_equal 1, Convertr::Task.without_convertor.first.id
+    end
   end
 
   context "Task" do

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ilya Lityuga
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +04:00
+date: 2010-10-14 00:00:00 +04:00
 default_executable: convertr
 dependencies: 
 - !ruby/object:Gem::Dependency