midicat 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac9b613fd3a9fefe484fdc5bebefb4ddcd20e84
-  data.tar.gz: 31fba230f379a2e7e198ea1622db15868c7f5c6e
+  metadata.gz: 6cb6388d3e6227596006f34f4d6a94b2bc583700
+  data.tar.gz: b03cba304283aa6c2ca9b632b30d1366ba3e6f81
 SHA512:
-  metadata.gz: dd1806bcbc6680bbc3bf6e5e87cfed8c42306dcf231f5066e8686edb74fe8ed47aa304e1e58cc752089f1d4560e8fc08fa84b85271ecd268a9236f2dc087d948
-  data.tar.gz: 2741db40ef7c84c7a130980255c398a242824374b00402d0b67ab30824a912bf330c1b005eaa2e9358f23ca09dc2803674c0282577f3c0fae9106e979d40cf96
+  metadata.gz: 112f8fd9da8029d313a75d86c51bdebc3475d4bfe6af8fef28d88e90f0ff68c73c6c21f40aa662e839d735d9bf6d40f09ed6eccb93a5d745ac5fbce34cf86309
+  data.tar.gz: 70e7a6183eea339f20e4d9e8d95884084d5944785d46289b3ffeac66cbd0967409337582e9f0b2ae647950669afee48487464419b8c78a27765b499692de6bd2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    midicat (0.1.0)
+    midicat (0.1.1)
       midi-nibbler
       unimidi
 
@@ -11,12 +11,12 @@ GEM
     alsa-rawmidi (0.3.1)
       ffi (~> 1.0)
     coderay (1.1.0)
-    ffi (1.9.6)
-    ffi-coremidi (0.3.7)
+    ffi (1.9.10)
+    ffi-coremidi (0.3.8)
       ffi (~> 1.9, >= 1.9.6)
     method_source (0.8.2)
     midi-jruby (0.1.5)
-    midi-message (0.4.5)
+    midi-message (0.4.9)
     midi-nibbler (0.2.3)
       midi-message (~> 0.4, >= 0.4.4)
     midi-winmm (0.1.10)
@@ -41,3 +41,6 @@ DEPENDENCIES
   midicat!
   pry
   rake (~> 10.0)
+
+BUNDLED WITH
+   1.10.6

data/bin/midicat

@@ -2,13 +2,4 @@
 
 require 'midicat'
 
-puts <<_EOM_
-
-        /\\     ___
-    )  ( ')   |___|   midicat #{Midicat::VERSION}
-   (  /  )   _|  _|   Ctrl-C to exit
-    \\(__)|  (@) (@)
-
-_EOM_
-
-Midicat::Cli.new
+Midicat::Cli.new ARGV

data/lib/midicat/cli.rb

@@ -1,8 +1,20 @@
+require 'optparse'
+require 'midicat/version'
+
 module Midicat
   class Cli
-    attr_reader :device
+    attr_reader :device, :options
+
+    def initialize args
+      @options = {
+        raw_mode: false
+      }
+
+      opt = OptionParser.new
+      opt.on('--raw', 'Enable raw mode (shows raw midi event)') { @options[:raw_mode] = true }
+      opt.version = Midicat::VERSION
+      opt.parse! args
 
-    def initialize()
       @ni = Nibbler.new
 
       if UniMIDI::Input.all.length > 1
@@ -27,18 +39,31 @@ module Midicat
     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}"
+          show_message device.name, data
+        end
+      end
+    end
+
+    def show_message device_name, data
+      timestamp = sprintf "%12.4f", data[:timestamp]
+
+      if @options[:raw_mode]
+        puts "#{timestamp} #{device_name} #{data[:data]}"
+      else
+        messages = @ni.parse(*data[:data])
+
+        if messages.is_a? Array
+          messages.each do |message|
+            pretty_print timestamp, device_name, message
           end
+        else
+          pretty_print timestamp, device_name, messages
         end
       end
     end
+
+    def pretty_print timestamp, device_name, message
+      puts "#{timestamp} #{device_name} #{Midicat::Formatter::format message}"
+    end
   end
 end

data/lib/midicat/version.rb

@@ -1,3 +1,3 @@
 module Midicat
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midicat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - polamjag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: pretty cat/tailf-like command for midi inputs