rupeepeethree 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3a69a46fdb054ddc2941e941cedeb321d10905f5
-  data.tar.gz: f520929c64b43c02dfe77a9867309fa6c2509c8a
+SHA256:
+  metadata.gz: c6ea14568b197d37a53cc1c58fa9ce4fcc2a3b1af8675e7d4b51215a2a4468b3
+  data.tar.gz: a458bc8467ecbbe840f2157a040b43e81809c587b02333e9192681491e4653cd
 SHA512:
-  metadata.gz: d31938cffc53559a4ce12ccc46740dd7f8fdf7ec9d86a93263f1562926a8639ea1bea21cbb9d89418623c894ba9f906165a6d62d1234d1244204837ab23bec09
-  data.tar.gz: 2bcd05aa59dcda4de7a0ceca2eac6907a3be7ca5a7d49b699dbe4c5ee41232010aef221cafbe37c6cc9919918aee9e1b76987f5dae473c43bcd785ab14aa9d96
+  metadata.gz: c6dd1c3d74e3fba531f93561f71bc1009f454577aa95e1d30de1a4d64d8d149f76cfec24c3bdc8155456f4901db2405a96853b212ea0174b713b0707946a352a
+  data.tar.gz: 8b3a99226769a7d8f4da165622dcb5586a66b8cf9f77070b716fa74b14f64e3fe2616644913187441822c973546cbe9bb46c3478320bcee4061b71e09336ec96

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
 Gemfile.lock
+.byebug_history

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem 'byebug'

data/lib/rupeepeethree/tagger.rb

@@ -36,7 +36,7 @@ module Rupeepeethree
           cover.picture = File.open(image_file,"rb"){|f|f.read}
           t.add_frame(cover)
         end
-        f.save
+        f.save(TagLib::MPEG::File::ID3v2)
       end
     end
 
@@ -52,7 +52,11 @@ module Rupeepeethree
         hash[:track_number] = t.track
         hash[:year] = t.year
         properties = f.audio_properties
-        hash[:length] = properties.length
+        hash[:length] = properties.length_in_seconds
+        picture = t.frame_list("APIC").first
+        if picture
+          hash[:picture] = { mime_type: picture.mime_type, data: picture.picture }
+        end
       end
       hash
     end
@@ -86,7 +90,7 @@ module Rupeepeethree
           result << "Bitrate: #{prop.bitrate}\n"
           result << "Channels: #{prop.channels}\n"
           result << "Sample Rate: #{prop.sample_rate}\n"
-          result << "Length: #{sprintf("%.2f", prop.length/60.0)}\n"
+          result << "Length: #{sprintf("%.2f", prop.length_in_seconds/60.0)}\n"
         end
       end
       return result
@@ -94,7 +98,10 @@ module Rupeepeethree
 
     private
     def self.mime_type(file)
-      MIME::Types.type_for(file).first.simplified.to_s
+      mime_type = MIME::Types.type_for(file).first
+      if mime_type
+        mime_type.simplified.to_s
+      end
     end
   end
 end

data/lib/rupeepeethree/version.rb

@@ -1,3 +1,3 @@
 module Rupeepeethree
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/rupeepeethree.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 require 'rupeepeethree/tagger'
 require 'rupeepeethree/version'
-require 'trollop'
+require 'optimist'
 
 module Rupeepeethree
   class Cli
     def self.run(args)
-      p = Trollop::Parser.new do
+      p = Optimist::Parser.new do
         version "RP3 version #{VERSION} by Tony Miller"
         banner <<-EOS
   ░█▀▄░█▀█░▀▀█
@@ -24,8 +24,8 @@ module Rupeepeethree
         opt :clear, "clear all tags!"
       end
 
-      opts = Trollop::with_standard_exception_handling p do
-        raise Trollop::HelpNeeded if ARGV.empty? # show help screen
+      opts = Optimist::with_standard_exception_handling p do
+        raise Optimist::HelpNeeded if ARGV.empty? # show help screen
         p.parse ARGV
       end
 

data/rupeepeethree.gemspec

@@ -22,19 +22,18 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = "rupeepeethree"
   s.rubygems_version = "1.8.25"
   s.summary = "tag your mp3 files"
 
-  s.add_dependency 'taglib-ruby', '~> 0.7.0'
-  s.add_dependency 'trollop', '~> 2.0'
+  s.add_dependency 'taglib-ruby', '~> 1.1'
+  s.add_dependency 'optimist'
   s.add_dependency 'mime-types', '>= 1.16'
 
-  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "fruity_formatter"
-  s.add_development_dependency "cocaine"
+  s.add_development_dependency "terrapin"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/rupeepeethree/tagger_spec.rb

@@ -10,11 +10,11 @@ describe Rupeepeethree::Tagger do
     image_string = /image: \[image\/jpeg\] \[59562 bytes\]\n/
     Rupeepeethree::Tagger.tag(mp3, tags)
     result = Rupeepeethree::Tagger.print_tags(mp3)
-    result.should match(image_string)
+    expect(result).to match(image_string)
 
     Rupeepeethree::Tagger.tag(mp3, tags)
     result = Rupeepeethree::Tagger.print_tags(mp3)
