coltrane 4.0.3 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2dce8fab34c2d90d0317a80349b7fd3bec643bd0f32c491a351a0251251349b
-  data.tar.gz: de1772b25200811627df8937663417db2c9a9ad5f8106e05ba0c6a41f6ccc96d
+  metadata.gz: 0c3c8660bcafcc989ef1797670510d821ab023664d7275095a6ee0fde7e93d6f
+  data.tar.gz: 4ff8579977fb1bd8f6a4702504d036e5dbff517936f730ba79d2c620aa2e642c
 SHA512:
-  metadata.gz: 6d0ed0415983d75c7fce264111e014e2c2bb3d2f0ae949c7579743668ea09678e93df6e85c450f66c4543fd13f60c89dd6711bc023cfb08c00a83300228713c5
-  data.tar.gz: 45fe81700b815b8762c39ad4d365ccafebfc8d7afa4d5e225f6344f70de713ce23d9d601273ee08a38f59bdb696815d2dd27cfd7920eae9f15f36f6fb3feb9eb
+  metadata.gz: cb931e46e6c45a238dc736e4b9de93fc9f56b0267163eca869add5fc091ff9a199eb94c31638b613444ff33c28e8c251709f2cfb820acc77129fdde76395167e
+  data.tar.gz: 7cf87180e20807855537afad00d1657fd414b00fdf64ef75210b0eb759e07c15d6f261fb776dbcc2760e6a420d6540ff36cf53e4fbb7e89751ed744131de897e

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+3.0.0

data/.travis.yml

@@ -7,7 +7,7 @@ git:
   depth: 1
 
 rvm:
-- 2.5.0
+- 3.0.0
 
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

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.
 
+## [4.0.6]
+- Change the CLI into a more intuitive one
+
 ## [4.0.0]
 - Includes totally revamped, easy to use command line interface.
 

data/Gemfile

@@ -15,4 +15,4 @@ group :test do
   gem 'rubocop',   require: false
 end
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,125 +1,127 @@
 PATH
   remote: .
   specs:
-    coltrane (4.0.3)
+    coltrane (4.1.1)
       activesupport (> 5.2)
-      cli-ui (~> 1.1)
       color (~> 1.8)
       dry-monads (~> 0.4)
