coltrane 2.1.5 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af07ab95dbc675d21b3543f87c30389a38a95685d963a6f6b0af48b60fb5653
-  data.tar.gz: d066a320b2d192feafcc7bea90e0aaee0977c7bb5284392c555de1689afc900f
+  metadata.gz: 73fefa27f1153e68849f503990c62b0f37d66a58f5979b6c8eca4292166ece20
+  data.tar.gz: f83f2490b0402555ef13f7d04790c4982e7e7f8274fcfd9f4290e497d357b3ed
 SHA512:
-  metadata.gz: 20d76f287e71bf910e9ca40e8d586ea35e03f30d9598ab6ed7ee249b9341ad0ff99269ff73ea2dc2b945af8d97e8941bc9da87a88cba39913f71ab42c3c371ec
-  data.tar.gz: 3b43103aa6830b80faa581586b87099a56186dfa4bfa7e6f9fa19da388f119ae88e6a20b8a7e83de5ff2afbc7d2ad342a176a885853ce744989209095237cc67
+  metadata.gz: 3aec21519141e0e6fd73a5bec77acbbc510cde319b16d1f6544a3fa256bb78d858dfa2525e049cd40b4d7f4acb5c480963906dd3aada7d3f6539f3ed5a14b7d1
+  data.tar.gz: 2ded1ec625ec59cc2cfb519128806b45b9e953ef123bb1822268a7a74f87b83e66027d0771e5e1bbf5c7ce26e1d63b6e901725cc68df71b0404378082de83265

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+git:
+  depth: 1
+rvm:
+- 2.5.0
+script:
+- bin/rspec spec
+deploy:
+  provider: rubygems
+  api_key:
+    secure: YLM/BiQPu0GMgns2tUeE1qO58JmzRVfo20ebgG6XNBqmptzPI3ReqEs/bYaUSdygYiK81pVhy69dWj3bjKjWV6C7EBr/w6tOE+qM6PUKEvd8rlcviXXUOgFfMCLLqREYi21zr+I0Z1Gj8mCRklBV2DFF+f6TTIcSh/afYVVWv8rktpMgivijB9Cexek5gP/8zhg8AaKAnGBzrmKzxraKZA7s97e5iWvZBMLtrDyqSe8mfkviKeOE6B1sKb8YdYLh9fSSpNewOEzKTtgS2AWmoCdP6IiUk+dhORTHu0s13Rz+nD2ZOYfkYIXt6iMNYlFHB30Nm1/4iusCrStIphDXlLqCD6DfBX4gRmBgRHsceCHoHggWqOCbgz28MI1vtkFsnoLz7/fJBlpPy/g+7VC6SnSt5fux35W4u26QcvMwmD3MkwJmjjktsi+GlIF9D+oDtb79VTUM1hzT2kkByWATZJnUK9M3CxxzGe4CqXpeFpVW5d0K84aMd0jpAuKFZf87jOVtQ80Jtl/ANFpHP/LO8P/SUil4OZh2eKmIADZg/z6itytkK/lcU5uEIpHIctP7q1oNqX27tLTPdoY1ht7gJ/x9IUL7lqTDsY7nRW7PrO3sNwzT1NCDIeAC2K/k7WCdrEKk3oj4C3Eqykho6X7tx+lfd2eTN6bzAcekCSseezE=
+  gem: coltrane
+  on:
+    repo: pedrozath/coltrane
+notifications:
+  slack:
+    secure: A4qliXrG8AgvMi9skLwfTfGgRxeVRBIBS8O6tIF2k0oLn+i0XRCEPWYnK4Xa1YufgCnMTFlGA144sxsvuf3spBuwCJkOefA7YhJJVhKQTCpmkSq0IPEaF8+KpwESI1W1hBJuEWmCAxwL1Z+tZa7CON2ELyKgHukxEtUTfQsbXMY1eeISRm7a73xi4DlfTM4UEV2Cfd/Rg9cpP4QGsWANowDsaNm33aQ611BIokfVSZtKf7A4IPAthZOrXkGqD0R4FjUxbDUtQEd5gg3tpcPmWrHIxunlvJow/XBXtv+/qDlbo8LzUUxtkElcGjj1g3hsQEZmevoNxZdGW/8/F5DMMLYYQRfph7Ot9Xm6dNYj3rIUcHjNob1qUNb0ON2pko4gcO6HiU8VZ/oQUsUtBBrB7ddf1htXVdO3jHH2josFTCWgFCzPwgxsCuyP71lieDBolyaKFOyWGaWj6cZhqGUfkSosLZNyDoUEWERkImOHyqvi5TQaPVteZvUeCDkD6ZtCTyEjZI8zXdyPKKweBLxRuGMjUgpsA5QEyo3dlIguLe7OYCLWyYYmEcF+2QjYLevEBFNM1rl6tK8VEF6aost0pa6Rq6/VHRNEEKn0ejYTqbiPGljmOiDOwWSCxQWhlJ9tw692wnpLN5/y0Cda40PQ87hi1tXyvcvLrrvETfYfXcU=

