coltrane 3.4.2 → 4.1.0

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

@@ -5,8 +5,7 @@ module Coltrane
         alias chord model
 
         def render
-          "#{chord.name}: ".ljust(5) +
-          TextRenderer.render(chord.notes, **options)
+          "#{chord.name}: ".ljust(5) + TextRenderer.render(chord.notes)
         end
       end
     end

data/lib/coltrane/theory/classic_scales.rb

@@ -45,7 +45,7 @@ module Coltrane
       alias blues         blues_major
 
       def known_scales
-        SCALES.keys + ['Major', 'Natural Minor']
+        ['Major', 'Natural Minor'] + SCALES.keys
       end
 
       # List of scales appropriate for search

data/lib/coltrane/theory/interval.rb

@@ -133,7 +133,7 @@ module Coltrane
       end
 
       def clone(override_args = {})
-        self.class.new({
+        self.class.new(**{
           semitones: semitones,
           letter_distance: letter_distance,
           compound: compound?

data/lib/coltrane/ui.rb

@@ -0,0 +1,8 @@
+require 'paint'
+require 'color'
+
+require 'gambiarra'
+require 'coltrane/commands'
+
+require File.expand_path('../ui/base_view', __FILE__)
+views = Dir[File.expand_path('../ui/views/*', __FILE__)].map { |view| require(view) }

data/lib/coltrane/ui/base_view.rb

@@ -0,0 +1,9 @@
+module Coltrane
+  module UI
+    class BaseView < Gambiarra::View
+      def self.render(view)
+        Commands::Render.run(view.render)
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/chords.rb

@@ -0,0 +1,19 @@
+module Coltrane
+  module UI
+    module Views
+      class Chords < BaseView
+        questions({
+          path: {
+            statement: 'What do you need',
+            options: [
+              'show chord',
+              'find chord by notes',
+              'find chords in scale',
+              'find common chords in scales'
+            ]
+          }
+        })
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/custom_progression.rb

@@ -0,0 +1,27 @@
+module Coltrane
+  module UI
+    module Views
+      class CustomProgression < BaseView
+        questions({
+          progression_notation: {
+            statement: 'What is the progression? (Ex: I-vi-IV-V)'
+          },
+
+          representation: {
+            statement: 'How do you wanna see the chords?',
+            options: Commands::AvailableChordRepresentations.run
+          },
+
+          key: {
+            statement: 'What is the key?'
+          },
+        })
+
+        def render
+          chords = Commands::GetChordsFromProgression.run(*params.values_at(:progression_notation, :key))
+          Commands::GetRepresentationChords.run(params[:representation], chords)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/find_chord_by_notes.rb

@@ -0,0 +1,16 @@
+module Coltrane
+  module UI
+    module Views
+      class FindChordByNotes < BaseView
+        questions({
+          notes: { statement: 'Which Notes?' }
+        })
+
+        def render
+          notes = Commands::GetNotesFromString.run(params[:notes])
+          Commands::FindChordByNotes.run(*notes)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/find_chords_in_scale.rb

@@ -0,0 +1,36 @@
+require 'coltrane/ui/views/show_scale'
+
+module Coltrane
+  module UI
+    module Views
+      class FindChordsInScale < ShowScale
+        questions({
+          chord_type: {
+            statement: 'Which kind of chords?',
+            options: ['tertian', 'all']
+          },
+
+          chord_size: {
+            statement: 'What is the size of the chords',
+            options: (3..7).to_a.map(&:to_s)
+          },
+
+          chord_representation: {
+            statement: 'How do you wanna see this',
+            options: Commands::AvailableChordRepresentations.run
+          },
+
+          representation: nil
+        })
+        def render
+          scale = Commands::GetClassicScale.run(*params.values_at(:scale, :tone))
+          chords = Commands::GetChordsFromScale.run(
+            scale,
+            *params.values_at(:chord_type, :chord_size)
+          )
+          Commands::GetRepresentationChords.run(params[:chord_representation], chords)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/find_common_chords_in_scales.rb

@@ -0,0 +1,40 @@
+module Coltrane
+  module UI
+    module Views
+      class FindCommonChordsInScales < BaseView
+        questions({
+          first_scale: {
+            statement: 'Choose the first scale',
+            options: Commands::AvailableClassicScales.run
+          },
+
+          first_scale_root: {
+            statement: 'Type the tone (note)'
+          },
+
+          second_scale: {
+            statement: 'Choose the second scale',
+            options: Commands::AvailableClassicScales.run
+          },
+
+          second_scale_root: {
+            statement: 'Type the tone (note)'
+          },
+
+          representation: {
+            statement: 'How do you wanna see the results?',
+            options: Commands::AvailableChordRepresentations.run
+          }
+        })
+
+        def render
+          scale_a    = Commands::GetClassicScale.run(*params.values_at(:first_scale, :first_scale_root))
+          scale_b    = Commands::GetClassicScale.run(*params.values_at(:second_scale, :second_scale_root))
+          chords     = Commands::FindCommonChords.run(scale_a, scale_b)
+          rep_chords = Commands::GetRepresentationChords.run(params[:representation], chords)
+          { "Chords that exist in #{scale_a.full_name} and #{scale_b.full_name}" => rep_chords }
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/find_progressions_from_chords.rb

@@ -0,0 +1,14 @@
+module Coltrane
+  module UI
+    module Views
+      class FindProgressionsFromChords < BaseView
+        questions chords: { statement: 'Type the chords? (Ex: CM EM GM)' }
+
+        def render
+          chords = Commands::GetChordsFromString.run(params[:chords])
+          Commands::FindProgressionsFromChords.run(*chords)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/find_scale.rb

@@ -0,0 +1,14 @@
+module Coltrane
+  module UI
+    module Views
+      class FindScale < BaseView
+        questions({
+          path: {
+            statement: 'How do you wanna search',
+            options: ['find scale by chords', 'find scale by notes']
+          },
+        })
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/find_scale_by_chords.rb

@@ -0,0 +1,16 @@
+module Coltrane
+  module UI
+    module Views
+      class FindScaleByChords < BaseView
+        questions({
+          chords: { statement: 'Which Chords?' }
+        })
+
+        def render
+          chords = Commands::GetChordsFromString.run(params[:chords])
+          Commands::FindScaleByChords.run(*chords)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/find_scale_by_notes.rb

@@ -0,0 +1,16 @@
+module Coltrane
+  module UI
+    module Views
+      class FindScaleByNotes < BaseView
+        questions({
+          notes: { statement: 'Which Notes?' }
+        })
+
+        def render
+          notes = Commands::GetNotesFromString.run(params[:notes])
+          Commands::FindScaleByNotes.run(*notes)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/index.rb

@@ -0,0 +1,14 @@
+module Coltrane
+  module UI
+    module Views
+      class Index < BaseView
+        questions({
+          path: {
+            statement: "Welcome to Coltrane #{Coltrane::VERSION}",
+            options: %w[notes chords scales progressions exit]
+          }
+        })
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/notes.rb

@@ -0,0 +1,20 @@
+module Coltrane
+  module UI
+    module Views
+      class Notes < BaseView
+        questions({
+          notes: { statement: 'Which notes?' } ,
+          representation: {
+            statement: 'How to display?',
+            options: Commands::AvailableRepresentations.run
+          }
+        })
+
+        def render
+          notes = Commands::GetNotesFromString.run(params[:notes])
+          Commands::GetRepresentationNotes.run(params[:representation], notes)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/progressions.rb

@@ -0,0 +1,18 @@
+module Coltrane
+  module UI
+    module Views
+      class Progressions < BaseView
+        questions({
+          path: {
+            statement: 'What do you need?',
+            options: [
+              'show progression',
+              'custom progression',
+              'find progressions from chords'
+            ]
+          }
+        })
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/scales.rb

@@ -0,0 +1,17 @@
+module Coltrane
+  module UI
+    module Views
+      class Scales < BaseView
+        questions({
+          path: {
+            statement: 'What do you need?',
+            options: [
+              'show scale',
+              'find scale'
+            ]
+          }
+        })
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/show_chord.rb

@@ -0,0 +1,21 @@
+module Coltrane
+  module UI
+    module Views
+      class ShowChord < BaseView
+        questions({
+          chord: { statement: 'Which chord?' },
+          chord_representation: {
+            statement: 'How do you wanna see it?',
+            options: Commands::AvailableChordRepresentations.run
+          }
+        })
+
+        def render
+          chord = Commands::GetChordsFromString.run(params[:chord]).first
+          Commands::GetRepresentationChords.run(params[:chord_representation], [chord])
+        end
+
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/show_progression.rb

@@ -0,0 +1,26 @@
+module Coltrane
+  module UI
+    module Views
+      class ShowProgression < BaseView
+        questions({
+          progression: {
+            statement: 'What is the progression?',
+            options: Commands::AvailableNotableProgressions.run
+          },
+
+          representation: {
+            statement: 'How do you wanna see the chords?',
+            options: Commands::AvailableChordRepresentations.run
+          },
+
+          root: { statement: 'Start at which note? (Ex: C; D#; Fb)' }
+        })
+
+        def render
+          chords = Commands::GetChordsFromNotableProgression.run(*params.values_at(:progression, :root))
+          Commands::GetRepresentationChords.run(params[:representation], chords)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/ui/views/show_scale.rb

@@ -0,0 +1,26 @@
+module Coltrane
+  module UI
+    module Views
+      class ShowScale < BaseView
+        questions({
+          scale: {
+            statement: 'Which Scale?',
+            options: Commands::AvailableClassicScales.run
+          },
+
+          tone: { statement: 'What is the root of the scale?' },
+
+          representation: {
+            statement: 'How to display?',
+            options: Commands::AvailableRepresentations.run
+          }
+        })
+
+        def render
+          scale = Commands::GetClassicScale.run(*params.values_at(:scale, :tone))
+          Commands::GetRepresentationNotes.run(params[:representation], scale.notes)
+        end
+      end
+    end
+  end
+end

data/lib/coltrane/version.rb

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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tty-reader
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: dry-monads
+  name: gambiarra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: pedrozath-mercenary
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,10 +116,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".bundle/config"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -140,6 +142,7 @@ files:
 - bin/console
 - bin/erubis
 - bin/flay
+- bin/gambiarra
 - bin/gitlab
 - bin/guard
 - bin/htmldiff
@@ -148,6 +151,7 @@ files:
 - bin/ldiff
 - bin/listen
 - bin/nokogiri
+- bin/old-coltrane
 - bin/opal
 - bin/opal-build
 - bin/opal-mspec
@@ -172,18 +176,30 @@ files:
 - coltrane.gemspec
 - config.ru
 - exe/coltrane
+- lib/.DS_Store
 - lib/coltrane.rb
+- lib/coltrane/.DS_Store
 - lib/coltrane/commands.rb
-- lib/coltrane/commands/chords.rb
+- lib/coltrane/commands/available_chord_representations.rb
+- lib/coltrane/commands/available_classic_scales.rb
+- lib/coltrane/commands/available_notable_progressions.rb
+- lib/coltrane/commands/available_representations.rb
 - 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
-- lib/coltrane/commands/progression.rb
-- lib/coltrane/commands/scale.rb
+- lib/coltrane/commands/find_chord_by_notes.rb
+- lib/coltrane/commands/find_common_chords.rb
+- lib/coltrane/commands/find_progressions_from_chords.rb
+- lib/coltrane/commands/find_scale_by_chords.rb
+- lib/coltrane/commands/find_scale_by_notes.rb
+- lib/coltrane/commands/get_chords_from_notable_progression.rb
+- lib/coltrane/commands/get_chords_from_progression.rb
+- lib/coltrane/commands/get_chords_from_scale.rb
+- lib/coltrane/commands/get_chords_from_string.rb
+- lib/coltrane/commands/get_classic_scale.rb
+- lib/coltrane/commands/get_notes.rb
+- lib/coltrane/commands/get_notes_from_string.rb
+- lib/coltrane/commands/get_representation_chords.rb
+- lib/coltrane/commands/get_representation_notes.rb
+- lib/coltrane/commands/render.rb
 - lib/coltrane/renderers.rb
 - lib/coltrane/renderers/renderer.rb
 - lib/coltrane/renderers/text_renderer.rb
@@ -241,6 +257,26 @@ files:
 - lib/coltrane/theory/scale_search_result.rb
 - lib/coltrane/theory/scale_set.rb
 - lib/coltrane/theory/voicing.rb
+- lib/coltrane/ui.rb
+- lib/coltrane/ui/.DS_Store
+- lib/coltrane/ui/base_view.rb
+- lib/coltrane/ui/views/.DS_Store
+- lib/coltrane/ui/views/chords.rb
+- lib/coltrane/ui/views/custom_progression.rb
+- lib/coltrane/ui/views/find_chord_by_notes.rb
+- lib/coltrane/ui/views/find_chords_in_scale.rb
+- lib/coltrane/ui/views/find_common_chords_in_scales.rb
+- lib/coltrane/ui/views/find_progressions_from_chords.rb
+- lib/coltrane/ui/views/find_scale.rb
+- lib/coltrane/ui/views/find_scale_by_chords.rb
+- lib/coltrane/ui/views/find_scale_by_notes.rb
+- lib/coltrane/ui/views/index.rb
+- lib/coltrane/ui/views/notes.rb
+- lib/coltrane/ui/views/progressions.rb
+- lib/coltrane/ui/views/scales.rb
+- lib/coltrane/ui/views/show_chord.rb
+- lib/coltrane/ui/views/show_progression.rb
+- lib/coltrane/ui/views/show_scale.rb
 - lib/coltrane/version.rb
 - lib/core_ext.rb
 homepage: http://github.com/pedrozath/coltrane
@@ -263,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: It deals with all sorts of calculations around music theory and allows for