patchmaster 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c68fa48a4f24f2e5b415950ca74445e84a63961
-  data.tar.gz: 2d359863417126a8e63eb401ccabe58727687b0e
+  metadata.gz: c0a690b803a2cbb24400d24f16f576e77f528638
+  data.tar.gz: c88d291e8e2b4849f3202544a7c14fc1235037f7
 SHA512:
-  metadata.gz: f79589d65c03ea1e0f6371ce149b0d5fff3c2d4b7f725f55afb9aa093f0813efefdd28a4276a370c263c39a618ddd7bb684fce49a76b0c6919a14f4904bb9c2a
-  data.tar.gz: 289d7ab401a04bf15cde5041cc4ce636e22893c6172d96142c116a5c655657cc0cf07df0f0d21a4a09823a0a15ada583c78143764d7e28bff728485428228cb8
+  metadata.gz: a6c9c655d1c47ebbda7f687af55e2c51d717926a27e4942e1611bd0c599c426e3dbb3ca0b3ffd4b514daa92aedbccf61b04cebb03a6089d20719a6721b9cac8e
+  data.tar.gz: 962920f0541fda505f4264ed524d054a2d0bcbb9d63321353c131aefffa12f3a06f6ab2520d2c3f0a83ea61696b0c3410bc313e5ece3b0b85340349a720e1cb2

data/bin/patchmaster

@@ -1,9 +1,12 @@
 #!/usr/bin/env ruby
 #
-# usage: patchmaster [-v] [-n] [-i] [-w] [-p port] [-d] [pm_file]
+# usage: patchmaster [-l] [-v] [-n] [-i] [-w] [-p port] [-d] [pm_file]
 #
 # Starts PatchMaster and optionally loads pm_file.
 #
+# -l lists all available MIDI inputs and outputs and exits. This is exactply
+# -the same as running the `unimidi list` command from your shell.
+#
 # -v outputs the version number and exits.
 #
 # The -n flag tells PatchMaster to not use MIDI. All MIDI errors such as not
@@ -29,6 +32,10 @@ port = nil
 OptionParser.new do |opts|
   opts.banner = "usage: patchmaster [options] [pm_file]"
   opts.on("-d", "--debug", "Turn on debug mode") { $DEBUG = true }
+  opts.on("-l", "--list", "List MIDI inputs and outputs and exit") do
+    system("unimidi list")
+    exit 0
+  end
   opts.on("-n", "--no-midi", "Turn off MIDI processing") { use_midi = false }
   opts.on("-i", "--irb", "Use an IRB console") { gui = :irb }
   opts.on("-w", "--web", "Use a Web browser GUI") { gui = :web }
@@ -47,23 +54,27 @@ end.parse!(ARGV)
 
 # Must require patchmaster here, after handling options, because Singleton
 # initialize code checks $DEBUG.
-require 'patchmaster'
+begin
+  require 'patchmaster'
+  require 'patchmaster/curses/main' # for function key symbols
+rescue LoadError
+  $LOAD_PATH << File.join(__dir__, '../lib')
+  retry
+end
 
 pm = PM::PatchMaster.instance
 pm.use_midi = use_midi
-pm.load(ARGV[0]) if ARGV[0]
 case gui
 when :curses
-  require 'patchmaster/curses/main'
   pm.gui = PM::Main.instance
-  pm.run
 when :irb
   require 'patchmaster/irb/irb'
-  start_patchmaster_irb(File.join(File.dirname(__FILE__), 'irb_init.rb'))
+  pm.gui = PM::IRB.instance
 when :web
   require 'patchmaster/web/sinatra_app'
   app = PM::SinatraApp.instance
   app.port = port if port
   pm.gui = app
-  pm.run
 end
+pm.load(ARGV[0]) if ARGV[0]
+pm.run

data/lib/patchmaster.rb

@@ -8,4 +8,5 @@ require 'patchmaster/filter'
 require 'patchmaster/instrument'
 require 'patchmaster/patchmaster'
 require 'patchmaster/trigger'
+require 'patchmaster/code_key'
 require 'patchmaster/dsl'

data/lib/patchmaster/code_chunk.rb

@@ -0,0 +1,21 @@
+module PM
+
+# A CodeChunk holds a block of code (lambda, block, proc) and the text that
+# created it as read in from a PatchMaster file.
+class CodeChunk
+
+  attr_accessor :block, :text
+
+  def initialize(block, text=nil)
+    @block, @text = block, text
+  end
+
+  def run(*args)
+    block.call(*args)
+  end
+
+  def to_s
+    "#<PM::CodeChunk block=#{block.inspect}, text=#{text.inspect}>"
+  end
+end
+end

data/lib/patchmaster/code_key.rb

