WaveSwissKnife 0.3.1.20130103 → 0.4.0.20130322

data/AUTHORS

@@ -4,3 +4,4 @@
 * 0.2.0.20120302
 * 0.3.0.20121227
 * 0.3.1.20130103
+* 0.4.0.20130322

data/ChangeLog

@@ -1,5 +1,11 @@
 = WaveSwissKnife Release History
 
+== 0.4.0.20130322 (Beta)
+
+* GMP library automatically installs if absent
+* Added support for Travis
+* Bug correction: Rational did not inspect the same as before.
+
 == 0.3.1.20130103 (Beta)
 
 * Bug correction: Core dumps using Ruby 1.9 and/or 64 bits environments

data/ReleaseInfo

@@ -2,7 +2,7 @@
 # This file has been generated by RubyPackager during a delivery.
 # More info about RubyPackager: http://rubypackager.sourceforge.net
 {
-  :version => '0.3.1.20130103',
+  :version => '0.4.0.20130322',
   :tags => [ 'Beta' ],
   :dev_status => 'Beta'
 }

data/bin/WSK.rb

@@ -5,7 +5,7 @@
 #++
 
 # Main file
-
+require 'rubygems'
 require 'rUtilAnts/Logging'
 RUtilAnts::Logging::install_logger_on_object
 require 'WSK/Common'

data/ext/WSK/CommonBuild.rb

@@ -3,6 +3,11 @@
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
+require 'rubygems'
+require 'mkmf'
+
+ROOT_DIR = File.expand_path("#{File.dirname(__FILE__)}/../..")
+
 # Build external libraries.
 # Set CFLAGS and LDFLAGS accordingly.
 #
@@ -24,6 +29,83 @@ def build_external_libs(*iLstExternalLibs)
   end
 end
 
-require 'mkmf'
+# Execute a command, with nice logging and error handling around
+#
+# Parameters:
+# * *iCmd* (_String_): Command to execute
+def exec_cmd(iCmd)
+  puts "[#{Dir.getwd}]> #{iCmd}"
+  raise RuntimeError, "Unable to execute \"#{iCmd}\" on your system." if !system(iCmd)
+  puts ''
+end
+
+# Build a local copy of GMP, downloaded directly from the Internet
+def build_local_gmp
+  lGMPBaseName = 'gmp-5.1.1'
+  lGMPDir = "#{ROOT_DIR}/gmp"
+  lGMPInstallDir = "#{ROOT_DIR}/gmp/#{lGMPBaseName}-install"
+
+  puts "**** Have to download, compile and install the GMP library in #{lGMPInstallDir}."
+  puts ''
+
+  FileUtils::mkdir_p(lGMPDir)
+  lOldDir = Dir.getwd
+  Dir.chdir(lGMPDir)
+  begin
+    puts "** Download #{lGMPBaseName} from ftp://ftp.gmplib.org/pub/gmp/#{lGMPBaseName}.tar.bz2 ..."
+    require 'net/ftp'
+    ftp = Net::FTP.new('ftp.gmplib.org')
+    ftp.login
+    ftp.getbinaryfile("pub/gmp/#{lGMPBaseName}.tar.bz2")
+    ftp.close
+    puts '** Extract archive contents ...'
+    exec_cmd "tar xjf #{lGMPBaseName}.tar.bz2"
+    Dir.chdir(lGMPBaseName)
+    puts '** Configure GMP for compilation ...'
+    exec_cmd "./configure --prefix=#{lGMPInstallDir}"
+    puts '** Compile GMP ...'
+    exec_cmd 'make'
+    puts "** Install locally GMP in #{lGMPInstallDir} ..."
+    exec_cmd 'make install'
+  ensure
+    Dir.chdir(lOldDir)
+  end
+
+  puts "**** GMP installed correctly in #{lGMPInstallDir}."
+  puts ''
+end
+
+# Look for GMP in system and locally
+# If it is found, compilation and link options will include it
+#
+# Return:
+# * _Boolean_: Has GMP been found?
+def find_gmp
+  rSuccess = have_library('gmp','mpz_get_str','gmp.h')
+
+  if (!rSuccess)
+    # Find locally installed GMP
+    lGMPDir = File.expand_path("#{File.dirname(__FILE__)}/../../gmp")
+    if (File.exist?(lGMPDir))
+      lLastInstalledGMP = Dir.glob("#{lGMPDir}/*-install").sort[-1]
+      if (lLastInstalledGMP != nil)
+        puts "Found GMP installed in #{lLastInstalledGMP}."
+        find_header('gmp.h',"#{lLastInstalledGMP}/include")
+        find_library('gmp',nil,"#{lLastInstalledGMP}/lib")
+        rSuccess = true
+      else
+        puts 'Could not find GMP library installed locally.'
+      end
+    end
+  end
+
+  return rSuccess
+end
+
 $CFLAGS += ' -Wall '
+if (!find_gmp)
+  build_local_gmp
+  raise RuntimeError, 'Unable to install GMP library automatically. Please do it manually from http://gmplib.org before attempting to install WaveSwissKnife.' unless find_gmp
+end
+
 build_external_libs('CommonUtils')

data/lib/WSK/Actions/DrawFct.rb

@@ -23,7 +23,7 @@ module WSK
       def get_nbr_samples(iInputData)
         @Function = WSK::Functions::Function.new
         @Function.read_from_file(@FctFileName)
-        lMinX, lMinY, lMaxX, lMaxY = @Function.get_bounds
+        lMinX, _, lMaxX, _ = @Function.get_bounds
         @NbrSamplesOut = lMaxX.to_i-lMinX.to_i+1
 
         return @NbrSamplesOut

data/lib/WSK/Actions/VolumeProfile.rb

@@ -46,7 +46,7 @@ module WSK
           lFunction.read_from_input_volume(iInputData, lIdxBegin, lIdxEnd, lInterval, @RMSRatio)
           # Normalize the volume function on a [-1..1] scale
           lFunction.divide_by(Rational(2)**(iInputData.Header.NbrBitsPerSample-1))
-          lMinX, lMinY, lMaxX, lMaxY = lFunction.get_bounds
+          _, lMinY, _, lMaxY = lFunction.get_bounds
           lDBMinY = lFunction.value_val_2_db(lMinY, Rational(1))
           lDBMaxY = lFunction.value_val_2_db(lMaxY, Rational(1))
           log_info "Dynamic range: [#{sprintf('%.2f',lMinY)} - #{sprintf('%.2f',lMaxY)}] ([#{sprintf('%.2f',lDBMinY)}db - #{sprintf('%.2f',lDBMaxY)}db] = #{sprintf('%.2f',lDBMaxY-lDBMinY)}db)"

data/lib/WSK/Functions.rb

@@ -5,6 +5,15 @@
 
 require 'rational'
 
+# Make sure pretty_inspect uses Rational constructor
+class Rational
+
+  def inspect
+    "Rational(#{self.numerator}, #{self.denominator})"
+  end
+
+end
+
 # Convert a float to a Rational
 class Float
 
@@ -227,7 +236,7 @@ module WSK
           log_err "Unknown function type: #{@Function[:FunctionType]}"
         end
       end
-      
+
       # Round values to a given precision
       #
       # Parameters::
@@ -244,7 +253,7 @@ module WSK
         end
         optimize
       end
-      
+
       # Apply damping.
       #
       # Parameters::
@@ -607,7 +616,7 @@ module WSK
       def value_log(iValue)
         return Math::log(iValue).to_r
       end
-      
+
       # Compute a DB value out of a ratio using function values
       #
       # Parameters::
@@ -618,7 +627,7 @@ module WSK
       def value_val_2_db(iValue, iMaxValue)
         @Log2 = Math::log(2).to_r
         @LogMax = value_log(iMaxValue)
-        
+
         return value_val_2_db_Internal(iValue)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: WaveSwissKnife
 version: !ruby/object:Gem::Version
-  version: 0.3.1.20130103
+  version: 0.4.0.20130322
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rUtilAnts