zappa 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9023032146667f3a56103972668db8b509523a40
-  data.tar.gz: 0518855d8507741d5b9b46f294fcef41c74bb09e
+  metadata.gz: 7451348ebf69ebf1dcfcccdb63e9a4f1b639aa46
+  data.tar.gz: cde7d8e96634e6e974cffd61b7d657e0ec6411e3
 SHA512:
-  metadata.gz: 15d39fad530e36503cd55f22c91293d01d68d67280bbe56c24095d76b5fba34de4bf4d429b265620cc7eabf0d082a7d8a32bc3544f80432ecf0f9bb817bb7ca3
-  data.tar.gz: 8cc0ff30f8583cdc5a0d917ea552183a71f4fd6df5fdedd85fc6c9b1d046672ae71f2dec33341668bbeef42b62438a774397f4b93b30d0fa8482878bd39ec072
+  metadata.gz: e776a7938072269a5cc3065b915c3c92317989ee05a4595abbaa7b3b4b862c5239309010a717c3c14182bd7124a152d9ee429a689f9ba57370e807d2230fcf4e
+  data.tar.gz: c356ed13032cf939aed42c4ea63a68cd73c7ed621dbde65213dae121551a930d0ca57462d1b1f54f1871f530a20444962d0474ff713f209280f042972e648a10

data/ROADMAP.md

@@ -1,17 +1,17 @@
-0.0.1 - Basic editing
+0.1 - Basic editing
 -------------------
 - Install ffmpeg + dependencies on MacOS X
 - Import: WAV
 - Export: WAV
 
 
-0.0.2 - Slicing
+0.2 - Slicing
 -------------
 - Slice segments into smaller parts (by time or samples)
 - Join segments
 
 
-0.0.3 - DSP - Basic
+0.3 - DSP - Basic
 ----------------
 - Amplify signals by DB
 - Calculate RMS
@@ -20,21 +20,21 @@
 - Phase Invert
 
 
-0.0.4 - Multi Format Exporting
+0.4 - Multi Format Exporting
 ----------------------------
 - Import: MP3, OGG, M4A, FLAC, AIFF
 - Export: MP3, OGG, M4A, FLAC, AIFF
 
-0.0.5 - OS Support
+0.5 - OS Support
 ----------------
 - OS: Windows, Linux, Mac Support
 
 
-Release - 0.1 Basic DSP Platform
+Release - 1.0 Basic DSP Platform
 ==============================
 
 
-0.1.1 - DSP - Filters - Basic
+1.1 - DSP - Filters - Basic
 ---------------------------
 
 - DSP: Low Pass Filter
@@ -42,19 +42,19 @@ Release - 0.1 Basic DSP Platform
 - DSP: Notch Filter
 
 
-0.1.2 DSP - Time Effects
+1.2 DSP - Time Effects
 ----------------------
 - Speed Up / Down
 - Reverse
 - Fade In / Fade Out
 
 
-0.1.3 - DSP - Equalizer
+1.3 - DSP - Equalizer
 ---------------------
 - 8 Chan EQ
 
 
-0.1.4 - DSP - Dynamics
+1.4 - DSP - Dynamics
 ----------------------
 
 - DSP: Compressor

data/lib/zappa/segment.rb

@@ -1,4 +1,6 @@
 require 'tempfile'
+require 'open3'
+require 'pry'
 
 module Zappa
   class Segment
@@ -16,11 +18,12 @@ module Zappa
       @source = Wave.new(safe_copy(path))
     end
 
-    def to_file(path, format = 'wav')
+    def to_file(path)
       raise FileError.new('No data in Segment') if @source.nil?
-      out = system('ffmpeg', '-i', @source.file_path, '-y', '-f', format, path)
-      raise ('Cannot export to' + path ) if out == false
-      raise FileError.new('ffmpeg not installed') if out.nil?
+      cmd = 'ffmpeg -i ' + @source.file_path + ' -y -f wav ' + path
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+        raise ('Cannot export to' + path ) unless wait_thr.value.success?
+      end
     end
 
     def ==(other)
@@ -31,9 +34,10 @@ module Zappa
 
     def safe_copy(path)
       tmp = Tempfile.new('zappa')
