popcap 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5015395f59243962df0c16cdf70a6e9c9de3d6
-  data.tar.gz: 7b0608fa5fc3f5fc7e69a8d8e03cb6fb37706cf7
+  metadata.gz: 931fd9befcffd1b5ab9805ceff6c8fe297312444
+  data.tar.gz: 599f3ed43bdf4b1be7a35f90ea76c7d16d0f08ef
 SHA512:
-  metadata.gz: cccf719a0f07c5c48ccca22fa2a8b5c13486dac590d987af767beabe402712bd4073b94c7312c39ad54ee6cbfddc11a5dc122f1f0d30cfff147954aac0c51d52
-  data.tar.gz: 0cdd2167a5b1e03ed808a944754ed2ca1d5908e07889c63523f073ea1c96def37dc1f25aefdfba2e0f52133845a9fb2d7dbbb31f0605ed9d0c9b685e1b2d3b47
+  metadata.gz: 347cd122247302dd21ac0760dfe096d93e768099cc713cde8851d4bc5582998e3c22555d71c82776883781ac01999c51066a51d44835070509b565f9fb4dae9f
+  data.tar.gz: 9be5928aa054bdf3838cb3b582dc30d26f688a0683d5387a58fdcf9c7044ae56ccc41ab4c027be8ff7d80310e24c1566714be512a5212e67b7170a84fb5c6792

data/.gitignore

@@ -2,3 +2,4 @@ coverage/*
 *.swp
 .rbx
 .rbenv-version
+*.gem

data/lib/pop_cap/ffmpeg/analyze_file.rb

@@ -0,0 +1,50 @@
+require 'pop_cap/ffmpeg/commander'
+
+module PopCap
+  # Public: This class is similar to TagReader, but is useful for debugging.
+  # If a file cannot be read, this will return the error message generated
+  # by FFprobe
+  #
+  class AnalyzeFile
+    attr_reader :filepath
+
+    # Public: Initialize an instance of AnalyzeFile.
+    # filepath = relative path to a file on the filesystem
+    #
+    def initialize(filepath)
+      @filepath = File.expand_path(filepath)
+      @datetime = Time.now.strftime("%Y-%m-%d at %H:%M:%S")
+    end
+
+    # Public: This method returns the stderr of FFprobe -show_format
+    # as an array.  The first element is a datetime stamp, the second
+    # element is the error message.
+    #
+    def examine
+      [datetimestamp, error]
+    end
+
+    # Public: A convenience class method for examining a file.
+    #
+    def self.examine(filepath)
+      new(filepath).examine
+    end
+
+    private
+    def command
+      %W{ffprobe -show_format -print_format json} + %W{#{filepath}}
+    end
+
+    def contents
+      Commander.new(*command).execute.stderr
+    end
+
+    def datetimestamp
+      "FFprobe read error on #{@datetime}"
+    end
+
+    def error
+      contents.split("\n").last
+    end
+  end
+end

data/lib/pop_cap/ffmpeg/converter.rb

@@ -8,7 +8,7 @@ module PopCap
     # Public: This method will execute the conversion.
     #
     def convert
-      unless commander.new(*command).execute.success?
+      unless execute.success?
         raise(FFmpegError, error_message('converting'))
       end
     end

data/lib/pop_cap/ffmpeg/ffmpeg.rb

@@ -33,6 +33,12 @@ module PopCap
       "Error #{message} #{filepath}."
     end
 
+    # Public: execute a command
+    #
+    def execute
+      @executed ||= commander.new(*command).execute
+    end
+
     private
     def check_for_ffmpeg_install
       begin

data/lib/pop_cap/ffmpeg/tag_reader.rb

@@ -24,7 +24,7 @@ module PopCap
     end
 
     def output
-      executed = commander.new(*command).execute
+      executed = execute
       raise(FFmpegError, error_message('reading')) unless executed.success?
       executed.stdout
     end

data/lib/pop_cap/ffmpeg/tag_writer.rb

@@ -10,7 +10,8 @@ module PopCap
     # is done to prevent corrupting the original file.
     #
     def write
-      unless commander.new(*command).execute.success?
+      unless execute.success?
+        cleanup_failed_write
         raise(FFmpegError, error_message('writing'))
       end
       FileUtils.move(tmppath, filepath)
@@ -24,7 +25,7 @@ module PopCap
 
     private
     def tmppath
-      '/tmp/' + File.basename(filepath)
+      @tmp ||= '/tmp/' + File.basename(filepath)
     end
 
     def command
@@ -40,5 +41,9 @@ module PopCap
     def clean_tags
       @cleaned ||= options.reject { |key,_| key == :commander }
     end
+
+    def cleanup_failed_write
+      FileUtils.rm_f(tmppath)
+    end
   end
 end

data/lib/pop_cap/version.rb

@@ -1,3 +1,3 @@
 module PopCap
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/spec/lib/pop_cap/ffmpeg/analyze_file_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'pop_cap/ffmpeg/analyze_file'
+require 'fileutils'
+
+module PopCap
+  describe AnalyzeFile do
+    let(:bad_file) { "#{File.expand_path('spec/fixtures/bad_file.img')}" }
+
+    before { FileUtils.touch bad_file }
+    after { FileUtils.rm_f bad_file }
+
+    context ".examine" do
+      let(:response) { AnalyzeFile.examine(bad_file) }
+
+      it 'has a datetime stamp' do
+        date_regex = %r(FFprobe read error on \d{4}-\d{2}-\d{2} at \d{2}:\d{2}:\d{2})
+        expect(response[0]).to match date_regex
+      end
+
+      it 'has the error message' do
+        expect(response).
+          to include "#{bad_file}: Invalid data found when processing input"
+      end
+    end
+  end
+end

data/spec/lib/pop_cap/ffmpeg/tag_reader_spec.rb

@@ -15,10 +15,6 @@ module PopCap
       instance.stub_chain(:execute, :stdout) { instance }
     end
 
-    it 'test' do
-      puts JSON.parse(TagReader.read('spec/fixtures/sample.flac'))
-    end
-
     describe '.read' do
       before { shared_example }
 

data/spec/lib/pop_cap/ffmpeg/tag_writer_spec.rb

@@ -54,6 +54,15 @@ module PopCap
             writer.write
           end.to raise_error(FFmpegError, "Error writing #{file}.")
         end
+
+        it 'removes the temp file' do
+          expect do
+            commander.should_receive(:new).with(*command) { instance }
+            instance.stub_chain(:execute, :success?) { false }
+            FileUtils.should_receive(:rm_f).with('/tmp/file.flac')
+            writer.write
+          end.to raise_error(FFmpegError, "Error writing #{file}.")
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popcap
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Culley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reek
@@ -54,6 +54,7 @@ files:
 - README.md
 - lib/pop_cap/audio_file.rb
 - lib/pop_cap/class_support.rb
+- lib/pop_cap/ffmpeg/analyze_file.rb
 - lib/pop_cap/ffmpeg/commander.rb
 - lib/pop_cap/ffmpeg/converter.rb
 - lib/pop_cap/ffmpeg/ffmpeg.rb
@@ -74,6 +75,7 @@ files:
 - spec/fixtures/sample.flac
 - spec/lib/pop_cap/audio_file_spec.rb
 - spec/lib/pop_cap/class_support_spec.rb
+- spec/lib/pop_cap/ffmpeg/analyze_file_spec.rb
 - spec/lib/pop_cap/ffmpeg/commander_spec.rb
 - spec/lib/pop_cap/ffmpeg/converter_spec.rb
 - spec/lib/pop_cap/ffmpeg/ffmpeg_spec.rb
@@ -110,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A library work with audio files on the filesystem .
@@ -118,6 +120,7 @@ test_files:
 - spec/fixtures/sample.flac
 - spec/lib/pop_cap/audio_file_spec.rb
 - spec/lib/pop_cap/class_support_spec.rb
+- spec/lib/pop_cap/ffmpeg/analyze_file_spec.rb
 - spec/lib/pop_cap/ffmpeg/commander_spec.rb
 - spec/lib/pop_cap/ffmpeg/converter_spec.rb
 - spec/lib/pop_cap/ffmpeg/ffmpeg_spec.rb
@@ -135,4 +138,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/popcap_spec_helper.rb
 - spec/support/reek_spec.rb
-has_rdoc: