musical 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b93d23893d873236fd13291ab1ff038c3bcbd308
-  data.tar.gz: 4c1c1ed28e90ad688aedb0900a040c72bb4b80aa
+  metadata.gz: 8c0e3eed1e21640f605dd3be2378d305bb487389
+  data.tar.gz: 28c05bdec7551b0181b4de684428ab0b9c6bdd96
 SHA512:
-  metadata.gz: 663e5f7acb2c8094444fc373e9da20a3504cc1e1309c100cef4ffb96fd6ed8f5c9ae8ad1ef5c942fb7362822721624b6e3338036ddcd22110b315794f25e549b
-  data.tar.gz: 46f1d27eddcb7f958b506e5d11181184bec321879d129d545efa7b529e07ca655be04344f1fbda65a93fab66849099f9a25b53f0b10d68f9fcc9ee4495819640
+  metadata.gz: f9c74c2cc5c4f260ee84f4ae57b0cddf6d925f90fa6eba470787bcd28d09afa41646bd147b32d6aec6b6381b064dee765451d59065076202517be20852bb94a2
+  data.tar.gz: 36d9d57a9501d8f491175c3aaaecc85d71e70baddd059a1179e6aa0d2375b9a8e48518616b66300a4784b922fff1064b66790a5fb98ea67b1f04b70284fffee0

data/README.md

@@ -48,6 +48,7 @@ They will help you to manage your music library easily.
 
 
 ## Supported OS
+- OSX 10.9 (Mavericks)
 - OSX 10.8 (Mountain Lion)
 
 ## Supported Ruby

data/bin/musical

@@ -8,17 +8,26 @@ Musical.setup
 dvd_options = {
   title: Musical.configuration.title,
   artist: Musical.configuration.artist,
+  year: Musical.configuration.year,
   path: Musical.configuration.path
 }
+progress_format = Musical.configuration.progress_format
 
 DVD.load(dvd_options) do |dvd|
   next puts dvd.info if Musical.configuration.info
 
-  chapters = dvd.rip
+  chapter_size = dvd.title_sets.inject(0){ |size, set| size + set[:chapter] }
+  ripping_progress_bar = Notification::ProgressBar.create(title: 'Ripping', total: chapter_size)
 
-  chapters.each do |chapter|
-    next if Musical.configuration.ignore_convert_sound
+  chapters = dvd.rip { ripping_progress_bar.increment }
+
+  next if Musical.configuration.ignore_convert_sound
+
+  unless Musical.configuration.ignore_use_itunes
+    converting_progress_bar = Notification::ProgressBar.create(title: 'Converting', total: chapters.size)
+  end
 
+  chapters.each do |chapter|
     wav = chapter.to_wav
     next if Musical.configuration.ignore_use_itunes
 
@@ -29,12 +38,15 @@ DVD.load(dvd_options) do |dvd|
       name: chapter.name,
       album: dvd.title,
       artist: dvd.artist,
+      year: dvd.year,
       track_count: chapters.size,
       track_number: chapter.chapter_number,
     )
 
     wav.delete!
     track.delete!
+
+    converting_progress_bar.increment
   end
 end
 

data/lib/musical.rb

@@ -37,6 +37,7 @@ module Musical
       opt :path, "Set device path of DVD", type: :string
       opt :title, "Set DVD title", type: :string, default: 'LIVE'
       opt :artist, "Set DVD artist", type: :string, default: 'Artist'
+      opt :year, "Set year DVD was recorded", type: :int, default: Time.now.year
       opt :output, "Set location of ripped data", type: :string, default: 'ripped'
     end
 

data/lib/musical/dvd.rb

@@ -7,7 +7,7 @@ module Musical
     include Musical::Util
     extend Musical::Util
 
-    attr_accessor :title, :artist
+    attr_accessor :title, :artist, :year
 
     @@path = nil
 
@@ -40,8 +40,9 @@ module Musical
       end
 
       dvd = DVD.instance
-      dvd.title = options[:title] || Musical.configuration.title
+      dvd.title  = options[:title]  || Musical.configuration.title
       dvd.artist = options[:artist] || Musical.configuration.artist
+      dvd.year   = options[:year]   || Musical.configuration.year
 
       if block_given?
         yield(dvd)
@@ -84,8 +85,6 @@ module Musical
       save_dir = Musical.configuration.output
       FileUtils.mkdir_p save_dir
 
-      chapter_size = title_sets.inject(0){ |size, set| size + set[:chapter] }
-      progress_bar = Notification::ProgressBar.create(title: 'Ripping', total: chapter_size, format: '%a %B %p%% %t')
       chapters = []
 
       title_sets.each do |title_set|
@@ -99,10 +98,11 @@ module Musical
           commands << "--output='#{Musical.configuration.working_dir}'"
           execute_command(commands.join(' '), true)
 
-          progress_bar.increment
-
           vob_save_path = "#{save_dir}/TITLE_#{title_set[:title]}_#{chapter_index}.VOB"
           FileUtils.mv(vob_path, vob_save_path)
+
+          yield if block_given?
+
           Chapter.new(vob_save_path, title_number: title_set[:title], chapter_number: chapter_index)
         end
       end

data/lib/musical/notification/progress_bar.rb

@@ -2,8 +2,11 @@
 module Musical
   module Notification
     class ProgressBar < ::ProgressBar
+      FORMAT = '%a %B %p%% %t'
+
       def self.create(options = {})
-        progress_bar = super
+        options = { format: FORMAT }.merge(options)
+        progress_bar = super(options)
 
         Thread.new do
           while !progress_bar.finished?

data/lib/musical/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Musical
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/musical.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls", "~> 0.6.6"
   spec.add_runtime_dependency "ruby-progressbar", ">= 1.2.0"
   spec.add_runtime_dependency "trollop", ">= 2.0"
-  spec.add_runtime_dependency "itunes-client", "~> 0.1.2"
+  spec.add_runtime_dependency "itunes-client", "~> 0.1.4"
 end

data/spec/musical/dvd_spec.rb

@@ -209,10 +209,6 @@ EOM
         dvd.should_receive(:title_sets).at_least(1).and_return(title_sets)
         dvd.should_receive(:execute_command).at_least(1).with(/dvdbackup (.)*/, true) { FileUtils.touch(vob_path) }
         dvd.should_receive(:execute_command).at_least(1).with(/find (.)*/).and_return("#{vob_path}\n")
-
-        progress_bar = double
-        progress_bar.should_receive(:increment).at_least(1)
-        ProgressBar.should_receive(:create).and_return(progress_bar)
       end
 
       before do

data/spec/musical_spec.rb

@@ -37,6 +37,11 @@ describe Musical do
       it { expect(setup.artist).to eq("artist!") }
     end
 
+    context 'when argument `year` is given' do
+      before { stub_const('ARGV', ['--year=2000']) }
+      it { expect(setup.year).to eq(2000) }
+    end
+
     context 'when argument `output` is given' do
       before { stub_const('ARGV', ['--output=/tmp']) }
       it { expect(setup.output).to eq('/tmp') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musical
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - ryo katsuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 description: musical is a simple tool for your favorite DVD. You can rip vob file
   by DVD chapter, convert it to wav file and add it to your iTunes library.
 email: