coltrane 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bcc965c58bf6b15535fb68f68afae4d2c2bc80c4093fed74d2262832493ae1
-  data.tar.gz: fbb8f333da624a0024cff3980393cf5b58d2072fc39f9f66cf7c5e90e974f8de
+  metadata.gz: 3461b7ccf37f1b56926dd7e97ae10e1bb05b72c7b431706dc9bcfe621f583d78
+  data.tar.gz: d1e3cb3b4735ba4a06bb5ec10232812d729d45918159b6574f7c6b310556ce86
 SHA512:
-  metadata.gz: 5a3bbe886d212f9681fcee881062adf31f03420244d2a722768fadb7d3b13d6610afbc4ceb3411ffd83a86414aaa81e7723fda49279ee573bea3aba69733d5b1
-  data.tar.gz: e4415544069e87173a94a784cace25eb51b57f18763d9ad4b331ce49ea3738c07729c7fdc7c6b9ef5f25489de933ed8c777705dce35c1821936d7f8ca9ee4134
+  metadata.gz: 0c4fed6840276e6c80e6ace57db61f66f69a69702792b98afadf72e8f59db135845e79fadd33a49f648e96d8dd2145e17ed99973780c76462b678d1a11a5629f
+  data.tar.gz: de98df40119044911a4e399e2ba4d985f4ba68ace17381fd3832f1db066b8600e01f0274b820aa5fdd146b2121d252eb1e240d6b83ab1f4be8adf6f1f9ea5fa8

data/CHANGELOG.md

@@ -5,6 +5,9 @@
 - Fix chords so that they generate a barre and a non-barre version and prevent
   barre chords from picking notes before the barre.
 
+## [3.4.0]
+- Adds `find-guitar-chord` command. It allows discovering a guitar chord name.
+
 ## [3.3.3]
 - Fixes a bug in greek modes for accidental notes
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coltrane (3.3.3)
+    coltrane (3.4.0)
       color (~> 1.8)
       dry-monads (~> 0.4)
       paint (~> 2.0)

data/bin/console

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
 require "bundler/setup"
 require "coltrane"
+require "coltrane/commands"
 require "coltrane/representation"
 require "coltrane/renderers"
 

data/lib/coltrane/commands.rb

@@ -12,3 +12,4 @@ require 'coltrane/commands/progression'
 require 'coltrane/commands/common_chords'
 require 'coltrane/commands/find_scale'
 require 'coltrane/commands/find_progression'
+require 'coltrane/commands/find_guitar_chord'

data/lib/coltrane/commands/find_guitar_chord.rb

@@ -0,0 +1,25 @@
+module Coltrane
+  module Commands
+    class FindGuitarChord < Command
+      attr_reader :notation
+
+      def initialize(notation)
+        @notation = notation
+      end
+
+      def representation
+        Representation::Guitar.find_chord_by_notation(notation)
+      end
+
+      def self.mercenary_init(program)
+        program.command(:'find-guitar-chord') do |c|
+          c.syntax 'find-guitar-chord x-2-2-4-5-x'
+          c.description 'find the chord name assuming the standard tuning (EADGBE)'
+          c.action do |(notation)|
+            new(notation).render
+          end
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/representation/guitar.rb

@@ -22,12 +22,18 @@ module Coltrane
         Guitar::NoteSet.new(notes, guitar: new)
       end
 
+      def self.find_chord_by_notation(chord_notation)
+        Guitar::Chord.find_by_notation(new, chord_notation)
+      end
+
       def initialize(tuning: nil, frets: nil, special_frets: nil)
         @tuning        = tuning        || %w[E2 A2 D3 G3 B3 E4]
         @special_frets = special_frets || [3, 5, 7, 9, 12, 15, 17, 19]
         @frets         = frets         || 23
 
-        @strings = @tuning.map { |p| String.new(Theory::Pitch[p], guitar: self) }
+        @strings = @tuning.map do |p|
+          String.new(Theory::Pitch[p], guitar: self)
+        end
       end
     end
   end

data/lib/coltrane/representation/guitar/chord.rb

@@ -17,6 +17,32 @@ module Coltrane
           .reverse
         end
 
+        def self.find_by_notation(guitar, chord_notation)
+          chord_notation
+          .split('-')
+          .map
+          .with_index do |n, i|
+            next if n == 'x'
+            n = Guitar::Note.new(guitar.strings[i], n.to_i).pitch.pitch_class
+          end
+          .yield_self do |notes|
+            notes
+            .map
+            .with_index do |note, index|
+              begin
+                Theory::Chord.new(notes: notes.rotate(index))
+              rescue Theory::ChordNotFoundError
+                next
+              end
+            end
+            .compact
+            .yield_self do |chords|
+              raise(Theory::ChordNotFoundError) if chords.empty?
+              chords.compact.uniq &:name
+            end
+          end
+        end
+
         def initialize(target_chord,
                        guitar_notes: [],
                        free_fingers: 4,
@@ -183,4 +209,4 @@ module Coltrane
       end
     end
   end
-end
+end

data/lib/coltrane/theory/chord_quality.rb

@@ -76,16 +76,16 @@ module Coltrane
 
       def get_name
         find_chord(retrieve_chord_intervals.compact) ||
-          find_chord(retrieve_chord_intervals(sus2_sequence).compact) ||
-          find_chord(retrieve_chord_intervals(sus4_sequence).compact) ||
-          raise(ChordNotFoundError)
+        find_chord(retrieve_chord_intervals(sus2_sequence).compact) ||
+        find_chord(retrieve_chord_intervals(sus4_sequence).compact) ||
+        raise(ChordNotFoundError)
       end
 
       def suspension_type
         if has_major_second?
           'sus2'
-        else has_fourth?
-             'sus4'
+        elsif has_fourth?
+          'sus4'
         end
       end
 

data/lib/coltrane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coltrane
-  VERSION = '3.3.3'
+  VERSION = '3.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -179,6 +179,7 @@ files:
 - lib/coltrane/commands/command.rb
 - lib/coltrane/commands/common_chords.rb
 - lib/coltrane/commands/errors.rb
+- lib/coltrane/commands/find_guitar_chord.rb
 - lib/coltrane/commands/find_progression.rb
 - lib/coltrane/commands/find_scale.rb
 - lib/coltrane/commands/notes.rb
@@ -265,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: It deals with all sorts of calculations around music theory and allows for