aud 0.0.1 → 0.0.2

data/lib/aud/cli.rb

@@ -8,67 +8,78 @@ module Aud
     desc 'listen', 'Listens to STDIN or a file'
 
     method_option :octave,
-      default: 3,
-      aliases: '-o',
-      banner: 'Set an octave [1-5]'
+      :default => 3,
+      :aliases => '-o',
+      :type => :numeric,
+      :banner => 'Set an octave [1-5]'
+
+    method_option :note,
+       :default => 'C',
+       :aliases => '-n',
+       :banner => 'The note to play [A-G]'
 
     method_option :file,
-        aliases: '-f',
-        banner: 'A file to listen to'
+        :aliases => '-f',
+        :banner => 'A file to listen to'
 
     method_option :channel,
-       default: 1,
-       aliases: '-c',
-       type: :numeric,
-       banner: 'Set a MIDI channel [1-16]'
+       :default => 1,
+       :aliases => '-c',
+       :type => :numeric,
+       :banner => 'Set a MIDI channel [1-16]'
 
     method_option :delay,
-       default: 50,
-       aliases: '-d',
-       type: :numeric,
-       banner: 'Minimum delay in milliseconds between sounds'
+       :default => 50,
+       :aliases => '-d',
+       :type => :numeric,
+       :banner => 'Minimum delay in milliseconds between sounds'
 
     method_option :strategy,
-        default: 'tick',
-        aliases: '-s',
-        banner: 'A strategy for making sounds, currently only tick'
+        :default => 'tick',
+        :aliases => '-s',
+        :banner => 'A strategy for making sounds, currently only tick'
 
-    method_option :notext,
-        type: :boolean,
-        default: false,
-        aliases: '-n',
-        banner: 'Suppress text output'
+    method_option :silent,
+        :type => :boolean,
+        :banner => 'Silence printing of input'
 
     def listen
-      output = UniMIDI::Output.first
+      case options[:strategy]
 
-      if options[:strategy] == 'tick'
-        aud = Aud::Tick.new(output, options)
-      else
-        raise 'Only tick strategy is supported, but feel free to contribute another!'
-      end
+        when 'test'
+          return [nil, options]
+
+        when 'tick'
+
+          _exit = false
+          Signal.trap(:INT)  do _exit = true end
+          Signal.trap(:TERM) do _exit = true end
+
+          output = UniMIDI::Output.first
+          aud = Aud::Tick.new(output, options)
+
+          process_line = lambda { |line|
+            line = line.strip
+            aud.process(line)
+            puts line unless options[:silent]
+            sleep(options[:delay] / 1000.0)
+          }
+
+          if options[:file]
+            File.open(options[:file]).each do |line|
+              process_line.call(line) unless _exit
+            end
+          else
+            # fixup ARGF
+            ARGV.clear
+            ARGF.each_line do |line|
+              process_line.call(line) unless _exit
+            end
+          end
+
+        else
+          raise 'Only tick strategy is supported, but feel free to contribute another!'
 
-      _exit = false
-      Signal.trap(:INT)  do _exit = true end
-      Signal.trap(:TERM) do _exit = true end
-
-      process_line = lambda { |line|
-        line = line.strip
-        aud.process(line)
-        puts line unless options[:notext]
-        sleep(options[:delay] / 1000.0)
-      }
-
-      if options[:file]
-        File.open(options[:file]).each do |line|
-          process_line.call(line) unless _exit
-        end
-      else
-        # fixup ARGF
-        ARGV.clear
-        ARGF.each_line do |line|
-          process_line.call(line) unless _exit
-        end
       end
     end
   end

data/lib/aud/tick.rb

@@ -7,21 +7,15 @@ module Aud
     attr_accessor :output
     attr_accessor :properties
 
-    def initialize(output, properties)
-      self.midi = MIDI::IO.new(output)
+    def initialize(output, properties, _midi=nil)
+      self.midi = _midi || MIDI::IO.new(output)
       self.properties = properties
     end
 
     def process(line)
-      self.midi.octave properties[:octave] || 3
-      self.midi.note(to_note(line), :channel => properties[:channel])
+      self.midi.octave(properties[:octave])
+      self.midi.note(properties[:note], :channel => properties[:channel])
       self.midi.off
     end
-
-    private
-
-    def to_note(line)
-      "C"
-    end
   end
 end

data/lib/aud/version.rb

@@ -1,3 +1,3 @@
 module Aud
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aud
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,6 +43,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.9
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -98,3 +146,4 @@ signing_key:
 specification_version: 3
 summary: Audibilize text files
 test_files: []
+has_rdoc: