coltrane 1.0.22 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57dabf818555a71744bf6fb434099d6c33e1b9b33aa3fdaa475c38433b42554f
-  data.tar.gz: 0c405a62ff1eaf8fc94f0f819d4c3eac4158565ca83ba8374c21964d4c68c0e5
+  metadata.gz: a1412370cff765b0e183ec7c6d41290d4162f1ecd11cf7899f10f6a1b6e2fc44
+  data.tar.gz: 1c45cadfe804956ce78bbbcb7109b13dd4decf4767a5269495eb942fefb02584
 SHA512:
-  metadata.gz: 9e86b4fbad7d9961eddf2f1a6d3eb15b86f280e963322a67d4e1ae1d469f7234f632be0d1a0abaaa0d1ee1a3a9409a804e6e44ceefdad45852a402ee9b00ced4
-  data.tar.gz: 7dba69b15767ff2d1aac5262075e40eca9548d0aabc244fc018801876c22a4917a54815293e295e048c1c7a7b1d6a706b91010f4783551810410b24c6f2c333e
+  metadata.gz: e81e810c26c8511b682b27f9bc6af6881c4fee7c2ebca55669034b250dcc4ae7c5316b3bbb39bca46ca3d54dd9a84f1791a42e35236d672d5c1eb45b1ce3ba09
+  data.tar.gz: 790c5c2955888c8ff80170f7b3dd064d14b6b3ac90e4923c7fa6bed34e0ebb94ef342d570a7759c504483a61924f824e80be35ac79f42eef9929ea7862b4288e

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+
+## [Unreleased]
+
+### Fixes
+- Correct Flat/Sharp on scales
+
+### Adds
+- Progressions
+- Refactor notes and add pitch frequencies, pitch classes
+
+
+## [1.1.24]
+
+### Adds
+- Some coloring on guitar output
+- Chromatic Scale
+
+### Fixes
+- Adjusts the marked frets alignment
+
+### Changes
+- Removes Natural sign ~padding~ for guitar instruments
+
+
+## [1.1.23]
+
+### Adds
+- A changelog
+
+### Fixes
+- #- operation on Note against number

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coltrane (1.0.22)
+    coltrane (1.0.23)
       color (~> 1.8)
       facets (~> 3.1)
       mercenary (~> 0.3)

data/README.md

@@ -11,12 +11,24 @@ https://gitter.im/coltrane-music/Lobby
 
 ## CLI (Command Line Interface)
 
+### Installation
+
+#### Compiled binary
+
+There's an experimental compiled version you can [download here](https://raw.githubusercontent.com/pedrozath/coltrane/master/dist/coltrane). It has been tested only macOS High Sierra so far, but it should work on Linux and Windows as well.
+
+macOS & Linux: You probably will need `chmod +x coltrane` before running it.
+Windows users: Please add the `.exe` extension to it before running it (via command prompt).
+
+#### Ruby command
+
 ```bash
 $ gem install coltrane
 ```
 
-When you install the gem on your system, you automatically gain access to the
-CLI.
+Once you install the gem the CLI is instaled in your system and it's ready to be used.
+
+### Usage
 
 It allows you to query for notes and chords and display them on your favorite instrument. No sheet music reading skills needed. It also allows you to find scales with a chord and find chords shared between two scales (that is actually the main goal when I did this project).
 

data/bin/build

@@ -0,0 +1 @@
+rubyc ../exe/coltrane -o ../dist/coltrane

data/lib/cli/errors.rb

@@ -18,7 +18,7 @@ module Coltrane
 
     class BadFindScales < ColtraneCliError
       def initialize(msg = nil)
-        super msg || 'Provide --notes or --chords. Ex: `coltrane find-scale --notes C E G`.'
+        super msg || 'Provide --notes or --chords. Ex: `coltrane find-scale --notes C-E-G`.'
       end
     end
 

data/lib/cli/guitar.rb

@@ -2,10 +2,11 @@
 
 module Coltrane
   module Cli
-    SPECIAL_FRETS = [3, 5, 7, 9, 12, 15, 17, 19].freeze
-
     # Renders notes in a common most popular ukulele scheme
     class Guitar < Representation
+      SPECIAL_FRETS = [3, 5, 7, 9, 12, 15, 17, 19].freeze
+
+      include Color
       def initialize(notes, flavor, tuning: %w[E A D G B E], frets: 22)
         @notes    = notes
         @tuning   = tuning.reverse
@@ -19,15 +20,15 @@ module Coltrane
       end
 
       def render_notes
-        @tuning.map do |string|
+        @tuning.each_with_index.map do |string, str_i|
           string_note = Note[string]
           Array.new(@frets + 2) do |i|
             if i.zero?
-              string
+              Paint[string, HSL.new(140 + str_i * 20,50,50).html]
             else
               fret = i - 1
               note = string_note + fret
-              m = (@notes.include?(note) ? place_mark(note) : '--')
+              m = (@notes.include?(note) ? place_mark(note) : place_empty(str_i))
               fret.zero? ? (m + ' |') : m
             end
           end.join(' ')
@@ -35,22 +36,33 @@ module Coltrane
       end
 
       def render_special_frets
-        Array.new(@frets + 1) do |fret|
+        '  ' +
+        Array.new(@frets + 2) do |fret|
           m = SPECIAL_FRETS.include?(fret) ? fret.to_s.rjust(2, 0.to_s) : '  '
           "#{m}#{'  ' if fret.zero?}"
         end.join(' ')
       end
 
-      def render_dotted_frets; end
+      def place_empty(str_i)
+        Paint['--', HSL.new(180 + str_i * 3,50,30).html]
+      end
 
       def place_mark(note)
-        case @flavor
-        when :notes     then note.pretty_name.ljust(2, "\u266E")
-        when :intervals then (@ref_note - note).name.ljust(2, '-')
-        when :degrees   then @notes.degree(note).to_s.rjust(2, '0')
-        when :marks     then '◼◼'
-        else raise WrongFlavorError
-        end
+        mark =
+          case @flavor
+          when :notes     then note.pretty_name.ljust(2, ' ')
+          when :intervals then (@ref_note - note).name.ljust(2, '-')
+          when :degrees   then @notes.degree(note).to_s.rjust(2, '0')
+          when :marks     then '  ' # '◼◼'
+          else raise WrongFlavorError
+          end
+
+        base_hue = (180 + note.number * 10) % 360 # + 260
+        Paint[
+          mark,
+          HSL.new(0, 0, 100).html,
+          HSL.new(base_hue, 100, 30).html
+        ]
       end
     end
   end

data/lib/cli/representation.rb

@@ -32,7 +32,7 @@ module Coltrane
       def hint
         case @flavor
         when :marks     then ''
-        when :notes     then "(\u266E means the note is natural, not flat nor sharp)"
+        # when :notes     then "(\u266E means the note is natural, not flat nor sharp)"
         when :intervals
           <<~DESC
             The letters represent the intervals relative to the root tone

data/lib/coltrane/classic_progressions.rb

@@ -4,37 +4,16 @@ module Coltrane
   # It's totally a wip yet.
   module ClassicProgressions
     PROGRESSIONS = {
-      pop:        [:major, [1, 5, 6, 4]],
-      fifties:    [:major, [1, 6, 4, 5]],
-      blues:      [:major, [1, 4, 1, 5, 4, 1]],
-      jazz:       [:major, [2, 5, 1]],
-      jazz_minor: [:minor, [2, 5, 1]],
-      andalusian: [:minor, [1, 7, 6, 5]]
+      'Pop'          => %w[I V vi IV],
+      'Blues'        => %w[I I I I IV IV I I V IV I I],
+      # 'Jazz Blues'   => %w[I7 IV7 I7 I7 F7 F7 I7 ]
+      'Fifties'      => %w[I IV V],
+      # pop:        [:major, [1, 5, 6, 4]],
+      # fifties:    [:major, [1, 6, 4, 5]],
+      # blues:      [:major, [1, 4, 1, 5, 4, 1]],
+      # jazz:       [:major, [2, 5, 1]],
+      # jazz_minor: [:minor, [2, 5, 1]],
+      # andalusian: [:minor, [1, 7, 6, 5]]
     }.freeze
-
-    def pop(tone)
-      scale, degrees = PROGRESSIONS[:pop]
-      Scale.public_send(scale, tone).progression(*degrees)
-    end
-
-    def fifties(tone)
-      scale, degrees = PROGRESSIONS[:fifties]
-      Scale.public_send(scale, tone).progression(*degrees)
-    end
-
-    def blues(tone)
-      scale, degrees = PROGRESSIONS[:blues]
-      Scale.public_send(scale, tone).progression(*degrees)
-    end
-
-    def jazz(tone)
-      scale, degrees = PROGRESSIONS[:jazz]
-      Scale.public_send(scale, tone).progression(*degrees)
-    end
-
-    def andalusian(tone)
-      scale, degrees = PROGRESSIONS[:andalusian]
-      Scale.public_send(scale, tone).progression(*degrees)
-    end
   end
 end

data/lib/coltrane/classic_scales.rb

@@ -13,7 +13,8 @@ module Coltrane
       'Pentatonic Minor' => [3, 2, 2, 3, 2],
       'Blues Minor'      => [3, 2, 1, 1, 3, 2],
       'Whole Tone'       => [2, 2, 2, 2, 2, 2],
-      'Flamenco'         => [1, 3, 1, 2, 1, 2, 2]
+      'Flamenco'         => [1, 3, 1, 2, 1, 2, 2],
+      'Chromatic'        => [1]*12
     }.freeze
 
     MODES = {

data/lib/coltrane/note.rb

@@ -77,7 +77,7 @@ module Coltrane
 
     def -(other)
       case other
-      when Numeric then Note.new(other - number)
+      when Numeric then Note[number - other]
       when Note    then Interval.new(other.number - number)
       end
     end
@@ -85,5 +85,12 @@ module Coltrane
     def interval_to(note_name)
       Note[note_name] - self
     end
+
+    def enharmonic?(other)
+      case other
+      when String then number == Note[other].number
+      when Note then number == other.number
+      end
+    end
   end
 end

data/lib/coltrane/progression.rb

@@ -11,10 +11,8 @@ module Coltrane
       @scale = Scale.from_key(key) unless key.nil?
     end
 
-    private
+    def chords
 
-    def chord_indexes
-      scale.degrees.map { |d| d - 1 }
     end
   end
 end

data/lib/coltrane/roman_chord.rb

@@ -7,23 +7,29 @@ module Coltrane
   class RomanChord
     DIGITS = %w[I II III IV V VI VII].freeze
     NOTATION_REGEX = %r{
-      (?<degree>[ivIV]*)
+      (?<degree>b?[ivIV]*)
       (?<quality>.*)
     }x
 
     def initialize(scale, notation)
       @scale    = scale
       @notation = notation.match(NOTATION_REGEX).named_captures
+      @notation['quality'] = @notation['quality']
+        .gsub('o', 'dim')
+        .gsub('ø', 'm7b5')
     end
 
     def degree
-      DIGITS.index(@notation['degree'].upcase) + 1
+      d      = @notation['degree']
+      @flats = d.count('b')
+      d      = d.delete('b')
+      @degree ||= DIGITS.index(d.upcase) + 1
     end
 
     def quality_name
       [
         minor_notation,
-        @notation['quality'].gsub('o', 'dim').gsub('ø', 'm7b5')
+        @notation['quality']
       ].join
     end
 
@@ -46,7 +52,8 @@ module Coltrane
     end
 
     def root_note
-      @scale[@degree]
+      binding.pry if @scale[degree] - @flats == Note['A#']
+      @scale[degree] - @flats
     end
   end
 end

data/lib/coltrane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.24
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -107,6 +107,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -115,6 +116,7 @@ files:
 - README.md
 - Rakefile
 - bin/_guard-core
+- bin/build
 - bin/bundle
 - bin/bundler
 - bin/byebug
@@ -147,6 +149,7 @@ files:
 - db/cache.sqlite3
 - db/cache_test.sqlite3
 - db/config.yml
+- dist/coltrane
 - exe/coltrane
 - img/coltrane-logo.png
 - img/screen-1.png