-    result.should_not match(/#{image_string}{2}/)
+    expect(result).not_to match(/#{image_string}{2}/)
   end
   it "gets a hash of the tags" do
     tags = {title: "foodfight",
@@ -28,7 +28,25 @@ describe Rupeepeethree::Tagger do
     expect(t[:artist]).to eq("ninjaturtle")
     expect(t[:album]).to eq("purplerain")
     expect(t[:year]).to eq(1987)
+    expect(t[:picture][:mime_type]).to eq "image/jpeg"
   end
+
+  it "sets field to blank" do
+    tags = {title: "foodfight",
+            artist: "ninjaturtle",
+            album: "purplerain",
+            year: "1987",
+            picture: "spec/fixtures/cover_art.jpg"}
+    Rupeepeethree::Tagger.tag(mp3, tags)
+    tags = {title: "",
+            artist: "ninjaturtle",
+            album: "purplerain",
+            year: "1987",
+            picture: "spec/fixtures/cover_art.jpg"}
+    Rupeepeethree::Tagger.tag(mp3, tags)
+    expect(Rupeepeethree::Tagger.tags(mp3)[:title]).to eq ""
+  end
+
   it "clears the tags"  do
     tags = {title: "foodfight",
             artist: "ninjaturtle",
@@ -38,11 +56,11 @@ describe Rupeepeethree::Tagger do
     Rupeepeethree::Tagger.tag(mp3, tags)
     Rupeepeethree::Tagger.clear(mp3)
     result = Rupeepeethree::Tagger.print_tags(mp3)
-    result.should match(/title: \n/)
-    result.should match(/artist: \n/)
-    result.should match(/album: \n/)
-    result.should match(/year: 0\n/)
-    result.should_not match(/image:/)
+    expect(result).to match(/title: \n/)
+    expect(result).to match(/artist: \n/)
+    expect(result).to match(/album: \n/)
+    expect(result).to match(/year: 0\n/)
+    expect(result).not_to match(/image:/)
   end
 
   it "returns track length" do

data/spec/rupeepeethree_spec.rb

@@ -1,5 +1,5 @@
 require "rupeepeethree"
-require "cocaine"
+require "terrapin"
 
 describe 'integration test' do
   before :all do
@@ -7,38 +7,38 @@ describe 'integration test' do
   end
   before :each do
     # clear tags
-    line = Cocaine::CommandLine.new(@rp3, "-c :mp3")
+    line = Terrapin::CommandLine.new(@rp3, "-c :mp3")
     line.run(mp3: "spec/fixtures/test.mp3")
   end
   it "sets a title tag" do
-    line = Cocaine::CommandLine.new(@rp3, "-t :title :mp3")
+    line = Terrapin::CommandLine.new(@rp3, "-t :title :mp3")
     result = line.run(title: "foodfight", mp3: "spec/fixtures/test.mp3")
-    result.should match(/foodfight/)
+    expect(result).to match(/foodfight/)
   end
   it "sets an artist tag" do
-    line = Cocaine::CommandLine.new(@rp3, "-a :artist :mp3")
+    line = Terrapin::CommandLine.new(@rp3, "-a :artist :mp3")
     result = line.run(artist: "ninjaturtle", mp3: "spec/fixtures/test.mp3")
-    result.should match(/ninjaturtle/)
+    expect(result).to match(/ninjaturtle/)
   end
   it "sets an album tag" do
-    line = Cocaine::CommandLine.new(@rp3, "-A :album :mp3")
+    line = Terrapin::CommandLine.new(@rp3, "-A :album :mp3")
     result = line.run(album: "purplerain", mp3: "spec/fixtures/test.mp3")
-    result.should match(/purplerain/)
+    expect(result).to match(/purplerain/)
   end
   it "sets a year tag" do
-    line = Cocaine::CommandLine.new(@rp3, "-Y :year :mp3")
+    line = Terrapin::CommandLine.new(@rp3, "-Y :year :mp3")
     result = line.run(year: "1987", mp3: "spec/fixtures/test.mp3")
-    result.should match(/1987/)
+    expect(result).to match(/1987/)
   end
   it "sets album art tag" do
-    line = Cocaine::CommandLine.new(@rp3, "-p :pic :mp3")
+    line = Terrapin::CommandLine.new(@rp3, "-p :pic :mp3")
     result = line.run(pic: "spec/fixtures/cover_art.jpg", mp3: "spec/fixtures/test.mp3")
-    result.should match(/image\/jpeg/)
-    result.should match(/59562 bytes/)
+    expect(result).to match(/image\/jpeg/)
+    expect(result).to match(/59562 bytes/)
   end
   it "sets track number" do
-    line = Cocaine::CommandLine.new(@rp3, "-n :num :mp3")
+    line = Terrapin::CommandLine.new(@rp3, "-n :num :mp3")
     result = line.run(num: "3", mp3: "spec/fixtures/test.mp3")
-    result.should match(/track number: 3/)
+    expect(result).to match(/track number: 3/)
   end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: rupeepeethree
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tony Miller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-03-14 00:00:00.000000000 Z
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cocaine
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -181,7 +181,7 @@ homepage: http://github.com/datafruits/rupeepeethree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -198,9 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rupeepeethree
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 3
 summary: tag your mp3 files
 test_files:
@@ -208,4 +207,3 @@ test_files:
 - spec/fixtures/test.mp3
 - spec/rupeepeethree/tagger_spec.rb
 - spec/rupeepeethree_spec.rb
-has_rdoc: