musical 0.0.1 → 0.0.2

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "trollop", ">=1.16.2"
 gem "progressbar", ">=0.9.1"
+gem "rb-appscript", ">=0.6.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.rdoc

@@ -1,12 +1,12 @@
 = musical
 
 Musical is a simple tool for your DVD.
-It enables you to rip and convert it to wav data by chapter.
+It enables you to rip data by chapter, encode it with your iTunes setting and add it to your iTunes library automatically.
 
 
 == Install
 
-1 Install dvdbackup and ffmpeg. For example,
+1 Musical depends on dvdbackup and ffmpeg. To install them try this for example,
   brew install dvdbackup
   brew install ffmpeg
 
@@ -21,13 +21,18 @@ Set you DVD and type
 Options:
                   --info, -i:   Show your DVD data
   --ignore-convert-sound, -g:   Rip data only, NOT convert them to wav file
+     --ignore-use-itunes, -n:   NOT add ripped files to iTunes and encode the
                --dev, -d <s>:   Set location of DVD device
              --title, -t <s>:   Set DVD title (default: LIVE)
+            --artist, -a <s>:   Set DVD artist (default: Artist)
             --output, -o <s>:   Set location of ripped data (default: ripped)
                --version, -v:   Print version and exit
                   --help, -h:   Show this message
 
 
+When you use iTunes, you should use --title and --artist options. They will help you to manage your music library easily.
+
+
 == FAQ
 
 === On Mac OS X 10.7.x, I cannot install ffmpeg.
@@ -35,7 +40,7 @@ Options:
 The latest Xcode doesn't include gcc. Install gcc-4.2[https://github.com/kennethreitz/osx-gcc-installer].
 
 And try this.
-  brew install --use-clang --HEAD --use-gcc ffmpeg
+  brew install --use-gcc ffmpeg
 
 
 === I got an error, /bin/sh: /usr/bin/pod2man: Permission denied

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/musical

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'musical'
-
 include Musical
 
-DVD.new
+opts = Musical.setup
+DVD.new opts

data/lib/musical.rb

@@ -2,135 +2,39 @@ require 'rubygems'
 require 'trollop'
 require 'progressbar'
 require 'fileutils'
+require 'appscript'
 
-module Musical
-  class DVD
-    attr_accessor :opts
-
-    def self.detect
-      dev_infos = `df -h | awk {'print $1,$5,$6'}`.split("\n")
-      candidates = []
-      dev_infos.each do |dev_info|
-        info = dev_info.split(" ")
-        file_system = info[0]
-        capacity = info[1]
-        mounted = info[2]
-        if capacity == "100%" && mounted.include?("/Volumes")
-          candidates << mounted
-        end
-      end
-
-      raise "Not detect DVD device" if candidates.empty?
-      candidates
-    end
-
-    def initialize
-      @opts = Trollop::options do
-        version 'Musical 0.0.1'
-        opt :info, "Show your DVD data", :type => :boolean
-        opt :ignore_convert_sound, "Rip data only, NOT convert them to wav file", :type => :boolean
-        opt :dev, "Set location of DVD device"
-        opt :title, "Set DVD title", :default => 'LIVE'
-        opt :output, "Set location of ripped data", :default => 'ripped'
-      end
-      run
-    end
-
-    def run
-      check_env
-      return puts info if @opts[:info]
-      rip_by_chapter
-      convert_sound unless @opts[:ignore_convert_sound]
-    end
-
-    def dev
-      @_dev ||= DVD.detect.first
-    end
-
-    def info
-      raise "Not detect DVD device" if dev.empty?
-      @_info ||= `dvdbackup --input=#{dev} --info 2>/dev/null`
-    end
-
-    def title_with_chapters
-      return @_title_chapters unless @_title_chapters.nil?
-
-      @_title_chapters = []
-      info_str = info.split("\n")
-      info_str.each_with_index do |line, index|
-        if line =~ /\s*Title (\d):$/
-          @_title_chapters << { :title => $1.to_i, :line => index }
-        end
-      end
+require 'musical/dvd'
+require 'musical/itunes'
 
-      @_title_chapters.each do |title_chapter|
-        line = title_chapter[:line]
-        if info_str[line + 1] =~ /\s*Title (\d) has (\d*) chapter/
-          title_chapter[:chapter] = $2.to_i
-          title_chapter.delete(:line)
-        end
-      end
-      @_title_chapters
-    end
-
-    def rip_by_chapter
-      task_message "Ripping"
-
-      pbar = ProgressBar.new "Ripping", chapter_size
-      title_with_chapters.each_with_index do |title_chapter, title_index|
-        ripped_dir_base = "#{@opts[:output]}"
-        saved_dir = "#{ripped_dir_base}/#{@opts[:title]}/title_#{title_index+1}"
-        FileUtils.mkdir_p "#{saved_dir}"
-
-        1.upto title_chapter[:chapter] do |chapter|
-          `dvdbackup --name=#{@opts[:title]} --input=#{dev} --title=#{title_index+1} --start=#{chapter} --end=#{chapter} --output=#{ripped_dir_base}_#{title_index}_#{chapter} 2>/dev/null`
-          pbar.inc
-
-          # moved file
-          vob_path = `find #{ripped_dir_base}_#{title_index}_#{chapter} -name "*.VOB"`.chomp
-          FileUtils.mv vob_path, "#{saved_dir}/chapter_#{chapter}.VOB"
-          FileUtils.rm_rf "#{ripped_dir_base}_#{title_index}_#{chapter}"
-        end
-      end
-      pbar.finish
-    end
-
-    def convert_sound
-      task_message "Converting"
-
-      pbar = ProgressBar.new "Converting", chapter_size
-      title_with_chapters.each_with_index do |title_chapter, title_index|
-        ripped_dir_base = "#{@opts[:output]}"
-        saved_dir = "#{ripped_dir_base}/#{@opts[:title]}/title_#{title_index+1}"
-
-        1.upto title_chapter[:chapter] do |chapter|
-          `ffmpeg -i #{saved_dir}/chapter_#{chapter}.VOB #{saved_dir}/chapter_#{chapter}.wav 2>/dev/null`
-          FileUtils.rm_f "#{saved_dir}/chapter_#{chapter}.VOB"
-          pbar.inc
-        end
+module Musical
+  def setup
+    # check env
+    ['dvdbackup', 'ffmpeg'].each do |app|
+      if `which #{app}`.empty?
+        raise RuntimeError, "\n\n'#{app}' is not installed.\n\ntry:\n  brew install #{app}\n\n"
       end
-      pbar.finish
     end
 
-    def task_message(task)
-      raise "Not found any titles and chapters" if title_with_chapters.size == 0 && chapter_size == 0
-      puts "#{task} #{title_with_chapters.size} titles, #{chapter_size} chapters to #{@opts[:output]} directory"
-    end
-    private :task_message
+    version = open(File.join(File.dirname(__FILE__), "..", "VERSION")){ |f| f.gets }
 
-    def chapter_size
-      @_chapter_size ||= title_with_chapters.inject(0){ |count, t| count + t[:chapter]}
+    # parse options
+    opts = Trollop::options do
+      version "Musical #{version}"
+      opt :info, "Show your DVD data", :type => :boolean
+      opt :ignore_convert_sound, "Rip data only, NOT convert them to wav file", :type => :boolean
+      opt :ignore_use_itunes, "NOT add ripped files to iTunes and encode them"
+      opt :dev, "Set location of DVD device"
+      opt :title, "Set DVD title", :default => 'LIVE'
+      opt :artist, "Set DVD artist", :default => 'Artist'
+      opt :output, "Set location of ripped data", :default => 'ripped'
     end
-    private :chapter_size
 
-    def check_env
-      ['dvdbackup', 'ffmpeg'].each do |app|
-        if `which #{app}`.empty?
-          raise RuntimeError, "\n\n'#{app}' is not installed.\n\ntry:\n  brew install #{app}\n\n"
-        end
-      end
-    end
-    private :check_env
+    # fix fox dvdbackup
+    opts[:trim_title] = opts[:title].gsub(" ", "_")
+    opts[:trim_artist] = opts[:artist].gsub(" ", "_")
 
