taifu 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eadfaff239772633fc2471d38d2312631115736a
-  data.tar.gz: e1ea4e6985a13f861930e5e47f808be99144f702
+  metadata.gz: 687e080038b7ca8e3b794a76d5a2eef0eef6ea19
+  data.tar.gz: b4b3377605241443b5d7327bb17c03c388122ef1
 SHA512:
-  metadata.gz: 1e69a23a889681856423d3e4fa5ab60bfec847d4a94abe219e2f51998fc6e13ce344596200d3fd8701c01ab2776ffcffe816e4e4e3dc0e4d999d01ac7b95250e
-  data.tar.gz: a8457c3a5704680cb154f2c0d7f4a90807b0ccdf3ac7a3099a05d627ea375bad57f4f8c1d938041d0f913fcad3acdbd9dd0473bf218a956eae03768f975ad252
+  metadata.gz: 8e8619e306cdbea2e3edd8b8dea1d3347aaffd89a771b04f1725a5750737e8563f8582293dba9aed78143d6698aeccdab13c89282120f646571a8bdd27edd53a
+  data.tar.gz: bff38a8313cc3f0fc37ee0c47d2eb3e5c2843132beec88430165b8e76724523e8e1b986a66ae738a8e2cb9d3b7ae0840cef8d7d68afa9863bb6fc723a2bb5223

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.coveralls.yml
 coverage
 InstalledFiles
 lib/bundler/man

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/README.md

@@ -1,4 +1,4 @@
-# taifu [![Build Status](https://travis-ci.org/katsuma/taifu.png?branch=master)](https://travis-ci.org/katsuma/taifu)
+# taifu [![Build Status](https://travis-ci.org/katsuma/taifu.png?branch=master)](https://travis-ci.org/katsuma/taifu) [![Coverage Status](https://coveralls.io/repos/katsuma/taifu/badge.png?branch=master)](https://coveralls.io/r/katsuma/taifu)
 taifu brings YouTube sound to your iTunes library silently.
 
 ## Usage
@@ -6,7 +6,7 @@ taifu brings YouTube sound to your iTunes library silently.
 Try
 
 ```
-taifu http://www.youtube.com/watch?v=I1X6MrBfjrk
+taifu http://www.youtube.com/watch?v=your-video-id
 ```
 
 After that type `taifu` at search box on your iTunes.
@@ -32,5 +32,9 @@ gem install taifu
 
 You can install these tools by homebrew.
 
+## Warning
+You can use this tool for only contents you have copyrights.
+
+
 ## Licence
 taifu is released under the MIT License.

data/lib/taifu.rb

@@ -1,16 +1,17 @@
 # coding: utf-8
 require 'fileutils'
 require 'logger'
+require 'itunes-client'
 require 'taifu/app'
+require 'taifu/util'
 require 'taifu/version'
 
 module Taifu
   def hit
     url = ARGV.first
     if url.nil?
-      raise ArgumentError.new 'You need to specify URL. Try "taifu http://www.youtube.com/watch?v=I1X6MrBfjrk"'
+      raise ArgumentError.new 'You need to specify URL. Try "taifu http://www.youtube.com/watch?v=your-video-id"'
     end
-
     taifu = App.new
     wav_path = taifu.save_as_wav_with(url)
     taifu.add_track(wav_path)

data/lib/taifu/app.rb

@@ -10,15 +10,18 @@ module Taifu
 
     def save_as_wav_with(youtube_url)
       url = youtube_url.split('&').first
+      flv_path = "#{working_dir}/taifu.flv"
       wav_file = 'taifu.wav'
       wav_path = "#{working_dir}/#{wav_file}"
 
+      FileUtils.rm_f(wav_path) if File.exist?(wav_path)
+
       @logger.info 'Download data'
-      download_from url
+      Util.save_flv_from_url(url, flv_path)
 
       @logger.info 'Save wav file'
-      convert_flv_to wav_path
-      remove_flv
+      Util.convert_flv_to_wav(flv_path, wav_path)
+      FileUtils.rm_f(flv_path)
 
       wav_path
     end
@@ -30,12 +33,11 @@ module Taifu
         raise ArgumentError.new 'Not found wav file'
       end
 
-      script_path = File.expand_path("#{File.dirname(__FILE__)}/../../scripts/add_track.scpt")
-      expand_wav_path = File.expand_path(wav_path)
-      execute_script(script_path, expand_wav_path)
-
-      FileUtils.rm_f(wav_path) if clean_up
-
+      track = Itunes::Application.instance.add(wav_path)
+      converted_track = track.convert
+      converted_track.update_attributes(name: 'Taifu')
+      track.delete! if clean_up
+      FileUtils.rm_f(wav_path)
       @logger.info "Done. Type 'taifu' on your iTunes"
     end
 
@@ -56,7 +58,7 @@ module Taifu
     private :check_env
 
     def installed?(app)
-      !`which #{app}`.empty?
+      !!(system "which #{app}")
     end
     private :installed?
 
@@ -72,25 +74,5 @@ module Taifu
       end
     end
     private :init_working_dir
-
-    def download_from(url)
-      system "youtube-dl -q #{url} -o #{working_dir}/taifu.flv"
-    end
-    private :download_from
-
-    def convert_flv_to(wav)
-      system "ffmpeg -i #{working_dir}/taifu.flv #{wav} 2>/dev/null"
-    end
-    private :convert_flv_to
-
-    def remove_flv
-      system "rm -f #{working_dir}/taifu.flv"
-    end
-    private :remove_flv
-
-    def execute_script(script, args)
-      `osascript #{script} #{args}`
-    end
-    private :execute_script
   end
 end

data/lib/taifu/util.rb

@@ -0,0 +1,12 @@
+# coding: utf-8
+module Taifu
+  class Util
+    def self.save_flv_from_url(url, flv_path)
+      system "youtube-dl -q #{url} -o #{flv_path}"
+    end
+
+    def self.convert_flv_to_wav(flv_path, wav_path)
+      system "ffmpeg -i #{flv_path} #{wav_path} 2>/dev/null"
+    end
+  end
+end

data/lib/taifu/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module Taifu
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@
 
 require 'bundler'
 require 'fakefs/spec_helpers'
+require 'simplecov'
+require 'coveralls'
 
 Bundler.setup(:default, :development)
 
@@ -11,3 +13,11 @@ RSpec.configure do |config|
   #config.formatter = :documentation
   config.include FakeFS::SpecHelpers, fakefs: true
 end
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+ add_filter '/spec/'
+end

data/spec/taifu_spec.rb

@@ -5,6 +5,7 @@ require 'taifu'
 describe Taifu do
   let(:url) { 'http://www.youtube.com/watch?v=I1X6MrBfjrk' }
   let(:working_dir) { '/tmp/.taifu' }
+  let(:util) { Taifu::Util  }
 
   describe '#hit' do
     context 'with no arguments' do
@@ -34,7 +35,6 @@ describe Taifu do
   end
 
   describe Taifu::App do
-
     describe '.new' do
       subject { Taifu::App.new }
 
@@ -55,12 +55,12 @@ describe Taifu do
 
         before do
           taifu.should_receive(:installed?).at_least(:twice).and_return(true)
+          FileUtils.rm_rf(working_dir)
         end
 
         it 'makes a working directory', fakefs: true do
           taifu.should_receive(:working_dir).at_least(:twice).and_return(working_dir)
-          subject
-          File.should exist(working_dir)
+          expect { subject }.to change { File.exist?(working_dir) }.from(false).to(true)
         end
       end
     end
@@ -74,18 +74,18 @@ describe Taifu do
       let(:load_url) { "#{url}&fature=endscreen" }
       let(:taifu) { Taifu::App.any_instance }
 
-      before { stub_constructor }
+      before { stub_app_installed }
 
       it 'saves file as wav' do
-        taifu.should_receive(:download_from).with(url)
-        taifu.should_receive(:convert_flv_to).with("#{working_dir}/taifu.wav")
-        taifu.should_receive(:remove_flv)
+        util.should_receive(:save_flv_from_url)
+        util.should_receive(:convert_flv_to_wav)
+
         subject
       end
     end
 
     describe '#add_track' do
-      subject do
+      subject(:add_track) do
         taifu = Taifu::App.new
         taifu.add_track(wav_path)
       end
@@ -93,7 +93,7 @@ describe Taifu do
       let(:taifu) { Taifu::App.any_instance }
       let(:wav_path) { '/tmp/.taifu.wav' }
 
-      before { stub_constructor }
+      before { stub_app_installed }
 
       context 'if wav file is not found' do
         before do
@@ -101,7 +101,7 @@ describe Taifu do
         end
 
         it 'raises ArgumentError', fakefs: true do