-      out = system('ffmpeg', '-i', path, '-vn', '-y', '-f', 'wav', tmp.path)
-      raise 'Cannot open file' if out == false
-      raise 'ffmpeg not installed' if out.nil?
+      cmd = 'ffmpeg -i ' + path + ' -vn -y -f wav ' + tmp.path
+      Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+        raise ('Cannot open file ' + path ) unless wait_thr.value.success?
+      end
       tmp.path
     end
   end

data/lib/zappa/version.rb

@@ -1,3 +1,3 @@
 module Zappa
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/zappa/wave.rb

@@ -3,10 +3,11 @@
 module Zappa
   class Wave
     attr_accessor :format, :data, :data_size, :file_path
-    SUBCHUNKS = %w('fmt', 'data')
+    SUBCHUNKS = %q('fmt', 'data')
     KNOWN_FMT_SIZE = 16
 
     def initialize(path)
+      @header = {}
       @format = {}
       @data = {}
 
@@ -20,6 +21,35 @@ module Zappa
       end
     end
 
+    def update
+      raw_file = pack_riff_header + pack_fmt + pack_data
+      File.write(@file_path, raw_file)
+    end
+
+    def pack_riff_header
+      hdr = ''
+      hdr += @header[:chunk_id]
+      hdr += [@header[:chunk_size]].pack('V')
+      hdr += @header[:format]
+    end
+
+    def pack_fmt
+      fmt = 'fmt '
+      fmt += [16].pack('V')
+      fmt += [@format[:audio_format]].pack('v')
+      fmt += [@format[:channels]].pack('v')
+      fmt += [@format[:sample_rate]].pack('V')
+      fmt += [@format[:byte_rate]].pack('V')
+      fmt += [@format[:block_align]].pack('v')
+      fmt += [@format[:bits_per_sample]].pack('v')
+    end
+
+    def pack_data
+      data = 'data'
+      data += [@data[:size]].pack('V')
+      data += @data[:data]
+    end
+
     def unpack_wav
       unpack_riff_header
       while @data[:data].nil?
@@ -28,11 +58,11 @@ module Zappa
     end
 
     def unpack_riff_header
-      chunk_id = @file.read(4)
-      _ = @file.read(4).unpack('V').first # chunk_size
-      format = @file.read(4)
-      raise FileFormatError.new('Format is not WAVE') unless format == 'WAVE'
-      raise FileFormatError.new('ID is not RIFF') unless chunk_id == 'RIFF'
+      @header[:chunk_id] = @file.read(4)
+      @header[:chunk_size] = @file.read(4).unpack('V').first
+      @header[:format] = @file.read(4)
+      raise FileFormatError.new('Format is not WAVE') unless @header[:format] == 'WAVE'
+      raise FileFormatError.new('ID is not RIFF') unless @header[:chunk_id] == 'RIFF'
     end
 
     def unpack_subchunk
@@ -58,7 +88,7 @@ module Zappa
 
     def unpack_data
       @data[:size]  = @file.read(4).unpack('V').first
-      @data[:data]  = @file.read(@data_size)
+      @data[:data]  = @file.read(@data[:size])
     end
 
     def unpack_unknown

data/spec/segment_spec.rb

@@ -25,7 +25,7 @@ describe Zappa::Segment do
   describe '#to_file' do
     it 'exports the segment to a wav file' do
       tmp = Tempfile.new('zappa-spec')
-      subject.to_file(tmp.path, 'wav')
+      subject.to_file(tmp.path)
       expect(Zappa::Wave.new(WAV_IN)).to eq(Zappa::Wave.new(tmp.path))
     end
 

data/spec/wave_spec.rb

@@ -16,6 +16,13 @@ describe Zappa::Wave do
     expect(w.format).to eq(fmt_header)
   end
 
+  it 'updates file without altering it' do
+    orig = Zappa::Wave.new(WAV_IN)
+    orig.update
+    current = Zappa::Wave.new(WAV_IN)
+    expect(orig).to eq(current)
+  end
+
   it 'raises error for incorrect path' do
     expect { Zappa::Wave.new(WAV_EX) }.to raise_error(Zappa::FileError)
   end

data/zappa.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Varun Srinivasan']
   spec.email         = ['varunsrin@gmail.com']
   spec.summary       = 'Ruby gem for manipulating audio files.'
-  spec.description   = ''
+  spec.description   = 'Write a longer description. Optional.'
   spec.homepage      = ''
   spec.license       = 'MIT'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zappa
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Varun Srinivasan
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ''
+description: Write a longer description. Optional.
 email:
 - varunsrin@gmail.com
 executables: []