mp3file 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bfcaa237ab4362c6e5ff6267f84c6becd95aab3
-  data.tar.gz: 3d86a90044fbf1ed37cf558a660e464993f71ec8
+  metadata.gz: bdcc2442876710b6da53f59179d328091eced9a5
+  data.tar.gz: af34504fee2f1e9ace71b702b17dc8e2074d8055
 SHA512:
-  metadata.gz: 13e2cf72a0f6db63c9676d3a78eeed4345bd01e9cfb7487d1b24a864cf9ff35c9a4c945bf3890c97c269efb13ef0125177ee89902d2b5f8eb94f5c798faf36c2
-  data.tar.gz: e483622cdc9d209500c82809fb619f19e8ef0caa454c3ff209923d66438568b173c0d39cbe67c2852d16650f2b690b7b23b0c5b61a7e1d81c95bd4190fe1b16a
+  metadata.gz: c51ba93dcbd12cf6565a038be1ba2925717446d53e99bb4615083bb414e50d3fbd1925dbe2ab4e35d4acbd7d99ffc229e7beed2dc11eb10001c5c3e5c37361fd
+  data.tar.gz: d4c6da6e050d7899d62a0a6db55f577c8f5f0b0b0bae236a3669d7673cc226e639b7dd7d52e0806f4b20ea347f4a0df5fab349a48c86ea9351c76a24cd249b9e

data/.gitignore

@@ -3,3 +3,5 @@ pkg/*
 .bundle
 .DS_Store
 /Gemfile.lock
+/.ruby-version
+/.ruby-gemset

data/bin/mp3info

@@ -18,9 +18,10 @@ alias :h :humanize
 ARGV.each do |file|
   begin
     mp3 = Mp3file::MP3File.new(file, scan_all_headers: true)
+    audio_percent = mp3.audio_size.to_f / mp3.file_size.to_f * 100.0
 
     puts("File: #{mp3.file.path}")
-    puts("    Size: #{h(mp3.file_size)} bytes Audio_size: #{h(mp3.audio_size)} bytes")
+    puts("    Size: #{h(mp3.file_size)} bytes Audio_size: #{h(mp3.audio_size)} bytes (#{audio_percent.round(2)}%)")
     puts("    #{mp3.mpeg_version} #{mp3.layer}")
     puts("    Bitrate: #{h(mp3.bitrate)} kbits/sec (vbr? #{mp3.vbr?.to_s}) Samplerate: #{mp3.samplerate} Hz Mode: #{mp3.mode}")
     puts("    Duration: #{h(mp3.length)} s")
@@ -38,7 +39,25 @@ ARGV.each do |file|
     if mp3.xing_header
       xing = mp3.xing_header
       puts("    Xing header:")
-      puts("        Frames: #{h(xing.frames)} Bytes: #{h(xing.bytes)} Quality: #{xing.quality} TOC: #{xing.toc ? 'present' : 'not present'}")
+      print("        ")
+
+      if xing.frames
+        print("Frames: #{h(xing.frames)} ")
+      end
+
+      if xing.bytes
+        print("Bytes: #{h(xing.bytes)} ")
+      end
+
+      if xing.quality
+        print("Quality: #{xing.quality} ")
+      end
+
+      if xing.toc
+        print("TOC: #{xing.toc ? 'present' : 'not present'}")
+      end
+
+      puts
     end
 
     if mp3.vbri_header

data/lib/mp3file/version.rb

@@ -1,3 +1,3 @@
 module Mp3file
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/mp3file/xing_header.rb

@@ -31,10 +31,10 @@ module Mp3file
       end
 
       @name = head.vbr_id
-      @frames = head.frames if head.frames_present == 1
-      @bytes = head.bytes if head.bytes_present == 1
-      @toc = head.toc.dup if head.toc_present == 1
-      @quality = head.quality if head.quality_present == 1
+      @frames = head.frames if (head.frames_present == 1 && head.frames > 0)
+      @bytes = head.bytes if (head.bytes_present == 1 && head.bytes > 0)
+      @toc = head.toc.dup if (head.toc_present == 1 && !head.toc.empty?)
+      @quality = head.quality if (head.quality_present == 1 && head.quality > 0)
     end
   end
 end

data/mp3file.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "mp3file"
 
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec', '~> 2.0', '< 2.99')
   s.add_development_dependency('rake')
   s.add_development_dependency('pry')
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: mp3file
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,8 +82,6 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -134,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mp3file
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Reads MP3 headers and returns their information.

data/.ruby-gemset

@@ -1 +0,0 @@
-mp3file

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.1