musk 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133564e8ff231c5a22373dff976442425055270d
-  data.tar.gz: f2244b11611fcb50294454a92ebd4b5bdf201861
+  metadata.gz: fe54725858bda7ea5b54f600384b2825aa215beb
+  data.tar.gz: 714ce8c5c38647b30f12d94440c41ec2bd3bdd68
 SHA512:
-  metadata.gz: 105306e6386f4018e53ef9b5b5ce7ba6e19f80779618dd224d3110e00ac5658c04a81ffba6a3064c72ca60b7e5d32141f6f702c46833579ff7834a5ff938744b
-  data.tar.gz: ad172e5d32c437b6d3693e8efbf6a4ed628b4fe8938327fe9af681692565273cf322271024be9a4d9787cea49e2e547e0005c316265dd5bc6d366ca6103a9df0
+  metadata.gz: 4e84f1c53a46a00e865f6b1c72a5dae29a7bf8040fa1fe73a160e4b82a19fd25ccdb58a44e378565e038b66d603e5974231510e7a903a079f466496ade18a6e2
+  data.tar.gz: 25b70dc5dee44dc91aa5e388e9653f9a5978594a2b6bff2fd6f1338bf7e0740fad451a26c29e71559fb390db81ea77ad5b19740ad3bfc0a5cfaf18dd530095a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    musk (0.1.3)
+    musk (0.1.4)
       gli (~> 2.9)
       taglib-ruby (~> 0.6)
 

data/LICENSE

@@ -1,3 +1,5 @@
+The MIT License (MIT)
+
 Copyright (c) 2014 Eugene Pempel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -1,10 +1,11 @@
 ## Musk
 
-[![Gem Version](https://badge.fury.io/rb/musk.png)](http://badge.fury.io/rb/musk)
-[![Code Climate](https://codeclimate.com/github/pempel/musk.png)](https://codeclimate.com/github/pempel/musk)
-[![Coverage Status](https://coveralls.io/repos/pempel/musk/badge.png?branch=master)](https://coveralls.io/r/pempel/musk?branch=master)
-[![Build Status](https://travis-ci.org/pempel/musk.png?branch=master)](https://travis-ci.org/pempel/musk)
-[![Dependency Status](https://gemnasium.com/pempel/musk.png)](https://gemnasium.com/pempel/musk)
+[![Gem Version](https://img.shields.io/gem/v/musk.svg)](https://badge.fury.io/rb/musk)
+[![Code Climate](https://img.shields.io/codeclimate/github/pempel/musk.svg)](https://codeclimate.com/github/pempel/musk)
+[![Coverage Status](https://img.shields.io/coveralls/pempel/musk/master.svg)](https://coveralls.io/r/pempel/musk?branch=master)
+[![Build Status](https://img.shields.io/travis/pempel/musk/master.svg)](https://travis-ci.org/pempel/musk)
+[![Dependency Status](https://img.shields.io/gemnasium/pempel/musk.svg)](https://gemnasium.com/pempel/musk)
+[![MIT License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://tldrlegal.com/license/mit-license)
 
 Use musk to impart the demonic scent of musk to your music.
 Musk allows you to extract tags from MP3 files and perfume MP3 files
@@ -93,6 +94,8 @@ several commands together. For example,
 
 ## License
 
+The MIT License (MIT)
+
 Copyright (c) 2014 Eugene Pempel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/musk/formatter/csv.rb

@@ -1,22 +1,23 @@
 module Musk
   module Formatter
     class CSV
-      ATTRIBUTES = [
-        :path,
-        :title,
-        :position,
-        :artist,
-        :release,
-        :genre,
-        :year,
-        :comment,
-      ]
-
       def self.print(tracks)
-        tracks.each do |track|
-          track = Musk::Decorator::PrintableTrack.new(track)
-          puts ATTRIBUTES.map {|a| track.send(a)}.join(",")
-        end
+        new(tracks).print
+      end
+
+      def initialize(tracks)
+        @tracks = tracks.map { |t| Musk::Decorator::PrintableTrack.new(t) }
+        @fields = [:path, :title, :position, :artist, :release, :genre, :year, :comment]
+      end
+
+      def print
+        @tracks.each { |t| puts printed(t) }
+      end
+
+      private
+
+      def printed(track)
+        @fields.map { |f| track.send(f) }.join(",")
       end
     end
   end

data/lib/musk/formatter/pretty.rb

@@ -1,25 +1,23 @@
 module Musk
   module Formatter
     class Pretty
-      ATTRIBUTES = [
-        :path,
-        :title,
-        :position,
-        :artist,
-        :release,
-        :genre,
-        :year,
-        :comment,
-      ]
-
       def self.print(tracks)
-        tracks.each_with_index do |track, index|
-          track = Musk::Decorator::PrintableTrack.new(track)
-          puts if index > 0
-          ATTRIBUTES.map do |attribute|
-            printf("%-10s%s\n", "#{attribute.capitalize}:", track.send(attribute))
-          end
-        end
+        new(tracks).print
+      end
+
+      def initialize(tracks)
+        @tracks = tracks.map { |t| Musk::Decorator::PrintableTrack.new(t) }
+        @fields = [:path, :title, :position, :artist, :release, :genre, :year, :comment]
+      end
+
+      def print
+        puts @tracks.map { |t| printed(t) }.join("\n")
+      end
+
+      private
+
+      def printed(track)
+        @fields.map { |f| sprintf("%-10s%s\n", "#{f.capitalize}:", track.send(f)) }.join
       end
     end
   end

data/lib/musk/track.rb

@@ -16,7 +16,7 @@ module Musk
     attr_accessor *ATTRIBUTES
 
     def attributes
-      Hash[ATTRIBUTES.map {|a| [a, send("#{a}")]}]
+      Hash[ATTRIBUTES.map { |a| [a, send("#{a}")] }]
     end
   end
 end

data/lib/musk/track_loader.rb

@@ -3,18 +3,36 @@ require "taglib"
 module Musk
   class TrackLoader
     def self.load!(path)
-      unless path and path.length > 0
+      new(path).load!
+    end
+
+    def initialize(path)
+      @path = path
+    end
+
+    def load!
+      verify_tracks!
+      create_tracks!
+    end
+
+    private
+
+    def verify_tracks!
+      unless @path and @path.length > 0
         raise "Undefined path to a file or files"
       end
-      unless File.file?(path) or File.directory?(path)
-        raise "Unknown path '#{path}' to a file or files"
+      unless File.file?(@path) or File.directory?(@path)
+        raise "Unknown path '#{@path}' to a file or files"
       end
-      if File.file?(path)
-        unless File.extname(path) == ".mp3"
-          raise "Unknown extension '#{File.extname(path)}'"
+      if File.file?(@path)
+        unless File.extname(@path) == ".mp3"
+          raise "Unknown extension '#{File.extname(@path)}'"
         end
       end
-      path = File.expand_path(path)
+    end
+
+    def create_tracks!
+      path = File.expand_path(@path)
       loadpath = "#{File.file?(path) ? File.dirname(path) : path}#{File::SEPARATOR}"
       deeppath = File.file?(path) ? path : File.join(path, "**", "*.mp3")
       Dir[deeppath].map do |fullpath|

data/lib/musk/track_printer.rb

@@ -1,11 +1,20 @@
 module Musk
   class TrackPrinter
     def self.print!(format, tracks)
-      case format.to_s.to_sym
-      when :csv    then Musk::Formatter::CSV.print(tracks)
-      when :pretty then Musk::Formatter::Pretty.print(tracks)
+      new(format, tracks).print!
+    end
+
+    def initialize(format, tracks)
+      @format = format
+      @tracks = tracks
+    end
+
+    def print!
+      case @format.to_s.to_sym
+      when :csv then Musk::Formatter::CSV.print(@tracks)
+      when :pretty then Musk::Formatter::Pretty.print(@tracks)
       else
-        raise "Unknown format '#{format}'"
+        raise "Unknown format '#{@format}'"
       end
     end
   end

data/lib/musk/version.rb

@@ -1,3 +1,3 @@
 module Musk
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/musk/formatter/csv_spec.rb

@@ -2,10 +2,9 @@ require "spec_helper"
 
 describe Musk::Formatter::CSV do
   describe ".print(tracks)" do
-    let(:tracks) {[build(:jets_track), build(:kamakura_track)]}
+    let(:tracks) { [build(:jets_track), build(:kamakura_track)] }
     let(:stdout) do
-      printable_tracks = tracks.map {|t| Musk::Decorator::PrintableTrack.new(t)}
-      printable_tracks.map do |track|
+      tracks.map { |t| Musk::Decorator::PrintableTrack.new(t) }.map do |track|
         "#{track.path},"\
         "#{track.title},"\
         "#{track.position},"\
@@ -18,7 +17,7 @@ describe Musk::Formatter::CSV do
     end
 
     it "should print tracks to STDOUT in the csv format" do
-      capture_stdout {described_class.print(tracks)}.should eq(stdout)
+      capture_stdout { described_class.print(tracks) }.should eq(stdout)
     end
   end
 end

data/spec/lib/musk/formatter/pretty_spec.rb

@@ -2,10 +2,9 @@ require "spec_helper"
 
 describe Musk::Formatter::Pretty do
   describe ".print(tracks)" do
-    let(:tracks) {[build(:jets_track), build(:kamakura_track)]}
+    let(:tracks) { [build(:jets_track), build(:kamakura_track)] }
     let(:stdout) do
-      printable_tracks = tracks.map {|t| Musk::Decorator::PrintableTrack.new(t)}
-      printable_tracks.map do |track|
+      tracks.map { |t| Musk::Decorator::PrintableTrack.new(t) }.map do |track|
         "Path:     #{track.path}\n"\
         "Title:    #{track.title}\n"\
         "Position: #{track.position}\n"\
@@ -18,7 +17,7 @@ describe Musk::Formatter::Pretty do
     end
 
     it "should print tracks to STDOUT in the pretty format" do
-      capture_stdout {described_class.print(tracks)}.should eq(stdout)
+      capture_stdout { described_class.print(tracks) }.should eq(stdout)
     end
   end
 end

data/spec/lib/musk/track_spec.rb

@@ -26,7 +26,7 @@ describe Musk::Track do
     it "should return a track attributes hash" do
       track = build(:jets_track)
       track.attributes.should eq(Hash[
-        Musk::Track::ATTRIBUTES.map {|a| [a, track.send("#{a}")]}
+        Musk::Track::ATTRIBUTES.map { |a| [a, track.send("#{a}")] }
       ])
     end
   end

data/spec/support/examples/extract_command_with_csv_format_example.rb

@@ -5,7 +5,7 @@ shared_examples "the extract command with the csv format" do |options|
     path = ENV["MUSK_TRACKS_PATH"]
     tracks = Musk::TrackLoader.load!(path)
     stdout, stderr, status = Open3.capture3("#{command} #{options} #{path}")
-    stdout.should eq(capture_stdout {Musk::Formatter::CSV.print(tracks)})
+    stdout.should eq(capture_stdout { Musk::Formatter::CSV.print(tracks) })
     status.exitstatus.should eq(0)
   end
 end

data/spec/support/examples/extract_command_with_pretty_format_example.rb

@@ -5,7 +5,7 @@ shared_examples "the extract command with the pretty format" do |options|
     path = ENV["MUSK_TRACKS_PATH"]
     tracks = Musk::TrackLoader.load!(path)
     stdout, stderr, status = Open3.capture3("#{command} #{options} #{path}")
-    stdout.should eq(capture_stdout {Musk::Formatter::Pretty.print(tracks)})
+    stdout.should eq(capture_stdout { Musk::Formatter::Pretty.print(tracks) })
     status.exitstatus.should eq(0)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eugene Pempel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli