musk 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe21ecab6424d26fc0bad44e87410d0ce7bfe30
-  data.tar.gz: e1acde8199b48808e9756371812bcf8752f3dfd5
+  metadata.gz: de4f097d74a73c706373689095573eede025a309
+  data.tar.gz: 3dfe5fff8e66130a94c826d582456159e75ee8ce
 SHA512:
-  metadata.gz: 970e98e097362cf63acc293754583ac067698a2ad053756cf118235ff040ee30c858978637b3d0e41043d328f34ac1ee37d21a63b824b55431c8f90a7ffbfa32
-  data.tar.gz: 949dfe1b4c97d634f9b9d74095f50e347df8b8fc560e71a8a5d656171dddaa15b6d89379eb0ab6bf08c2e9ced634f26be0331a32554304494ce682deb097cf01
+  metadata.gz: 8fbef5b662def26e868f5b81032e90606f3b014a2dcc448b5086f46c014b83b94151b0d8e6da214c04a2348d3a5a4a4016b922f994fb5848eb595e2c4d52d340
+  data.tar.gz: 034fb77607002b90a4c8bf10c36a704e0a7bf85762ef37c5019ad2bc077d552b53e50ab337b3a86c95c4ee39e8405839909347c96189271056bc7f70031d7de9

data/Gemfile.lock

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

data/bin/musk

@@ -1,15 +1,14 @@
 #!/usr/bin/env ruby
 
 require "gli"
-require "musk/track_loader"
-require "musk/track_printer"
+require "musk"
 
 extend GLI::App
 
 desc "Extract meta-data (tags) from MP3 files"
-arg_name "path_to_file or path_to_files"
+arg_name "path_to_files"
 command :extract do |command|
-  command.arg_name "format"
+  command.arg_name "csv|pretty"
   command.default_value "pretty"
   command.flag [:f, :format]
   command.action do |global_options, options, arguments|

data/lib/musk/formatter/csv.rb

@@ -0,0 +1,23 @@
+module Musk
+  module Formatter
+    class CSV
+      ATTRIBUTES = [
+        :path,
+        :title,
+        :position,
+        :artist,
+        :album,
+        :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
+      end
+    end
+  end
+end

data/lib/musk/formatter/pretty.rb

@@ -1,20 +1,24 @@
-require "musk/decorator/printable_track"
-
 module Musk
   module Formatter
     class Pretty
+      ATTRIBUTES = [
+        :path,
+        :title,
+        :position,
+        :artist,
+        :album,
+        :genre,
+        :year,
+        :comment,
+      ]
+
       def self.print(tracks)
         tracks.each_with_index do |track, index|
-          track = Musk::Decorator::PrintableTrack.new(track)
           puts if index > 0
-          printf("%-10s%s\n", "Path:",     track.path)
-          printf("%-10s%s\n", "Title:",    track.title)
-          printf("%-10s%s\n", "Position:", track.position)
-          printf("%-10s%s\n", "Artist:",   track.artist)
-          printf("%-10s%s\n", "Album:",    track.album)
-          printf("%-10s%s\n", "Genre:",    track.genre)
-          printf("%-10s%s\n", "Year:",     track.year)
-          printf("%-10s%s\n", "Comment:",  track.comment)
+          ATTRIBUTES.map do |attribute|
+            track = Musk::Decorator::PrintableTrack.new(track)
+            printf("%-10s%s\n", "#{attribute.capitalize}:", track.send(attribute))
+          end
         end
       end
     end

data/lib/musk/track_loader.rb

@@ -1,5 +1,4 @@
 require "taglib"
-require "musk/track"
 
 module Musk
   class TrackLoader

data/lib/musk/track_printer.rb

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

data/lib/musk/version.rb

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

data/lib/musk.rb

@@ -1,3 +1,7 @@
+require "musk/decorator/printable_track"
+require "musk/formatter/csv"
+require "musk/formatter/pretty"
 require "musk/track"
 require "musk/track_loader"
 require "musk/track_printer"
+require "musk/version"

data/spec/bin/musk_spec.rb

@@ -1,41 +1,43 @@
 require "spec_helper"
 
 describe "musk extract" do
-  let(:command) { "bundle exec bin/musk extract" }
-
   context "called without arguments" do
     it "should fail with the exit code 1" do
-      stdout, stderr, status = Open3.capture3(command)
+      stdout, stderr, status = Open3.capture3("bundle exec bin/musk extract")
       status.exitstatus.should eq(1)
     end
 
     it "should write an error message to STDERR" do
-      stdout, stderr, status = Open3.capture3(command)
+      stdout, stderr, status = Open3.capture3("bundle exec bin/musk extract")
       stderr.should_not be_empty
     end
   end
 
   context "called with 'path_to_tracks'" do
-    it_should_behave_like "a command to print tracks to STDOUT in the pretty format" do
-      let(:expected_command) { command }
-    end
+    it_should_behave_like "the extract command with the pretty format"
   end
 
-  context "called with '-f pretty path_to_tracks'" do
-    it_should_behave_like "a command to print tracks to STDOUT in the pretty format" do
-      let(:expected_command) { "#{command} -f pretty" }
-    end
+  context "called with 'path_to_tracks -f pretty'" do
+    it_should_behave_like "the extract command with the pretty format", "-f pretty"
   end
 
-  context "called with '--format pretty path_to_tracks'" do
-    it_should_behave_like "a command to print tracks to STDOUT in the pretty format" do
-      let(:expected_command) { "#{command} --format pretty" }
-    end
+  context "called with 'path_to_tracks --format pretty'" do
+    it_should_behave_like "the extract command with the pretty format", "--format pretty"
   end
 
-  context "called with '--format=pretty path_to_tracks'" do
-    it_should_behave_like "a command to print tracks to STDOUT in the pretty format" do
-      let(:expected_command) { "#{command} --format=pretty" }
-    end
+  context "called with 'path_to_tracks --format=pretty'" do
+    it_should_behave_like "the extract command with the pretty format", "--format=pretty"
+  end
+
+  context "called with 'path_to_tracks -f csv'" do
+    it_should_behave_like "the extract command with the csv format", "-f csv"
+  end
+
+  context "called with 'path_to_tracks --format csv'" do
+    it_should_behave_like "the extract command with the csv format", "--format csv"
+  end
+
+  context "called with 'path_to_tracks --format=csv'" do
+    it_should_behave_like "the extract command with the csv format", "--format=csv"
   end
 end

data/spec/lib/musk/decorator/printable_track_spec.rb

@@ -25,14 +25,14 @@ describe Musk::Decorator::PrintableTrack do
     end
   end
 
-  it_should_behave_like "a decorator with zeroable attributes", [
+  it_should_behave_like "the track decorator with zeroable attributes", [
     :position_number,
     :positions_count,
     :comment,
     :year,
   ]
 
-  it_should_behave_like "a decorator with nullable attributes", [
+  it_should_behave_like "the track decorator with nullable attributes", [
     :title,
     :artist,
     :album,

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

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Musk::Formatter::CSV do
+  describe ".print(tracks)" do
+    let(:tracks) do
+      [build(:jets_track), build(:kamakura_track)]
+    end
+
+    let(:printable_tracks) do
+      tracks.map {|t| Musk::Decorator::PrintableTrack.new(t)}
+    end
+
+    let(:attributes) do
+      [:path, :title, :position, :artist, :album, :genre, :year, :comment]
+    end
+
+    let(:stdout) do
+      printable_tracks.map do |track|
+        attributes.map {|a| track.send(a)}.join(",").concat("\n")
+      end.join
+    end
+
+    it "should print tracks to STDOUT in the csv format" do
+      capture_stdout { described_class.print(tracks) }.should eq(stdout)
+    end
+  end
+end

data/spec/lib/musk/track_printer_spec.rb

@@ -4,7 +4,15 @@ describe Musk::TrackPrinter do
   describe ".print!(format, tracks)" do
     let(:tracks) { build_list(:track, 2) }
 
-    context "when format is the pretty format" do
+    context "when format == 'csv'" do
+      it "should call Musk::Formatter::CSV.print(tracks)" do
+        allow(Musk::Formatter::CSV).to receive(:print).with(tracks)
+        described_class.print!('csv', tracks)
+        expect(Musk::Formatter::CSV).to have_received(:print).with(tracks)
+      end
+    end
+
+    context "when format == 'pretty'" do
       it "should call Musk::Formatter::Pretty.print(tracks)" do
         allow(Musk::Formatter::Pretty).to receive(:print).with(tracks)
         described_class.print!('pretty', tracks)
@@ -12,7 +20,7 @@ describe Musk::TrackPrinter do
       end
     end
 
-    context "when format is an unsupported format" do
+    context "else" do
       it "should raise \"Unknown format '{format}'\"" do
         error = "Unknown format 'unsupported'"
         expect { described_class.print!('unsupported', tracks) }.to raise_error(error)

data/spec/support/examples/extract_command_with_csv_format_example.rb

@@ -0,0 +1,11 @@
+shared_examples "the extract command with the csv format" do |options|
+  let(:command) { "bundle exec bin/musk extract" }
+
+  it "should print tracks to STDOUT via Musk::Formatter::CSV" do
+    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)})
+    status.exitstatus.should eq(0)
+  end
+end

data/spec/support/examples/extract_command_with_pretty_format_example.rb

@@ -0,0 +1,11 @@
+shared_examples "the extract command with the pretty format" do |options|
+  let(:command) { "bundle exec bin/musk extract" }
+
+  it "should print tracks to STDOUT via Musk::Formatter::Pretty" do
+    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)})
+    status.exitstatus.should eq(0)
+  end
+end

data/spec/support/examples/{decorator_with_nullable_attributes_example.rb → track_decorator_with_nullable_attributes_example.rb}

@@ -1,5 +1,5 @@
-shared_examples "a decorator with nullable attributes" do |attributes|
-  subject { Musk::Decorator::PrintableTrack }
+shared_examples "the track decorator with nullable attributes" do |attributes|
+  let(:decorator) { Musk::Decorator::PrintableTrack }
 
   attributes.each do |attribute|
     describe "##{attribute}" do
@@ -7,7 +7,7 @@ shared_examples "a decorator with nullable attributes" do |attributes|
         it "should return '-'" do
           track = build(:track)
           allow(track).to receive(attribute).and_return(nil)
-          subject.new(track).send(attribute).should eq("-")
+          decorator.new(track).send(attribute).should eq("-")
         end
       end
 
@@ -15,7 +15,7 @@ shared_examples "a decorator with nullable attributes" do |attributes|
         it "should return track.#{attribute}" do
           track = build(:track)
           allow(track).to receive(attribute).and_return("VaLuE")
-          subject.new(track).send(attribute).should eq("VaLuE")
+          decorator.new(track).send(attribute).should eq("VaLuE")
         end
       end
     end

data/spec/support/examples/{decorator_with_zeroable_attributes_example.rb → track_decorator_with_zeroable_attributes_example.rb}

@@ -1,5 +1,5 @@
-shared_examples "a decorator with zeroable attributes" do |attributes|
-  subject { Musk::Decorator::PrintableTrack }
+shared_examples "the track decorator with zeroable attributes" do |attributes|
+  let(:decorator) { Musk::Decorator::PrintableTrack }
 
   attributes.each do |attribute|
     describe "##{attribute}" do
@@ -7,7 +7,7 @@ shared_examples "a decorator with zeroable attributes" do |attributes|
         it "should return '-'" do
           track = build(:track)
           allow(track).to receive(attribute).and_return(nil)
-          subject.new(track).send(attribute).should eq("-")
+          decorator.new(track).send(attribute).should eq("-")
         end
       end
 
@@ -15,7 +15,7 @@ shared_examples "a decorator with zeroable attributes" do |attributes|
         it "should return '-'" do
           track = build(:track)
           allow(track).to receive(attribute).and_return(0)
-          subject.new(track).send(attribute).should eq("-")
+          decorator.new(track).send(attribute).should eq("-")
         end
       end
 
@@ -23,7 +23,7 @@ shared_examples "a decorator with zeroable attributes" do |attributes|
         it "should return '-'" do
           track = build(:track)
           allow(track).to receive(attribute).and_return("0")
-          subject.new(track).send(attribute).should eq("-")
+          decorator.new(track).send(attribute).should eq("-")
         end
       end
 
@@ -31,7 +31,7 @@ shared_examples "a decorator with zeroable attributes" do |attributes|
         it "should return track.#{attribute}" do
           track = build(:track)
           allow(track).to receive(attribute).and_return("VaLuE")
-          subject.new(track).send(attribute).should eq("VaLuE")
+          decorator.new(track).send(attribute).should eq("VaLuE")
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Eugene Pempel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -138,6 +138,7 @@ files:
 - bin/musk
 - lib/musk.rb
 - lib/musk/decorator/printable_track.rb
+- lib/musk/formatter/csv.rb
 - lib/musk/formatter/pretty.rb
 - lib/musk/track.rb
 - lib/musk/track_loader.rb
@@ -146,14 +147,16 @@ files:
 - musk.gemspec
 - spec/bin/musk_spec.rb
 - spec/lib/musk/decorator/printable_track_spec.rb
+- spec/lib/musk/formatter/csv_spec.rb
 - spec/lib/musk/formatter/pretty_spec.rb
 - spec/lib/musk/track_loader_spec.rb
 - spec/lib/musk/track_printer_spec.rb
 - spec/lib/musk/track_spec.rb
 - spec/spec_helper.rb
-- spec/support/examples/command_to_print_tracks_to_stdout_in_pretty_format_example.rb
-- spec/support/examples/decorator_with_nullable_attributes_example.rb
-- spec/support/examples/decorator_with_zeroable_attributes_example.rb
+- spec/support/examples/extract_command_with_csv_format_example.rb
+- spec/support/examples/extract_command_with_pretty_format_example.rb
+- spec/support/examples/track_decorator_with_nullable_attributes_example.rb
+- spec/support/examples/track_decorator_with_zeroable_attributes_example.rb
 - spec/support/factories/tracks.rb
 - spec/support/helpers/capture_stdout_helper.rb
 - spec/support/matchers/be_tracks_matcher.rb
@@ -186,14 +189,16 @@ summary: Your music with the demonic scent of musk
 test_files:
 - spec/bin/musk_spec.rb
 - spec/lib/musk/decorator/printable_track_spec.rb
+- spec/lib/musk/formatter/csv_spec.rb
 - spec/lib/musk/formatter/pretty_spec.rb
 - spec/lib/musk/track_loader_spec.rb
 - spec/lib/musk/track_printer_spec.rb
 - spec/lib/musk/track_spec.rb
 - spec/spec_helper.rb
-- spec/support/examples/command_to_print_tracks_to_stdout_in_pretty_format_example.rb
-- spec/support/examples/decorator_with_nullable_attributes_example.rb
-- spec/support/examples/decorator_with_zeroable_attributes_example.rb
+- spec/support/examples/extract_command_with_csv_format_example.rb
+- spec/support/examples/extract_command_with_pretty_format_example.rb
+- spec/support/examples/track_decorator_with_nullable_attributes_example.rb
+- spec/support/examples/track_decorator_with_zeroable_attributes_example.rb
 - spec/support/factories/tracks.rb
 - spec/support/helpers/capture_stdout_helper.rb
 - spec/support/matchers/be_tracks_matcher.rb

data/spec/support/examples/command_to_print_tracks_to_stdout_in_pretty_format_example.rb

@@ -1,9 +0,0 @@
-shared_examples "a command to print tracks to STDOUT in the pretty format" do
-  it "should print tracks to STDOUT via Musk::Formatter::Pretty" do
-    path = ENV["MUSK_TRACKS_PATH"]
-    tracks = Musk::TrackLoader.load!(path)
-    stdout, stderr, status = Open3.capture3("#{expected_command} #{path}")
-    stdout.should eq(capture_stdout { Musk::Formatter::Pretty.print(tracks) })
-    status.exitstatus.should eq(0)
-  end
-end