coltrane 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8412a5eacbab879b926a8754d15d5fd0e38be905c8d7352db107aad5d4598ab8
-  data.tar.gz: 2f60c931dc63ca0dea2eee00be6c78b45ee8303d737af3ccc1eca93f567d7d32
+  metadata.gz: c3e26972df8988b780fba7a447408cfb7c5c80e2852ecc605bc2fe71bf056890
+  data.tar.gz: 4bf04233585e2c2a284e914444d9d293c068f5cd5b0e731ec398bf5bacfdf371
 SHA512:
-  metadata.gz: 1fdd2e8aef21c73f2a7a127031ba1079c451a9cc5e85f3cb559818b97eee106a53d3098115814b8c8268abda85468b85c151f608032b36e86be8882d4b132918
-  data.tar.gz: 62a50cb05ab3439d565f6714d0d0ffde2886c5b85409929cd535f80634e3303de98ec7e7ae5e5e26379180acbca10e48cc4062c854fe0c9bc203135cb7d22143
+  metadata.gz: c4962377b0bf4b64a956b6a02c9b3241b58386c06399f373e99401d50973403c9b1c97f21c0c6cf0848081d992305cba5d2f63cfac2bdb16f235eddc95e630ab
+  data.tar.gz: 2e2bdd93920af71911f1dd6a45077f5f116e975765d2cf46caeb4de0cd9a2369119fb22cb8e78429f5a1e2682cc6a515675d2e5722fdaa4b480612df20cffeac

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,11 +1,11 @@
 PATH
   remote: .
   specs:
-    coltrane (4.0.5)
+    coltrane (4.0.6)
       activesupport (> 5.2)
-      cli-ui (~> 1.1)
       color (~> 1.8)
       dry-monads (~> 0.4)
+      gambiarra (~> 0)
       paint (~> 2.0)
 
 GEM
@@ -31,6 +31,10 @@ GEM
       dry-core (~> 0.3, >= 0.3.3)
       dry-equalizer
     equatable (0.5.0)
+    gambiarra (0.0.1)
+      activesupport (> 5.2)
+      cli-ui (~> 1.1)
+      thor (= 0.20)
     hike (1.2.3)
     hitimes (1.2.6)
     i18n (1.1.1)
@@ -93,6 +97,7 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
+    thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
     timers (4.1.2)

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/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,9 +33,9 @@ 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 "rake",      '~> 10.0'

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/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_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.5'
+  VERSION = '4.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-20 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
@@ -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
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 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,86 +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,48 +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)
-            @questions.compact!
-          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