+      gambiarra (~> 0)
       paint (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    ast (2.4.0)
-    byebug (10.0.2)
-    cli-ui (1.1.4)
-    coderay (1.1.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    byebug (11.1.3)
+    cli-ui (1.4.0)
+    coderay (1.1.3)
     color (1.8)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    docile (1.3.0)
-    dry-core (0.4.7)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.1)
+    dry-equalizer (0.3.0)
     dry-monads (0.4.0)
       dry-core (~> 0.3, >= 0.3.3)
       dry-equalizer
-    equatable (0.5.0)
+    gambiarra (0.0.5)
+      activesupport (> 5.2)
+      cli-ui (~> 1.1)
+      thor (~> 1.1.0)
     hike (1.2.3)
-    hitimes (1.2.6)
-    i18n (1.1.1)
+    i18n (1.8.8)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    necromancer (0.4.0)
-    opal (0.10.5)
+    method_source (1.0.0)
+    minitest (5.14.3)
+    opal (0.10.6)
       hike (~> 1.2)
       sourcemap (~> 0.1.0)
       sprockets (~> 3.1)
       tilt (>= 1.4)
-    opal-rspec (0.6.1)
+    opal-rspec (0.6.2)
       opal (>= 0.10.0, < 0.12)
-    paint (2.0.1)
-    parallel (1.12.1)
-    parser (2.5.0.5)
-      ast (~> 2.4.0)
-    pastel (0.7.2)
-      equatable (~> 0.5.0)
-      tty-color (~> 0.4.0)
-    powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rack (2.0.4)
+    paint (2.2.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    regexp_parser (2.0.3)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.54.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.9.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    simplecov (0.16.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sourcemap (0.1.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    thread_safe (0.3.6)
-    tilt (2.0.8)
-    timers (4.1.2)
-      hitimes
-    tty-color (0.4.2)
-    tty-cursor (0.5.0)
-    tty-prompt (0.16.0)
-      necromancer (~> 0.4.0)
-      pastel (~> 0.7.0)
-      timers (~> 4.0)
-      tty-cursor (~> 0.5.0)
-      tty-reader (~> 0.2.0)
-    tty-reader (0.2.0)
-      tty-cursor (~> 0.5.0)
-      tty-screen (~> 0.6.4)
-      wisper (~> 2.0.0)
-    tty-screen (0.6.4)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    wisper (2.0.0)
+    thor (1.1.0)
+    tilt (2.0.10)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    wisper (2.0.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.14)
+  bundler (~> 2.2.5)
   coltrane!
   opal-rspec
   pry
@@ -131,4 +133,4 @@ DEPENDENCIES
   tty-prompt
 
 BUNDLED WITH
-   1.16.4
+   2.2.5

data/bin/bundle

@@ -11,7 +11,7 @@
 require "rubygems"
 
 m = Module.new do
-    module_function
+  module_function
 
   def invoked_as_script?
     File.expand_path($0) == File.expand_path(__FILE__)
@@ -31,7 +31,7 @@ m = Module.new do
         bundler_version = a
       end
       next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
+      bundler_version = $1
       update_index = i
     end
     bundler_version
@@ -61,32 +61,41 @@ m = Module.new do
   end
 
   def bundler_version
-    @bundler_version ||= begin
+    @bundler_version ||=
       env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
   end
 
   def load_bundler!
     ENV["BUNDLE_GEMFILE"] ||= gemfile
 
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
+    activate_bundler
   end
 
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
+  def activate_bundler
     gem_error = activation_error_handling do
-      gem "bundler", bundler_version
+      gem "bundler", bundler_requirement
     end
     return if gem_error.nil?
     require_error = activation_error_handling do
       require "bundler/version"
     end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
     exit 42
   end
 

data/bin/console

@@ -1,17 +1,29 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "coltrane"
-require "coltrane/commands"
-require "coltrane/representation"
-require "coltrane/renderers"
+#
+# This file was generated by Bundler.
+#
+# The application 'console' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-require "pry"
+bundle_binstub = File.expand_path("../bundle", __FILE__)
 
-include Coltrane
-include Coltrane::Theory
-include Coltrane::Representation
-include Coltrane::Renderers
+if File.file?(bundle_binstub)
+  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.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
 
-Pry.start
+load Gem.bin_path("wisper", "console")

data/bin/gambiarra

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'gambiarra' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  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.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("gambiarra", "gambiarra")

data/bin/setup

@@ -1,8 +1,29 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-bundle install
+#
+# This file was generated by Bundler.
+#
+# The application 'setup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-# Do any other automated setup that you need to do here
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  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.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("wisper", "setup")

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

@@ -33,10 +33,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   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 'cli-ui',      '~> 1.1'
   spec.add_runtime_dependency 'activesupport', '> 5.2'
-  spec.add_development_dependency "bundler",   '~> 1.14'
+  spec.add_development_dependency "bundler",   '~> 2.2.5'
   spec.add_development_dependency "rake",      '~> 10.0'
 end

data/exe/coltrane

@@ -6,10 +6,8 @@ require 'coltrane/ui'
 
 module Coltrane
   module UI
-    class App
-      attr_reader :router
-
-      def self.start(initial_route)
+    class App < Gambiarra::App
+      def setup
         if ENV['COLORTERM'] == 'truecolor'
           Paint.mode = 0xFFFFFF
         else
@@ -18,75 +16,6 @@ module Coltrane
                "Try something like iTerm2 (for macOS), VTE or Konsole (for linux) or Hyper" \
                " (for Windows) and you'll see the true magic!"
         end
-
-        path, params = initial_route.split(' ').each_with_object([nil, {}]) do |segment, memo|
-          if segment =~ /:/
-            key, value = segment.split(':')
-            memo[1].merge!([[key.to_sym, value.gsub('-', ' ')]].to_h)
-          else
-            memo[0] = [memo[0], segment].compact.join(' ')
-          end
-        end
-
-        response = {path: (path || ''), **params}
-        loop { response = app.flow(**response) }
-      end
-
-      def self.app
-        @app ||= new
-      end
-
-      def initialize
-        @router = Router.new
-      end
-
-      def ask_questions(questions)
-        questions.map { |name, question| [name, ask_question(question)] }.to_h
-      end
-
-      def ask_question(question)
-        CLI::UI::Prompt.ask(question[:statement], options: question[:options])
-      end
-
-      def navigation(params)
-        return {} if params.empty?
-        CLI::UI::Prompt.ask('What to do now?') do |h|
-          params.each do |key, _value|
-            h.option("Different #{key}") { params[key] = nil }
-          end
-          h.option("Go back") { params[:path] = '' }
-        end
-        params
-      end
-
-      def output(response)
-        return unless response[:content]
-        puts [
-          nil,
-          "-> coltrane #{router.url}",
-          nil,
-          response[:content],
-          nil
-        ]
-      end
-
-      def flow(response)
-        raise 'Response is empty' unless response
-        output(response)
-        response.delete(:content)
-        questions = response&.delete(:questions) || {}
-        response.merge!(navigation(response)) unless response.has_key?(:path) || questions.any?
-        response.merge!(ask_questions(questions)) if questions.any?
-        exit if response[:path] == 'exit'
-        router.get(**response.compact)
-      rescue => e
-        response.delete(:path)
-        puts e
-        retry
-      end
-
-      def exit
-        Kernel.exit(0)
       end
     end
   end

data/lib/coltrane/commands/find_scale_by_chords.rb

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

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

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

@@ -1,9 +1,8 @@
-require 'active_support/inflector'
 require 'paint'
 require 'color'
-require 'cli/ui' # shopify cli
 
-require 'coltrane'
+require 'gambiarra'
 require 'coltrane/commands'
-require 'coltrane/ui/views'
-require 'coltrane/ui/router'
+
+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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class Chords < View
+      class Chords < BaseView
         questions({
           path: {
             statement: 'What do you need',

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class CustomProgression < View
+      class CustomProgression < BaseView
         questions({
           progression_notation: {
             statement: 'What is the progression? (Ex: I-vi-IV-V)'

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class FindChordByNotes < View
+      class FindChordByNotes < BaseView
         questions({
           notes: { statement: 'Which Notes?' }
         })

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

@@ -18,7 +18,9 @@ module Coltrane
           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))

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class FindCommonChordsInScales < View
+      class FindCommonChordsInScales < BaseView
         questions({
           first_scale: {
             statement: 'Choose the first scale',

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class FindProgressionsFromChords < View
+      class FindProgressionsFromChords < BaseView
         questions chords: { statement: 'Type the chords? (Ex: CM EM GM)' }
 
         def render

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class FindScale < View
+      class FindScale < BaseView
         questions({
           path: {
             statement: 'How do you wanna search',

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class FindScaleByChords < View
+      class FindScaleByChords < BaseView
         questions({
           chords: { statement: 'Which Chords?' }
         })

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class FindScaleByNotes < View
+      class FindScaleByNotes < BaseView
         questions({
           notes: { statement: 'Which Notes?' }
         })

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class Index < View
+      class Index < BaseView
         questions({
           path: {
             statement: "Welcome to Coltrane #{Coltrane::VERSION}",

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class Notes < View
+      class Notes < BaseView
         questions({
           notes: { statement: 'Which notes?' } ,
           representation: {

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class Progressions < View
+      class Progressions < BaseView
         questions({
           path: {
             statement: 'What do you need?',

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class Scales < View
+      class Scales < BaseView
         questions({
           path: {
             statement: 'What do you need?',

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class ShowChord < View
+      class ShowChord < BaseView
         questions({
           chord: { statement: 'Which chord?' },
           chord_representation: {

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class ShowProgression < View
+      class ShowProgression < BaseView
         questions({
           progression: {
             statement: 'What is the progression?',

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

@@ -1,7 +1,7 @@
 module Coltrane
   module UI
     module Views
-      class ShowScale < View
+      class ShowScale < BaseView
         questions({
           scale: {
             statement: 'Which Scale?',

data/lib/coltrane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.1
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: gambiarra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: color
+  name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: cli-ui
+  name: color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     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
@@ -142,6 +142,7 @@ files:
 - bin/console
 - bin/erubis
 - bin/flay
+- bin/gambiarra
 - bin/gitlab
 - bin/guard
 - bin/htmldiff
@@ -258,8 +259,8 @@ files:
 - 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/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
@@ -276,7 +277,6 @@ files:
 - 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
@@ -299,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

data/lib/coltrane/ui/router.rb

@@ -1,87 +0,0 @@
-module Coltrane
-  module UI
-    class Router
-
-      class Route
-        attr_reader :path, :view, :last
-        attr_accessor :params
-
-        def initialize(path, to:, with: {})
-          @path   = path
-          @view   = to
-          @params = with
-        end
-
-        def render(**other_params)
-          view.render(**params, **other_params)
-        end
-      end
-
-      class History
-        attr_reader :routes
-
-        def initialize
-          @routes = []
-        end
-
-        def add(route)
-          @routes << route
-        end
-
-        def previous
-          routes[-2]&.path || ''
-        end
-
-        def current_route
-          routes[-1]
-        end
-
-        def back
-          routes.pop.render
-        end
-
-        def refresh(params={})
-          current_route.render(params)
-        end
-      end
-
-      attr_reader :path, :params, :routes, :history, :url
-
-      def initialize
-        @routes  = []
-        @history = History.new
-
-        draw_route '', to: Coltrane::UI::Views::Index
-        Views.constants.each do |view|
-          draw_route view.to_s.underscore.humanize.downcase, to: "Coltrane::UI::Views::#{view}".constantize
-        end
-      end
-
-      def get(**params)
-        path = params.delete(:path)
-        @url  = build_url(path || history.current_route.path, **params)
-        route = @routes.detect { |route| route.path == path }
-        return history.refresh(params) unless route
-        history.add(route)
-        route.render(**params)
-      end
-
-      def build_url(path, params)
-        [
-          path,
-          (params || {}).map do |k,v|
-            [k,v.gsub(' ', '-')].join(':')
-          end
-        ].compact.join(' ')
-      end
-
-      def previous_path
-        history.previous
-      end
-
-      def draw_route(*args, **keyword_args, &block)
-        @routes << Route.new(*args, **keyword_args, &block)
-      end
-    end
-  end
-end

data/lib/coltrane/ui/views.rb

@@ -1,4 +0,0 @@
-require 'coltrane/ui/views/view'
-Dir[File.expand_path('../views/*', __FILE__)].map do |f|
-  require(f)
-end

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

@@ -1,47 +0,0 @@
-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