diamond 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e670f044ab17c64cedf2c71573a1a510928cd2
-  data.tar.gz: 0b91f502f5952b2df09f311f1569eb5aa6b061bb
+  metadata.gz: 22b0827e29e0badfcb4d903d1d044a37547ed9cf
+  data.tar.gz: fc7f67067f9f4d4d96f20fa55e607c0de29c2018
 SHA512:
-  metadata.gz: 60f2d5c041101b1bece73255f6cb4416ed5a254afcb971cda4f7de68f1a962f6f1ce8d3ff99fb34fef43b41c404d42581599ee9a45ca74aa71041fa17b5c320f
-  data.tar.gz: d782c0fa28658fd8c8521ae20f17b763e7bc22f9df7a0202ae67711e0494480eee2842ff0f782045c7c3d722fa13d6b39fdc00742f3ed4072f6da74a8e8cdcf4
+  metadata.gz: f53d500728d43d54edc7e5ef988c9468282cd08453e3bf0c32e9fc87e87387323a8d95ff0a73a047ee06bfdaaa8a5495c73360cf5a5e49ce798dc570bce6807e
+  data.tar.gz: 6dd537bb28d2eedb740c87f48377517341a5c0d399cd0777d07d3d0383f9b7f9e89fa1ced1f0548f19f6bf8609017e455be8ae38a720883a7605effff81b006d

data/lib/diamond.rb

@@ -5,7 +5,7 @@
 # (c)2011-2014 Ari Russo and licensed under the Apache 2.0 License
 #
 
-# libs 
+# libs
 require "forwardable"
 require "midi-instrument"
 require "midi-message"
@@ -29,7 +29,7 @@ require "diamond/sequence"
 require "diamond/sequence_parameters"
 
 module Diamond
-  
-  VERSION = "0.5.3"
-  
+
+  VERSION = "0.5.4"
+
 end

data/lib/diamond/clock.rb

@@ -80,10 +80,12 @@ module Diamond
     # Initialize the tick event
     # @return [Boolean]
     def initialize_events
+      @arpeggiators.each do |arpeggiator|
+        arpeggiator.sequencer.event.stop << proc { @clock.stop }
+      end
       @clock.event.tick << proc do
-        @arpeggiators.each do |arpeggiator|
+        @arpeggiators.map do |arpeggiator|
           arpeggiator.sequencer.exec(arpeggiator.sequence)
-          arpeggiator.sequencer.event.stop { @clock.stop }
           arpeggiator
         end
       end

data/test/api_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class Diamond::APITest < Test::Unit::TestCase
+class Diamond::APITest < Minitest::Test
 
   context "API" do
 
@@ -23,14 +23,14 @@ class Diamond::APITest < Test::Unit::TestCase
         end
 
         should "acknowledge message with rx channel" do
-          @arpeggiator.add(@messages[1])
           @arpeggiator.sequence.instance_variable_get("@input_queue").expects(:concat).once.with([@messages[1]])
+          @arpeggiator.add(@messages[1])
         end
 
         should "with omni on, acknowledge any rx channel" do
           @arpeggiator.omni_on
+          @arpeggiator.sequence.instance_variable_get("@input_queue").expects(:concat).once.with([@messages[2]])
           @arpeggiator.add(@messages[2])
-          @arpeggiator.sequence.instance_variable_get("@input_queue").expects(:concat).once.with([@messages[2]]) 
         end
 
       end
@@ -45,7 +45,7 @@ class Diamond::APITest < Test::Unit::TestCase
 
         should "add a midi source" do
           @arpeggiator.add_midi_source(@input)
-          assert_not_empty @arpeggiator.midi_sources
+          refute_empty @arpeggiator.midi_sources
           assert @arpeggiator.midi_sources.include?(@input)
         end
 
@@ -57,7 +57,7 @@ class Diamond::APITest < Test::Unit::TestCase
           @input = $test_device[:input]
           @arpeggiator = Diamond::Arpeggiator.new
           @arpeggiator.add_midi_source(@input)
-          assert_not_empty @arpeggiator.midi_sources
+          refute_empty @arpeggiator.midi_sources
           assert @arpeggiator.midi_sources.include?(@input)
         end
 
@@ -75,7 +75,7 @@ class Diamond::APITest < Test::Unit::TestCase
         end
 
         should "mute the arpeggiator" do
-          refute @arpeggiator.muted?     
+          refute @arpeggiator.muted?
           @arpeggiator.mute = true
           assert @arpeggiator.muted?
           @arpeggiator.mute = false
@@ -97,7 +97,7 @@ class Diamond::APITest < Test::Unit::TestCase
       context "#rate=" do
 
         should "set the rate" do
-          assert_not_equal 16, @arpeggiator.rate
+          refute_equal 16, @arpeggiator.rate
           @arpeggiator.rate = 16
           assert_equal 16, @arpeggiator.rate
         end
@@ -110,7 +110,7 @@ class Diamond::APITest < Test::Unit::TestCase
           @arpeggiator.range = 4
           assert_equal 4, @arpeggiator.range
           @arpeggiator.range += 1
-          assert_equal 5, @arpeggiator.range 
+          assert_equal 5, @arpeggiator.range
         end
 
       end
@@ -118,9 +118,9 @@ class Diamond::APITest < Test::Unit::TestCase
       context "#interval=" do
 
         should "set the interval" do
-          assert_not_equal 7, @arpeggiator.interval
+          refute_equal 7, @arpeggiator.interval
           @arpeggiator.interval = 7
-          assert_equal 7, @arpeggiator.interval 
+          assert_equal 7, @arpeggiator.interval
         end
 
       end
@@ -128,9 +128,9 @@ class Diamond::APITest < Test::Unit::TestCase
       context "#gate=" do
 
         should "set the gate" do
-          assert_not_equal 125, @arpeggiator.gate
+          refute_equal 125, @arpeggiator.gate
           @arpeggiator.gate = 125
-          assert_equal 125, @arpeggiator.gate 
+          assert_equal 125, @arpeggiator.gate
         end
 
       end
@@ -138,7 +138,7 @@ class Diamond::APITest < Test::Unit::TestCase
       context "#pattern_offset=" do
 
         should "set the offset" do
-          assert_not_equal 5, @arpeggiator.pattern_offset
+          refute_equal 5, @arpeggiator.pattern_offset
           @arpeggiator.pattern_offset = 5
           assert_equal 5, @arpeggiator.pattern_offset
         end

data/test/arpeggiator_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class Diamond::ApeggiatorTest < Test::Unit::TestCase
+class Diamond::ApeggiatorTest < Minitest::Test
 
   context "Arpeggiator" do
 
@@ -10,23 +10,23 @@ class Diamond::ApeggiatorTest < Test::Unit::TestCase
         @arpeggiator = Diamond::Arpeggiator.new
         assert_equal 128, @arpeggiator.resolution
         assert_equal 8, @arpeggiator.rate
-        assert_equal 3, @arpeggiator.range    
-        assert_equal 12, @arpeggiator.interval  
+        assert_equal 3, @arpeggiator.range
+        assert_equal 12, @arpeggiator.interval
       end
 
       should "allow setting params" do
         @arpeggiator = Diamond::Arpeggiator.new(:interval => 7, :range => 4, :rate => 16)
         assert_equal 128, @arpeggiator.resolution
         assert_equal 16, @arpeggiator.rate
-        assert_equal 4, @arpeggiator.range    
-        assert_equal 7, @arpeggiator.interval  
+        assert_equal 4, @arpeggiator.range
+        assert_equal 7, @arpeggiator.interval
       end
 
       should "allow passing in input" do
         @input = $test_device[:input]
         @arpeggiator = Diamond::Arpeggiator.new(:midi => @input)
-        assert_not_empty @arpeggiator.midi_sources
-        assert @arpeggiator.midi_sources.include?(@input) 
+        refute_empty @arpeggiator.midi_sources
+        assert @arpeggiator.midi_sources.include?(@input)
       end
 
     end

data/test/clock_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class Diamond::ClockTest < Test::Unit::TestCase
+class Diamond::ClockTest < Minitest::Test
 
   context "Clock" do
 
@@ -13,8 +13,8 @@ class Diamond::ClockTest < Test::Unit::TestCase
       should "get MIDI output" do
         output = Object.new
         @clock = Diamond::Clock.new(120, :output => output)
-        assert_not_nil @clock.midi_outputs
-        assert_not_empty @clock.midi_outputs
+        refute_nil @clock.midi_outputs
+        refute_empty @clock.midi_outputs
         assert @clock.midi_outputs.include?(output)
       end
 
@@ -26,8 +26,8 @@ class Diamond::ClockTest < Test::Unit::TestCase
         output = Object.new
         refute @clock.midi_outputs.include?(output)
         @clock.midi_output.devices << output
-        assert_not_nil @clock.midi_outputs
-        assert_not_empty @clock.midi_outputs
+        refute_nil @clock.midi_outputs
+        refute_empty @clock.midi_outputs
         assert @clock.midi_outputs.include?(output)
       end
 
@@ -39,8 +39,8 @@ class Diamond::ClockTest < Test::Unit::TestCase
         output = Object.new
         refute @clock.midi_outputs.include?(output)
         @clock.midi_output.devices << output
-        assert_not_nil @clock.midi_outputs
-        assert_not_empty @clock.midi_outputs
+        refute_nil @clock.midi_outputs
+        refute_empty @clock.midi_outputs
         assert @clock.midi_outputs.include?(output)
 
         @clock.midi_output.devices.delete(output)

data/test/helper.rb

@@ -1,20 +1,20 @@
 dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift dir + "/../lib"
 
-require "test/unit"
+require "minitest/autorun"
 require "mocha/test_unit"
 require "shoulda-context"
 require "diamond"
 
 module TestHelper
-  
+
   def self.select_devices
     $test_device ||= {}
     { :input => UniMIDI::Input, :output => UniMIDI::Output }.each do |type, klass|
       $test_device[type] = klass.gets
     end
   end
-     
+
 end
 
 TestHelper.select_devices

data/test/osc_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class Diamond::OSCTest < Test::Unit::TestCase
+class Diamond::OSCTest < Minitest::Test
 
   context "OSC" do
 
@@ -13,20 +13,23 @@ class Diamond::OSCTest < Test::Unit::TestCase
         ]
         @addresses = @map.map { |mapping| mapping[:address] }
         @osc = Diamond::OSC.new(:server_port => 8000)
+        ::OSC::EMServer.any_instance.expects(:run).once
+        ::OSC::EMServer.any_instance.expects(:add_method).times(@map.size).with do |arg|
+          assert @addresses.include?(arg)
+        end
+      end
+
+      teardown do
+        ::OSC::EMServer.any_instance.unstub(:run)
+        ::OSC::EMServer.any_instance.unstub(:add_method)
       end
 
       should "start server" do
-        ::OSC::EMServer.any_instance.expects(:run).once
         @osc.enable_parameter_control(Object.new, @map)
-        ::OSC::EMServer.any_instance.unstub(:run)
       end
 
       should "assign map" do
-        ::OSC::EMServer.any_instance.expects(:add_method).times(@map.size).with do |arg| 
-          assert @addresses.include?(arg)
-        end
         @osc.enable_parameter_control(Object.new, @map)
-        ::OSC::EMServer.any_instance.unstub(:add_method)
       end
 
     end
@@ -34,4 +37,3 @@ class Diamond::OSCTest < Test::Unit::TestCase
   end
 
 end
-

data/test/pattern_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class PatternTest < Test::Unit::TestCase
+class PatternTest < Minitest::Test
 
   context "Pattern" do
 
@@ -26,7 +26,7 @@ class PatternTest < Test::Unit::TestCase
         pattern = Diamond::Pattern.find("Up")
         result = pattern.compute(3, 7)
         assert_equal 4, result.length
-        assert_equal [0, 7, 14, 21], result        
+        assert_equal [0, 7, 14, 21], result
       end
 
     end
@@ -35,25 +35,25 @@ class PatternTest < Test::Unit::TestCase
       should "populate Up" do
         pattern = Diamond::Pattern.find("Up")
         result = pattern.compute(2, 12)
-        assert_equal [0, 12, 24], result    
+        assert_equal [0, 12, 24], result
       end
 
       should "populate Down" do
         pattern = Diamond::Pattern.find("Down")
         result = pattern.compute(2, 12)
-        assert_equal [24, 12, 0], result  
+        assert_equal [24, 12, 0], result
       end
 
       should "populate UpDown" do
         pattern = Diamond::Pattern.find("UpDown")
         result = pattern.compute(3, 12)
-        assert_equal [0, 12, 24, 36, 24, 12, 0], result   
+        assert_equal [0, 12, 24, 36, 24, 12, 0], result
       end
 
       should "populate DownUp" do
         pattern = Diamond::Pattern.find("DownUp")
         result = pattern.compute(3, 12)
-        assert_equal [36, 24, 12, 0, 12, 24, 36], result   
+        assert_equal [36, 24, 12, 0, 12, 24, 36], result
       end
 
     end

data/test/sequence_parameters_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class Diamond::SequenceParametersTest < Test::Unit::TestCase
+class Diamond::SequenceParametersTest < Minitest::Test
 
   context "SequenceParameters" do
 
@@ -11,8 +11,15 @@ class Diamond::SequenceParametersTest < Test::Unit::TestCase
 
     context "#rate=" do
 
+      setup do
+        @sequence.expects(:mark_changed).times(7)
+      end
+
+      teardown do
+        @sequence.unstub(:mark_changed)
+      end
+
       should "set rate" do
-        @sequence.expects(:mark_changed).once
         @params.rate = 16
         assert_equal 16, @params.rate
       end
@@ -43,34 +50,54 @@ class Diamond::SequenceParametersTest < Test::Unit::TestCase
 
     context "#range=" do
 
+      setup do
+        @sequence.expects(:mark_changed).times(2)
+      end
+
+      teardown do
+        @sequence.unstub(:mark_changed)
+      end
+
       should "set range" do
-        @sequence.expects(:mark_changed).once
         @params.range = 4
         assert_equal 4, @params.range
 
-        @sequence.expects(:mark_changed).once
         @params.range += 1
-        assert_equal 5, @params.range   
+        assert_equal 5, @params.range
       end
 
     end
 
     context "#interval=" do
 
-      should "set interval" do
+      setup do
         @sequence.expects(:mark_changed).once
-        assert_not_equal 7, @params.interval
+      end
+
+      teardown do
+        @sequence.unstub(:mark_changed)
+      end
+
+      should "set interval" do
+        refute_equal 7, @params.interval
         @params.interval = 7
-        assert_equal 7, @params.interval 
+        assert_equal 7, @params.interval
       end
 
     end
 
     context "#gate=" do
 
+      setup do
+        @sequence.expects(:mark_changed).times(3)
+      end
+
+      teardown do
+        @sequence.unstub(:mark_changed)
+      end
+
       should "set gate" do
-        @sequence.expects(:mark_changed).once
-        assert_not_equal 125, @params.gate
+        refute_equal 125, @params.gate
         @params.gate = 125
         assert_equal 125, @params.gate
       end
@@ -85,11 +112,18 @@ class Diamond::SequenceParametersTest < Test::Unit::TestCase
 
     context "#pattern_offset=" do
 
-      should "set pattern offset" do
+      setup do
         @sequence.expects(:mark_changed).once
-        assert_not_equal 5, @params.pattern_offset
+      end
+
+      teardown do
+        @sequence.unstub(:mark_changed)
+      end
+
+      should "set pattern offset" do
+        refute_equal 5, @params.pattern_offset
         @params.pattern_offset = 5
-        assert_equal 5, @params.pattern_offset   
+        assert_equal 5, @params.pattern_offset
       end
 
     end
@@ -97,28 +131,27 @@ class Diamond::SequenceParametersTest < Test::Unit::TestCase
     context "#constrain" do
 
       should "constrain max only" do
-        assert_equal 40, @params.send(:constrain, 50, :max => 40)  
-        assert_equal 30, @params.send(:constrain, 30, :max => 40)  
+        assert_equal 40, @params.send(:constrain, 50, :max => 40)
+        assert_equal 30, @params.send(:constrain, 30, :max => 40)
       end
 
       should "constain min only" do
-        assert_equal 40, @params.send(:constrain, 30, :min => 40)  
-        assert_equal 50, @params.send(:constrain, 50, :min => 40)  
+        assert_equal 40, @params.send(:constrain, 30, :min => 40)
+        assert_equal 50, @params.send(:constrain, 50, :min => 40)
       end
 
       should "constrain to min and max" do
         assert_equal 10, @params.send(:constrain, 5, :min => 10, :max => 100)
-        assert_equal 100, @params.send(:constrain, 500, :min => 10, :max => 100)  
-        assert_equal 50, @params.send(:constrain, 50, :min => 10, :max => 100) 
+        assert_equal 100, @params.send(:constrain, 500, :min => 10, :max => 100)
+        assert_equal 50, @params.send(:constrain, 50, :min => 10, :max => 100)
       end
 
       should "constrain to range" do
         assert_equal 10, @params.send(:constrain, 5, :range => 10..100)
-        assert_equal 100, @params.send(:constrain, 500, :range => 10..100)  
-        assert_equal 50, @params.send(:constrain, 50, :range => 10..100) 
+        assert_equal 100, @params.send(:constrain, 500, :range => 10..100)
+        assert_equal 50, @params.send(:constrain, 50, :range => 10..100)
       end
 
     end
   end
 end
-

data/test/sequence_test.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class Diamond::SequenceTest < Test::Unit::TestCase
+class Diamond::SequenceTest < Minitest::Test
 
   context "Sequence" do
 
@@ -33,4 +33,3 @@ class Diamond::SequenceTest < Test::Unit::TestCase
   end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diamond
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: analog