shmidi 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3597c4286b7e19268aa340d94bc77346a045a75
-  data.tar.gz: be66d51d451f14247d77b2f2e792b39d23a3c860
+  metadata.gz: 97b3d6eb99003502655b27d0a4b526781a18fe4e
+  data.tar.gz: 1d909010bf910633383b2544f4679daee565e82c
 SHA512:
-  metadata.gz: 758e82429e48ac2659b5021e89344ee2f1d3e7d0f6ea0e8c59e2dde76450316efbe95f54b1695344f92f2458dd7f29c6b47097c57ee43fade65d7649e2f60802
-  data.tar.gz: bdf94aad7c06e4c9d825292a8ba9b3dd15e68d022d9d08d7c7f8d7c1f9b6df74c4b5ab3b3debbcb56f9d0df9c53c24e9e6e3bd2f931a62fa6115d3eed7bcf2a2
+  metadata.gz: 4f0caff94d82baab537a364bcc890a237697233781a5c663366341d83d5a84b1fd8bc09af32a258d80a2f3927a47c7a772ef3d92004fe5323f149abc0b0ac7a6
+  data.tar.gz: aab0d23669b5aaee1b68172e4abb421e56b6edf03ab479ae8c82bb2bb10603cde91b641a18280b8ea0a7456f7f3e7ebccbbece611914e453780697c7e600303c

data/Rakefile

@@ -1,8 +1,14 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
+require File.expand_path('../lib/shmidi/version.rb', __FILE__)
 
 task :build do
   system('gem build shmidi.gemspec')
 end
 
+task :install => :build do
+  system('gem uninstall -y shmidi')
+  system("gem install ./shmidi-#{Shmidi::VERSION}.gem")
+end
+
 task :default => :build

data/lib/shmidi.rb

@@ -29,19 +29,19 @@ module Shmidi
     end
   end
 
-  def self.TRACE(str)
+  def self.TRACE
     return nil unless TRACE
-    @@trace_queue.push(str)
+    @@trace_queue.push(yield)
   end
 
-  def self.TRACE_EXTERNAL(str)
+  def self.TRACE_EXTERNAL
     return nil unless TRACE_EXTERNAL
-    @@trace_queue.push(str)
+    @@trace_queue.push(yield)
   end
 
-  def self.TRACE_INTERNAL(str)
+  def self.TRACE_INTERNAL
     return nil unless TRACE_INTERNAL
-    @@trace_queue.push(str)
+    @@trace_queue.push(yield)
   end
 
   def self.ON_EXCEPTION
@@ -67,8 +67,8 @@ module Shmidi
     Oj.load(str, opts)
   rescue
     if opts[:warn]
-      Shmidi::ON_EXCEPTION
-      TRACE "#{str}".force_encoding(Encoding::UTF_8)
+      Shmidi.ON_EXCEPTION
+      TRACE {"#{str}".force_encoding(Encoding::UTF_8)}
     end
     nil
   end

data/lib/shmidi/base.rb

@@ -77,7 +77,7 @@ module Shmidi
           begin
             obj.instance_variable_set("@#{key}", value)
           rescue Exception
-            Shmidi::ON_EXCEPTION
+            Shmidi.ON_EXCEPTION
           end
         end
         obj.version ||= 0

data/lib/shmidi/controls/button.rb

@@ -17,15 +17,15 @@ module Shmidi
       socket.on_event(channel, :on, note) do |event|
         @pressed = true
         @counter += 1 # intentionaly before handlers
-        Shmidi.TRACE("#{CTYPE}\t#{id}\tPRESSED\t#{event.value}")
+        Shmidi.TRACE {"#{CTYPE}\t#{id}\tPRESSED\t#{event.value}"}
         @__on_press.each { |b| b.call(self) }
       end
 
-      @on_release = []
+      @__on_release = []
       socket.on_event(channel, :off, note) do |event|
         @pressed = false
-        Shmidi.TRACE("#{CTYPE}\t#{id}\tRELEASE\t#{event.value}")
-        @on_release.each { |b| b.call(self) }
+        Shmidi.TRACE {"#{CTYPE}\t#{id}\tRELEASE\t#{event.value}"}
+        @__on_release.each { |b| b.call(self) }
         @counter += 1 # intentionaly after handlers
       end
     end
@@ -45,7 +45,7 @@ module Shmidi
       !@pressed
     end
     def on_release(&block)
-      @on_release << block
+      @__on_release << block
     end
 
   end

data/lib/shmidi/controls/knob.rb

@@ -15,14 +15,14 @@ module Shmidi
       @__on_value = []
       socket.on_event(channel, :cc, note) do |event|
         reset(event.value)
-        Shmidi.TRACE("#{CTYPE}\t#{id}\t#{@value}")
+        Shmidi.TRACE {"#{CTYPE}\t#{id}\t#{@value} (on_event)"}
         @__on_value.each { |b| b.call(self) }
       end
     end
 
     def reset(new_value=0)
       @prev_value = @value
-      @value = 0
+      @value = new_value
     end
 
     def on_value(&block)

data/lib/shmidi/socket.rb

@@ -32,7 +32,7 @@ module Shmidi
             @__in_dev.gets.each do |event|
               event[:source] = @name
               event = Event.new(event)
-              Shmidi.TRACE_INTERNAL("> #{@name}\t#{event}")
+              Shmidi.TRACE_INTERNAL {"#{@name} ->\t#{event}"}
               @__queue.push(event)
               @__on_event.each do |rule|
                 next if (channel  = rule[:channel]) && channel  != event.channel
@@ -61,7 +61,7 @@ module Shmidi
 
     def push(events)
       events = Array(events).reduce([]) do |array, event|
-        Shmidi.TRACE_EXTERNAL("< #{@name}\t#{event}")
+        Shmidi.TRACE_EXTERNAL {"< #{@name}\t#{event}"}
         array << event.data
         array
       end

data/lib/shmidi/switch.rb

@@ -17,7 +17,7 @@ module Shmidi
 
     def on_button_press(button)
       (@switch_state = !@switch_state) ? @led.turn_on : @led.turn_off
-      Shmidi.TRACE("#{CTYPE}\t#{@id}\tSTATE\t#{@switch_state ? :ON : :OFF}")
+      Shmidi.TRACE {"#{CTYPE}\t#{@id}\tSTATE\t#{@switch_state ? :ON : :OFF}"}
       @on_switch.each { |b| b.call(self) }
     end
 

data/lib/shmidi/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Shmidi
-  VERSION = '0.1'
+  VERSION = '0.1.1'
 end

data/shmidi.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler',    '~> 1.7'
   s.add_development_dependency 'rake',       '~> 10.1'
   s.add_development_dependency 'minitest',   '~> 4.7'
-  # NOTE: it's useful to install
+  # NOTE: you need to install
   # specified version of perftools.rb w/o bundler first
   s.add_development_dependency 'perftools.rb', '~> 2.0.4'
   s.add_dependency 'ffi-coremidi',  '0.3.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shmidi
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - sinm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler