coltrane 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0d46eac3d20a2fedcaa721b417747a825114751af354ee2006e216ed07c7f4
-  data.tar.gz: ec03e35092ad2006a41031755b91be814d0e7c7a211fe859a5714823ac7ce7e7
+  metadata.gz: 389f01b2c9f2a783e912534f02c9b0a1506f3c9bb4274f3c08c7e94eb18559d6
+  data.tar.gz: d2550c127ae11b1798559d41195b3905c6481019195e1a634e54386e14e66215
 SHA512:
-  metadata.gz: 4e752677867bafe244e6fcb5df03957a16b1f35b2f2fce127778394197509afabd99a916444d27d90a50694e6dd11fab39cf78d4f17653aa9ef5f8d0b644bfe9
-  data.tar.gz: ceeee17fffeb15eb6e1cffbb8b9780152d68e7784f656894e543a579f9b195f83e8c8abd5cbf83933d9da2725d5e099d44dab821db46cdd786d5a8006d5ef285
+  metadata.gz: 8a5ee68e12b83f27ea1f0da1e74efad208548a6d1376bcc75e828f64c777b24964ac1ce40ee7a9df1e9c9555e3228565335e233938f68231cd656eb64e14057f
+  data.tar.gz: 4b84d5abe27a48bf6dff5942860d16be8ae77b18cccff75f507eee1f5de078a8caac1b31fb7333b83181b08b4a7af44241c9ba7a3f8e63288c397e520edd8add

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.2.0]
+- Adds custom_guitar and custom_guitar_frets
+
 ## [3.1.3]
 - Several fixes.
 - Interactive mode

data/Gemfile.lock

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

data/lib/coltrane/commands/chords.rb

@@ -32,18 +32,28 @@ module Coltrane
 
       def on_model
         case on
-        when :text              then chord
-        when :guitar            then Representation::Guitar.find_chords(chord).first(voicings)
-        when :ukulele, :ukelele then Representation::Ukulele.find_chords(chord).first(voicings)
-        when :bass              then Representation::Bass.find_notes(chord.notes)
-        when :piano             then Representation::Piano.find_notes(chord.notes)
-        when :'guitar-frets'    then Representation::Guitar.find_notes(chord.notes)
-        when :'ukulele-frets', :'ukelele-frets' then Representation::Ukulele.find_notes(chord.notes)
+        when :text                  then chord
+        when :guitar                then Representation::Guitar.find_chords(chord).first(voicings)
+        when :ukulele, :ukelele     then Representation::Ukulele.find_chords(chord).first(voicings)
+        when :bass                  then Representation::Bass.find_notes(chord.notes)
+        when :piano                 then Representation::Piano.find_notes(chord.notes)
+        when :'guitar-frets'        then Representation::Guitar.find_notes(chord.notes)
+        when :'ukulele-frets',      :'ukelele-frets' then Representation::Ukulele.find_notes(chord.notes)
+        when /custom_guitar_frets/  then custom_guitar_notes
+        when /custom_guitar/        then custom_guitar_chords.first(voicings)
         end
       end
 
+      def custom_guitar_notes
+        Representation::Guitar::NoteSet.new(chord.notes, guitar: custom_guitar)
+      end
+
+      def custom_guitar_chords
+        Representation::Guitar::Chord.find(chord, guitar: custom_guitar)
+      end
+
       def layout_horizontal?
-        [:guitar, :ukulele, :ukelele, :bass, :piano].include?(on)
+        on.to_s =~ /guitar|ukulele|ukelele|bass|piano/
       end
 
       def renderer_options

data/lib/coltrane/commands/command.rb

@@ -5,7 +5,9 @@ module Coltrane
         on: [
           '--on <INSTRUMENT>',
           'Shows the notes on the given instrument/representation type. ' \
-          'Can be piano, guitar, ukulele, bass or text'
+          'Can be text, piano, guitar, ukulele, bass.' \
+          'You can also provide a custom guitar using the following format:' \
+          '--on custom_guitar=D2-A3-D3-B3-C3'
         ],
 
         flavor: [
@@ -21,6 +23,15 @@ module Coltrane
         ]
       }
 
+      def custom_guitar
+        on
+        .to_s
+        .split('=')
+        .fetch(1)
+        .split('-')
+        .yield_self { |tuning| Representation::Guitar.new(tuning: tuning) }
+      end
+
       def render
         puts "\n" + Renderers::TextRenderer.render(
           representation, **renderer_options

data/lib/coltrane/commands/notes.rb

@@ -21,7 +21,7 @@ module Coltrane
 
       def on_model
         case on.to_sym
-        when :text              then notes
+        when /custom_guitar/    then custom_guitar_notes
         when :guitar            then Representation::Guitar.find_notes(notes)
         when :ukulele, :ukelele then Representation::Ukulele.find_notes(notes)
         when :bass              then Representation::Bass.find_notes(notes)
@@ -29,6 +29,10 @@ module Coltrane
         end
       end
 
+      def custom_guitar_notes
+        Representation::Guitar::NoteSet.new(notes, guitar: custom_guitar)
+      end
+
       def self.mercenary_init(program)
         program.command(:notes) do |c|
           c.alias(:note)

data/lib/coltrane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader