maxy-gen 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53f56c6fbf28759545461bf9040d70820ae267d99b7a494804f840381b0570d
-  data.tar.gz: b3f8057b1a4568f9988e559f46c6c29c9cc291a169406777ea843f67bab9e54c
+  metadata.gz: e4e86040c41c2e7c72dad39a7aa9cb2f5747c4ee675c8ff95f44d96f556c24a0
+  data.tar.gz: 53d688a7848ce51d8c198c938189114578e536aefb92640a31eb702d7e117227
 SHA512:
-  metadata.gz: 165c624d8b47bb14f04c1a9b021d90005f93e625601e8f9a3e2d101639cd8f1eeda71d6b8d7427a7588367f54006fdf452b57cc2ccf57871166594cab0eb1966
-  data.tar.gz: 4ff924c93ce593d96b1939fbcfb8c19e0a4af620addae168041b85b6fcdaf786bea6ed0fe16182f51de22a2f83a81ceaaca1a038310de8374e789afaec688382
+  metadata.gz: 0bc189243c8caea6c73b8b2b4740591c974d47ab33c6f26c9eeb492ffd09123af01476e895e16accd0795573751937526f873cc4af1bae633562cc70dc0c36e6
+  data.tar.gz: db4d6a15270c862b2719e2f845893610bf7e82ae9b108077c2be4c2ea93d135b698db636a1a5392535dc1c69dc940bf1c505d911e9680607738ef8ec8591d0e9

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Metrics/LineLength:
+  Max: 110

data/.travis.yml

@@ -3,3 +3,5 @@ language: ruby
 rvm:
   - 2.3.3
 before_install: gem install bundler -v 1.14.6
+script:
+  - bundle exec rake spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maxy-gen (0.3.1)
+    maxy-gen (0.3.2)
       nokogiri
       thor
 

data/README.md

@@ -2,7 +2,7 @@
 
 A commandline tool to generate max patches in an emmet-like fashion
 
-![](https://s3.eu-central-1.amazonaws.com/maxy-gen/maxygen-demo-v0.3.0.gif)
+![](https://s3.eu-central-1.amazonaws.com/maxy-gen/maxygen-demo-v0.3.3.gif)
 
 ## Installation and Upgrading
 
@@ -39,6 +39,8 @@ Use an [emmet](https://emmet.io/)-like pattern to generate a max patch, e.g.
 As of now you can use 
 
 - `-` dashes to indicate patch chords 
+- `=` equal signs to connect a row (as in `t b b`) to multiple objects at once
+- `<` less than signs to connect a single outlet to an object with many inputs (as in `pack 1 2 3`)
 - `{}` curly braces to denote arguments passed to objects
 - `+` to denote sibling objects
 - `(...)` to group objects together (see demo above)
@@ -46,10 +48,15 @@ As of now you can use
 A couple of objects need escaping (with `\`), because some characters are taken, obviously. These are:
 
 - `\==`
+- `\<`
+- `\<=`
 - `\-`
 - `\+`
+- `\<<`
 - `\*`
 - `\==~`
+- `\<=~`
+- `\<~`
 - `\-~`
 - `\+=~`
 - `\+~`

data/lib/maxy/gen/cli.rb

@@ -55,7 +55,7 @@ module Maxy
           end
         end
 
-        library[:objects].select { |k, _v| k.match?(/\A^[-+*={}()].*/) }.each do |k, _v|
+        library[:objects].select { |k, _v| k.match?(/\A^[-+*={}()<].*/) }.each do |k, _v|
           key = "\\#{k}"
           library[:objects][key] = library[:objects].delete k
         end

data/lib/maxy/gen/generator.rb

@@ -14,7 +14,7 @@ module Maxy
       attr_accessor :library
 
       def initialize
-        raise RuntimeError.new('No object definitions were found. please run `maxy-gen install` first') unless File.exist?("#{ENV['HOME']}/.maxy-gen/library.yml")
+        raise 'No object definitions were found. please run `maxy-gen install` first' unless File.exist?("#{ENV['HOME']}/.maxy-gen/library.yml")
 
         @object_count = 1
         @patch = Psych.load_file(File.join(__dir__, '../../../assets/blank.yml')).dup
@@ -40,6 +40,10 @@ module Maxy
           generate_node(child_node, child_id)
           if node.flags.include? :connect_children_individually
             @patch['patcher']['lines'] << make_line(id, child_id, index, 0)
+          elsif node.flags.include? :connect_all_child_inlets
+            0.upto(child_node.args.split.count - 1) do |i|
+              @patch['patcher']['lines'] << make_line(id, child_id, 0, i)
+            end
           else
             @patch['patcher']['lines'] << make_line(id, child_id)
           end

data/lib/maxy/gen/parser.rb

@@ -2,7 +2,7 @@ module Maxy
   module Gen
     class Parser
       def initialize(tokens)
-        raise RuntimeError.new('No object definitions were found. please run `maxy-gen install` first') unless File.exist?("#{ENV['HOME']}/.maxy-gen/library.yml")
+        raise 'No object definitions were found. please run `maxy-gen install` first' unless File.exist?("#{ENV['HOME']}/.maxy-gen/library.yml")
 
         @library = Psych.load_file("#{ENV['HOME']}/.maxy-gen/library.yml").freeze
         @tokens = tokens
@@ -13,11 +13,12 @@ module Maxy
       def parse(parent_node=@tree, closing_group=false)
         if closing_group
           if peek(:dash) || peek(:identifier) || peek(:escaped_identifier)
-            raise RuntimeError.new("Parsing Error: only + is allowed after a ) closing a group.")
+            raise 'Parsing Error: only + is allowed after a ) closing a group.'
           end
         else
           parse_begin_group parent_node
           child_node = parse_identifier parent_node
+          parse_less_than child_node
           parse_equals child_node
           parse_dash child_node
         end
@@ -51,7 +52,7 @@ module Maxy
 
         arguments = parse_arguments || ''
 
-        raise RuntimeError.new("Could not find #{obj_name} in object definitions.") if @library[:objects][obj_name].nil?
+        raise "Could not find #{obj_name} in object definitions." if @library[:objects][obj_name].nil?
 
         new_obj_node = ObjectNode.new(obj_name, arguments, [])
         parent.child_nodes << new_obj_node
@@ -72,12 +73,12 @@ module Maxy
         if token.type == expected_type
           token
         else
-          raise RuntimeError.new("Expected token type #{expected_type.inspect}, but got #{token.type.inspect}")
+          raise "Expected token type #{expected_type.inspect}, but got #{token.type.inspect}"
         end
       end
 
       def peek(expected_type)
-        @tokens.length > 0 && @tokens.fetch(0).type == expected_type
+        @tokens.length.positive? && @tokens.fetch(0).type == expected_type
       end
 
       def parse_plus(obj_node)
@@ -101,6 +102,14 @@ module Maxy
           parse(obj_node)
         end
       end
+
+      def parse_less_than(obj_node)
+        if peek(:less_than)
+          consume(:less_than)
+          obj_node.flags << :connect_all_child_inlets
+          parse(obj_node)
+        end
+      end
     end
 
     ObjectNode = Struct.new(:name, :args, :child_nodes, :x_rank, :y_rank, :flags) do
@@ -109,6 +118,5 @@ module Maxy
       end
     end
     RootNode = Struct.new(:child_nodes)
-
   end
 end

data/lib/maxy/gen/tokenizer.rb

@@ -2,14 +2,15 @@ module Maxy
   module Gen
     class Tokenizer
       TOKEN_TYPES = [
-          [:arguments, /({[^{}]*})/],
-          [:escaped_identifier, /(\\[\S][^-+={}()\\]*)(?=[-+=*{}])?/],
-          [:identifier, /([^-+={}()\\]+)(?=[-+=*{}])?/],
-          [:oparen, /(\()/],
-          [:cparen, /(\))/],
-          [:plus, /(\+)/],
-          [:equals, /(=)/],
-          [:dash, /(-)/]
+        [:arguments, /({[^{}]*})/],
+        [:escaped_identifier, /(\\[\S][^-+={}<()\\]*)(?=[-+=*<{}])?/],
+        [:identifier, /([^-+={}<()\\]+)(?=[-+=*<{}])?/],
+        [:oparen, /(\()/],
+        [:cparen, /(\))/],
+        [:plus, /(\+)/],
+        [:less_than, /(<)/],
+        [:equals, /(=)/],
+        [:dash, /(-)/]
       ]
 
       def initialize(pattern)
@@ -34,10 +35,10 @@ module Maxy
           end
         end
 
-        raise RuntimeError.new "Couldn't match token on #{@pattern.inspect}"
+        raise "Couldn't match token on #{@pattern.inspect}"
       end
     end
 
     Token = Struct.new(:type, :value)
   end
-end
+end

data/lib/maxy/gen/version.rb

@@ -1,5 +1,5 @@
 module Maxy
   module Gen
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxy-gen
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile