feep 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cf734b83d85cc000c7d442ab4dcd51dac1db397
-  data.tar.gz: f174b0d4d3d0c23a3a474a6f26ab7537ef67064d
+  metadata.gz: afb4a7dc316220898ac338ec8b9882084dd6c200
+  data.tar.gz: 9de77f715508f1c8a8b63dfe51d37c9ac499cf16
 SHA512:
-  metadata.gz: 8549da4394340c349d329944894cbe70044bd7a091b3ac4e11e2c25aacd43531f34547de2421494b6f948285781b3ec58ceb972820b193b955af32aec01bad81
-  data.tar.gz: 04000a3960298bb291966b41c50f9cddbdca6660777a4fe40a91f6b69ac708b5eba11e70cb43548b3ccee8fd97f7b81cd88364807b1c7694af50bb23850d81b6
+  metadata.gz: e9ac4d7aaa80c2ae8052cd638bfd2a612ca6cf5765dc715ea1d7c6855d2cce3b1963dd500fedf1575bcc6ad9cff2f2ebe9b013634509adf0d2eafa10d4beba31
+  data.tar.gz: 6b3e938e4d7dcbbdd43c4faadce2bfecf2348335cfa58c4e82387675e5f50e9bdb4f98aad1b5e3c6e7d3a39366770054cfffce9df73cf4127c20fac0e64aa9d8

data/bin/feep

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'pry'
+
 require_relative '../lib/feep'
 require_relative '../lib/feep/version'
 
@@ -8,30 +10,34 @@ def parse_options
   options = {:freq_or_note => '440.000', :scale => nil, :waveform => 'sine', :volume => 0.5, :duration => 100, :save => false, :loud => false, :usage => nil}
 
   optparse = OptionParser.new do |opts|
-    opts.banner = 'usage: feep [-f, -n, --freq-or-note FREQUENCY|NOTE_NAME] [-s, --scale SCALE_ID] [-sd, --degrees NUMBER_OF_SCALE_DEGREES] [-w, --waveform WAVEFORM_ID] [-a, --amplitude MAX_AMPLITUDE] [-d, --duration DURATION] [--save] [--loud]'
+    opts.banner = 'usage: feep [-f, -n, --frequency, --note FREQUENCY|NOTE_NAME] [-s, --scale SCALE_ID] [-sd, --degrees NUMBER_OF_SCALE_DEGREES] [-w, --waveform WAVEFORM_ID] [-a, --amplitude MAX_AMPLITUDE] [-d, --duration DURATION] [--save] [--loud]'
 
-    opts.on('-f', '-n', '--freq-or-note FREQUENCY|NOTE_NAME', 'One or more frequencies or note names to play at once, e.g. 440 or A4 or 220,440,880') do |f_or_n|
-      options[:freq_or_note] = f_or_n
+    opts.on('-f', '--frequency FREQUENCY', 'One or more frequencies or to play at once, e.g. 440 or 220,440,880') do |frequency|
+      options[:freq_or_note] = frequency
+    end
+    
+    opts.on('-n', '--note NOTE_NAME', 'One or more note names to play at once, e.g. A4 or A4,C5,E5') do |note|
+      options[:freq_or_note] = note
     end
     
-    opts.on('-s', '--scale SCALE_ID', 'Name of a scale to play') do |s|
-      options[:scale] = s
+    opts.on('-s', '--scale SCALE_ID', 'Name of a scale to play') do |scale_id|
+      options[:scale] = scale_id
     end
     
-    opts.on('-sd', '--degrees SCALE_DEGREES', 'Number of degrees of the scale to play') do |sd|
-      options[:degrees] = sd
+    opts.on('--degrees SCALE_DEGREES', 'Number of degrees of the scale to play') do |degrees|
+      options[:degrees] = degrees
     end
     
-    opts.on('-w', '--waveform WAVEFORM', 'Waveform type to use for the sound') do |w|
-      options[:waveform] = w
+    opts.on('-w', '--waveform WAVEFORM', 'Waveform type to use for the sound') do |waveform|
+      options[:waveform] = waveform
     end
 
-    opts.on('-a', '--amplitude MAX_AMPLITUDE', 'Amplitude/volume (0.0 - 1.0) to play the sound(s) at') do |a|
-      options[:volume] = a.to_f
+    opts.on('-a', '--amplitude MAX_AMPLITUDE', 'Amplitude/volume (0.0 - 1.0) to play the sound(s) at') do |amplitude|
+      options[:volume] = amplitude.to_f
     end
     
