feep 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afb4a7dc316220898ac338ec8b9882084dd6c200
-  data.tar.gz: 9de77f715508f1c8a8b63dfe51d37c9ac499cf16
+  metadata.gz: 89ce3097472490d2980637363ad9473134efdc92
+  data.tar.gz: be53e5714ea5f0fc1b58b44858374733a9ce6694
 SHA512:
-  metadata.gz: e9ac4d7aaa80c2ae8052cd638bfd2a612ca6cf5765dc715ea1d7c6855d2cce3b1963dd500fedf1575bcc6ad9cff2f2ebe9b013634509adf0d2eafa10d4beba31
-  data.tar.gz: 6b3e938e4d7dcbbdd43c4faadce2bfecf2348335cfa58c4e82387675e5f50e9bdb4f98aad1b5e3c6e7d3a39366770054cfffce9df73cf4127c20fac0e64aa9d8
+  metadata.gz: 0f949291db5d01fb823359d98991ad5b23a09a04e26e4ad9f62acec7be5789994eb208087db7bf1e43319f1264ee8b167d5dc89087543eae8499a3b99a4c7c40
+  data.tar.gz: 8121f241ce3085927311d2f911f3dc0c4b4007c9003b53f446bffc243271d995b48d9bbffe73db9aba8d7beb236bcd4966113a17871415e119460c280b42274e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    feep (0.0.9)
+    feep (0.1.1)
       os (~> 0.9, >= 0.9.6)
       wavefile (= 0.6.0)
 
@@ -73,3 +73,6 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.29)
+
+BUNDLED WITH
+   1.10.3

data/README.md

@@ -18,13 +18,13 @@ Feep doesn't require any parameters, as it will play a 440Hz/A4 sine wave at 50%
 
 The full usage looks like this:
 
-`feep [-f, -n, --freq-or-note FREQUENCY|NOTE_NAME] [-s, --scale SCALE_ID] [-sd, --degrees SCALE_DEGREES] [-w, --waveform WAVEFORM_ID] [-a, --amplitude MAX_AMPLITUDE] [-d, --duration DURATION] [--save] [--loud]`
+`feep [-f, --frequency FREQUENCY] [-n, --note NOTE_NAME] [-s, --scale SCALE_ID] [--degrees SCALE_DEGREES] [-w, --waveform WAVEFORM_ID] [-a, --amplitude MAX_AMPLITUDE] [-d, --duration DURATION] [--save] [--loud]`
 
-`-f, -n, --freq-or-note`: a number from 0 to 20000, or a valid note name from C0 to B9 (including sharps and flats). You can try a frequency outside of this range, but you may get odd results. You may also enter some combination of these with commas between them and it'll play all of them together in a chord.
+`-f, --frequency, -n, --note`: a number from 0 to 20000, or a valid note name from C0 to B9 (including sharps and flats). Both `-f|--frequency` and `-n|--note` parameters can take either kind; they're both supported mainly for ease of use. You can try a frequency outside of this range, but you may get odd results. You may also enter some combination of these with commas between them and it'll play all of them together in a chord.
 
-`-s, -scale`: a scale ID that is part of the list that the gem understands. If you put in an invalid one, it will list the valid ones.
+`-s, -scale`: a scale ID that is part of the list that the gem understands. If you put in an invalid one, it will list the valid ones. If you try to use a frequency for the root note that doesn't map to a traditional note, you will get an error message (I may try to support arbitrary frequencies (microtones!) in the future).
 
-`-sd, --degrees`: the number of degrees of a scale you want to play. By default, the scale will play one octave.
+`--degrees`: the number of degrees of a scale you want to play. By default, the scale will play one octave.
 
 `-w, --waveform`: a string equal to "sine", "square", "saw", "triangle", or "noise".
 
@@ -43,4 +43,4 @@ The full usage looks like this:
 * `feep -n C#5 -w square -a 0.4 -d 500` - play a C#5 square wave note at 40% full volume for 500 ms
 * `feep -n 2000 -w triangle -a 0.8 -d 2000` - play a 2000Hz triangle wave note at 80% full volume for 2000 ms
 * `feep -n C3 -s major` - play a major scale with C3 as the root note
-* `feep -n D#5 -s whole_note -d 20` - play 20 degrees of a whole note scale with D#5 as the root note
+* `feep -n D#5 -s whole_note --degrees 20` - play 20 degrees of a whole note scale with D#5 as the root note

data/lib/feep/sound_player.rb

@@ -20,12 +20,8 @@ module Feep
   
     # use command line app to play wav file
     def play_wav_file(file, duration)
-      delimiter = OS.windows? ? ';' : ':'
-
-      system_apps = ENV['PATH'].split(delimiter).collect { |d| Dir.entries d if Dir.exist? d }.flatten
-
       if OS.windows?
-        if system_apps.include? SNDPLAYER_WIN
+        if command_exists?(SNDPLAYER_WIN)
           display_text_beep(duration)
           system("#{SNDPLAYER_WIN} #{file}")
         else
@@ -34,7 +30,7 @@ module Feep
       end
 
       if OS.mac? || OS.linux?
-        if system_apps.include? SNDPLAYER_UNIX
+        if command_exists?(SNDPLAYER_UNIX)
           display_text_beep(duration)
           system("#{SNDPLAYER_UNIX} #{file}")
         else
@@ -81,6 +77,14 @@ module Feep
         end
       end
     end
+    
+    private
+    
+    def command_exists?(cmd)
+      ENV['PATH'].split(File::PATH_SEPARATOR).collect { |d| 
+        Dir.entries d if Dir.exist? d 
+      }.flatten.include?(cmd)
+    end
 
   end
 end

data/lib/feep/version.rb

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

metadata

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