xi-lang 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38043c0ad025b398a49d63e1c93681992c0b184a
-  data.tar.gz: fbc0e32315abf8272f388bbe59917236633a0d09
+  metadata.gz: bd3c1d2086dab411b68d702c8ca72ba9ba0875dc
+  data.tar.gz: 4a3ef7494c570a1990ae49a97a3f6d29371398cd
 SHA512:
-  metadata.gz: 10f089d5ecb56a89e70091b2845654fdbdf7beb9c7b3fc23366038ae078769065166b3b89fd08de19fca0ec99612bce60853f16554aacb2d269036e895df4a29
-  data.tar.gz: e4fa8eef3158cbf1d14d8f9b8d4241dfe83de117a1ef6730c947992baf555a9c110f425e9d7828eaafdf9201cf71f52d9c2cd2737100e85c198397ce22048a68
+  metadata.gz: 102013a3fb01d7764e83f9d5fa461ab430ef27153502e4f4b4bee5a1528001ef15660c0600ab1681f435defd615fdd7cd307b14958a7df0d7d2752ba7e5d3774
+  data.tar.gz: d94f330514d532fe1aa4de6d627ad7c8accf689f9e173fbdd4ba638d433f07c2a83db7edc081653c798a5ddfa41144e550313be4084ccc676f4a650dd3c5b39e

data/README.md

@@ -15,16 +15,25 @@ multiple known bugs, missing features, documentation and tests.
 ## Example
 
 ```ruby
-k = MIDI::Stream.new
-
-k.set degree: [0, 3, 5, 7],
-      octave: [1, 2],
-      scale: [Scale.egyptian],
-      voice: (0..6).p.scale(0, 6, 0, 127),
-      vel: [30, 25, 20].p + 20,
-      cutoff: P.sin1(32, 2) * 128,
-      delay_feedback: 1/2 * 128,
-      delay_time: [0, 0x7f].p(1/16)
+melody = [1,4,7,8,9]
+scale = [Scale.iwato, Scale.jiao]
+
+fm.set degree: melody.p(1/2,1/8,1/8,1/8,1/16,1/8,1/8).seq(2),
+       gate: :degree,
+       detune: [0.1, 0.4, 0.4],
+       sustain: [1,2,3,10],
+       accelerate: [0.5, 0, 0.1],
+       octave: [3,4,5,6].p(1/3),
+       scale: scale.p(1/2),
+       amp: P.new { |y| y << rand * 0.2 + 0.8 }.p(1/2)
+
+kick.set freq: s("xi.x .ix. | xi.x xx.x", 70, 200), amp: 0.8, gate: :freq
+
+clap.set n: s("..x. xyz. .x.. .xyx", 60, 61, 60).p.decelerate(2),
+         gate: :n,
+         amp: 0.35,
+         pan: P.sin(16, 2) * 0.6,
+         sustain: 0.25
 ```
 
 ## Installation
@@ -64,8 +73,9 @@ Then:
 
     $ cd xi
     $ bundle install
+    $ rake install
 
-You're done! Fire up the REPL from `bin/xi`.
+You're done! Fire up the REPL using `xi`.
 
 ## Development
 
@@ -78,6 +88,9 @@ release a new version, update the version number in `version.rb`, and then run
 git commits and tags, and push the `.gem` file to
 [rubygems.org](https://rubygems.org).
 
+You can also try things on the REPL without installing the gem on your machine
+by doing `bundle exec bin/xi`.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at

data/bin/xi

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'bundler/setup'
 require "xi"
 require "xi/repl"
 

data/lib/xi/bjorklund.rb

@@ -0,0 +1,60 @@
+# Implementation adapted from Nebs' (MIT licensed)
+# https://github.com/nebs/bjorklund-euclidean-rhythms
+#
+class Xi::Bjorklund
+  attr_reader :pulses, :slots, :value
+
+  def initialize(pulses, slots, value=nil)
+    @pulses = pulses.to_i
+    @slots = slots.to_i
+    @value = value || 1
+  end
+
+  def p(*args, **metadata)
+    ary = to_a
+    ary.map { |v| v ? @value : nil }.p(1 / ary.size, **metadata)
+  end
+
+  def inspect
+    "e(#{@pulses}, #{@slots}, #{@value.inspect})"
+  end
+
+  def to_s
+    to_a.map { |i| i ? 'x' : '.' }.join
+  end
+
+  def to_a
+    k = @pulses
+    n = @slots
+
+    return [] if n == 0 || k == 0
+
+    bins = []
+    remainders = []
+    k.times { |i| bins[i] = [true] }
+    (n-k).times { |i| remainders[i] = [false] }
+
+    return bins.flatten if n == k
+
+    loop do
+      new_remainders = []
+      bins.each_with_index do |bin, i|
+        if remainders.empty?
+          new_remainders.push bin
+        else
+          bin += remainders.shift
+          bins[i] = bin
+        end
+      end
+
+      if new_remainders.any?
+        bins.pop new_remainders.count
+        remainders = new_remainders
+      end
+
+      break unless remainders.size > 1
+    end
+
+    return (bins + remainders).flatten
+  end
+end

data/lib/xi/clock.rb

@@ -64,6 +64,14 @@ module Xi
       @mutex.synchronize { 1.0 / @cps }
     end
 
+    def current_time
+      Time.now.to_f - @init_ts + @latency
+    end
+
+    def current_cycle
+      current_time * cps
+    end
+
     def inspect
       "#<#{self.class.name}:#{"0x%014x" % object_id} " \
         "cps=#{cps.inspect} #{playing? ? :playing : :stopped}>"
@@ -80,7 +88,7 @@ module Xi
 
     def do_tick
       return unless playing?
-      now = Time.now.to_f - @init_ts + @latency
+      now  = self.current_time
       cps = self.cps
       @streams.each { |s| s.notify(now, cps) }
     rescue => err

data/lib/xi/core_ext/array.rb

@@ -0,0 +1,13 @@
+require 'xi/pattern'
+
+module Xi::CoreExt
+  module Array
+    def p(*delta, **metadata)
+      Xi::Pattern.new(self, delta: delta, **metadata)
+    end
+  end
+end
+
+class Array
+  include Xi::CoreExt::Array
+end

data/lib/xi/core_ext/enumerable.rb

@@ -1,25 +1,17 @@
 require 'xi/pattern'
 
-module Xi
-  module Pattern::Enumerable
-    def p(dur=nil, **metadata)
-      Pattern.new(self, event_duration: dur, **metadata)
+module Xi::CoreExt
+  module Enumerable
+    def p(*delta, **metadata)
+      Xi::Pattern.new(self.to_a, delta: delta, **metadata)
     end
   end
 end
 
 class Enumerator
-  include Xi::Pattern::Enumerable
-end
-
-class Array
-  include Xi::Pattern::Enumerable
-end
-
-class Hash
-  include Xi::Pattern::Enumerable
+  include Xi::CoreExt::Enumerable
 end
 
 class Range
-  include Xi::Pattern::Enumerable
+  include Xi::CoreExt::Enumerable
 end

data/lib/xi/core_ext/enumerator.rb

@@ -0,0 +1,14 @@
+module Xi::CoreExt
+  module Enumerator
+    def next?
+      peek
+      true
+    rescue StopIteration
+      false
+    end
+  end
+end
+
+class Enumerator
+  include Xi::CoreExt::Enumerator
+end

data/lib/xi/core_ext/fixnum.rb

@@ -1,5 +1,5 @@
-module Xi
-  module CoerceToRational
+module Xi::CoreExt
+  module Fixnum
     def /(o)
       super(o.to_r)
     end
@@ -7,5 +7,5 @@ module Xi
 end
 
 class Fixnum
-  prepend Xi::CoerceToRational
+  prepend Xi::CoreExt::Fixnum
 end

data/lib/xi/core_ext/numeric.rb

@@ -1,4 +1,4 @@
-module Xi
+module Xi::CoreExt
   module Numeric
     def midi_to_cps
       440 * (2 ** ((self - 69) / 12.0))
@@ -22,13 +22,13 @@ module Xi
 end
 
 class Fixnum
-  include Xi::Numeric
+  include Xi::CoreExt::Numeric
 end
 
 class Float
-  include Xi::Numeric
+  include Xi::CoreExt::Numeric
 end
 
 class Rational
-  include Xi::Numeric
+  include Xi::CoreExt::Numeric
 end

data/lib/xi/core_ext/scalar.rb

@@ -0,0 +1,16 @@
+require 'xi/pattern'
+
+module Xi::CoreExt
+  module Scalar
+    def p(*delta, **metadata)
+      [self].p(*delta, **metadata)
+    end
+  end
+end
+
+class Fixnum;   include Xi::CoreExt::Scalar; end
+class Float;    include Xi::CoreExt::Scalar; end
+class String;   include Xi::CoreExt::Scalar; end
+class Symbol;   include Xi::CoreExt::Scalar; end
+class Rational; include Xi::CoreExt::Scalar; end
+class Hash;     include Xi::CoreExt::Scalar; end

data/lib/xi/core_ext/string.rb

@@ -1,50 +1,52 @@
-# String Inflectors, taken from ActiveSupport 5.0 source code
-module Xi::Inflectors
-  # Converts strings to UpperCamelCase.
-  # If the +uppercase_first_letter+ parameter is set to false, then produces
-  # lowerCamelCase.
-  #
-  # Also converts '/' to '::' which is useful for converting
-  # paths to namespaces.
-  #
-  #   camelize('active_model')                # => "ActiveModel"
-  #   camelize('active_model', false)         # => "activeModel"
-  #   camelize('active_model/errors')         # => "ActiveModel::Errors"
-  #   camelize('active_model/errors', false)  # => "activeModel::Errors"
-  #
-  # As a rule of thumb you can think of +camelize+ as the inverse of
-  # #underscore, though there are cases where that does not hold:
-  #
-  #   camelize(underscore('SSLError'))        # => "SslError"
-  def camelize
-    string = self.sub(/^[a-z\d]*/) { |match| match.capitalize }
-    string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
-    string.gsub!('/'.freeze, '::'.freeze)
-    string
-  end
+module Xi::CoreExt
+  # String Inflectors, taken from ActiveSupport 5.0 source code
+  module String
+    # Converts strings to UpperCamelCase.
+    # If the +uppercase_first_letter+ parameter is set to false, then produces
+    # lowerCamelCase.
+    #
+    # Also converts '/' to '::' which is useful for converting
+    # paths to namespaces.
+    #
+    #   camelize('active_model')                # => "ActiveModel"
+    #   camelize('active_model', false)         # => "activeModel"
+    #   camelize('active_model/errors')         # => "ActiveModel::Errors"
+    #   camelize('active_model/errors', false)  # => "activeModel::Errors"
+    #
+    # As a rule of thumb you can think of +camelize+ as the inverse of
+    # #underscore, though there are cases where that does not hold:
+    #
+    #   camelize(underscore('SSLError'))        # => "SslError"
+    def camelize
+      string = self.sub(/^[a-z\d]*/) { |match| match.capitalize }
+      string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
+      string.gsub!('/'.freeze, '::'.freeze)
+      string
+    end
 
-  # Makes an underscored, lowercase form from the expression in the string.
-  #
-  # Changes '::' to '/' to convert namespaces to paths.
-  #
-  #   underscore('ActiveModel')         # => "active_model"
-  #   underscore('ActiveModel::Errors') # => "active_model/errors"
-  #
-  # As a rule of thumb you can think of +underscore+ as the inverse of
-  # #camelize, though there are cases where that does not hold:
-  #
-  #   camelize(underscore('SSLError'))  # => "SslError"
-  def underscore
-    return self unless self =~ /[A-Z-]|::/
-    word = self.to_s.gsub('::'.freeze, '/'.freeze)
-    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'.freeze)
-    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2'.freeze)
-    word.tr!("-".freeze, "_".freeze)
-    word.downcase!
-    word
+    # Makes an underscored, lowercase form from the expression in the string.
+    #
+    # Changes '::' to '/' to convert namespaces to paths.
+    #
+    #   underscore('ActiveModel')         # => "active_model"
+    #   underscore('ActiveModel::Errors') # => "active_model/errors"
+    #
+    # As a rule of thumb you can think of +underscore+ as the inverse of
+    # #camelize, though there are cases where that does not hold:
+    #
+    #   camelize(underscore('SSLError'))  # => "SslError"
+    def underscore
+      return self unless self =~ /[A-Z-]|::/
+      word = self.to_s.gsub('::'.freeze, '/'.freeze)
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'.freeze)
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2'.freeze)
+      word.tr!("-".freeze, "_".freeze)
+      word.downcase!
+      word
+    end
   end
 end
 
 class String
-  include Xi::Inflectors
+  include Xi::CoreExt::String
 end

data/lib/xi/core_ext.rb

@@ -1,6 +1,8 @@
+require 'xi/core_ext/array'
 require 'xi/core_ext/enumerable'
+require 'xi/core_ext/enumerator'
 require 'xi/core_ext/fixnum'
 require 'xi/core_ext/numeric'
 require 'xi/core_ext/object'
-require 'xi/core_ext/simple'
+require 'xi/core_ext/scalar'
 require 'xi/core_ext/string'