-    opts.on('-d', '--duration DURATION', 'Duration in ms to play the sound(s)') do |d|
-      options[:duration] = d.to_i
+    opts.on('-d', '--duration DURATION', 'Duration in ms to play the sound(s)') do |duration|
+      options[:duration] = duration.to_i
     end
 
     opts.on('--save', 'Save the resulting WAV file in the current directory') do

data/lib/feep/constants.rb

@@ -248,8 +248,9 @@ module Feep
 
   # error messages
   ERROR_MSG = Hash[
-    :invalid_note => 'Note name argument is invalid.',
-    :invalid_scale => "Scale ID is invalid. Valid IDs are: #{SCALES.keys}",
+    :invalid_note             => 'Note name argument is invalid.',
+    :invalid_scale            => "Scale ID is invalid. Valid IDs are: #{SCALES.keys}",
+    :invalid_scale_root_note  => 'Scale cannot start with that note/frequency.',
     :invalid_waveform => "Waveform type is invalid. Valid waveform types are: #{WAVE_TYPES}",
     :scale_needs_note => 'You need to enter a valid note (-n) if you want to play a scale.'
   ]

data/lib/feep/scale.rb

@@ -1,5 +1,7 @@
 # lib/feep/scale.rb
+
 require_relative '../feep'
+require_relative 'utils'
 require_relative 'constants'
 
 module Feep
@@ -11,40 +13,47 @@ module Feep
         Utils.print_error(:invalid_scale)
       end
 
-      unless NOTES.include?(options[:freq_or_note]) && NOTES_ALT.include?(options[:freq_or_note])
-        Utils.print_error(:invalid_note)
-      end
-
-      steps = SCALES[options[:scale].to_sym].split(',')
+      valid_notes = NOTES | NOTES_ALT | FREQS
+      freq = Utils::convert_note_to_freq(options[:freq_or_note]).to_f
 
-      note = options[:freq_or_note]
-      note_index = NOTES.index(note)
-      freq = FREQS[NOTES.index(note)]
+      if valid_notes.include?(freq)
+        steps = SCALES[options[:scale].to_sym].split(',')
 
-      feep_options = {:freq_or_note => note, :waveform => options[:waveform], :volume => options[:volume], :duration => options[:duration], :save => options[:save], :loud => options[:loud]}
+        freq_index = FREQS.index(freq)
 
-      # play number of degrees of scale supplied or one octave by default
-      degrees = options[:degrees] || steps.length
+        feep_options = {
+          :freq_or_note => freq.to_s, 
+          :waveform => options[:waveform], 
+          :volume => options[:volume], 
+          :duration => options[:duration], 
+          :save => options[:save], 
+          :loud => options[:loud]
+        }
 
-      if options[:loud]
-        puts "Playing a #{options[:scale]} scale..."
-      end
+        # play number of degrees of scale supplied or one octave by default
+        degrees = options[:degrees] || steps.length
 
-      1.upto(degrees.to_i) {|deg|
         if options[:loud]
-          puts "note: #{note}, freq: #{freq}"
+          puts "Playing a #{options[:scale]} scale..."
         end
-        
-        # play note
-        Feep::Base.new(feep_options)
-
-        # go to the next note in the scale
-        note_index += steps[deg].to_i
 
-        # set new note to play next time around
-        note = feep_options[:freq_or_note] = NOTES[note_index]
-        freq = FREQS[note_index]
-      }
+        1.upto(degrees.to_i) {|deg|
+          if options[:loud]
+            puts "note: #{NOTE_FREQ.key(freq)}, freq: #{freq}"
+          end
+          
+          # play note
+          Feep::Base.new(feep_options)
+      
+          # go to the next note in the scale
+          freq_index += steps[deg].to_i
+
+          # set new note to play next time around
+          freq = feep_options[:freq_or_note] = FREQS[freq_index].to_s
+        }
+      else
+        Utils.print_error(:invalid_scale_root_note)
+      end
     end
 
   end

data/lib/feep/utils.rb

@@ -32,7 +32,7 @@ module Feep
     def self.print_error(msg_id)
       msg = ERROR_MSG[msg_id.to_sym]
       puts "#{File.basename($PROGRAM_NAME).split(".")[0]}: #{msg}"
-      puts 'usage: feep [frequency|note-name|list-of-frequencies-or-note-names] [scale] [scale-degrees] [sine|square|saw|triangle|noise] [volume] [duration] [save] [loud]'
+      puts 'feep -h for usage'
       exit
     end
   

data/lib/feep/version.rb

@@ -1,3 +1,3 @@
 module Feep
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feep
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wavefile