handbrake 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+0.3.0
+=====
+
+- Change the output from the `scan` action to be a {HandBrake::Disc}
+  object which contains a titles hash, rather than the hash directly.
+- When `scan`ning for a single title, return only a single
+  {HandBrake::Title}.
+- Accept a path for the `:atomic` option to
+  {HandBrake::CLI#output}. If specified, the temporary file will be
+  written to this path rather than the ultimate target directory.
+- Ensure that trace mode prints updating lines (e.g., the encode
+  status) that do not end in newlines in a timely fashion.
+- Add property-based constructors to {HandBrake::Title} and
+  {HandBrake::Chapter} for easier construction in tests of consuming
+  apps/libs.
+
 0.2.1
 =====
 

data/README.md

@@ -39,13 +39,13 @@ A brief sample:
 
     project = hb.input('/Volumes/Arcturan Megafreighter/DVDs/L')
 
-    titles = project.scan
-    titles[1].number              # => 1
-    titles[1].main_feature?       # => true
-    titles[1].duration            # => "01:21:18"
-    titles[1].seconds             # => 4878
-    titles[1].chapters.size       # => 23
-    titles[1].chapters[3].seconds # => 208
+    disc = project.scan
+    disc.titles[1].number              # => 1
+    disc.titles[1].main_feature?       # => true
+    disc.titles[1].duration            # => "01:21:18"
+    disc.titles[1].seconds             # => 4878
+    disc.titles[1].chapters.size       # => 23
+    disc.titles[1].chapters[3].seconds # => 208
 
     project.title(1).
       preset('Normal').
@@ -99,10 +99,9 @@ come in any order, a few must come last and have particular return
 values:
 
 * `output`: triggers a transcode using all the options set up to this
-  point.
-* `scan`: triggers a title scan and returns a `Hash`-like structure
-  of {HandBrake::Title} objects describing the contents of the
-  input. The hash is indexed by title number.
+  point. No return value.
+* `scan`: triggers a title scan and returns either a {HandBrake::Disc}
+  (for all titles) or a {HandBrake::Title} (for a single title).
 * `update`: returns true or false depending on whether the version of
   HandBrakeCLI in use is up to date.
 * `preset_list`: returns a hash containing all the known presets and
@@ -122,9 +121,8 @@ along different paths.  E.g.:
     # TV
     project.preset('High Profile').output('project-tv.m4v')
 
-To put it more technically, the chain object returned from each
-intermediate configuration step returns an independent copy of the
-configuration chain.
+To put it more technically, each intermediate configuration step
+returns an independent copy of the configuration chain.
 
 ### Output options
 

data/lib/handbrake.rb

@@ -5,9 +5,10 @@ module HandBrake
   autoload :VERSION, 'handbrake/version'
 
   autoload :CLI,     'handbrake/cli'
-  autoload :Titles,  'handbrake/titles'
-  autoload :Title,   'handbrake/titles'
-  autoload :Chapter, 'handbrake/titles'
+  autoload :Disc,    'handbrake/disc'
+  autoload :Title,   'handbrake/disc'
+  autoload :Titles,  'handbrake/disc'
+  autoload :Chapter, 'handbrake/disc'
 
   ##
   # The exception thrown when a file exists that shouldn't.

data/lib/handbrake/cli.rb

@@ -68,16 +68,19 @@ module HandBrake
     #   `true`, the file is replaced. If `false`, an exception is
     #   thrown. If `:ignore`, the file is skipped; i.e., HandBrakeCLI
     #   is not invoked.
-    # @option options [Boolean] :atomic (false) provides a
+    # @option options [Boolean, String] :atomic (false) provides a
     #   pseudo-atomic mode for transcoded output. If true, the
     #   transcode will go into a temporary file and only be copied to
-    #   the specified filename if it completes. The temporary filename
-    #   is the target filename with `.handbraking` inserted before the
-    #   extension. Any `:overwrite` checking will be applied to the
-    #   target filename both before and after the transcode happens
-    #   (the temporary file will always be overwritten). This option
-    #   is intended to aid in writing automatically resumable batch
-    #   scripts.
+    #   the specified filename if it completes. If the value is
+    #   literally `true`, the temporary filename is the target
+    #   filename with `.handbraking` inserted before the extension. If
+    #   the value is a string, it is interpreted as a path; the
+    #   temporary file is written to this path instead of in the
+    #   ultimate target directory. Any `:overwrite` checking will be
+    #   applied to the target filename both before and after the
+    #   transcode happens (the temporary file will always be
+    #   overwritten). This option is intended to aid in writing
+    #   automatically resumable batch scripts.
     #
     # @return [void]
     def output(filename, options={})
@@ -98,10 +101,15 @@ module HandBrake
 
       atomic = options.delete :atomic
       interim_filename =
-        if atomic
+        case atomic
+        when true
           partial_filename(filename)
-        else
+        when String
+          partial_filename(File.join(atomic, File.basename(filename)))
+        when false, nil
           filename
+        else
+          fail "Unsupported value for :atomic: #{atomic.inspect}"
         end
 
       unless options.empty?
@@ -127,7 +135,7 @@ module HandBrake
           else
             true
           end
-        FileUtils.mv interim_filename, filename if replace
+        FileUtils.mv(interim_filename, filename, :verbose => trace?) if replace
       end
     end
 
@@ -147,13 +155,22 @@ module HandBrake
     # titles. (HandBrakeCLI defaults to only returning information for
     # title 1.)
     #
-    # @return [Titles]
+    # @return [Disc,Title] a {Disc} when scanning for all titles, or a
+    #   {Title} when scanning for one title.
     def scan
-      if arguments.include?('--title')
-        result = run('--scan')
-        Titles.from_output(result.output)
+      one_title = arguments.include?('--title')
+
+      args = %w(--scan)
+      unless one_title
+        args.unshift('--title', '0')
+      end
+
+      disc = Disc.from_output(run(*args).output)
+
+      if one_title
+        disc.titles.values.first
       else
-        title(0).scan
+        disc
       end
     end
 
@@ -264,7 +281,7 @@ module HandBrake
 
         $stderr.puts "Spawning HandBrakeCLI using #{cmd.inspect}" if @cli.trace?
         IO.popen(cmd) do |io|
-          while line = io.gets
+          while line = io.read(60)
             output << line
             $stderr.write(line) if @cli.trace?
           end

data/lib/handbrake/{titles.rb → disc.rb}

@@ -4,13 +4,12 @@ require 'handbrake'
 
 module HandBrake
   ##
-  # And enhanced `Hash` which can self-parse the output from
-  # HandBrakeCLI's `--scan` mode. The keys of this hash will be title
-  # numbers and the values will be {Title} instances.
+  # An object representation of the output from HandBrakeCLI's
+  # `--scan` mode.
   #
   # @see Title
   # @see Chapter
-  class Titles < Hash
+  class Disc
     ##
     # The HandBrakeCLI scan output from which this instance was
     # parsed, if available.
@@ -26,18 +25,37 @@ module HandBrake
     attr_reader :raw_tree
 
     ##
-    # Builds a new {Titles} instance from the output of `HandBrakeCLI
+    # The titles in the disc. The keys are the title numbers.
+    #
+    # @return [Hash<Fixnum, Title>]
+    attr_reader :titles
+
+    ##
+    # The name of the disc.
+    #
+    # @return [String]
+    attr_accessor :name
+
+    def initialize(name=nil)
+      @name = name
+      @titles = {}
+    end
+
+    ##
+    # Builds a new {Disc} instance from the output of `HandBrakeCLI
     # --scan`.
     #
     # @param [String] output the raw contents from the scan
-    # @return [Titles] a new, completely initialized title catalog
+    # @return [Disc] a new, completely initialized title catalog
     def self.from_output(output)
-      self.new.tap do |titles|
-        titles.raw_output = output
-        titles.raw_tree.children.
+      name = File.basename(
+        output.split("\n").grep(/hb_scan/).first.scan(/path=([^,]*),/).first.first)
+      self.new(name).tap do |disc|
+        disc.raw_output = output
+        disc.raw_tree.children.
           collect { |title_node| Title.from_tree(title_node) }.
-          each { |title| title.collection = titles }.
-          each { |title| titles[title.number] = title }
+          each { |title| title.disc = disc }.
+          each { |title| disc.titles[title.number] = title }
       end
     end
 
@@ -54,6 +72,10 @@ module HandBrake
       @raw_tree = extract_tree
     end
 
+    def to_yaml_properties
+      %w(@name  @titles)
+    end
+
     private
 
     def extract_tree
@@ -100,10 +122,27 @@ module HandBrake
     end
   end
 
+  ##
+  # Mix-in that provides a class with a constructor that sets any
+  # publicly writable properties from values in a hash.
+  module ConstructWithProperties
+    def initialize(properties={})
+      properties.each do |prop, value|
+        setter = :"#{prop}="
+        if self.respond_to?(setter)
+          self.send(setter, value)
+        else
+          fail("No property #{prop.inspect} in #{self.class}")
+        end
+      end
+    end
+  end
+
   ##
   # Metadata about a single DVD title.
   class Title
     include DurationAsSeconds
+    include ConstructWithProperties
 
     ##
     # @return [Fixnum] The title number of this title (a positive integer).
@@ -125,8 +164,8 @@ module HandBrake
     attr_writer :main_feature
 
     ##
-    # @return [Titles] The collection this title belongs to.
-    attr_accessor :collection
+    # @return [Disc] The disc this title belongs to.
+    attr_accessor :disc
 
     ##
     # Creates a new instance from the given scan subtree.
@@ -176,6 +215,7 @@ module HandBrake
   # The metadata about a single chapter in a title of a DVD.
   class Chapter
     include DurationAsSeconds
+    include ConstructWithProperties
 
     ##
     # @return [String] The duration of the title in the format

data/lib/handbrake/version.rb

@@ -1,5 +1,5 @@
 module HandBrake
   ##
   # The current version
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/handbrake/cli_spec.rb

@@ -163,32 +163,30 @@ module HandBrake
             end
           end
 
-          context 'true' do
-            let(:expected_temporary_file) { File.join(tmpdir, "foo.handbraking.m4v") }
-
+          shared_examples 'atomic enabled' do
             it 'outputs to the temporary file with ".handbraking" inserted before the extension' do
-              cli.output(filename, :atomic => true)
+              cli.output(filename, :atomic => atomic_option_value)
               it_should_have_run(expected_temporary_file)
             end
 
             it 'appends .handbraking if the output file does not have an extension' do
-              cli.output(File.join(tmpdir('a.b.c'), 'foo'), :atomic => true)
-              it_should_have_run(File.join(tmpdir('a.b.c'), 'foo.handbraking'))
+              cli.output(File.join(tmpdir('a.b.c'), 'foo'), :atomic => atomic_option_value)
+              it_should_have_run(expected_no_extension_temporary_filename)
             end
 
             it 'copies the output to the desired filename' do
-              cli.output(filename, :atomic => true)
+              cli.output(filename, :atomic => atomic_option_value)
               File.read(filename).should == 'This is the file created by --output'
             end
 
             it 'removes the temporary file' do
-              cli.output(filename, :atomic => true)
+              cli.output(filename, :atomic => atomic_option_value)
               File.exist?(expected_temporary_file).should be_false
             end
 
             it 'overwrites the temporary file if it exists' do
               FileUtils.touch expected_temporary_file
-              cli.output(filename, :atomic => true)
+              cli.output(filename, :atomic => atomic_option_value)
               it_should_have_run(expected_temporary_file)
             end
 
@@ -196,13 +194,13 @@ module HandBrake
               describe 'false' do
                 it 'throws an exception if the target filename exists initially' do
                   FileUtils.touch filename
-                  lambda { cli.output(filename, :atomic => true, :overwrite => false) }.
+                  lambda { cli.output(filename, :atomic => atomic_option_value, :overwrite => false) }.
                     should raise_error(HandBrake::FileExistsError)
                 end
 
                 it 'throws an exception if the target filename exists after output' do
                   runner.behavior = lambda { FileUtils.touch filename }
-                  lambda { cli.output(filename, :atomic => true, :overwrite => false) }.
+                  lambda { cli.output(filename, :atomic => atomic_option_value, :overwrite => false) }.
                     should raise_error(HandBrake::FileExistsError)
                 end
               end
@@ -210,7 +208,7 @@ module HandBrake
               describe ':ignore' do
                 it 'does nothing if the target filename exists initially' do
                   FileUtils.touch filename
-                  cli.output(filename, :atomic => true, :overwrite => :ignore)
+                  cli.output(filename, :atomic => atomic_option_value, :overwrite => :ignore)
                   it_should_not_have_run
                 end
 
@@ -218,7 +216,7 @@ module HandBrake
                   runner.behavior = lambda {
                     File.open(filename, 'w') { |f| f.write 'Other process result' }
                   }
-                  cli.output(filename, :atomic => true, :overwrite => :ignore)
+                  cli.output(filename, :atomic => atomic_option_value, :overwrite => :ignore)
                   File.read(filename).should == 'Other process result'
                 end
 
@@ -226,17 +224,38 @@ module HandBrake
                   runner.behavior = lambda {
                     File.open(filename, 'w') { |f| f.write 'Other process result' }
                   }
-                  cli.output(filename, :atomic => true, :overwrite => :ignore)
+                  cli.output(filename, :atomic => atomic_option_value, :overwrite => :ignore)
                   File.exist?(expected_temporary_file).should be_true
                 end
               end
             end
           end
+
+          context 'true' do
+            let(:atomic_option_value) { true }
+            let(:expected_temporary_file) { File.join(tmpdir, "foo.handbraking.m4v") }
+            let(:expected_no_extension_temporary_filename) {
+              File.join(tmpdir('a.b.c'), 'foo.handbraking')
+            }
+
+            include_examples 'atomic enabled'
+          end
+
+          context 'an alternate path' do
+            let(:atomic_option_value) { tmpdir('somewhere/else') }
+            let(:expected_temporary_file) { File.join(atomic_option_value, "foo.handbraking.m4v") }
+            let(:expected_no_extension_temporary_filename) {
+              File.join(atomic_option_value, 'foo.handbraking')
+            }
+
+            include_examples 'atomic enabled'
+          end
         end
       end
 
       describe '#scan' do
         let(:sample_scan) { File.read(File.expand_path('../sample-titles-scan.err', __FILE__)) }
+        let(:single_scan) { File.read(File.expand_path('../single-title-scan.err', __FILE__)) }
 
         before do
           runner.output = sample_scan
@@ -253,8 +272,8 @@ module HandBrake
         end
 
         it 'only scans the specified title if one is specified' do
-          cli.title(3).scan
-          runner.actual_arguments.should == %w(--title 3 --scan)
+          cli.title(2).scan
+          runner.actual_arguments.should == %w(--title 2 --scan)
         end
 
         it 'does not permanently modify the argument list when using the default title setting' do
@@ -262,9 +281,15 @@ module HandBrake
           cli.arguments.should_not include('--title')
         end
 
-        it 'returns titles from the output' do
-          # The details for this are tested in titles_spec
-          cli.scan.size.should == 5
+        it 'return a Disc when scanning all titles' do
+          # The details for this are tested in disc_spec
+          cli.scan.should be_a HandBrake::Disc
+        end
+
+        it 'returns a Title when scanning one title' do
+          # The details for this are tested in disc_spec
+          runner.output = single_scan
+          cli.title(2).scan.should be_a HandBrake::Title
         end
       end
 

data/spec/handbrake/disc_spec.rb

@@ -0,0 +1,201 @@
+require File.expand_path('../../spec_helper.rb', __FILE__)
+
+module HandBrake
+  describe Disc do
+    let(:body) { File.read(File.expand_path('../sample-titles-scan.err', __FILE__)) }
+    let(:disc) { Disc.from_output(body) }
+    let(:titles) { disc.titles }
+
+    describe '#titles' do
+      it 'contains all the titles' do
+        titles.size.should == 5
+      end
+
+      it 'indexes the titles correctly' do
+        titles[3].number.should == 3
+      end
+
+      it 'is enumerable' do
+        titles.collect { |k, v| k }.sort.should == [1, 2, 3, 6, 11]
+      end
+    end
+
+    it 'extracts the name' do
+      disc.name.should == 'D2'
+    end
+
+    it 'contains a reference to the full output' do
+      disc.raw_output.should == body
+    end
+
+    describe "#raw_tree" do
+      let(:tree) { disc.raw_tree }
+
+      it 'has the raw values at the top level of nodes' do
+        tree.children.collect { |c| c.name }.should ==
+          ['title 1:', 'title 2:', 'title 3:', 'title 6:', 'title 11:']
+      end
+
+      it 'has the raw values at the second level' do
+        tree['title 11:'][3].name.should == 'autocrop: 0/0/0/0'
+      end
+
+      it 'has the raw values at the third level' do
+        tree['title 3:']['audio tracks:'][1].name.should ==
+          '2, Francais (AC3) (Dolby Surround) (iso639-2: fra), 48000Hz, 192000bps'
+      end
+    end
+
+    describe 'YAML serialization' do
+      describe 'round trip' do
+        let(:yaml) { disc.to_yaml }
+        let(:reloaded) { YAML.load(yaml) }
+
+        it 'does not include the raw output' do
+          reloaded.raw_output.should be_nil
+        end
+
+        it 'does not include the raw tree' do
+          reloaded.raw_tree.should be_nil
+        end
+
+        it 'preserves the name' do
+          reloaded.name.should == 'D2'
+        end
+
+        it 'preserves the titles' do
+          reloaded.titles.size.should == 5
+        end
+
+        it 'preserves the backreference from a title to the disc' do
+          pending "Psych issue #19" if RUBY_VERSION =~ /1.9/
+          reloaded.titles[1].disc.should eql(reloaded)
+        end
+
+        it 'preserves the chapters' do
+          reloaded.titles[3].chapters.size.should == 13
+        end
+
+        it 'preserves the backreference from a chapter to its title' do
+          pending "Psych issue #19" if RUBY_VERSION =~ /1.9/
+          title_1 = reloaded.titles[1]
+          title_1.chapters[4].title.should eql(title_1)
+        end
+      end
+    end
+  end
+
+  describe Title do
+    let(:body) { File.read(File.expand_path('../sample-titles-scan.err', __FILE__)) }
+    let(:disc) { Disc.from_output(body) }
+    let(:titles) { disc.titles }
+
+    let(:title_1) { titles[1] }
+    let(:title_3) { titles[3] }
+
+    it 'has a reference to its parent disc' do
+      title_1.disc.should be disc
+    end
+
+    describe '#initialize' do
+      describe 'without a hash' do
+        it 'works' do
+          lambda { Title.new }.should_not raise_error
+        end
+      end
+
+      describe 'with a hash' do
+        it 'can set settable properties' do
+          Title.new(:number => 5, :duration => '01:45:35').number.should == 5
+        end
+
+        it 'fails for an unknown property' do
+          lambda { Title.new(:foo => 'bar') }.
+            should raise_error('No property :foo in HandBrake::Title')
+        end
+      end
+    end
+
+    describe '#main_feature?' do
+      it 'is true when it is' do
+        title_1.should be_main_feature
+      end
+
+      it 'is false when it is' do
+        title_3.should_not be_main_feature
+      end
+
+      it 'is not a complex value when true, so that serializations are simpler' do
+        title_1.main_feature?.should == true
+      end
+    end
+
+    it 'has the number' do
+      title_1.number.should == 1
+    end
+
+    it 'has the duration' do
+      title_3.duration.should == '01:43:54'
+    end
+
+    it 'has the duration in seconds' do
+      title_3.seconds.should == 6234
+    end
+
+    it 'has the right number of chapters' do
+      title_3.should have(13).chapters
+    end
+
+    it 'has chapters indexed by chapter number' do
+      title_3.chapters[2].tap do |c|
+        c.duration.should == '00:00:52'
+        c.number.should == 2
+      end
+    end
+
+    it 'has an array of the chapters in order' do
+      title_3.all_chapters.collect { |ch| ch.number }.should == (1..13).to_a
+    end
+
+    describe 'a chapter' do
+      let(:chapter) { title_3.chapters[5] }
+
+      it 'has the duration' do
+        chapter.duration.should == '00:03:23'
+      end
+
+      it 'has the duration in seconds' do
+        chapter.seconds.should == 203
+      end
+
+      it 'has the number' do
+        chapter.number.should == 5
+      end
+
+      it 'has a reference to its parent' do
+        chapter.title.should eql title_3
+      end
+    end
+  end
+
+  describe Chapter do
+    describe '#initialize' do
+      describe 'without a hash' do
+        it 'works' do
+          lambda { Chapter.new }.should_not raise_error
+        end
+      end
+
+      describe 'with a hash' do
+        it 'can set settable properties' do
+          Chapter.new(:number => 5, :duration => '01:45:35').duration.should == '01:45:35'
+        end
+
+        it 'fails for an unknown property' do
+          lambda { Chapter.new(:foo => 'bar') }.
+            should raise_error('No property :foo in HandBrake::Chapter')
+        end
+      end
+    end
+  end
+end

data/spec/handbrake/single-title-scan.err

@@ -0,0 +1,96 @@
+[21:49:40] hb_init: checking cpu count
+[21:49:40] hb_init: starting libhb thread
+HandBrake rev3736 (2011081199) - Darwin x86_64 - http://handbrake.fr
+2 CPUs detected
+Opening /Volumes/Arcturan Megafreighter/DVDs/L...
+[21:49:40] hb_scan: path=/Volumes/Arcturan Megafreighter/DVDs/L, title_index=1
+libbluray/bdnav/index_parse.c:157: indx_parse(): error opening /Volumes/Arcturan Megafreighter/DVDs/L/BDMV/index.bdmv
+libbluray/bluray.c:960: nav_get_title_list(/Volumes/Arcturan Megafreighter/DVDs/L) failed (0x102013400)
+[21:49:40] bd: not a bd - trying as a stream/file instead
+libdvdnav: Using dvdnav version 4.1.3
+libdvdread: Using libdvdcss version 1.2.9 for DVD access
+libdvdread: Couldn't find device name.
+libdvdnav: Can't read name block. Probably not a DVD-ROM device.
+libdvdnav: Unable to find map file '/Users/rsutphin/.dvdnav/.map'
+libdvdnav: DVD disk reports itself with Region mask 0x00fe0000. Regions: 1
+libdvdread: Using libdvdcss version 1.2.9 for DVD access
+libdvdread: Couldn't find device name.
+[21:49:40] scan: DVD has 3 title(s)
+[21:49:40] scan: scanning title 1
+[21:49:40] scan: opening IFO for VTS 1
+[21:49:40] scan: duration is 01:21:18 (4878000 ms)
+[21:49:40] pgc_id: 1, pgn: 1: pgc: 0x101605130
+[21:49:40] scan: vts=1, ttn=1, cells=0->22, blocks=58609->58608, 2081952 blocks
+[21:49:40] scan: checking audio 1
+[21:49:40] scan: id=80bd, lang=English (AC3), 3cc=eng ext=0
+[21:49:40] scan: checking audio 2
+[21:49:40] scan: id=81bd, lang=Francais (AC3), 3cc=fra ext=0
+[21:49:40] scan: title 1 has 23 chapters
+[21:49:40] scan: chap 1 c=0->0, b=58609->108062 (49454), 120223 ms
+[21:49:40] scan: chap 2 c=1->1, b=108063->181132 (73070), 148385 ms
+[21:49:40] scan: chap 3 c=2->2, b=181133->265640 (84508), 208487 ms
+[21:49:40] scan: chap 4 c=3->3, b=265641->342075 (76435), 199636 ms
+[21:49:40] scan: chap 5 c=4->4, b=342076->464043 (121968), 322732 ms
+[21:49:40] scan: chap 6 c=5->5, b=464044->528308 (64265), 167554 ms
+[21:49:40] scan: chap 7 c=6->6, b=528309->613576 (85268), 297605 ms
+[21:49:40] scan: chap 8 c=7->7, b=613577->698083 (84507), 237727 ms
+[21:49:40] scan: chap 9 c=8->8, b=698084->832431 (134348), 291828 ms
+[21:49:40] scan: chap 10 c=9->9, b=832432->950393 (117962), 271647 ms
+[21:49:40] scan: chap 11 c=10->10, b=950394->1067913 (117520), 281843 ms
+[21:49:40] scan: chap 12 c=11->11, b=1067914->1163132 (95219), 212671 ms
+[21:49:40] scan: chap 13 c=12->12, b=1163133->1282848 (119716), 276599 ms
+[21:49:40] scan: chap 14 c=13->13, b=1282849->1330562 (47714), 120309 ms
+[21:49:40] scan: chap 15 c=14->14, b=1330563->1476681 (146119), 301613 ms
+[21:49:40] scan: chap 16 c=15->15, b=1476682->1577253 (100572), 205434 ms
+[21:49:40] scan: chap 17 c=16->16, b=1577254->1650064 (72811), 185610 ms
+[21:49:40] scan: chap 18 c=17->17, b=1650065->1744727 (94663), 195639 ms
+[21:49:40] scan: chap 19 c=18->18, b=1744728->1904668 (159941), 328863 ms
+[21:49:40] scan: chap 20 c=19->19, b=1904669->2018698 (114030), 252789 ms
+[21:49:40] scan: chap 21 c=20->20, b=2018699->2105949 (87251), 179543 ms
+[21:49:40] scan: chap 22 c=21->21, b=2105950->2140482 (34533), 64239 ms
+[21:49:40] scan: chap 23 c=22->22, b=58531->58608 (78), 7013 ms
+[21:49:40] scan: aspect = 0
+[21:49:40] scan: decoding previews for title 1
+libdvdnav: DVD disk reports itself with Region mask 0x00fe0000. Regions: 1
+[21:49:40] scan: title angle(s) 1
+[21:49:40] scan: audio 0x80bd: AC-3, rate=48000Hz, bitrate=192000 English (AC3) (2.0 ch)
+[21:49:40] scan: audio 0x81bd: AC-3, rate=48000Hz, bitrate=192000 Francais (AC3) (2.0 ch)
+Scanning title 1 of 3...
+[21:49:40] scan: 10 previews, 720x480, 23.976 fps, autocrop = 0/0/8/4, aspect 4:3, PAR 8:9
+[21:49:40] scan: title (0) job->width:624, job->height:480
+[21:49:40] libhb: scan thread found 1 valid title(s)
++ title 1:
+  + vts 1, ttn 1, cells 0->22 (2081952 blocks)
+  + duration: 01:21:18
+  + size: 720x480, pixel aspect: 8/9, display aspect: 1.33, 23.976 fps
+  + autocrop: 0/0/8/4
+  + chapters:
+    + 1: cells 0->0, 49454 blocks, duration 00:02:00
+    + 2: cells 1->1, 73070 blocks, duration 00:02:28
+    + 3: cells 2->2, 84508 blocks, duration 00:03:28
+    + 4: cells 3->3, 76435 blocks, duration 00:03:20
+    + 5: cells 4->4, 121968 blocks, duration 00:05:23
+    + 6: cells 5->5, 64265 blocks, duration 00:02:48
+    + 7: cells 6->6, 85268 blocks, duration 00:04:58
+    + 8: cells 7->7, 84507 blocks, duration 00:03:58
+    + 9: cells 8->8, 134348 blocks, duration 00:04:52
+    + 10: cells 9->9, 117962 blocks, duration 00:04:32
+    + 11: cells 10->10, 117520 blocks, duration 00:04:42
+    + 12: cells 11->11, 95219 blocks, duration 00:03:33
+    + 13: cells 12->12, 119716 blocks, duration 00:04:37
+    + 14: cells 13->13, 47714 blocks, duration 00:02:00
+    + 15: cells 14->14, 146119 blocks, duration 00:05:02
+    + 16: cells 15->15, 100572 blocks, duration 00:03:25
+    + 17: cells 16->16, 72811 blocks, duration 00:03:06
+    + 18: cells 17->17, 94663 blocks, duration 00:03:16
+    + 19: cells 18->18, 159941 blocks, duration 00:05:29
+    + 20: cells 19->19, 114030 blocks, duration 00:04:13
+    + 21: cells 20->20, 87251 blocks, duration 00:03:00
+    + 22: cells 21->21, 34533 blocks, duration 00:01:04
+    + 23: cells 22->22, 78 blocks, duration 00:00:07
+  + audio tracks:
+    + 1, English (AC3) (2.0 ch) (iso639-2: eng), 48000Hz, 192000bps
+    + 2, Francais (AC3) (2.0 ch) (iso639-2: fra), 48000Hz, 192000bps
+  + subtitle tracks:
+    + 1, Closed Captions (iso639-2: eng) (Text)(CC)
+HandBrake has exited.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handbrake
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-14 00:00:00.000000000Z
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree
-  requirement: &2153698700 !ruby/object:Gem::Requirement
+  requirement: &2152701940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153698700
+  version_requirements: *2152701940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153698200 !ruby/object:Gem::Requirement
+  requirement: &2152701440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2153698200
+  version_requirements: *2152701440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153697740 !ruby/object:Gem::Requirement
+  requirement: &2152700980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2153697740
+  version_requirements: *2152700980
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153697280 !ruby/object:Gem::Requirement
+  requirement: &2152700520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153697280
+  version_requirements: *2152700520
 description: A lightweight literate ruby wrapper for HandBrakeCLI, the command-line
   interface for the HandBrake video transcoder.
 email:
@@ -76,12 +76,13 @@ files:
 - hrirb
 - lib/handbrake.rb
 - lib/handbrake/cli.rb
-- lib/handbrake/titles.rb
+- lib/handbrake/disc.rb
 - lib/handbrake/version.rb
 - spec/handbrake/cli_spec.rb
+- spec/handbrake/disc_spec.rb
 - spec/handbrake/sample-preset-list.out
 - spec/handbrake/sample-titles-scan.err
-- spec/handbrake/titles_spec.rb
+- spec/handbrake/single-title-scan.err
 - spec/handbrake/version_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rsutphin/handbrake.rb
@@ -110,8 +111,9 @@ specification_version: 3
 summary: A ruby wrapper for HandBrakeCLI
 test_files:
 - spec/handbrake/cli_spec.rb
+- spec/handbrake/disc_spec.rb
 - spec/handbrake/sample-preset-list.out
 - spec/handbrake/sample-titles-scan.err
-- spec/handbrake/titles_spec.rb
+- spec/handbrake/single-title-scan.err
 - spec/handbrake/version_spec.rb
 - spec/spec_helper.rb

data/spec/handbrake/titles_spec.rb

@@ -1,115 +0,0 @@
-require File.expand_path('../../spec_helper.rb', __FILE__)
-
-module HandBrake
-  describe Titles do
-    let(:body) { File.read(File.expand_path('../sample-titles-scan.err', __FILE__)) }
-    let(:titles) { Titles.from_output(body) }
-
-    it 'contains all the titles' do
-      titles.size.should == 5
-    end
-
-    it 'indexes the titles correctly' do
-      titles[3].number.should == 3
-    end
-
-    it 'is enumerable' do
-      titles.collect { |k, v| k }.sort.should == [1, 2, 3, 6, 11]
-    end
-
-    it 'contains a reference to the full output' do
-      titles.raw_output.should == body
-    end
-
-    describe "#raw_tree" do
-      let(:tree) { titles.raw_tree }
-
-      it 'has the raw values at the top level of nodes' do
-        tree.children.collect { |c| c.name }.should ==
-          ['title 1:', 'title 2:', 'title 3:', 'title 6:', 'title 11:']
-      end
-
-      it 'has the raw values at the second level' do
-        tree['title 11:'][3].name.should == 'autocrop: 0/0/0/0'
-      end
-
-      it 'has the raw values at the third level' do
-        tree['title 3:']['audio tracks:'][1].name.should ==
-          '2, Francais (AC3) (Dolby Surround) (iso639-2: fra), 48000Hz, 192000bps'
-      end
-    end
-  end
-
-  describe Title do
-    let(:body) { File.read(File.expand_path('../sample-titles-scan.err', __FILE__)) }
-    let(:titles) { Titles.from_output(body) }
-
-    let(:title_1) { titles[1] }
-    let(:title_3) { titles[3] }
-
-    it 'has a reference to its parent collection' do
-      title_1.collection.should eql(titles)
-    end
-
-    describe '#main_feature?' do
-      it 'is true when it is' do
-        title_1.should be_main_feature
-      end
-
-      it 'is false when it is' do
-        title_3.should_not be_main_feature
-      end
-
-      it 'is not a complex value when true, so that serializations are simpler' do
-        title_1.main_feature?.should == true
-      end
-    end
-
-    it 'has the number' do
-      title_1.number.should == 1
-    end
-
-    it 'has the duration' do
-      title_3.duration.should == '01:43:54'
-    end
-
-    it 'has the duration in seconds' do
-      title_3.seconds.should == 6234
-    end
-
-    it 'has the right number of chapters' do
-      title_3.should have(13).chapters
-    end
-
-    it 'has chapters indexed by chapter number' do
-      title_3.chapters[2].tap do |c|
-        c.duration.should == '00:00:52'
-        c.number.should == 2
-      end
-    end
-
-    it 'has an array of the chapters in order' do
-      title_3.all_chapters.collect { |ch| ch.number }.should == (1..13).to_a
-    end
-
-    describe 'a chapter' do
-      let(:chapter) { title_3.chapters[5] }
-
-      it 'has the duration' do
-        chapter.duration.should == '00:03:23'
-      end
-
-      it 'has the duration in seconds' do
-        chapter.seconds.should == 203
-      end
-
-      it 'has the number' do
-        chapter.number.should == 5
-      end
-
-      it 'has a reference to its parent' do
-        chapter.title.should eql title_3
-      end
-    end
-  end
-end