@@ -0,0 +1,16 @@
+module PM
+
+# A CodeKey holds a CodeChunk and remembers what key it is assigned to.
+class CodeKey
+
+  attr_accessor :key, :code_chunk
+
+  def initialize(key, code_chunk)
+    @key, @code_chunk = key, code_chunk
+  end
+
+  def run
+    @code_chunk.run
+  end
+end
+end

data/lib/patchmaster/connection.rb

@@ -42,7 +42,7 @@ class Connection
   def accept_from_input?(bytes)
     return true if @input_chan == nil
     return true unless bytes.channel?
-    bytes.note? && bytes.channel == @input_chan
+    bytes.channel == @input_chan
   end
 
   # Returns true if the +@zone+ is nil (allowing all notes throught) or if

data/lib/patchmaster/consts.rb

@@ -87,30 +87,47 @@ EOS
   # System reset
   SYSTEM_RESET = 0xFF
 
+  #--
   # Controller numbers
   # = 0 - 31 = continuous, MSB
   # = 32 - 63 = continuous, LSB
-  # = 64 - 97 = switches
-  CC_BANK_SELECT = 0
-  CC_MOD_WHEEL = 1
-  CC_BREATH_CONTROLLER = 2
-  CC_FOOT_CONTROLLER = 4
-  CC_PORTAMENTO_TIME = 5
-  CC_DATA_ENTRY_MSB = 6
-  CC_VOLUME = 7
-  CC_BALANCE = 8
-  CC_PAN = 10
-  CC_EXPRESSION_CONTROLLER = 11
-  CC_GEN_PURPOSE_1 = 16
-  CC_GEN_PURPOSE_2 = 17
-  CC_GEN_PURPOSE_3 = 18
-  CC_GEN_PURPOSE_4 = 19
+  # = 64 - 97 = momentary switches
+  #++
+  CC_BANK_SELECT           = CC_BANK_SELECT_MSB           = 0
+  CC_MOD_WHEEL             = CC_MOD_WHEEL_MSB             = 1
+  CC_BREATH_CONTROLLER     = CC_BREATH_CONTROLLER_MSB     = 2
+  CC_FOOT_CONTROLLER       = CC_FOOT_CONTROLLER_MSB       = 4
+  CC_PORTAMENTO_TIME       = CC_PORTAMENTO_TIME_MSB       = 5
+  CC_DATA_ENTRY            = CC_DATA_ENTRY_MSB            = 6
+  CC_VOLUME                = CC_VOLUME_MSB                = 7
+  CC_BALANCE               = CC_BALANCE_MSB               = 8
+  CC_PAN                   = CC_PAN_MSB                   = 10
+  CC_EXPRESSION_CONTROLLER = CC_EXPRESSION_CONTROLLER_MSB = 11
+  CC_GEN_PURPOSE_1         = CC_GEN_PURPOSE_1_MSB         = 16
+  CC_GEN_PURPOSE_2         = CC_GEN_PURPOSE_2_MSB         = 17
+  CC_GEN_PURPOSE_3         = CC_GEN_PURPOSE_3_MSB         = 18
+  CC_GEN_PURPOSE_4         = CC_GEN_PURPOSE_4_MSB         = 19
 
+  #--
   # [32 - 63] are LSB for [0 - 31]
-  CC_DATA_ENTRY_LSB = 38
+  #++
+  CC_BANK_SELECT_LSB           = CC_BANK_SELECT_MSB           + 32
+  CC_MOD_WHEEL_LSB             = CC_MOD_WHEEL_MSB             + 32
+  CC_BREATH_CONTROLLER_LSB     = CC_BREATH_CONTROLLER_MSB     + 32
+  CC_FOOT_CONTROLLER_LSB       = CC_FOOT_CONTROLLER_MSB       + 32
+  CC_PORTAMENTO_TIME_LSB       = CC_PORTAMENTO_TIME_MSB       + 32
+  CC_DATA_ENTRY_LSB            = CC_DATA_ENTRY_MSB            + 32
+  CC_VOLUME_LSB                = CC_VOLUME_MSB                + 32
+  CC_BALANCE_LSB               = CC_BALANCE_MSB               + 32
+  CC_PAN_LSB                   = CC_PAN_MSB                   + 32
+  CC_EXPRESSION_CONTROLLER_LSB = CC_EXPRESSION_CONTROLLER_MSB + 32
+  CC_GEN_PURPOSE_1_LSB         = CC_GEN_PURPOSE_1_MSB         + 32
+  CC_GEN_PURPOSE_2_LSB         = CC_GEN_PURPOSE_2_MSB         + 32
+  CC_GEN_PURPOSE_3_LSB         = CC_GEN_PURPOSE_3_MSB         + 32
+  CC_GEN_PURPOSE_4_LSB         = CC_GEN_PURPOSE_4_MSB         + 32
 
   #--
-  # Momentaries:
+  # Momentary switches:
   #++
   CC_SUSTAIN = 64
   CC_PORTAMENTO = 65
@@ -145,31 +162,47 @@ EOS
   CM_MONO_MODE_ON = 0x7E        # Val = # chans
   CM_POLY_MODE_ON = 0x7F        # Val must be 0
 
-  # Controller names
   CONTROLLER_NAMES = [
-    "0",
-    "Modulation",
-    "Breath Control",
-    "3",
-    "Foot Controller",
-    "Portamento Time",
-    "Data Entry",
-    "Volume",
-    "Balance",
-    "9",
-    "Pan",
-    "Expression Control",
-    "12", "13", "14", "15",
-    "General Controller 1",
-    "General Controller 2",
-    "General Controller 3",
-    "General Controller 4",
-    "20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
-    "30", "31",
-    "32", "33", "34", "35", "36", "37", "38", "39", "40", "41",
-    "42", "43", "44", "45", "46", "47", "48", "49", "50", "51",
-    "52", "53", "54", "55", "56", "57", "58", "59", "60", "61",
-    "62", "63",
+    "Bank Select (MSB)",
+    "Modulation (MSB)",
+    "Breath Control (MSB)",
+    "3 (MSB)",
+    "Foot Controller (MSB)",
+    "Portamento Time (MSB)",
+    "Data Entry (MSB)",
+    "Volume (MSB)",
+    "Balance (MSB)",
+    "9 (MSB)",
+    "Pan (MSB)",
+    "Expression Control (MSB)",
+    "12 (MSB)", "13 (MSB)", "14 (MSB)", "15 (MSB)",
+    "General Controller 1 (MSB)",
+    "General Controller 2 (MSB)",
+    "General Controller 3 (MSB)",
+    "General Controller 4 (MSB)",
+    "20 (MSB)", "21 (MSB)", "22 (MSB)", "23 (MSB)", "24 (MSB)", "25 (MSB)",
+    "26 (MSB)", "27 (MSB)", "28 (MSB)", "29 (MSB)", "30 (MSB)", "31 (MSB)",
+
+    "Bank Select (LSB)",
+    "Modulation (LSB)",
+    "Breath Control (LSB)",
+    "35 (LSB)",
+    "Foot Controller (LSB)",
+    "Portamento Time (LSB)",
+    "Data Entry (LSB)",
+    "Volume (LSB)",
+    "Balance (LSB)",
+    "41 (LSB)",
+    "Pan (LSB)",
+    "Expression Control (LSB)",
+    "44 (LSB)", "45 (LSB)", "46 (LSB)", "47 (LSB)",
+    "General Controller 1 (LSB)",
+    "General Controller 2 (LSB)",
+    "General Controller 3 (LSB)",
+    "General Controller 4 (LSB)",
+    "52 (LSB)", "53 (LSB)", "54 (LSB)", "55 (LSB)", "56 (LSB)", "57 (LSB)",
+    "58 (LSB)", "59 (LSB)", "60 (LSB)", "61 (LSB)", "62 (LSB)", "63 (LSB)",
+
     "Sustain Pedal",
     "Portamento",
     "Sostenuto",

data/lib/patchmaster/curses/list_window.rb

@@ -22,8 +22,9 @@ class ListWindow < PmWindow
     return unless @list
 
     curr_item = PM::PatchMaster.instance.send(@curr_item_method_sym)
-    curr_index = @list.index(curr_item)
+    return unless curr_item
 
+    curr_index = @list.index(curr_item)
     if curr_index < @offset
       @offset = curr_index
     elsif curr_index >= @offset + visible_height

data/lib/patchmaster/curses/main.rb

@@ -18,7 +18,6 @@ class Main
 
   def initialize
     @pm = PatchMaster.instance
-    @message_bindings = {}
   end
 
   def run
@@ -91,8 +90,10 @@ class Main
           @pm.debug caller.join("\n")
         end
 
-        msg_name = @message_bindings[ch]
+        msg_name = @pm.message_bindings[ch]
         @pm.send_message(msg_name) if msg_name
+        code_key = @pm.code_bindings[ch]
+        code_key.run if code_key
       end
     ensure
       clear
@@ -103,14 +104,6 @@ class Main
     end
   end
 
-  def bind_message(name, key_or_sym)
-    if FUNCTION_KEY_SYMBOLS.keys.include?(key_or_sym)
-      @message_bindings[FUNCTION_KEY_SYMBOLS[key_or_sym]] = name
-    else
-      @message_bindings[key_or_sym] = name
-    end
-  end
-
   def config_curses
     init_screen
     cbreak                      # unbuffered input

data/lib/patchmaster/cursor.rb

@@ -2,7 +2,7 @@ module PM
 
 # A PM::Cursor knows the current PM::SongList, PM::Song, and PM::Patch, how
 # to move between songs and patches, and how to find them given name
-# regexes. A Cursor does not start/stop patches or manage connections.
+# regexes.
 class Cursor
 
   attr_reader :song_list, :song, :patch

data/lib/patchmaster/dsl.rb

@@ -1,4 +1,5 @@
 require 'unimidi'
+require_relative './code_chunk'
 
 module PM
 
@@ -18,6 +19,7 @@ class DSL
     @outputs = {}
     @triggers = []
     @filters = []
+    @code_keys = []
     @songs = {}                 # key = name, value = song
   end
 
@@ -25,6 +27,7 @@ class DSL
     contents = IO.read(file)
     init
     instance_eval(contents)
+    read_code_keys(contents)
     read_triggers(contents)
     read_filters(contents)
   end
@@ -50,21 +53,42 @@ class DSL
     raise "output: error creating output instrument \"#{name || sym}\" on output port #{port_num}: #{ex}"
   end
   alias_method :out, :output
+  alias_method :outp, :output
 
   def message(name, bytes)
-    @pm.messages[name.downcase] = bytes
+    @pm.messages[name.downcase] = [name, bytes]
   end
 
-  def message_key(name, key_or_sym)
-    if @pm.gui
-      @pm.gui.bind_message(name, key_or_sym)
+  def message_key(key_or_sym, name)
+    if name.is_a?(Symbol)
+        name, key_or_sym = key_or_sym, name
+        $stderr.puts "WARNING: the arguments to message_key are now key first, then name."
+        $stderr.puts "I will use #{name} as the name and #{key_or_sym} as the key for now."
+        $stderr.puts "Please swap them for future compatability."
     end
+    if key_or_sym.is_a?(String) && name.is_a?(String)
+      if name.length == 1 && key_or_sym.length > 1
+        name, key_or_sym = key_or_sym, name
+        $stderr.puts "WARNING: the arguments to message_key are now key first, then name."
+        $stderr.puts "I will use #{name} as the name and #{key_or_sym} as the key for now."
+        $stderr.puts "Please swap them for future compatability."
+      elsif name.length == 1 && key_or_sym.length == 1
+        raise "message_key: since both name and key are one-character strings, I can't tell which is which. Please make the name longer."
+      end
+    end
+    @pm.bind_message(name, to_binding_key(key_or_sym))
+  end
+
+  def code_key(key_or_sym, &block)
+    ck = CodeKey.new(to_binding_key(key_or_sym), CodeChunk.new(block))
+    @pm.bind_code(ck)
+    @code_keys << ck
   end
 
   def trigger(instrument_sym, bytes, &block)
     instrument = @inputs[instrument_sym]
     raise "trigger: error finding instrument #{instrument_sym}" unless instrument
-    t = Trigger.new(bytes, block)
+    t = Trigger.new(bytes, CodeChunk.new(block))
     instrument.triggers << t
     @triggers << t
   end
@@ -145,7 +169,7 @@ class DSL
   alias_method :x, :transpose
 
   def filter(&block)
-    @conn.filter = Filter.new(block)
+    @conn.filter = Filter.new(CodeChunk.new(block))
     @filters << @conn.filter
   end
   alias_method :f, :filter
@@ -173,6 +197,9 @@ class DSL
   def save(file)
     File.open(file, 'w') { |f|
       save_instruments(f)
+      save_messages(f)
+      save_message_keys(f)
+      save_code_keys(f)
       save_triggers(f)
       save_songs(f)
       save_song_lists(f)
@@ -181,18 +208,41 @@ class DSL
 
   def save_instruments(f)
     @pm.inputs.each do |instr|
-      f.puts "input #{instr.port_num}, :#{instr.sym}, #{quoted(instr.name)}"
+      f.puts "input #{instr.port_num}, :#{instr.sym}, #{instr.name.inspect}"
     end
     @pm.outputs.each do |instr|
-      f.puts "output #{instr.port_num}, :#{instr.sym}, #{quoted(instr.name)}"
+      f.puts "output #{instr.port_num}, :#{instr.sym}, #{instr.name.inspect}"
     end
     f.puts
   end
 
+  def save_messages(f)
+    @pm.messages.each do |_, (correct_case_name, msg)|
+      f.puts "message #{correct_case_name.inspect}, #{msg.inspect}"
+    end
+  end
+
+  def save_message_keys(f)
+    @pm.message_bindings.each do |key, message_name|
+      f.puts "message_key #{to_save_key(key).inspect}, #{message_name.inspect}"
+    end
+  end
+
+  def save_code_keys(f)
+    @pm.code_bindings.values.each do |code_key|
+      str = if code_key.code_chunk.text[0] == '{'
+              "code_key(#{to_save_key(code_key.key).inspect}) #{code_key.code_chunk.text}"
+            else
+              "code_key #{to_save_key(code_key.key).inspect} #{code_key.code_chunk.text}"
+            end
+      f.puts str
+    end
+  end
+
   def save_triggers(f)
     @pm.inputs.each do |instrument|
       instrument.triggers.each do |trigger|
-        str = "trigger :#{instrument.sym}, #{trigger.bytes.inspect} #{trigger.text}"
+        str = "trigger :#{instrument.sym}, #{trigger.bytes.inspect} #{trigger.code_chunk.text}"
         f.puts str
       end
     end
@@ -201,7 +251,7 @@ class DSL
 
   def save_songs(f)
     @pm.all_songs.songs.each do |song|
-      f.puts "song #{quoted(song.name)} do"
+      f.puts "song #{song.name.inspect} do"
       song.patches.each { |patch| save_patch(f, patch) }
       f.puts "end"
       f.puts
@@ -209,7 +259,7 @@ class DSL
   end
 
   def save_patch(f, patch)
-    f.puts "  patch #{quoted(patch.name)} do"
+    f.puts "  patch #{patch.name.inspect} do"
     f.puts "    start_bytes #{patch.start_bytes.inspect}" if patch.start_bytes
     patch.connections.each { |conn| save_connection(f, conn) }
     f.puts "  end"
@@ -222,29 +272,42 @@ class DSL
     f.puts "      prog_chg #{conn.pc_prog}" if conn.pc?
     f.puts "      zone #{conn.note_num_to_name(conn.zone.begin)}, #{conn.note_num_to_name(conn.zone.end)}" if conn.zone
     f.puts "      xpose #{conn.xpose}" if conn.xpose
-    f.puts "      filter #{conn.filter.text}" if conn.filter
+    f.puts "      filter #{conn.filter.code_chunk.text}" if conn.filter
     f.puts "    end"
   end
 
   def save_song_lists(f)
     @pm.song_lists.each do |sl|
       next if sl == @pm.all_songs
-      f.puts "song_list #{quoted(sl.name)}, ["
+      f.puts "song_list #{sl.name.inspect}, ["
       @pm.all_songs.songs.each do |song|
-        f.puts "  #{quoted(song.name)},"
+        f.puts "  #{song.name.inspect},"
       end
       f.puts "]"
     end
   end
 
-  def quoted(str)
-    "\"#{str.gsub('"', "\\\"")}\"" # ' <= un-confuse Emacs font-lock
-  end
-
   # ****************************************************************
 
   private
 
+  # Translate symbol like :f1 to the proper function key value.
+  def to_binding_key(key_or_sym)
+    if key_or_sym.is_a?(Symbol) && PM::Main::FUNCTION_KEY_SYMBOLS[key_or_sym]
+      key_or_sym = PM::Main::FUNCTION_KEY_SYMBOLS[key_or_sym]
+    end
+  end
+
+  # Translate function key values into symbol strings and other keys into
+  # double-quoted strings.
+  def to_save_key(key)
+    if PM::Main::FUNCTION_KEY_SYMBOLS.value?(key)
+      PM::Main::FUNCTION_KEY_SYMBOLS.key(key)
+    else
+      key
+    end
+  end
+
   def read_triggers(contents)
     read_block_text('trigger', @triggers, contents)
   end
@@ -253,6 +316,10 @@ class DSL
     read_block_text('filter', @filters, contents)
   end
 
+  def read_code_keys(contents)
+    read_block_text('code_key', @code_keys, contents)
+  end
+
   # Extremely simple block text reader. Relies on indentation to detect end
   # of code block.
   def read_block_text(name, containers, contents)
@@ -260,11 +327,13 @@ class DSL
     in_block = false
     block_indentation = nil
     block_end_token = nil
+    chunk = nil
     contents.each_line do |line|
       if line =~ /^(\s*)#{name}\s*.*?(({|do|->\s*{|lambda\s*{)(.*))/
         block_indentation, text = $1, $2
         i += 1
-        containers[i].text = text + "\n"
+        chunk = containers[i].code_chunk
+        chunk.text = text + "\n"
         in_block = true
         block_end_token = case text
                              when /^{/
@@ -281,15 +350,18 @@ class DSL
         indentation, text = $1, $2
         if indentation.length <= block_indentation.length
           if text =~ /^#{block_end_token}/
-            containers[i].text << line
+            chunk.text << line
           end
           in_block = false
         else
-          containers[i].text << line
+          chunk.text << line
         end
       end
     end
-    containers.each { |thing| thing.text.strip! if thing.text }
+    containers.each do |thing|
+      text = thing.code_chunk.text
+      text.strip! if text
+    end
   end
 
 end

data/lib/patchmaster/filter.rb

@@ -5,18 +5,18 @@ module PM
 # representation as well.
 class Filter
 
-  attr_accessor :block, :text
+  attr_accessor :code_chunk
 
-  def initialize(block, text=nil)
-    @block, @text = block, text
+  def initialize(code_chunk)
+    @code_chunk = code_chunk
   end
 
   def call(conn, bytes)
-    @block.call(conn, bytes)
+    @code_chunk.run(conn, bytes)
   end
 
   def to_s
-    @text || '# no block text found'
+    @code_chunk.text || '# no block text found'
   end
 
 end

data/lib/patchmaster/instrument.rb

@@ -26,6 +26,7 @@ class InputInstrument < Instrument
     super(sym, name, port_num, input_port(port_num, use_midi))
     @connections = []
     @triggers = []
+    @listener = nil
   end
 
   def add_connection(conn)
@@ -95,6 +96,7 @@ end
 class MockInputPort
 
   attr_reader :name
+  attr_accessor :buffer
 
   # For MIDIEye::Listener
   def self.is_compatible?(input)
@@ -104,6 +106,7 @@ class MockInputPort
   # Constructor param is ignored; it's required by MIDIEye.
   def initialize(arg)
     @name = "MockInputPort #{arg}"
+    @buffer = []
   end
 
   def gets
@@ -116,18 +119,15 @@ class MockInputPort
 
   def clear_buffer
   end
-
-  # add this class to the Listener class' known input types
-  MIDIEye::Listener.input_types << self
-
 end
 
 class MockOutputPort
-
   attr_reader :name
+  attr_accessor :buffer
 
   def initialize(port_num)
     @name = "MockOutputPort #{port_num}"
+    @buffer = []
   end
 
   def puts(data)

data/lib/patchmaster/irb/irb.rb

@@ -4,17 +4,28 @@ require 'tempfile'
 
 $dsl = nil
 
-# For bin/patchmaster. Does nothing.
-def run
+module PM
+  class IRB
+
+    include Singleton
+
+    attr_reader :dsl
+
+    def initialize
+      @dsl = PM::DSL.new
+      @dsl.song("IRB Song")
+      @dsl.patch("IRB Patch")
+    end
+
+    # For bin/patchmaster.
+    def run
+      ::IRB.start
+    end
+  end
 end
 
 def dsl
-  unless $dsl
-    $dsl = PM::DSL.new
-    $dsl.song("IRB Song")
-    $dsl.patch("IRB Patch")
-  end
-  $dsl
+  PM::IRB.instance.dsl
 end
 
 # Return the current (only) patch.
@@ -33,8 +44,8 @@ def pm_help
   puts IO.read(File.join(File.dirname(__FILE__), 'irb_help.txt'))
 end
 
-# The "panic" command is handled by $dsl. This version tells panic to send
-# all all-notes-off messages.
+# The "panic" command is handled by the PM::DSL instance. This version
+# (+panic!+) tells that +panic+ to send all all-notes-off messages.
 def panic!
   PM::PatchMaster.instance.panic(true)
 end
@@ -54,8 +65,3 @@ def method_missing(sym, *args)
     super
   end
 end
-
-def start_patchmaster_irb(init_file=nil)
-  ENV['IRBRC'] = init_file if init_file
-  IRB.start
-end

data/lib/patchmaster/patchmaster.rb

@@ -21,7 +21,7 @@ class PatchMaster < SimpleDelegator
   include Singleton
 
   attr_reader :inputs, :outputs, :all_songs, :song_lists
-  attr_reader :messages
+  attr_reader :messages, :message_bindings, :code_bindings
   attr_accessor :use_midi
   alias_method :use_midi?, :use_midi
   attr_accessor :gui
@@ -37,6 +37,8 @@ class PatchMaster < SimpleDelegator
     super(@cursor)
     @use_midi = true
     @gui = nil
+    @message_bindings = {}
+    @code_bindings = {}
 
     if $DEBUG
       @debug_file = File.open(DEBUG_FILE, 'a')
@@ -77,6 +79,14 @@ class PatchMaster < SimpleDelegator
     raise("error saving #{file}: #{ex}" + caller.join("\n"))
   end
 
+  def bind_message(name, key)
+    @message_bindings[key] = name
+  end
+
+  def bind_code(code_key)
+    @code_bindings[code_key.key] = code_key
+  end
+
   # Initializes the cursor and all data.
   def init_data
     @cursor.clear
@@ -127,7 +137,7 @@ class PatchMaster < SimpleDelegator
   # Send the message with the given +name+ to all outputs. Names are matched
   # case-insensitively.
   def send_message(name)
-    msg = @messages[name.downcase]
+    _correct_case_name, msg = @messages[name.downcase]
     if !msg
       message("Message \"#{name}\" not found")
       return

data/lib/patchmaster/predicates.rb

@@ -11,7 +11,7 @@ class Integer
   end
 
   def channel?
-    self >= PM::NOTE_ON && self < PM::SYSEX 
+    self >= PM::NOTE_OFF && self < PM::SYSEX
   end
   alias_method :chan?, :channel?
 

data/lib/patchmaster/song.rb

@@ -1,6 +1,6 @@
 module PM
 
-# A Song is a named list of Patches with a cursor.
+# A Song is a named list of Patches.
 class Song
 
   attr_accessor :name, :patches, :notes

data/lib/patchmaster/song_list.rb

@@ -1,6 +1,6 @@
 module PM
 
-# A SongList is a list of Songs with a cursor.
+# A SongList is a list of Songs.
 class SongList
 
   attr_accessor :name, :songs
@@ -15,8 +15,7 @@ class SongList
   end
 
   # Returns the first Song that matches +name+. +name+ may be either a
-  # Regexp or a String. The match will be made case-insensitive. Does not
-  # move or set the cursor.
+  # Regexp or a String. The match will be made case-insensitive.
   def find(name_regex)
     name_regex = Regexp.new(name_regex.to_s, true) # make case-insensitive
     @songs.detect { |s| s.name =~ name_regex }

data/lib/patchmaster/trigger.rb

@@ -1,34 +1,33 @@
 module PM
 
-# A Trigger performs an action when it sees a particular array of bytes.
-# Instruments have zero or more triggers. The action is a symbol that gets
-# sent to PM::PatchMaster.
+# A Trigger executes code when it sees a particular array of bytes.
+# Instruments have zero or more triggers.
 #
 # Since we want to save them to files, we store the text representation as
 # well.
 class Trigger
 
-  attr_accessor :bytes, :block, :text
+  attr_accessor :bytes, :code_chunk
 
-  def initialize(bytes, block)
-    @bytes, @block = bytes, block
+  def initialize(bytes, code_chunk)
+    @bytes, @code_chunk = bytes, code_chunk
   end
 
   def method_missing(sym, *args)
     PM::PatchMaster.instance.send(sym, *args)
   end
 
-  # If +bytes+ matches our +@bytes+ array then run +@block+.
+  # If +bytes+ matches our +@bytes+ array then run +@code_chunk+.
   def signal(bytes)
     if bytes == @bytes
       pm = PM::PatchMaster.instance
-      pm.instance_eval &@block
+      @code_chunk.run(pm)
       pm.gui.refresh if pm.gui
     end
   end
 
   def to_s
-    "#{@bytes.inspect} => #{(@text || '# no block text found').gsub(/\n\s*/, '; ')}"
+    "#{@bytes.inspect} => #{(@code_chunk.text || '# no block text found').gsub(/\n\s*/, '; ')}"
   end
 end
 end

data/lib/patchmaster/web/public/js/patchmaster.coffee

@@ -29,6 +29,7 @@ connection_row = (conn) ->
 connection_rows = (connections) ->
   rows = (connection_row(conn) for conn in connections)
   $('#patch').html(CONN_HEADERS + "\n" + rows.join("\n"))
+  set_colors()
 
 maybe_name = (data, key) -> if data[key] then data[key]['name'] else ''
 
@@ -48,21 +49,23 @@ kp = (action) ->
     message(data['message']) if data['message']?
   )
 
-cycle_colors = () ->
-  base_class = COLOR_SCHEMES[color_scheme_index]
+remove_colors = () ->
   if color_scheme_index >= 0
+    base_class = COLOR_SCHEMES[color_scheme_index]
     $('body').removeClass(base_class)
     $('.selected, th, td#appname').removeClass("reverse-#{base_class}")
     $('tr, td, th').removeClass("#{base_class}-border")
 
-  color_scheme_index = (color_scheme_index + 1) % COLOR_SCHEMES.length
-
+set_colors = () ->
   base_class = COLOR_SCHEMES[color_scheme_index]
   $('body').addClass(base_class)
   $('.selected, th, td#appname').addClass("reverse-#{base_class}")
   $('tr, td, th').addClass("#{base_class}-border")
 
-  color_scheme = base_class
+cycle_colors = () ->
+  remove_colors()
+  color_scheme_index = (color_scheme_index + 1) % COLOR_SCHEMES.length
+  set_colors()
 
 bindings =
   'j': 'next_patch'

data/lib/patchmaster/web/public/js/patchmaster.js

@@ -56,7 +56,8 @@
       }
       return _results;
     })();
-    return $('#patch').html(CONN_HEADERS + "\n" + rows.join("\n"));
+    $('#patch').html(CONN_HEADERS + "\n" + rows.join("\n"));
+    return set_colors();
   };
 
   maybe_name = function(data, key) {
@@ -88,20 +89,28 @@
     });
   };
 
-  cycle_colors = function() {
-    var base_class, color_scheme;
-    base_class = COLOR_SCHEMES[color_scheme_index];
+  remove_colors = function() {
     if (color_scheme_index >= 0) {
+      var base_class;
+      base_class = COLOR_SCHEMES[color_scheme_index];
       $('body').removeClass(base_class);
       $('.selected, th, td#appname').removeClass("reverse-" + base_class);
       $('tr, td, th').removeClass("" + base_class + "-border");
     }
-    color_scheme_index = (color_scheme_index + 1) % COLOR_SCHEMES.length;
+  };
+
+  set_colors = function() {
+    var base_class;
     base_class = COLOR_SCHEMES[color_scheme_index];
     $('body').addClass(base_class);
     $('.selected, th, td#appname').addClass("reverse-" + base_class);
-    $('tr, td, th').addClass("" + base_class + "-border");
-    return color_scheme = base_class;
+    return $('tr, td, th').addClass("" + base_class + "-border");
+  };
+
+  cycle_colors = function() {
+    remove_colors();
+    color_scheme_index = (color_scheme_index + 1) % COLOR_SCHEMES.length;
+    return set_colors();
   };
 
   bindings = {

data/lib/patchmaster/web/sinatra_app.rb

@@ -2,13 +2,6 @@ require 'sinatra'
 require 'sinatra/json'
 require 'singleton'
 
-# ================================================================
-# Settings
-# ================================================================
-
-set :run, true
-set :root, File.dirname(__FILE__)
-
 # ================================================================
 # Helper methods
 # ================================================================
@@ -106,7 +99,10 @@ end
 
 module PM
 
-class SinatraApp
+class SinatraApp < Sinatra::Base
+
+  set :run, true
+  set :root, File.dirname(__FILE__)
 
   include Singleton
 
@@ -118,7 +114,7 @@ class SinatraApp
   end
 
   def run
-    set(:port, @port) if @port
+    self.class.set(:port, @port) if @port
     @pm.start
   ensure
     @pm.stop

data/test/support/test_connection.rb

@@ -0,0 +1,11 @@
+# A TestConnection records all bytes received and passes them straight
+# through.
+class TestConnection < PM::Connection
+  attr_accessor :bytes_received
+
+  def midi_in(bytes)
+    @bytes_received ||= []
+    @bytes_received += bytes
+    midi_out(bytes)
+  end
+end

data/test/test_helper.rb

@@ -1,55 +1,7 @@
 require 'test/unit'
 require 'patchmaster'
+require 'support/mock_ports'
+require 'support/test_connection'
 
 # For all tests, make sure mock I/O MIDI ports are used.
 PM::PatchMaster.instance.use_midi = false
-
-module PM
-
-# To help with testing, we replace PM::MockInputPort#gets and
-# PM::MockOutputPort#puts with versions that send what we want and save what
-# is received.
-class MockInputPort
-
-  attr_accessor :data_to_send
-
-  def initialize(arg)
-    @name = "MockInputPort #{arg}"
-    @t0 = (Time.now.to_f * 1000).to_i
-  end
-
-  def gets
-    retval = @data_to_send || []
-    @data_to_send = []
-    [{:data => retval, :timestamp => (Time.now.to_f * 1000).to_i - @t0}]
-  end
-end
-
-class MockOutputPort
-
-  attr_accessor :buffer
-
-  def initialize(port_num)
-    @name = "MockOutputPort #{port_num}"
-    @buffer = []
-  end
-
-  def puts(bytes)
-    @buffer += bytes
-  end
-end
-end
-
-# A TestConnection records all bytes received and passes them straight
-# through.
-class TestConnection < PM::Connection
-
-  attr_accessor :bytes_received
-
-  def midi_in(bytes)
-    @bytes_received ||= []
-    @bytes_received += bytes
-    midi_out(bytes)
-  end
-
-end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: patchmaster
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jim Menard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: midi-eye
   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'
 description: |
@@ -36,6 +36,8 @@ files:
 - bin/irb_init.rb
 - bin/patchmaster
 - lib/patchmaster.rb
+- lib/patchmaster/code_chunk.rb
+- lib/patchmaster/code_key.rb
 - lib/patchmaster/connection.rb
 - lib/patchmaster/consts.rb
 - lib/patchmaster/curses/geometry.rb
@@ -68,6 +70,7 @@ files:
 - lib/patchmaster/web/public/js/patchmaster.js
 - lib/patchmaster/web/public/style.css
 - lib/patchmaster/web/sinatra_app.rb
+- test/support/test_connection.rb
 - test/test_helper.rb
 homepage: http://www.patchmaster.org/
 licenses:
@@ -79,19 +82,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Realtime MIDI setup configuration and MIDI filtering
 test_files:
+- test/support/test_connection.rb
 - test/test_helper.rb