data/CHANGELOG.md

@@ -5,6 +5,11 @@
 - Fix chords so that they generate a barre and a non-barre version and prevent
   barre chords from picking notes before the barre.
 
+## [2.2.0]
+
+- Intervals were completely refactored according to [#11](https://github.com/pedrozath/coltrane/issues/11) and (https://github.com/pedrozath/coltrane/issues/12). Thanks [@art-of-dom](https://github.com/art-of-dom) for the valuable information. We now have new interval classes and new ways on how to deal with them.
+  Check the [wiki](https://github.com/pedrozath/coltrane/wiki) for more details.
+
 ## [2.1.0]
 
 - Correct Flat/Sharp on Diatonic Scales

data/Gemfile

@@ -6,8 +6,7 @@ group :test, :development do
   gem 'pry'
   gem 'pry-byebug'
   gem 'pry-rescue'
-  gem 'pronto'
-  gem 'pronto-flay'
+  # gem 'pronto'
   gem 'pronto-rubocop'
   gem 'opal-rspec'
 end

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    coltrane (2.1.0)
+    coltrane (2.2.1)
       color (~> 1.8)
-      coreaudio
+      dry-monads (~> 0.4)
       paint (~> 2.0)
       pedrozath-mercenary (~> 0.3)
 
@@ -17,30 +17,27 @@ GEM
     coderay (1.1.2)
     color (1.8)
     concurrent-ruby (1.0.5)
-    coreaudio (0.0.12)
-      narray (~> 0.6.0.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    erubis (2.7.0)
+    dry-core (0.4.5)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.2.0)
+    dry-monads (0.4.0)
+      dry-core (~> 0.3, >= 0.3.3)
+      dry-equalizer
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    flay (2.10.0)
-      erubis (~> 2.7.0)
-      path_expander (~> 1.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
     gitlab (3.6.1)
       httparty
       terminal-table
     hike (1.2.3)
-    httparty (0.16.0)
+    httparty (0.16.1)
       multi_xml (>= 0.5.2)
     interception (0.5)
     json (2.1.0)
     method_source (0.9.0)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    narray (0.6.0.9)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     opal (0.10.5)
@@ -54,7 +51,6 @@ GEM
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
-    path_expander (1.0.2)
     pedrozath-mercenary (0.3.6)
     powerpack (0.1.1)
     pronto (0.6.0)
@@ -62,9 +58,6 @@ GEM
       octokit (~> 4.3, >= 4.1.0)
       rugged (~> 0.24, >= 0.23.0)
       thor (~> 0.19.0)
-    pronto-flay (0.6.2)
-      flay (~> 2.8)
-      pronto (~> 0.6.0)
     pronto-rubocop (0.6.2)
       pronto (~> 0.6.0)
       rubocop (~> 0.38, >= 0.35.0)
@@ -102,13 +95,10 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    ruby_parser (3.11.0)
-      sexp_processor (~> 4.9)
     rugged (0.26.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    sexp_processor (4.10.1)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -131,8 +121,6 @@ DEPENDENCIES
   bundler (~> 1.14)
   coltrane!
   opal-rspec
-  pronto
-  pronto-flay
   pronto-rubocop
   pry
   pry-byebug

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/pedrozath/coltrane.svg?branch=master)](https://travis-ci.org/pedrozath/coltrane)
+
 # Coltrane
 
 A music calculation library/CLI written in Ruby.
@@ -5,7 +7,7 @@ A music calculation library/CLI written in Ruby.
 ![Coltrane](img/coltrane-logo.png)
 
 * [How to use this library](https://github.com/pedrozath/coltrane/wiki/Core-music-theory-library).
-* [Why did I wrote this library](https://medium.com/@pedrozath/so-i-wrote-a-library-to-help-me-compose-music-ddb4ae7c8227).
+* [Why did I write this library](https://medium.com/@pedrozath/so-i-wrote-a-library-to-help-me-compose-music-ddb4ae7c8227).
 * [Chat room for discussing the project, answering questions, etc.](https://gitter.im/coltrane-music/Lobby)
 
 ## CLI (Command Line Interface)
@@ -50,4 +52,4 @@ We are looking for contributors. Find me on [our chatroom](https://gitter.im/col
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
-by Pedro Maciel | [twitter](http://twitter.com/pedrozath) | pedro@pedromaciel.com
+by Pedro Maciel | [twitter](http://twitter.com/pedrozath) | pedro@pedromaciel.com

data/bin/console

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require "bundler/setup"
 require "coltrane"
 require "coltrane_instruments"
-require "coltrane_synth"
+# require "coltrane_synth"
 
 require "pry"
 

data/coltrane.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_runtime_dependency 'coreaudio'
+  spec.add_runtime_dependency 'dry-monads',          '~> 0.4'
   spec.add_runtime_dependency 'paint',               '~> 2.0'
   spec.add_runtime_dependency 'color',               '~> 1.8'
   spec.add_runtime_dependency 'pedrozath-mercenary', '~> 0.3'

data/lib/cli.rb

@@ -7,7 +7,7 @@ require 'color'
 
 require 'coltrane'
 require 'coltrane_instruments'
-require 'coltrane_synth'
+# require 'coltrane_synth'
 
 require 'cli/config'
 require 'cli/errors'

data/lib/cli/chord.rb

@@ -29,7 +29,7 @@ module Coltrane
         @chords.each do |chord|
           desc = "#{chord.name} chord:"
           Coltrane::Cli::Notes.new chord.notes, desc: desc
-          ColtraneSynth::Base.play(chord, 1) if Cli.config.sound
+          # ColtraneSynth::Base.play(chord, 1) if Cli.config.sound
         end
       end
     end

data/lib/cli/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coltrane
   module Cli
     class Config
@@ -5,7 +7,7 @@ module Coltrane
         flavor: :notes,
         sound: false,
         on: :text
-      }
+      }.freeze
 
       attr_accessor :flavor, :degrees, :sound
       attr_reader :on
@@ -23,7 +25,6 @@ module Coltrane
               else instrument
               end
       end
-
     end
 
     def self.config
@@ -35,4 +36,4 @@ module Coltrane
       @config = nil
     end
   end
-end
+end

data/lib/cli/guitar_chords.rb

@@ -14,7 +14,7 @@ module Coltrane
         target_chord = Coltrane::Chord.new(notes: @notes)
         chords = ColtraneInstruments::Guitar::Base.find_chords(target_chord)
         @chords = chords.sort[-6..-1].reverse
-        @chords.each { |c| ColtraneSynth::Base.play(c.voicing) } if false
+        # @chords.each { |c| ColtraneSynth::Base.play(c.voicing) } if false
       end
 
       def chord_height
@@ -34,32 +34,32 @@ module Coltrane
         rchords = @chords.map { |c| render_chord(c).split("\n") }
         rchords.max_by(&:size).size.times.reduce('') do |memo1, l|
           memo1 +
-          rchords.reduce('') do |memo2, c|
-            memo2 +
-            (c[l].nil? ? " " * (c.map(&:size).max) + '  ' : "#{c[l]}  ")
-          end +
-          "\n"
+            rchords.reduce('') do |memo2, c|
+              memo2 +
+                (c[l].nil? ? ' ' * c.map(&:size).max + '  ' : "#{c[l]}  ")
+            end +
+            "\n"
         end
       end
 
       def render_chord(chord)
         render_top(chord) +
-        (chord.lowest_fret..chord.lowest_fret+chord_height)
+          (chord.lowest_fret..chord.lowest_fret + chord_height)
           .each_with_index.reduce('') do |memo1, (f, y)|
-            memo1 +
-            '   ' +
-            (chord.guitar.strings.size*2).times.map {|x| base_color border(x,y) }.join('') +
-            "\n" +
-            chord.guitar.strings.reduce(base_color f.to_s.ljust(2, ' ')) do |memo2, s|
-              memo2 +
-              ' ' +
-              render_note(chord.guitar_notes.select do |n|
-                n.string == s && n.fret == f
-              end.any?)
-            end +
-            " \n"
-          end + '   ' +
-          (chord.guitar.strings.size*2).times.map do |x|
+              memo1 +
+                '   ' +
+                (chord.guitar.strings.size * 2).times.map { |x| base_color border(x, y) }.join('') +
+                "\n" +
+              chord.guitar.strings.reduce(base_color(f.to_s.ljust(2, ' '))) do |memo2, s|
+                memo2 +
+                  ' ' +
+                render_note(chord.guitar_notes.select do |n|
+                  n.string == s && n.fret == f
+                end.any?)
+              end +
+                " \n"
+            end + '   ' +
+          (chord.guitar.strings.size * 2).times.map do |x|
             base_color border(x, chord_height + 1)
           end.join('')
       end
@@ -70,8 +70,8 @@ module Coltrane
         y_on_start  = y == 0
         x_on_edge   = x == edge[0]
         y_on_edge   = y == edge[1]
-        x_on_middle = (0...edge[0]).include?(x)
-        y_on_middle = (0...edge[1]).include?(y)
+        x_on_middle = (0...edge[0]).cover?(x)
+        y_on_middle = (0...edge[1]).cover?(y)
 
         if    x_on_start  && y_on_start  then '┍'
         elsif x_on_middle && y_on_start  then x.odd? ? '━' : '┯'
@@ -103,14 +103,14 @@ module Coltrane
       def render_top(chord)
         chord.guitar.strings.reduce('   ') do |memo, s|
           memo +
-          if chord.guitar_notes.select {|n|
-            n.string == s && n.fret == 0 }.any?
-            highlight '⬤ '
-          elsif chord.guitar_notes.select {|n| n.string == s && n.fret == nil }.any?
-            alt 'x '
-          else
-            '  '
-          end
+            if chord.guitar_notes.select { |n|
+              n.string == s && n.fret == 0 }.any?
+              highlight '⬤ '
+            elsif chord.guitar_notes.select { |n| n.string == s && n.fret.nil? }.any?
+              alt 'x '
+            else
+              '  '
+            end
         end + "\n"
       end
 

data/lib/cli/scale.rb

@@ -5,7 +5,7 @@ module Coltrane
     # Interfaces commands with the scales functionality
     class Scale
       def self.parse(str)
-        raise BadScaleError unless str && str.include?('-')
+        raise BadScaleError unless str&.include?('-')
         *scale_name, tone = str.split('-')
         Coltrane::Scale.fetch(scale_name.join('_'), tone)
       end

data/lib/coltrane.rb

@@ -4,11 +4,11 @@ require 'json'
 require 'forwardable'
 require 'core_ext'
 require 'ostruct'
-
+require 'dry-monads'
 
 # The main module for working with Music Theory
 module Coltrane
-  autoload :Frequency,              'coltrane/frequency'
+  autoload :Frequency, 'coltrane/frequency'
 
   BASE_OCTAVE = 4
   BASE_PITCH_INTEGER = 9
@@ -33,8 +33,9 @@ module Coltrane
   autoload :Note,                   'coltrane/note'
   autoload :NoteSet,                'coltrane/note_set'
 
-  autoload :Interval,               'coltrane/interval'
+  autoload :FrequencyInterval,      'coltrane/frequency_interval'
   autoload :IntervalClass,          'coltrane/interval_class'
+  autoload :Interval,               'coltrane/interval'
   autoload :UnorderedIntervalClass, 'coltrane/unordered_interval_class'
   autoload :IntervalSequence,       'coltrane/interval_sequence'
   autoload :Qualities,              'coltrane/qualities'

data/lib/coltrane/chord_quality.rb

@@ -27,7 +27,7 @@ module Coltrane
       hash ||= chord_trie
       return quality_names if hash.empty?
       if hash['name']
-        quality_names[hash.delete('name')] = intervals.map { |n| IntervalClass.new(n) }
+        quality_names[hash.delete('name')] = intervals.map { |n| Interval.public_send(n.underscore) }
       end
       hash.reduce(quality_names) do |memo, (interval, values)|
         memo.merge intervals_per_name(hash:  values,
@@ -45,7 +45,7 @@ module Coltrane
         return trie['name']
       end
       interval = given_interval_names.shift
-      new_trie = trie[interval]
+      new_trie = trie[interval.full_name]
       find_chord given_interval_names, last_name: (trie['name'] || last_name),
                                        trie: new_trie
     end
@@ -63,7 +63,7 @@ module Coltrane
     end
 
     def retrieve_chord_intervals(chord_sequence = normal_sequence)
-      ints = IntervalSequence.new(intervals: self)
+      ints = IntervalSequence.new(*self)
       chord_sequence.map do |int_sym|
         next unless interval_name = ints.public_send(int_sym)
         ints.delete_if { |i| i.cents == IntervalClass.new(interval_name).cents }
@@ -91,7 +91,7 @@ module Coltrane
     def initialize(name: nil, notes: nil, bass: nil)
       if name
         @name = bass.nil? ? name : [name, bass].join('/')
-        super(intervals: intervals_from_name(name))
+        super(*intervals_from_name(name))
       elsif notes
         super(notes: notes)
         @name = get_name

data/lib/coltrane/circle_of_fifths.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coltrane
   class CircleOfFifths
     attr_reader :notes
@@ -22,8 +24,8 @@ module Coltrane
              size:  size - 1
     end
 
-    def letters(i=nil)
+    def letters(i = nil)
       i.nil? ? LETTER_SEQUENCE : LETTER_SEQUENCE[i % LETTER_SEQUENCE.size]
     end
   end
-end
+end

data/lib/coltrane/classic_scales.rb

@@ -42,11 +42,11 @@ module Coltrane
     end
 
     # Factories for the diatonic scale
-    def major(note='C')
+    def major(note = 'C')
       DiatonicScale.new(note)
     end
 
-    def minor(note='A')
+    def minor(note = 'A')
       DiatonicScale.new(note, major: false)
     end
 

data/lib/coltrane/diatonic_scale.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coltrane
   class DiatonicScale < Scale
     def initialize(tone, major: true)
@@ -31,4 +33,4 @@ module Coltrane
       !@major
     end
   end
-end
+end