coltrane 3.4.2 → 4.0.3

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

@@ -0,0 +1,16 @@
+module Coltrane
+  module UI
+    module Views
+      class FindScaleByNotes < View
+        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 < View
+        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 < View
+        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 < View
+        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 < View
+        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 < View
+        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 < View
+        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 < View
+        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/ui/views/view.rb

@@ -0,0 +1,47 @@
+module Coltrane
+  module UI
+    module Views
+      class View
+        attr_reader :params, :path
+
+        class << self
+          def inherited(subclass)
+            @questions ||= {}
+            subclass.instance_variable_set(:@questions, @questions.deep_dup)
+          end
+
+          def questions(question_data)
+            @questions.merge!(question_data)
+          end
+
+          def set_path(value)
+            @params[:path] = value
+          end
+
+          def render(**params)
+            remaining_questions = @questions.slice(*(@questions.keys - params.keys))
+            return { questions: remaining_questions, **params } if remaining_questions.any?
+            view = new(**params)
+            { content: Commands::Render.run(view.render), **params }
+          end
+        end
+
+        def initialize(**params)
+          @params = params
+        end
+
+        def output(object)
+          self.class.output(object)
+        end
+
+        def go_to(path, **params)
+          # App.router.set_next(path, **params) and return
+        end
+
+        def ensure_param(param_name, &block)
+          @params[param_name] = block.call if @params[param_name].nil?
+        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.0.3'
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-10-16 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: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: color
+  name: cli-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.1'
 - !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
@@ -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
@@ -148,6 +150,7 @@ files:
 - bin/ldiff
 - bin/listen
 - bin/nokogiri
+- bin/old-coltrane
 - bin/opal
 - bin/opal-build
 - bin/opal-mspec
@@ -172,18 +175,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 +256,27 @@ 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/router.rb
+- lib/coltrane/ui/views.rb
+- 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/ui/views/view.rb
 - lib/coltrane/version.rb
 - lib/core_ext.rb
 homepage: http://github.com/pedrozath/coltrane

data/lib/coltrane/commands/chords.rb

@@ -1,93 +0,0 @@
-module Coltrane
-  module Commands
-    class Chords < Command
-      attr_reader :chord, :flavor, :on, :preface, :voicings
-
-      def initialize(chord = nil,
-                     flavor: :notes,
-                     on: :text,
-                     notes: nil,
-                     preface: nil,
-                     voicings: 4,
-                     **options)
-        if chord
-          @chord = chord.is_a?(Theory::Chord) ? chord : Theory::Chord.new(name: chord)
-        elsif notes
-          @chord = Theory::Chord.new(notes: notes&.split('-'))
-        else
-          raise 'Provide chord names or notes. Ex: coltrane chords Cm7-Db7, ' \
-                'or coltrane chords --notes C-E-G'
-        end
-
-        @flavor   = flavor.to_sym
-        @preface  = preface || @chord.name
-        @on       = on.to_sym
-        @voicings = voicings.to_i
-      end
-
-      def representation
-        return on_model if on == :text
-        { preface => on_model }
-      end
-
-      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 /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?
-        on.to_s =~ /guitar|ukulele|ukelele|bass|piano/
-      end
-
-      def renderer_options
-        [
-          { flavor: flavor },
-          (
-            {
-              layout: :horizontal,
-              per_row: 4,
-            } if layout_horizontal?
-          )
-        ]
-        .compact
-        .reduce({}, :merge)
-      end
-
-      def self.mercenary_init(program)
-        program.command(:chords) do |c|
-          c.alias(:chord)
-          c.syntax 'chords [<chord-name>] [--on <instrument>]'
-          c.description 'Shows the given chord. Ex: coltrane chord Cmaj7 --on piano'
-          c.option :notes, '--notes C-D-E', 'finds chords with those notes, ' \
-                           'provided they are separated by dashes'
-
-          add_shared_option(:flavor, c)
-          add_shared_option(:on, c)
-          add_shared_option(:voicings, c)
-          c.action { |(chords), **options|
-            (chords&.split('-') || [nil]).each { |chord|
-              new(chord, **options).render
-            }
-          }
-        end
-      end
-    end
-  end
-end