rupeepeethree 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c246d6bf55b54ae1c32dc4859aa1f4c359a985e3
-  data.tar.gz: bcc7b3d8a968f9c6e8ab7a7bf73b2617a7c56198
+  metadata.gz: a9b8edd7bd8c74aa52856c2cc0fce126106ace72
+  data.tar.gz: 2adb6bcf7b0d698961137239b9673007498e82c8
 SHA512:
-  metadata.gz: 47f8c56abde949079168870ab8daf4c49cef89579516670825948baeb518ae1683a843eb10f165d7c23ffd0412c020c4171658566b468f065a6943922ef07dda
-  data.tar.gz: 332bb70f0f688daeae19d6fa18bc821592db91245232becb0ea044bccb916a6a481b0007bcf87319f1549223839562c7b4b406a6879e1314736a1cfe9df44c53
+  metadata.gz: e8243fbaf1da772131416834f7e694632715462be07e8675bb8888e4a69aa638cb0a2a67d8ad1c994a9b223f52a8059dd749efe2b28f395ae06fbaed29db35da
+  data.tar.gz: c95605dd6b16325f8ab54fe0f7eeeb8f2ed36488e702172e05e08e7d022e7a28f482999ae0990a060653f7576d2e16cede04cbfe6f2210b6324a49f61173cfa2

data/README.md

@@ -6,7 +6,13 @@ http://github.com/datafruits/rupeepeethree
 
 [![Build Status](https://secure.travis-ci.org/datafruits/rupeepeethree.png?branch=master)](http://travis-ci.org/datafruits/rupeepeethree)
 
-tag your mp3 files. a command line wrapper around taglib-ruby.
+░█▀▄░█▀█░▀▀█
+░█▀▄░█▀▀░░▀▄
+░▀░▀░▀░░░▀▀░
+┣¨ｷ┣¨ｷ
+You thought your mp3s were cool. Turns out you were wrong. Your mp3s have no tags. You must tag them!
+
+a simple library and command line utility wrapper around ruby-taglib
 
 ## FEATURES/PROBLEMS:
 

data/Rakefile

@@ -1,5 +1,8 @@
 # -*- ruby -*-
 
 require "rubygems"
+require 'rspec/core/rake_task'
 
-# vim: syntax=ruby
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/rp3

@@ -2,4 +2,4 @@
 
 require 'rupeepeethree'
 
-Rupeepeethree.run ARGV
+Rupeepeethree::Cli.run ARGV

data/lib/rupeepeethree.rb

@@ -3,41 +3,43 @@ require 'rupeepeethree/tagger'
 require 'rupeepeethree/version'
 require 'trollop'
 
-class Rupeepeethree
-  def self.run(args)
-    p = Trollop::Parser.new do
-      version "RP3 version #{VERSION} by Tony Miller"
-      banner <<-EOS
-░█▀▄░█▀█░▀▀█
-░█▀▄░█▀▀░░▀▄
-░▀░▀░▀░░░▀▀░
-┣¨ｷ┣¨ｷ
-You thought your mp3s were cool. Turns out you were wrong. Your mp3s have no tags. You must tag them!
-      EOS
-      opt :title, "title", type: String, short: 't'
-      opt :artist, "artist", type: String, short: 'a'
-      opt :year, "track year", type: String, short: 'Y'
-      opt :track, "track number", type: String, short: 'n'
-      opt :album, "album title", type: String, short: 'A'
-      opt :picture, "artwork", type: String, short: 'p'
-      opt :clear, "clear all tags!"
-    end
+module Rupeepeethree
+  class Cli
+    def self.run(args)
+      p = Trollop::Parser.new do
+        version "RP3 version #{VERSION} by Tony Miller"
+        banner <<-EOS
+  ░█▀▄░█▀█░▀▀█
+  ░█▀▄░█▀▀░░▀▄
+  ░▀░▀░▀░░░▀▀░
+  ┣¨ｷ┣¨ｷ
+  You thought your mp3s were cool. Turns out you were wrong. Your mp3s have no tags. You must tag them!
+        EOS
+        opt :title, "title", type: String, short: 't'
+        opt :artist, "artist", type: String, short: 'a'
+        opt :year, "track year", type: String, short: 'Y'
+        opt :track, "track number", type: String, short: 'n'
+        opt :album, "album title", type: String, short: 'A'
+        opt :picture, "artwork", type: String, short: 'p'
+        opt :clear, "clear all tags!"
+      end
 
-    opts = Trollop::with_standard_exception_handling p do
-      raise Trollop::HelpNeeded if ARGV.empty? # show help screen
-      p.parse ARGV
-    end
+      opts = Trollop::with_standard_exception_handling p do
+        raise Trollop::HelpNeeded if ARGV.empty? # show help screen
+        p.parse ARGV
+      end
 
-    mp3s = ARGV
-    if mp3s.empty?
-      abort("no mp3 specified...")
-    end
-    mp3s.each do |mp3|
-      if opts[:clear]
-        Tagger.clear(mp3)
-      else
-        Tagger.tag(mp3,opts)
-        puts Tagger.print_tags(mp3)
+      mp3s = ARGV
+      if mp3s.empty?
+        abort("no mp3 specified...")
+      end
+      mp3s.each do |mp3|
+        if opts[:clear]
+          Tagger.clear(mp3)
+        else
+          Tagger.tag(mp3,opts)
+          puts Tagger.print_tags(mp3)
+        end
       end
     end
   end

data/lib/rupeepeethree/tagger.rb

@@ -1,77 +1,93 @@
 require 'taglib'
 require 'mime/types'
 
-class Tagger
-  def self.tag(mp3,tags)
-    TagLib::MPEG::File.open(mp3) do |f|
-      t = f.id3v2_tag || TagLib::ID3v2::Tag.new
-      if tags[:title]
-        t.title = tags[:title]
-      end
-      if tags[:artist]
-        t.artist = tags[:artist]
-      end
-      if tags[:album]
-        t.album = tags[:album]
-      end
-      if tags[:year]
-        t.year = tags[:year].to_i
-      end
-      if tags[:track]
-        t.track = tags[:track].to_i
-      end
-      if tags[:picture]
-        image_file = File.expand_path(tags[:picture])
-        # delete old frame if it exists
-        cover = t.frame_list('APIC').first
-        if cover
-          t.remove_frame(cover)
+module Rupeepeethree
+  class Tagger
+    def self.tag(mp3,tags)
+      TagLib::MPEG::File.open(mp3) do |f|
+        t = f.id3v2_tag || TagLib::ID3v2::Tag.new
+        if tags[:title]
+          t.title = tags[:title]
+        end
+        if tags[:artist]
+          t.artist = tags[:artist]
         end
-        cover = TagLib::ID3v2::AttachedPictureFrame.new
-        cover.mime_type = mime_type(image_file)
-        cover.type = TagLib::ID3v2::AttachedPictureFrame::FrontCover
-        cover.picture = File.open(image_file,"rb"){|f|f.read}
-        t.add_frame(cover)
+        if tags[:album]
+          t.album = tags[:album]
+        end
+        if tags[:year]
+          t.year = tags[:year].to_i
+        end
+        if tags[:track]
+          t.track = tags[:track].to_i
+        end
+        if tags[:picture]
+          image_file = File.expand_path(tags[:picture])
+          # delete old frame if it exists
+          cover = t.frame_list('APIC').first
+          if cover
+            t.remove_frame(cover)
+          end
+          cover = TagLib::ID3v2::AttachedPictureFrame.new
+          cover.mime_type = mime_type(image_file)
+          cover.type = TagLib::ID3v2::AttachedPictureFrame::FrontCover
+          cover.picture = File.open(image_file,"rb"){|f|f.read}
+          t.add_frame(cover)
+        end
+        f.save
       end
-      f.save
     end
-  end
 
-  # clear all tags
-  def self.clear(mp3)
-    TagLib::MPEG::File.open(mp3) do |f|
-      f.strip
+    def self.tags(mp3)
+      hash = {}
+      TagLib::MPEG::File.open(mp3) do |f|
+        t = f.id3v2_tag
+
+        hash[:title] =  t.title
+        hash[:artist] = t.artist
+        hash[:album] = t.album
+        hash[:track_number] = t.track
+        hash[:year] = t.year
+      end
+      hash
     end
-  end
 
-  def self.print_tags(mp3)
-    result = ""
-    TagLib::MPEG::File.open(mp3) do |f|
-      t = f.id3v2_tag
+    # clear all tags
+    def self.clear(mp3)
+      TagLib::MPEG::File.open(mp3) do |f|
+        f.strip
+      end
+    end
 
-      result << "title: #{t.title}\n"
-      result << "artist: #{t.artist}\n"
-      result << "album: #{t.album}\n"
-      result << "track number: #{t.track}\n"
-      result << "year: #{t.year}\n"
+    def self.print_tags(mp3)
+      result = ""
+      TagLib::MPEG::File.open(mp3) do |f|
+        t = f.id3v2_tag
 
-      t.frame_list('APIC').each do |cover|
-        result << "image: [#{cover.mime_type}] [#{cover.picture.length} bytes]\n"
-      end
+        result << "title: #{t.title}\n"
+        result << "artist: #{t.artist}\n"
+        result << "album: #{t.album}\n"
+        result << "track number: #{t.track}\n"
+        result << "year: #{t.year}\n"
 
-      prop = f.audio_properties
-      if prop
-        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"
+        t.frame_list('APIC').each do |cover|
+          result << "image: [#{cover.mime_type}] [#{cover.picture.length} bytes]\n"
+        end
+
+        prop = f.audio_properties
+        if prop
+          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"
+        end
       end
+      return result
     end
-    return result
-  end
 
-  private
-  def self.mime_type(file)
-    MIME::Types.type_for(file).first.simplified.to_s
+    private
+    def self.mime_type(file)
+      MIME::Types.type_for(file).first.simplified.to_s
+    end
   end
 end

data/lib/rupeepeethree/version.rb

@@ -1,3 +1,3 @@
-class Rupeepeethree
-  VERSION = "0.0.3"
+module Rupeepeethree
+  VERSION = "0.0.4"
 end

data/spec/rupeepeethree/tagger_spec.rb

@@ -1,30 +1,43 @@
 require './lib/rupeepeethree/tagger'
 
-describe Tagger do
+describe Rupeepeethree::Tagger do
   let(:mp3) { 'spec/fixtures/test.mp3' }
   before :each do
-    Tagger.clear(mp3)
+    Rupeepeethree::Tagger.clear(mp3)
   end
   it "edits the existing cover art frame instead of creating a new one" do
     tags = {picture: "spec/fixtures/cover_art.jpg"}
     image_string = /image: \[image\/jpeg\] \[59562 bytes\]\n/
-    Tagger.tag(mp3, tags)
-    result = Tagger.print_tags(mp3)
+    Rupeepeethree::Tagger.tag(mp3, tags)
+    result = Rupeepeethree::Tagger.print_tags(mp3)
     result.should match(image_string)
 
-    Tagger.tag(mp3, tags)
-    result = Tagger.print_tags(mp3)
+    Rupeepeethree::Tagger.tag(mp3, tags)
+    result = Rupeepeethree::Tagger.print_tags(mp3)
     result.should_not match(/#{image_string}{2}/)
   end
+  it "gets a hash of the tags" do
+    tags = {title: "foodfight",
+            artist: "ninjaturtle",
+            album: "purplerain",
+            year: "1987",
+            picture: "spec/fixtures/cover_art.jpg"}
+    Rupeepeethree::Tagger.tag(mp3, tags)
+    t = Rupeepeethree::Tagger.tags(mp3)
+    expect(t[:title]).to eq("foodfight")
+    expect(t[:artist]).to eq("ninjaturtle")
+    expect(t[:album]).to eq("purplerain")
+    expect(t[:year]).to eq(1987)
+  end
   it "clears the tags"  do
     tags = {title: "foodfight",
             artist: "ninjaturtle",
             album: "purplerain",
             year: "1987",
             picture: "spec/fixtures/cover_art.jpg"}
-    Tagger.tag(mp3, tags)
-    Tagger.clear(mp3)
-    result = Tagger.print_tags(mp3)
+    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/)

data/spec/rupeepeethree_spec.rb

@@ -1,7 +1,7 @@
 require "rupeepeethree"
 require "cocaine"
 
-describe Rupeepeethree do
+describe 'integration test' do
   before :all do
     @rp3 = "ruby -Ilib bin/rp3"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rupeepeethree
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tony Miller
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rupeepeethree
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 3
 summary: tag your mp3 files
@@ -138,4 +138,3 @@ test_files:
 - spec/fixtures/test.mp3
 - spec/rupeepeethree/tagger_spec.rb
 - spec/rupeepeethree_spec.rb
-has_rdoc: