banjo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a2db070a4d537dd0f0507fa271e5b1392861d3
-  data.tar.gz: 2f9d961e602991034a2a90445b9c6b369390cfa1
+  metadata.gz: f7be890f11132a6586510d1318db7a1490302eb9
+  data.tar.gz: 11dfd1affb2cb7ff03ac187dc25ce04358e83386
 SHA512:
-  metadata.gz: 7b98de3fd1fb5692a6ca401bfe86ec02dc35e2fb0596fc54853d77b6ca774881aac35304c8c50c8ad39e475c15038f953b92cb8817be048d954b29066b595619
-  data.tar.gz: b657cff30587dbac401d57dbb6656b2060150c634f95660b9ba67b1fe49e1e9763e871072aba129149672f9376e9dee58fc1c82494e838fa0130e349aafa6874
+  metadata.gz: 1513b019ec8d7efc6199b5358694c39e10c984ab5f6fec51f5bc516b0a9ec2e2f7db7c4605ab318b720fd5e678c6fd7824acecac150d04b942529fc60a04faef
+  data.tar.gz: 92ac9053013d58bbcfc981fb4ac8d37059b836cebaca095a78a7ad7a7f3bff645549e2131edf81d850aeca8c52dd293bda0894832187e817cdf2d0aac3fbc145

data/.travis.yml

@@ -1,2 +1,9 @@
+language: ruby
+cache: bundler
+
 rvm:
   - 2.0.0
+
+before_install:
+  - sudo apt-get install libasound2
+  - sudo apt-get install libasound-dev

data/README.md

@@ -1,3 +1,4 @@
+[![Build Status](http://allthebadges.io/dabit/banjo/travis.png)](http://allthebadges.io/dabit/banjo/travis)
 [![Code Climate](http://allthebadges.io/dabit/banjo/code_climate.png)](http://allthebadges.io/dabit/banjo/code_climate)
 
 # Banjo
@@ -14,8 +15,20 @@ Install it:
 
 ### Mac OS X
 
-You need to create virtual MIDI IAC inputs. You can learn how to do so by
-watching [this video][1].
+You need to create virtual MIDI IAC inputs.
+
+Open Audio Midi Setup
+
+![](http://monosnap.com/image/u5lWy0g41Qt2JnjJqFp1nPExF9aIK9.png)
+
+Then on the Window Menu click on Show MIDI Window
+
+![](http://monosnap.com/image/TswtEsSbER5dKiB7gLoxEzjptzzjzy.png)
+
+Double Click the IAC Driver icon and press the + where it says Ports, you should
+see something like this:
+
+![](http://monosnap.com/image/D8wQ6wC2SPvhW2fW7f3qjznlUrUV4J.png)
 
 Each one of these inputs will work as a Channel for Banjo.
 
@@ -26,8 +39,14 @@ command:
 
     input:
     0) Apple Inc. IAC Driver
+    2) Apple Inc. IAC Driver
+    4) Apple Inc. IAC Driver
+    6) Apple Inc. IAC Driver
     output:
     1) Apple Inc. IAC Driver
+    3) Apple Inc. IAC Driver
+    5) Apple Inc. IAC Driver
+    7) Apple Inc. IAC Driver
 
 The `unimidi list` command will show you a list of the available IAC drivers
 that can be used with Banjo.
@@ -56,4 +75,4 @@ reactor is running and you will notice the changes in realtime.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-[1]:[http://www.youtube.com/watch?v=hgFA_fdup7g]
+[1]:http://www.youtube.com/watch?v=hgFA_fdup7g

data/banjo.gemspec

@@ -21,8 +21,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "unimidi", "0.3.3"
   spec.add_dependency "eventmachine", "~> 1.0.3"
   spec.add_dependency "rubysl-yaml", "2.0.0"
+  spec.add_dependency "alsa-rawmidi"
+  spec.add_dependency "midi-winmm"
+  spec.add_dependency "midi-jruby"
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "minitest", "4.7.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rr"
+  spec.add_development_dependency "simplecov"
 end

data/lib/banjo.rb

@@ -3,12 +3,15 @@ require 'banjo/version'
 require 'eventmachine'
 require 'unimidi'
 
+require 'banjo/keys'
 require 'banjo/channel'
+require 'banjo/note'
 
 $: << '.'
 
 module Banjo
   class << self
+    attr_accessor :tick
     attr_accessor :beats_per_measure
     attr_accessor :measures_per_loop
     attr_accessor :tempo
@@ -28,25 +31,40 @@ module Banjo
     end
   end
 
+  def self.hush_all
+    Banjo::Channel.channels.each do |channel|
+      channel.new.hush
+    end
+  end
+
   def self.play
     Banjo.measures_per_loop ||= 1
-    Banjo.ticks_per_period = Banjo.ticks_per_beat * Banjo.beats_per_measure * Banjo.measures_per_loop
-    tempo_in_ms = 60.0 / Banjo.tempo / Banjo.ticks_per_beat
-    puts "Beat every: #{tempo_in_ms}"
+    Banjo.ticks_per_period    = Banjo.ticks_per_beat * Banjo.beats_per_measure * Banjo.measures_per_loop
+    poll_rate                 = (60.0 / Banjo.tempo / Banjo.ticks_per_beat)
+    p "Tick every: #{poll_rate} seconds"
 
     EventMachine.run do
-      tick = 0
+      Banjo.tick      = 0
       self.loop_count = 0
 
-      EM.add_periodic_timer(tempo_in_ms) do
-        Banjo.load_channels if tick == 0
+      # Display available channels
+      p Banjo::Channel.channels
+
+      # Shut down all channels
+      hush_all
+
+      EM.add_periodic_timer(poll_rate) do
+        #puts Time.now if (Banjo.tick % 4 == 0)
+        p Banjo.tick
+
+        Banjo.load_channels if Banjo.tick == 0
 
         Banjo::Channel.channels.each do |klass|
-          channel = klass.new(tick)
+          channel = klass.new
           channel.perform
         end
 
-        tick = update_counters(tick)
+        Banjo.tick = update_counters(Banjo.tick)
       end
 
       puts "Banjo Reactor started..."
@@ -57,7 +75,7 @@ module Banjo
     if tick < (ticks_per_period - 1)
       tick += 1
     else
-      puts self.loop_count += 1
+      puts "Loop: #{self.loop_count += 1}"
       tick = 0
     end
     tick

data/lib/banjo/channel.rb

@@ -1,13 +1,20 @@
 module Banjo
   class Channel
-    attr_accessor :output, :tick
+    include Banjo::Keys
+
+    attr_accessor :output
+
     DEFAULT_DURATION = 0.5
 
     def channel
       0
     end
 
-    def midi_channels
+    def play(note)
+      Note.new(self, note)
+    end
+
+    def midi_messages
       [0x90, 0x80]
     end
 
@@ -19,27 +26,8 @@ module Banjo
       channels << child
     end
 
-    def initialize(tick)
+    def initialize
       @output = UniMIDI::Output.all[channel]
-      @tick   = tick
-    end
-
-    def tick_note(tick, note, velocity = 50, duration = DEFAULT_DURATION)
-      play_note(note, velocity, duration) if tick == self.tick
-    end
-
-    def tick_notes(notes, velocity = 50, duration = DEFAULT_DURATION)
-      notes.each do |tick, note|
-        tick_note(tick, note, velocity, duration)
-      end
-    end
-
-    def mod_note(mod, note, offset = 0, velocity = 50, duration = DEFAULT_DURATION)
-      play_note(note, velocity, duration) if ((tick + offset) % mod == 0)
-    end
-
-    def play_note(note, velocity = 50, duration = DEFAULT_DURATION)
-      EM.defer { play_note!(note, velocity, duration) }
     end
 
     def modulation(value = 0)
@@ -61,14 +49,19 @@ module Banjo
       end
     end
 
-    def stfu
+    def hush
       output.puts 0xB0, 0x7B, 0
     end
 
-    def play_note!(note, velocity = 50, duration = DEFAULT_DURATION)
-      output.puts(midi_channels[0], note, velocity)
-      sleep(duration)
-      output.puts(midi_channels[1], note, velocity)
+    def play_note!(note, velocity = 100, duration = DEFAULT_DURATION)
+      output.puts(midi_messages[0], note, velocity)
+      EventMachine.add_timer(duration, proc { output.puts(midi_messages[1], note, 100) })
+    end
+
+    def within(lower, upper, &block)
+      if(Banjo.tick >= lower && Banjo.tick <= upper)
+        block.call
+      end
     end
   end
 end

data/lib/banjo/keys.rb

@@ -0,0 +1,13 @@
+module Banjo
+  module Keys
+    KEYS = %i{c cs d ds e f fs g gs a as b}
+
+    def self.included(base)
+      KEYS.each_with_index do |key, i|
+        base.send(:define_method, key) do |scale=3|
+          24 + i + (scale * 12)
+        end
+      end
+    end
+  end
+end

data/lib/banjo/note.rb

@@ -0,0 +1,34 @@
+module Banjo
+  class Note
+    attr_accessor :channel, :note, :velocity, :duration
+
+    def initialize(channel, note)
+      self.channel  = channel
+      self.note     = note
+      self.velocity = 100
+      self.duration = 0.5
+    end
+
+    def at(tick)
+      play if Banjo.tick == tick
+    end
+
+    def every(period, offset = 0)
+      play if ((Banjo.tick + offset) % period == 0)
+    end
+
+    def with_velocity(velocity)
+      self.velocity = velocity
+      self
+    end
+
+    def for(duration)
+      self.duration = duration
+      self
+    end
+
+    def play
+      channel.play_note!(note, velocity, duration)
+    end
+  end
+end

data/lib/banjo/version.rb

@@ -1,3 +1,3 @@
 module Banjo
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/sample/heartbreaker/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/test/cases/banjo/channel_test.rb

@@ -1,37 +1,75 @@
 require 'test_helper'
 
 class ChannelTest < Test::Unit::TestCase
-  def subject
-    @subject ||= Banjo::Channel.new(0)
+  def channel
+    @channel ||= Banjo::Channel.new
   end
 
-  def test_channel
-    assert_equal 0, subject.channel
+  def test_inherited
+    klass = Class.new(Banjo::Channel)
+    assert_includes Banjo::Channel.channels, klass
   end
 
-  def test_tick_note_plays
-    mock(subject).play_note(15, 50, 0.5)
-    subject.tick_note(0, 15)
+  def test_channel
+    assert_equal 0, channel.channel
   end
 
-  def test_tick_note_does_not_play
-    mock(subject).play_note(15, 50, 0.5).never
-    subject.tick_note(3, 15)
+  def test_play
+    note = channel.play(22)
+    assert_equal 22, note.note
+    assert_equal channel, note.channel
+    assert_kind_of Banjo::Note, note
   end
 
-  def test_mod_note_when_note_plays
-    [0, 4, 8, 12].each do |tick|
-      subject.tick = tick
-      mock(subject).play_note(15, 50, 0.5)
-      subject.mod_note(4, 15)
+  def test_within_plays
+    Banjo.tick = 1
+    called = false
+    channel.within(0, 2) do
+      called = true
     end
+
+    assert called, "Given block should be called"
   end
 
-  def test_mod_note_when_note_does_not_play
-    ((0..15).to_a - [0, 4, 8, 12]).each do |tick|
-      subject.tick = tick
-      mock(subject).play_note(15, 50, 0.5).never
-      subject.mod_note(4, 15)
+  def test_within_does_not_play
+    Banjo.tick = 1
+    called = true
+    channel.within(10, 20) do
+      called = false
     end
+
+    assert called, "Given block should not be called"
+  end
+
+  def test_midi_messages
+    assert_equal [0x90, 0x80], channel.midi_messages
+  end
+
+  def test_channels
+    assert_equal [], Banjo::Channel.channels
+  end
+
+  def test_modulation
+    channel.output = stub!
+    mock(channel.output).puts(0xB0, 0x01, 100)
+    channel.modulation(100)
+  end
+
+  def test_pitch
+    channel.output = stub!
+    mock(channel.output).puts(0xE0, 0, 100)
+    channel.pitch(100)
+  end
+
+  def test_sustain
+    channel.output = stub!
+    mock(channel.output).puts(0xB0, 0x40, 100)
+    channel.sustain(100)
+  end
+
+  def test_hush
+    channel.output = stub!
+    mock(channel.output).puts(0xB0, 0x7B, 0)
+    channel.hush
   end
 end

data/test/cases/banjo/keys_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class KeysTest < Test::Unit::TestCase
+  def channel
+    @channel ||= Banjo::Channel.new
+  end
+
+  def test_c_scale_0_key
+    assert_equal 24, channel.c(0)
+  end
+
+  def test_c_key
+    assert_equal 60, channel.c
+  end
+
+  def test_cs_key
+    assert_equal 61, channel.cs
+  end
+
+  def test_b_key
+    assert_equal 71, channel.b
+  end
+end
+

data/test/cases/banjo/note_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class NoteTest < Test::Unit::TestCase
+  def channel
+    @channel ||= Banjo::Channel.new
+  end
+
+  def note
+    @note ||= Banjo::Note.new(channel, 2)
+  end
+
+  def test_at
+    Banjo.tick = 1
+    mock(note).play.once
+    note.at(1)
+  end
+
+  def test_at_dont_play
+    Banjo.tick = 1
+    mock(note).play.never
+    note.at(2)
+  end
+
+  def test_every
+    mock(note).play.times(4)
+    (0..12).each do |i|
+      Banjo.tick = i
+      note.every(4)
+    end
+  end
+
+  def test_with_velocity
+    assert_equal note, note.with_velocity(3)
+    assert_equal 3, note.velocity
+  end
+
+  def test_for
+    assert_equal note, note.for(5)
+    assert_equal 5, note.duration
+  end
+
+  def test_play
+    mock(channel).play_note!(2, 100, 0.5)
+    note.play
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,11 @@
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter 'test'
+end
+
+gem 'minitest', '4.7.5'
+
 require 'test/unit'
 require 'rr'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: banjo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - David Padilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unimidi
@@ -52,6 +52,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: alsa-rawmidi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: midi-winmm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: midi-jruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.7.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MIDI looper designed for live performances
 email:
 - david@crowdint.com
@@ -110,8 +180,17 @@ files:
 - banjo.gemspec
 - lib/banjo.rb
 - lib/banjo/channel.rb
+- lib/banjo/keys.rb
+- lib/banjo/note.rb
 - lib/banjo/version.rb
+- sample/basic/basic.band/Alternatives/000/Autosave/.dummy
+- sample/heartbreaker/.ruby-version
+- sample/heartbreaker/heartbreaker.logicx/Alternatives/000/Autosave/.dummy
+- sample/nickel/logic/.musicapps-project-folder
+- sample/nickel/logic/logic.logicx/Alternatives/000/Autosave/.dummy
 - test/cases/banjo/channel_test.rb
+- test/cases/banjo/keys_test.rb
+- test/cases/banjo/note_test.rb
 - test/cases/banjo_test.rb
 - test/channels/load_test.rb
 - test/test_helper.rb
@@ -135,12 +214,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: MIDI looper designed for live performances
 test_files:
 - test/cases/banjo/channel_test.rb
+- test/cases/banjo/keys_test.rb
+- test/cases/banjo/note_test.rb
 - test/cases/banjo_test.rb
 - test/channels/load_test.rb
 - test/test_helper.rb