+    opts
   end
+
 end

data/lib/musical/dvd.rb

@@ -0,0 +1,132 @@
+module Musical
+  class DVD
+    attr_accessor :opts
+
+    def self.detect
+      dev_infos = `df -h | awk {'print $1,$5,$6'}`.split("\n")
+      candidates = []
+      dev_infos.each do |dev_info|
+        info = dev_info.split(" ")
+        file_system = info[0]
+        capacity = info[1]
+        mounted = info[2]
+        if capacity == "100%" && mounted.include?("/Volumes")
+          candidates << mounted
+        end
+      end
+
+      raise "Not detect DVD device" if candidates.empty?
+      candidates
+    end
+
+    def initialize(options={})
+      @opts = options
+
+      return puts info if @opts[:info]
+
+      # rip_by_chapter
+      # convert_sound unless @opts[:ignore_convert_sound]
+      to_itunes unless @opts[:ignore_use_itunes]
+    end
+
+    def dev
+      @_dev ||= DVD.detect.first
+    end
+
+    def info
+      raise "Not detect DVD device" if dev.empty?
+      @_info ||= `dvdbackup --input=#{dev} --info 2>/dev/null`
+    end
+
+    def title_with_chapters
+      return @_title_chapters unless @_title_chapters.nil?
+
+      @_title_chapters = []
+      info_str = info.split("\n")
+      info_str.each_with_index do |line, index|
+        if line =~ /\s*Title (\d):$/
+          @_title_chapters << { :title => $1.to_i, :line => index }
+        end
+      end
+
+      @_title_chapters.each do |title_chapter|
+        line = title_chapter[:line]
+        if info_str[line + 1] =~ /\s*Title (\d) has (\d*) chapter/
+          title_chapter[:chapter] = $2.to_i
+          title_chapter.delete(:line)
+        end
+      end
+      @_title_chapters
+    end
+
+    def rip_by_chapter
+      task_message "Ripping"
+
+      pbar = ProgressBar.new "Ripping", chapter_size
+      title_with_chapters.each_with_index do |title_chapter, title_index|
+        ripped_dir_base = "#{@opts[:output]}"
+        saved_dir = "#{ripped_dir_base}/#{@opts[:trim_title]}/title_#{title_index+1}"
+        FileUtils.mkdir_p "#{saved_dir}"
+
+        1.upto title_chapter[:chapter] do |chapter|
+          `dvdbackup --name=#{@opts[:trim_title]} --input=#{dev} --title=#{title_index+1} --start=#{chapter} --end=#{chapter} --output=#{ripped_dir_base}_#{title_index}_#{chapter} 2>/dev/null`
+          pbar.inc
+          # moved file
+          vob_path = `find #{ripped_dir_base}_#{title_index}_#{chapter} -name "*.VOB"`.chomp
+          FileUtils.mv vob_path, "#{saved_dir}/chapter_#{chapter}.VOB"
+          FileUtils.rm_rf "#{ripped_dir_base}_#{title_index}_#{chapter}"
+        end
+      end
+      pbar.finish
+    end
+
+    def convert_sound
+      task_message "Converting"
+
+      pbar = ProgressBar.new "Converting", chapter_size
+      title_with_chapters.each_with_index do |title_chapter, title_index|
+        ripped_dir_base = "#{@opts[:output]}"
+        saved_dir = "#{ripped_dir_base}/#{@opts[:trim_title]}/title_#{title_index+1}"
+
+        1.upto title_chapter[:chapter] do |chapter|
+          `ffmpeg -i #{saved_dir}/chapter_#{chapter}.VOB #{saved_dir}/chapter_#{chapter}.wav 2>/dev/null`
+          FileUtils.rm_f "#{saved_dir}/chapter_#{chapter}.VOB"
+          pbar.inc
+        end
+      end
+      pbar.finish
+    end
+
+    def to_itunes
+      task_message "To iTunes"
+
+      pbar = ProgressBar.new "To iTunes", chapter_size
+      its = ITunes.new
+
+      title_with_chapters.each_with_index do |title_chapter, title_index|
+        ripped_dir_base = "#{@opts[:output]}"
+        saved_dir = "#{ripped_dir_base}/#{@opts[:trim_title]}/title_#{title_index+1}"
+
+        options = { :album => @opts[:title], :artist => @opts[:artist], :track_count => title_chapter[:chapter]}
+        1.upto title_chapter[:chapter] do |chapter|
+          its.add("#{saved_dir}/chapter_#{chapter}.wav", options.merge(:track_number => chapter))
+          pbar.inc
+        end
+      end
+      FileUtils.rm_rf @opts[:output]
+      pbar.finish
+    end
+
+    def chapter_size
+      @_chapter_size ||= title_with_chapters.inject(0){ |count, t| count + t[:chapter]}
+    end
+    private :chapter_size
+
+    def task_message(task)
+      raise "Not found any titles and chapters" if title_with_chapters.size == 0 && chapter_size == 0
+      puts "#{task} #{title_with_chapters.size} titles, #{chapter_size} chapters"
+    end
+    private :task_message
+
+  end
+end

data/lib/musical/itunes.rb

@@ -0,0 +1,31 @@
+module Musical
+  include Appscript
+
+  class ITunes
+    attr_accessor :opts
+    def initialize(options = {})
+      raise "iTunes support works on only Mac OSX" unless RUBY_PLATFORM.include? "darwin"
+      @opts = options # not used yet
+    end
+
+    def its
+      @_its ||= app "iTunes.app"
+    end
+
+    def add(file_path, options = {})
+      wav = its.add MacTypes::FileURL.path(File.expand_path(file_path))
+      return if wav.nil?
+
+      tracks = wav.convert
+      sleep 5 # FIXME
+      tracks.each do |track|
+        [:name, :album, :artist, :track_count, :track_number].each do |key|
+          unless options[key].nil?
+            track.send(key).set options[key]
+          end
+        end
+      end
+      its.delete wav
+    end
+  end
+end

data/musical.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{musical}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ryo katsuma"]
-  s.date = %q{2011-11-06}
+  s.date = %q{2011-11-26}
   s.default_executable = %q{musical}
   s.description = %q{Musical is a simple rip and convert tool for your DVD. It enables you to rip and convert it to wav data by chapter.}
   s.email = %q{katsuma@gmail.com}
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/musical",
     "lib/musical.rb",
+    "lib/musical/dvd.rb",
+    "lib/musical/itunes.rb",
     "musical.gemspec",
     "spec/musical_spec.rb",
     "spec/spec_helper.rb"
@@ -44,6 +46,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<trollop>, [">= 1.16.2"])
       s.add_runtime_dependency(%q<progressbar>, [">= 0.9.1"])
+      s.add_runtime_dependency(%q<rb-appscript>, [">= 0.6.1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -51,6 +54,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<trollop>, [">= 1.16.2"])
       s.add_dependency(%q<progressbar>, [">= 0.9.1"])
+      s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -59,6 +63,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<trollop>, [">= 1.16.2"])
     s.add_dependency(%q<progressbar>, [">= 0.9.1"])
+    s.add_dependency(%q<rb-appscript>, [">= 0.6.1"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

metadata

@@ -2,7 +2,7 @@
 name: musical
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - ryo katsuma
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 +09:00
+date: 2011-11-26 00:00:00 +09:00
 default_executable: musical
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,8 +36,19 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rb-appscript
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -56,10 +67,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,10 +78,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,7 +89,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 description: Musical is a simple rip and convert tool for your DVD. It enables you to rip and convert it to wav data by chapter.
 email: katsuma@gmail.com
 executables: 
@@ -98,6 +109,8 @@ files:
 - VERSION
 - bin/musical
 - lib/musical.rb
+- lib/musical/dvd.rb
+- lib/musical/itunes.rb
 - musical.gemspec
 - spec/musical_spec.rb
 - spec/spec_helper.rb
@@ -115,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 785758502750108159
+      hash: -3076262886197774611
       segments: 
       - 0
       version: "0"