midicat 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d02b099c830f00e3e8930bcfad9528f4b080ebe6
-  data.tar.gz: 9861e9f2e1aa46280db3d5c6382893245a71a4fc
+  metadata.gz: 24807f126d4e82ea5443eec40861ecd0e7d6bd10
+  data.tar.gz: 9420baa64ce470b5c42ef5d8fe7300db06bb3f8e
 SHA512:
-  metadata.gz: 0701b9ccaef4c5902ac9264cd1006dc132c360d2c4a6ed6f8a3a1d61801c701458d752b1342e924219598ac2ced475ceae78b64d7922d25eef060f2f32501c9c
-  data.tar.gz: 6cb09cc075a40384f097154c23e1bb85cc0825a0a760625be64dfd309487000fcb9f2a8a304054adb4be0b56a2f59d1bdcbc649460beb845f479b0227014a0cb
+  metadata.gz: 53ec2ffd54d7fa2e433725962867764c7465a3191b7bc2e5d619e7514668c1ae1847a670e2d1223072196b71c34e16747229e565b1af4eeffcdf1bc64d4dc500
+  data.tar.gz: 3d54b7fbac53f388449c455f98e485a516e3532d1b7886b9c6a5943f5d69ee80d2fa1be568faf88043308beb37035dd6c3fd38e68aec704b0c7a8cdbde222472

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    midicat (0.0.3)
+    midicat (0.0.4)
       midi-nibbler
       unimidi
 

data/README.md

@@ -1,5 +1,7 @@
 # midicat
 
+[![Gem Version](https://badge.fury.io/rb/midicat.svg)](http://badge.fury.io/rb/midicat)
+
 cat/tailf for MIDI input events
 
 ![demo screen](./demo.gif)

data/bin/midicat

@@ -1,65 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'unimidi'
-require 'nibbler'
-
 require 'midicat'
 
-devices = []
-threads = []
-data = []
-timestamps = []
-ni = Nibbler.new
-
-def format_mes(message)
-  if message.is_a? MIDIMessage::ControlChange
-    "Ch.#{message.channel}.#{message.index} -> #{message.value}"
-  elsif message.is_a? MIDIMessage::NoteOn
-    "Ch.#{message.channel}.#{message.name} ON @ #{message.velocity}"
-  elsif message.is_a? MIDIMessage::NoteOff
-    "Ch.#{message.channel}.#{message.name} OFF @ #{message.velocity}"
-  elsif message.is_a? MIDIMessage::SystemExclusive::Message
-    "SysEx. #{message.data.to_s}"
-  else
-    message
-  end
-end
-
 puts <<_EOM_
-           /\\
-       )  ( ')     midicat #{Midicat::VERSION}
-      (  /  )      Ctrl-C to exit
-       \\(__)|
 
-_EOM_
+        /\\     ___
+    )  ( ')   |___|   midicat #{Midicat::VERSION}
+   (  /  )   _|  _|   Ctrl-C to exit
+    \\(__)|  (@) (@)
 
-UniMIDI::Input.all.each_with_index do |d, i|
-  puts d.pretty_name
-  devices[i] = d.open
-  ii = 0
-  threads << Thread.new do
-    loop do
-      data[i] = d.gets
-      data[i].each do |dd|
-        timestamps[i] = sprintf "%12.4f", dd[:timestamp]
-        ms = ni.parse(*dd[:data])
-        if ms.is_a? Array
-          ms.each do |mss|
-            puts "#{timestamps[i]} #{d.name} #{format_mes mss}"
-          end
-        else
-          puts "#{timestamps[i]} #{d.name} #{format_mes ms}"
-        end
-      end
-    end
-  end
-end
+_EOM_
 
-if threads.size != 0
-  threads.each do |t|
-    t.join
-  end
-else
-  puts "no MIDI devices found."
-  puts "aborting"
-end
+Midicat::Cli.new

data/lib/midicat.rb

@@ -1,3 +1,9 @@
+require "unimidi"
+require "nibbler"
+
+require "midicat/formatter"
+require "midicat/cli"
+
 require "midicat/version"
 
 module Midicat

data/lib/midicat/cli.rb

@@ -0,0 +1,41 @@
+module Midicat
+  class Cli
+    attr_reader :device
+
+    def initialize()
+      @ni = Nibbler.new
+
+      if UniMIDI::Input.all.length > 0
+        @device = UniMIDI::Input.gets
+      else
+        puts "no MIDI device found!"
+        exit! 1
+      end
+
+      unless @device.nil?
+        begin
+          mainloop @device.open
+        ensure
+          @device.close
+        end
+      end
+    end
+
+    def mainloop(device)
+      loop do
+        device.gets.each do |data|
+          timestamp = sprintf "%12.4f", data[:timestamp]
+
+          ms = @ni.parse(*data[:data])
+          if ms.is_a? Array
+            ms.each do |mss|
+              puts "#{timestamp} #{device.name} #{Midicat::Formatter::format mss}"
+            end
+          else
+            puts "#{timestamp} #{device.name} #{Midicat::Formatter::format ms}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/midicat/formatter.rb

@@ -0,0 +1,17 @@
+module Midicat
+  module Formatter
+    def self.format(message)
+      if message.is_a? MIDIMessage::ControlChange
+        "Ch.#{message.channel}.#{message.index} -> #{message.value}"
+      elsif message.is_a? MIDIMessage::NoteOn
+        "Ch.#{message.channel}.#{message.name} ON @ #{message.velocity}"
+      elsif message.is_a? MIDIMessage::NoteOff
+        "Ch.#{message.channel}.#{message.name} OFF @ #{message.velocity}"
+      elsif message.is_a? MIDIMessage::SystemExclusive::Message
+        "SysEx. #{message.data.to_s}"
+      else
+        message
+      end
+    end
+  end
+end

data/lib/midicat/version.rb

@@ -1,3 +1,3 @@
 module Midicat
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midicat
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - polamjag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,8 @@ files:
 - bin/midicat
 - demo.gif
 - lib/midicat.rb
+- lib/midicat/cli.rb
+- lib/midicat/formatter.rb
 - lib/midicat/version.rb
 - midicat.gemspec
 homepage: https://github.com/polamjag/midicat