-          expect { subject }.to raise_error(ArgumentError)
+          expect { add_track }.to raise_error(ArgumentError)
         end
       end
 
@@ -110,19 +110,22 @@ describe Taifu do
           FileUtils.touch(wav_path)
         end
 
-        it 'converts wav file', fakefs: true do
-          taifu.should_receive(:execute_script)
+        let(:track) { Itunes::Track.new }
+        let(:converted_track) { Itunes::Track.new }
+
+        it 'calls Itunes util methods', fakefs: true do
+          Itunes::Application.any_instance.stub(:add).with(wav_path).and_return(track)
+          track.should_receive(:convert).and_return(converted_track)
+          converted_track.should_receive(:update_attributes)
+          track.should_receive(:delete!)
 
-          File.should exist(wav_path)
-          subject
-          File.should_not exist(wav_path)
+          add_track
         end
       end
     end
 
-    def stub_constructor
-      taifu.should_receive(:installed?).exactly(2).times.and_return(true)
-      taifu.should_receive(:working_dir).at_least(:once).and_return(working_dir)
+    def stub_app_installed
+      taifu.should_receive(:system).with(/^which/).exactly(2).times.and_return(true)
     end
   end
 end

data/spec/util_spec.rb

@@ -0,0 +1,28 @@
+# coding: utf-8
+require 'spec_helper'
+require 'taifu'
+
+describe Taifu::Util do
+  let(:util) { Taifu::Util }
+
+  describe '.save_flv_from_url' do
+    subject(:save_flv_from_url) { util.save_flv_from_url(url, flv_path)  }
+    let(:url) { 'http://www.youtube.com/watch?v=foo' }
+    let(:flv_path) { '/tmp/foo.flv' }
+    it 'executes youtube_dl command' do
+      util.should_receive(:system).with("youtube-dl -q #{url} -o #{flv_path}")
+      save_flv_from_url
+    end
+  end
+
+  describe '.convert_flv_to_wav' do
+    subject(:convert_flv_to_wav) { util.convert_flv_to_wav(flv_path, wav_path) }
+    let(:flv_path) { '/tmp/foo.flv' }
+    let(:wav_path) { '/tmp/foo.wav' }
+
+    it 'executes ffmpeg command' do
+      util.should_receive(:system).with("ffmpeg -i #{flv_path} #{wav_path} 2>/dev/null")
+      convert_flv_to_wav
+    end
+  end
+end

data/taifu.gemspec

@@ -19,11 +19,15 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.licenses = ["MIT"]
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rb-fsevent"
-  s.add_development_dependency "guard"
-  s.add_development_dependency "guard-rspec"
-  s.add_development_dependency "growl"
-  s.add_development_dependency "fakefs"
+  s.add_development_dependency "rake", "~> 10.0.3"
+  s.add_development_dependency "rspec", "~> 2.13.0"
+  s.add_development_dependency "rb-fsevent", "~> 0.9.3"
+  s.add_development_dependency "guard", "~> 1.8.1"
+  s.add_development_dependency "guard-rspec", "~> 3.0.2"
+  s.add_development_dependency "growl", "~> 1.0.3"
+  s.add_development_dependency "fakefs", "~> 0.4.2"
+  s.add_development_dependency "coveralls", "~> 0.6.6"
+  s.add_development_dependency "simplecov", "~> 0.7.1"
+  s.add_development_dependency "pry", "~> 0.9.12.2"
+  s.add_dependency "itunes-client", "~> 0.0.6"
 end

metadata

@@ -1,113 +1,169 @@
 --- !ruby/object:Gem::Specification
 name: taifu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryo Katsuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.6
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12.2
+- !ruby/object:Gem::Dependency
+  name: itunes-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 description: taifu brings YouTube sound to your iTunes library silently
 email:
 - katsuma@gmail.com
@@ -116,7 +172,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -126,10 +184,12 @@ files:
 - bin/taifu
 - lib/taifu.rb
 - lib/taifu/app.rb
+- lib/taifu/util.rb
 - lib/taifu/version.rb
 - scripts/add_track.scpt
 - spec/spec_helper.rb
 - spec/taifu_spec.rb
+- spec/util_spec.rb
 - taifu.gemspec
 homepage: http://github.com/katsuma/taifu
 licenses:
@@ -151,10 +211,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: taifu
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: YouTube sound converter for iTunes
 test_files:
 - spec/spec_helper.rb
 - spec/taifu_spec.rb
+- spec/util_spec.rb