coltrane 3.4.2 → 4.1.0

data/bin/thor

@@ -15,7 +15,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
 bundle_binstub = File.expand_path("../bundle", __FILE__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/coltrane.gemspec

@@ -32,11 +32,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'tty-reader',  '~> 0.2'
   spec.add_runtime_dependency 'dry-monads',  '~> 0.4'
+  spec.add_runtime_dependency 'gambiarra',   '~> 0'
   spec.add_runtime_dependency 'paint',       '~> 2.0'
   spec.add_runtime_dependency 'color',       '~> 1.8'
-  spec.add_runtime_dependency 'pedrozath-mercenary', '0.3.8'
-  spec.add_development_dependency "bundler", '~> 1.14'
-  spec.add_development_dependency "rake",    '~> 10.0'
+  spec.add_runtime_dependency 'activesupport', '> 5.2'
+  spec.add_development_dependency "bundler",   '~> 2.2.5'
+  spec.add_development_dependency "rake",      '~> 10.0'
 end

data/exe/coltrane

@@ -1,65 +1,24 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
-
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
-require 'paint'
-require 'color'
-
-require 'pedrozath-mercenary'
-require 'coltrane/commands'
-
-if ENV['COLORTERM'] == 'truecolor'
-  Paint.mode = 0xFFFFFF
-else
-  Paint.mode = 0
-  puts "This terminal doesn't seem to support true color. " \
-       "Try something like iTerm2 (for macOS), VTE or Konsole (for linux) or Hyper" \
-       " (for Windows) and you'll see the true magic!"
-end
-
-Mercenary.program(:Coltrane) do |p|
-  p.version Coltrane::VERSION
-  p.description <<~DESC
-    A music querying interface
-    by Pedro Maciel (pedro@pedromaciel.com)
-
-    Check the chat room for project help/discussion/contribution: https://coltrane-ruby.herokuapp.com
-  DESC
-  p.syntax 'coltrane <subcommand> [options]'
-
-  Coltrane::Commands::Command.subclasses.each do |command|
-    command.mercenary_init(p)
-  end
-
-  p.command(:about) do |c|
-    c.description 'Shows this screen'
-    c.action { puts p }
-  end
-
-  p.command(:shell) do |c|
-    c.description 'Starts an interactive shell'
-    c.action do
-      system File.expand_path('../../bin', __FILE__) + "/coltrane-interactive"
-    end
-  end
-
-  p.command(:help) do |c|
-    c.description 'May give you some help.'
-    c.syntax 'help <command> [subcommand, sub-subcommand, ...]'
-    c.action do |(*command_path), _options|
-      if command_path.empty?
-        puts p
-      else
-        puts begin
-          command_path.reduce(p) do |memo, key|
-            memo.commands.delete(key.to_sym)
-          end || "\n Sorry, command found."
+require 'coltrane/ui'
+
+module Coltrane
+  module UI
+    class App < Gambiarra::App
+      def setup
+        if ENV['COLORTERM'] == 'truecolor'
+          Paint.mode = 0xFFFFFF
+        else
+          Paint.mode = 0
+          puts "This terminal doesn't seem to support true color. " \
+               "Try something like iTerm2 (for macOS), VTE or Konsole (for linux) or Hyper" \
+               " (for Windows) and you'll see the true magic!"
         end
       end
     end
   end
-
-  p.default_command(:shell)
 end
 
+Coltrane::UI::App.start(ARGV.join(' '))

data/lib/coltrane/commands.rb

@@ -3,13 +3,8 @@
 require 'coltrane'
 require 'coltrane/representation'
 require 'coltrane/renderers'
-
 require 'coltrane/commands/command'
-require 'coltrane/commands/notes'
-require 'coltrane/commands/chords'
-require 'coltrane/commands/scale'
-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'
+
+Dir[File.expand_path('../commands/*', __FILE__)].map do |f|
+  require(f)
+end

data/lib/coltrane/commands/available_chord_representations.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class AvailableChordRepresentations < Command
+      def run
+        return ['GuitarChordChart'] + AvailableRepresentations.run
+      end
+    end
+  end
+end

data/lib/coltrane/commands/available_classic_scales.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class AvailableClassicScales < Command
+      def run
+        Theory::Scale.known_scales
+      end
+    end
+  end
+end

data/lib/coltrane/commands/available_notable_progressions.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class AvailableNotableProgressions < Command
+      def run
+        Theory::NotableProgressions::PROGRESSIONS.keys
+      end
+    end
+  end
+end

data/lib/coltrane/commands/available_representations.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class AvailableRepresentations < Command
+      def run
+        ['Text'] + Representation.constants.map(&:to_s)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/command.rb

@@ -1,61 +1,10 @@
 module Coltrane
   module Commands
     class Command
-      COMMON_OPTIONS = {
-        on: [
-          '--on <INSTRUMENT>',
-          'Shows the notes on the given instrument/representation type. ' \
-          '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'
-        ],
+      attr_reader :error
 
-        flavor: [
-          '--flavor <FLAVOR>',
-          'Chooses which additional information to display: ' \
-          'marks, notes, intervals or degrees'
-        ],
-
-        voicings: [
-          '--voicings <NUMBER>',
-          'Number of voicings for guitar like instruments. Default is 6' \
-          'provided they are separated by dashes'
-        ]
-      }
-
-      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
-        )
-      end
-
-      def renderer_options
-        {}
-      end
-
-      class << self
-
-        def subclasses
-          @subclasses ||= []
-        end
-
-        def inherited(base)
-          subclasses << base
-          super(base)
-        end
-
-        def add_shared_option(option_name, mercenary_command)
-          mercenary_command.option(option_name, *COMMON_OPTIONS[option_name])
-        end
+      def self.run(*args)
+        new.run(*args)
       end
     end
   end

data/lib/coltrane/commands/find_chord_by_notes.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class FindChordByNotes < Command
+      def run(notes)
+        Theory::Chord.new(notes: notes)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/find_common_chords.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class FindCommonChords < Command
+      def run(*scales)
+        scales.map(&:chords).reduce(&:&)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/find_progressions_from_chords.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class FindProgressionsFromChords < Command
+      def run(*chords)
+        Theory::Progression.find(*chords)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/find_scale_by_chords.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class FindScaleByChords < Command
+      def run(*chords)
+        Theory::Scale.having_chords(*chords)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/find_scale_by_notes.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class FindScaleByNotes < Command
+      def run(notes)
+        Theory::Scale.having_notes(*notes)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_chords_from_notable_progression.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class GetChordsFromNotableProgression < Command
+      def run(progression, key)
+        Theory::Progression.send(progression.underscore, key).chords
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_chords_from_progression.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class GetChordsFromProgression < Command
+      def run(notation, key)
+        Theory::Progression.new(notation, key: key).chords
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_chords_from_scale.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class GetChordsFromScale < Command
+      def run(scale, type, size)
+        scale.send(type == 'tertians' ? :tertians : :chords)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_chords_from_string.rb

@@ -0,0 +1,11 @@
+module Coltrane
+  module Commands
+    class GetChordsFromString < Command
+      def run(string)
+        string.split(' ').map do |chord|
+          Theory::Chord.new(name: chord)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_classic_scale.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class GetClassicScale < Command
+      def run(scale, tone)
+        Theory::Scale.fetch(scale, tone)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_notes.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class GetNotes < Command
+      def run(*notes)
+        Theory::NoteSet[*notes]
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_notes_from_string.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class GetNotesFromString < Command
+      def run(string)
+        GetNotes.run(*string.split(' '))
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_representation_chords.rb

@@ -0,0 +1,18 @@
+module Coltrane
+  module Commands
+    class GetRepresentationChords < Command
+      def run(representation, chords)
+        chords.map do |chord|
+          if representation == 'GuitarChordChart'
+            {
+              chord.name => Representation::Guitar.find_chords(chord).first(4),
+              options: { layout: :horizontal, per_row: 4 }
+            }
+          else
+            { chord.name => GetRepresentationNotes.run(representation, chord.notes) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/commands/get_representation_notes.rb

@@ -0,0 +1,12 @@
+module Coltrane
+  module Commands
+    class GetRepresentationNotes < Command
+      def run(representation, notes)
+        return notes if representation == 'Text'
+        Object
+          .const_get("Coltrane::Representation::#{representation}")
+          .find_notes(notes)
+      end
+    end
+  end
+end

data/lib/coltrane/commands/render.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module Commands
+    class Render < Command
+      def run(object)
+        Renderers::TextRenderer.render(object)
+      end
+    end
+  end
+end

data/lib/coltrane/renderers/text_renderer/hash_drawer.rb

@@ -5,6 +5,7 @@ module Coltrane
         alias hash model
 
         def render
+          options = hash.delete(:options) || {}
           hash.map { |k, v|
             "#{k}: \n\n" +
             TextRenderer.render(v, **options)

data/lib/coltrane/renderers/text_renderer/representation_guitar_chord_drawer.rb

@@ -77,7 +77,7 @@ module Coltrane
             memo +
               if chord.guitar_notes.select do |n|
                 n.string == s && n.fret == 0 end.any?
-                highlight '⬤ '
+                highlight '• '
               elsif chord.guitar_notes.select { |n| n.string == s && n.fret.nil? }.any?
                 alt 'x '
               else
@@ -87,7 +87,7 @@ module Coltrane
         end
 
         def render_note(found)
-          found ? highlight('⬤') : base_color('│')
+          found ? highlight('•') : base_color('│')
         end
       end
     end

data/lib/coltrane/renderers/text_renderer/representation_piano_note_set_drawer.rb

@@ -40,7 +40,7 @@ module Coltrane
           when :intervals then (note_set.root - note).name
           when :marks then '◼ '
           when :degrees then note_set.notes.degree(note).to_s.rjust(2, '0')
-          when :notes then note.pretty_name.to_s.ljust(2, "\u266E")
+          when :notes then note.pretty_name.to_s.ljust(2, " ")
           end
         end
       end