coltrane 1.2.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b269a0644501532a2c011d225caf6432669d42682a1183d3be2f898dc32556c5
-  data.tar.gz: 7bdd218db4a3dfa93f8e7284790f46ba82c741fab325634f6de8e98400f911b3
+  metadata.gz: 80404f5ec9c45b649eae4fb0dd47bbb5b9349ca344a8d72b06561f689f9d9c56
+  data.tar.gz: 9e733b52b1f1d4466849fa5ef724ad4947ab93b1b60dee01475e3f9abeac043f
 SHA512:
-  metadata.gz: 766256cb10eabb774666cf04ddc30a9a96bb537cdd50cfd982bda1726402b001ad371718a5cde6da759c68527715a72eaac4d1d9504696b34c2e17d9dd89828a
-  data.tar.gz: e2f235be7b7c7901e8cc4967bd695528009aed2bd8af1a51ea3900cf7724a219a6a01a071a6368633eb7a9f3f3d5de3fadbf116f00d200f2889291a797cebc7f
+  metadata.gz: 87cab0e8294560a0185b9d2d960d36690208112b775b36002381e98bf5a93c2e6e215c00332dc0f7fd55b17dbda6a268c4069951237732b4b44dd53c2f517bbb
+  data.tar.gz: e3b5c7fdb14798100386449aab19bbf34442247bda37364df7601ddcf6d2196234876c0e7f27dd2af435bcd8453d1fdd24ed2e928ae2607088eebfbed1fa237c

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## [Unreleased]
 - Correct Flat/Sharp on scales
-- Refactor notes and add pitch frequencies, pitch classes
+
+## [2.0.0]
+
+### Changes
+
+- Code has been completely refactored. Things are organized around frequencies.
+  Intervals are backed by cents, which is an logarithmic measure used to measure
+  the distance between 2 frequencies.
+
+  We have now a distinction between PitchClass and Note. The first is a generic
+  concept of Notes while the latter deals with sharps and flats logic.
+
+  That refactor will allow us to in the next versions refactor scales so that
+  they output proper sharps and flats (https://github.com/pedrozath/coltrane/issues/3).
 
 ## [1.2.3]
 

data/Gemfile

@@ -6,6 +6,9 @@ group :test, :development do
   gem 'pry'
   gem 'pry-byebug'
   gem 'pry-rescue'
+  gem 'pronto'
+  gem 'pronto-flay'
+  gem 'pronto-rubocop'
 end
 
 group :test do

data/Gemfile.lock

@@ -1,31 +1,62 @@
 PATH
   remote: .
   specs:
-    coltrane (1.1.3)
+    coltrane (1.2.4)
       color (~> 1.8)
       facets (~> 3.1)
-      mercenary (~> 0.3)
       paint (~> 2.0)
+      pedrozath-mercenary (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     byebug (9.1.0)
     coderay (1.1.2)
     color (1.8)
     diff-lcs (1.3)
     docile (1.1.5)
+    erubis (2.7.0)
     facets (3.1.0)
+    faraday (0.14.0)
+      multipart-post (>= 1.2, < 3)
+    flay (2.10.0)
+      erubis (~> 2.7.0)
+      path_expander (~> 1.0)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    gitlab (3.6.1)
+      httparty
+      terminal-table
+    httparty (0.16.0)
+      multi_xml (>= 0.5.2)
     interception (0.5)
     json (2.1.0)
-    mercenary (0.3.6)
     method_source (0.9.0)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    octokit (4.8.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     paint (2.0.1)
     parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
+    path_expander (1.0.2)
+    pedrozath-mercenary (0.3.6)
     powerpack (0.1.1)
+    pronto (0.6.0)
+      gitlab (~> 3.6, >= 3.4.0)
+      octokit (~> 4.3, >= 4.1.0)
+      rugged (~> 0.24, >= 0.23.0)
+      thor (~> 0.19.0)
+    pronto-flay (0.6.2)
+      flay (~> 2.8)
+      pronto (~> 0.6.0)
+    pronto-rubocop (0.6.2)
+      pronto (~> 0.6.0)
+      rubocop (~> 0.38, >= 0.35.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -35,6 +66,7 @@ GEM
     pry-rescue (1.4.5)
       interception (>= 0.5)
       pry
+    public_suffix (3.0.2)
     rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.7.0)
@@ -58,11 +90,21 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
+    ruby_parser (3.11.0)
+      sexp_processor (~> 4.9)
+    rugged (0.26.0)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    sexp_processor (4.10.1)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (0.19.4)
     unicode-display_width (1.3.0)
 
 PLATFORMS
@@ -71,6 +113,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.14)
   coltrane!
+  pronto
+  pronto-flay
+  pronto-rubocop
   pry
   pry-byebug
   pry-rescue

data/Rakefile

@@ -1,2 +1,2 @@
-require "bundler/gem_tasks"
+# require "bundler/gem_tasks"
 task :default => :spec

data/bin/erubis

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -11,6 +12,17 @@ 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, 150) =~ /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"
 

data/bin/flay

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'flay' 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, 150) =~ /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("flay", "flay")

data/bin/gitlab

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'gitlab' 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, 150) =~ /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("gitlab", "gitlab")

data/bin/httparty

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'httparty' 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, 150) =~ /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("httparty", "httparty")

data/bin/pronto

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'pronto' 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, 150) =~ /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("pronto", "pronto")

data/bin/ruby_parse

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby_parse' 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, 150) =~ /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("ruby_parser", "ruby_parse")

data/bin/ruby_parse_extract_error

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'ruby_parse_extract_error' 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, 150) =~ /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("ruby_parser", "ruby_parse_extract_error")

data/bin/thor

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -11,6 +12,17 @@ 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, 150) =~ /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"
 

data/exe/coltrane

@@ -40,7 +40,8 @@ Mercenary.program(:Coltrane) do |p|
     'Chooses which <additional></additional> information to display: marks, notes, intervals or degrees'
   ]
 
-  p.command(:notes) do |c|
+  p.command(:note) do |c|
+    c.alias(:notes)
     c.syntax 'notes <notes separated by space> [--on <instrument>]'
     c.description 'Shows the given notes.'
     c.option(*@instrument_option)
@@ -53,6 +54,7 @@ Mercenary.program(:Coltrane) do |p|
   end
 
   p.command(:chord) do |c|
+    c.alias(:chords)
     c.syntax 'chord <chord-name> [--on <instrument>]'
     c.description 'Shows the given chord. Ex: coltrane chord Cmaj7 --on piano'
     c.option(*@instrument_option)
@@ -108,9 +110,9 @@ Mercenary.program(:Coltrane) do |p|
     c.option(*@instrument_option)
     c.option(*@flavor_option)
     c.action do |(prog, _, key), on: 'text', flavor: 'notes'|
-      possible_method = prog.gsub('-', '_')
+      possible_method = prog.tr('-', '_')
       progression = if Coltrane::Progression.respond_to?(possible_method)
-                      Coltrane::Progression.send(possible_method, note)
+                      Coltrane::Progression.send(possible_method, key)
                     else
                       Coltrane::Progression.new(prog, key: key)
                     end
@@ -126,7 +128,7 @@ Mercenary.program(:Coltrane) do |p|
       progressions   = Coltrane::Progression.find(*chord_notation.split('-'))
       notation_width = progressions.map(&:notation).map(&:size).max
       progressions.each do |progression|
-        puts "#{progression.notation.ljust(notation_width+1,' ')} in #{progression.scale} (#{progression.notes_out.size} notes out)"
+        puts "#{progression.notation.ljust(notation_width + 1, ' ')} in #{progression.scale} (#{progression.notes_out.size} notes out)"
       end
     end
   end
@@ -139,7 +141,7 @@ Mercenary.program(:Coltrane) do |p|
            when 'scales' then Coltrane::Scale.known_scales
            when 'flavors' then %w[marks notes intervals degrees]
            when 'instruments' then %w[guitar bass ukulele piano text]
-           when 'chords', 'chord-qualities' then Coltrane::Qualities::CHORD_QUALITIES.keys.sort.join(' ')
+           when 'chords', 'chord-qualities' then Coltrane::ChordQuality.intervals_per_name.keys.join(' ')
            end
     end
   end
@@ -197,7 +199,7 @@ Mercenary.program(:Coltrane) do |p|
         puts "\n"
         print Paint['coltrane ', '#F88550']
         cmd = gets.chomp
-        return if ['exit', 'exit', 'q', 'quit', 'stop'].include?(cmd)
+        return if %w[exit exit q quit stop].include?(cmd)
         puts "\n"
         p.go(cmd.split(' '))
       rescue Exception