coltrane 2.2.1 → 3.0.0.pre

data/lib/coltrane/theory/scale_search_result.rb

@@ -0,0 +1,6 @@
+module Coltrane
+  module Theory
+    class ScaleSearchResult
+    end
+  end
+end

data/lib/coltrane/theory/scale_set.rb

@@ -0,0 +1,40 @@
+module Coltrane
+  module Theory
+    class ScaleSet
+      extend Forwardable
+      def_delegators :scales, :map
+
+      attr_accessor :scales, :searched_notes
+
+      def initialize(*scales, searched_notes: nil)
+        @scales = scales.uniq
+        @searched_notes = searched_notes
+      end
+
+      def strict_scales
+        @strict_scales ||= scales.select do |scale|
+          (scale.notes & searched_notes).size == searched_notes.size
+        end
+      end
+
+      def results
+        raise 'No searched notes were provided' unless searched_notes
+        @table ||=
+          scales.each_with_object({}) do |scale, the_table|
+            the_table[scale.name] ||= {}
+            the_table[scale.name][scale.tone.pitch_class.name] = (
+              scale.notes & searched_notes
+            )
+          end
+      end
+
+      def names
+        map(&:name)
+      end
+
+      def full_names
+        map(&:full_name)
+      end
+    end
+  end
+end

data/lib/coltrane/theory/voicing.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Coltrane
+  module Theory
+    # This class describes an actual implementation of a Chord, being aware
+    # of exact octaves of each pitch and even repeating pitches across octaves.
+    class Voicing
+      attr_reader :pitches
+
+      def initialize(*pitch_strings, pitches: nil)
+        @pitches = if pitch_strings.any?
+                     pitch_strings.map { |s| Pitch[s] }
+                   elsif pitches
+                     pitches
+                   else
+                     raise WrongArgumentsError
+                   end
+      end
+
+      def self.[](*args)
+        new(*args)
+      end
+
+      def pitch_classes
+        NoteSet[*pitches.map(&:pitch_class).uniq]
+      end
+
+      alias notes pitch_classes
+
+      def chord
+        @chord ||= Chord.new(notes: notes)
+      rescue ChordNotFoundError
+        return false
+      end
+
+      def frequencies
+        pitches.map(&:frequency)
+      end
+    end
+  end
+end

data/lib/coltrane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coltrane
-  VERSION = '2.2.1'
+  VERSION = '3.0.0.pre'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0.pre
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: dry-monads
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: color
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +155,6 @@ files:
 - bin/pronto
 - bin/pry
 - bin/rackup
-- bin/rails
 - bin/rake
 - bin/rdoc
 - bin/rescue
@@ -158,66 +171,78 @@ files:
 - bin/tilt
 - coltrane.gemspec
 - config.ru
-- data/qualities.yml
-- db/cache.sqlite3
-- db/cache_test.sqlite3
-- db/config.yml
 - exe/coltrane
-- lib/cli.rb
-- lib/cli/bass_guitar.rb
-- lib/cli/chord.rb
-- lib/cli/config.rb
-- lib/cli/errors.rb
-- lib/cli/guitar.rb
-- lib/cli/guitar_chords.rb
-- lib/cli/notes.rb
-- lib/cli/piano.rb
-- lib/cli/representation.rb
-- lib/cli/scale.rb
-- lib/cli/text.rb
-- lib/cli/ukulele.rb
 - lib/coltrane.rb
-- lib/coltrane/cache.rb
-- lib/coltrane/cadence.rb
-- lib/coltrane/changes.rb
-- lib/coltrane/chord.rb
-- lib/coltrane/chord_quality.rb
-- lib/coltrane/chord_substitutions.rb
-- lib/coltrane/circle_of_fifths.rb
-- lib/coltrane/classic_scales.rb
-- lib/coltrane/diatonic_scale.rb
-- lib/coltrane/errors.rb
-- lib/coltrane/frequency.rb
-- lib/coltrane/frequency_interval.rb
-- lib/coltrane/interval.rb
-- lib/coltrane/interval_class.rb
-- lib/coltrane/interval_sequence.rb
-- lib/coltrane/key.rb
-- lib/coltrane/mode.rb
-- lib/coltrane/notable_progressions.rb
-- lib/coltrane/note.rb
-- lib/coltrane/note_set.rb
-- lib/coltrane/pitch.rb
-- lib/coltrane/pitch_class.rb
-- lib/coltrane/progression.rb
-- lib/coltrane/qualities.rb
-- lib/coltrane/roman_chord.rb
-- lib/coltrane/scale.rb
-- lib/coltrane/unordered_interval_class.rb
+- lib/coltrane/commands.rb
+- lib/coltrane/commands/chords.rb
+- lib/coltrane/commands/command.rb
+- lib/coltrane/commands/common_chords.rb
+- lib/coltrane/commands/errors.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/representation.rb
+- lib/coltrane/commands/scale.rb
+- lib/coltrane/renderers.rb
+- lib/coltrane/renderers/renderer.rb
+- lib/coltrane/renderers/text_renderer.rb
+- lib/coltrane/renderers/text_renderer/array_drawer.rb
+- lib/coltrane/renderers/text_renderer/base_drawer.rb
+- lib/coltrane/renderers/text_renderer/hash_drawer.rb
+- lib/coltrane/renderers/text_renderer/representation_guitar_chord_drawer.rb
+- lib/coltrane/renderers/text_renderer/representation_guitar_note_set_drawer.rb
+- lib/coltrane/renderers/text_renderer/representation_piano_note_set_drawer.rb
+- lib/coltrane/renderers/text_renderer/theory_chord_drawer.rb
+- lib/coltrane/renderers/text_renderer/theory_note_set_drawer.rb
+- lib/coltrane/renderers/text_renderer/theory_progression_drawer.rb
+- lib/coltrane/renderers/text_renderer/theory_progression_set_drawer.rb
+- lib/coltrane/renderers/text_renderer/theory_scale_drawer.rb
+- lib/coltrane/renderers/text_renderer/theory_scale_set_drawer.rb
+- lib/coltrane/representation.rb
+- lib/coltrane/representation/guitar.rb
+- lib/coltrane/representation/guitar/chord.rb
+- lib/coltrane/representation/guitar/note.rb
+- lib/coltrane/representation/guitar/note_set.rb
+- lib/coltrane/representation/guitar/string.rb
+- lib/coltrane/representation/guitar_like_instruments.rb
+- lib/coltrane/representation/piano.rb
+- lib/coltrane/representation/piano/note_set.rb
+- lib/coltrane/synth.rb.rb
+- lib/coltrane/synth/base.rb
+- lib/coltrane/synth/synth.rb
+- lib/coltrane/theory.rb
+- lib/coltrane/theory/cadence.rb
+- lib/coltrane/theory/changes.rb
+- lib/coltrane/theory/chord.rb
+- lib/coltrane/theory/chord_quality.rb
+- lib/coltrane/theory/chord_substitutions.rb
+- lib/coltrane/theory/circle_of_fifths.rb
+- lib/coltrane/theory/classic_scales.rb
+- lib/coltrane/theory/diatonic_scale.rb
+- lib/coltrane/theory/errors.rb
+- lib/coltrane/theory/frequency.rb
+- lib/coltrane/theory/frequency_interval.rb
+- lib/coltrane/theory/interval.rb
+- lib/coltrane/theory/interval_class.rb
+- lib/coltrane/theory/interval_sequence.rb
+- lib/coltrane/theory/key.rb
+- lib/coltrane/theory/mode.rb
+- lib/coltrane/theory/notable_progressions.rb
+- lib/coltrane/theory/note.rb
+- lib/coltrane/theory/note_set.rb
+- lib/coltrane/theory/pitch.rb
+- lib/coltrane/theory/pitch_class.rb
+- lib/coltrane/theory/progression.rb
+- lib/coltrane/theory/progression_set.rb
+- lib/coltrane/theory/qualities.rb
+- lib/coltrane/theory/roman_chord.rb
+- lib/coltrane/theory/scale.rb
+- lib/coltrane/theory/scale_search_result.rb
+- lib/coltrane/theory/scale_set.rb
+- lib/coltrane/theory/voicing.rb
 - lib/coltrane/version.rb
-- lib/coltrane/voicing.rb
-- lib/coltrane_game/question.rb
-- lib/coltrane_instruments.rb
-- lib/coltrane_instruments/guitar.rb
-- lib/coltrane_instruments/guitar/base.rb
-- lib/coltrane_instruments/guitar/chord.rb
-- lib/coltrane_instruments/guitar/note.rb
-- lib/coltrane_instruments/guitar/string.rb
-- lib/coltrane_synth.rb
-- lib/coltrane_synth/base.rb
-- lib/coltrane_synth/synth.rb
 - lib/core_ext.rb
-- lib/os.rb
 homepage: http://github.com/pedrozath/coltrane
 licenses:
 - MIT
@@ -234,9 +259,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6

data/bin/rails

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rails' 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 "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("railties", "rails")

data/data/qualities.yml

@@ -1,83 +0,0 @@
-# NOTE: suspended chords are added programatically
-
-Perfect Unison:
-  Minor Third:
-    Diminished Fifth:
-      name: dim
-      Diminished Seventh:
-        name: dim7
-        Minor Ninth:
-          name: dim9
-        Major Ninth:
-          name: dim(b9)
-      Minor Seventh:
-        name: m7b5
-        Minor Ninth:
-          name: m7b5b9
-          Perfect Eleventh:
-            name: m7b5b11
-            Major Thirteenth:
-              name: m7b5b13
-        Major Ninth:
-          name: m7b5(9)
-    Perfect Fifth:
-      name: m
-      Major Sixth:
-        name: m6
-      Minor Seventh:
-        name: m7
-        Minor Ninth:
-          name: m9
-          Perfect Eleventh:
-            name: m11
-      Major Seventh:
-        name: m(M7)
-        Major Ninth:
-          name: m(M9)
-          Perfect Eleventh:
-            name: m(M11)
-            Major Thirteenth:
-              name: m(M13)
-  Major Third:
-    Perfect Fifth:
-      name: M
-      Major Sixth:
-        name: M6
-        Major Ninth:
-          name: 6/9
-          Perfect Eleventh:
-            name: 6/9(add11)
-      Minor Seventh:
-        name: "7"
-        Major Ninth:
-          name: "9"
-          Perfect Eleventh:
-            name: "11"
-            Major Thirteenth:
-              name: "13"
-      Major Seventh:
-        name: M7
-        Major Ninth:
-          name: M9
-          Perfect Eleventh:
-            name: M11
-            Major Thirteenth:
-              name: M13
-    Augmented Fifth:
-      name: +
-      Minor Seventh:
-        name: "+7"
-        Major Ninth:
-          name: "+9"
-          Perfect Eleventh:
-            name: "+11"
-            Major Thirteenth:
-              name: "+13"
-      Major Seventh:
-        name: +M7
-        Major Ninth:
-          name: +M9
-          Perfect Eleventh:
-            name: +M11
-            Major Thirteenth:
-              name: +M13

data/db/config.yml

@@ -1,11 +0,0 @@
-production:
-  adapter: sqlite3
-  database: db/cache.sqlite3
-  pool: 5
-  timeout: 5000
-
-test:
-  adapter: sqlite3
-  database: db/cache_test.sqlite3
-  pool: 5
-  timeout: 5000

data/lib/cli.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'os'
-require 'mercenary'
-require 'paint'
-require 'color'
-
-require 'coltrane'
-require 'coltrane_instruments'
-# require 'coltrane_synth'
-
-require 'cli/config'
-require 'cli/errors'
-require 'cli/representation'
-require 'cli/text'
-require 'cli/piano'
-require 'cli/guitar'
-require 'cli/bass_guitar'
-require 'cli/ukulele'
-require 'cli/guitar_chords'
-
-require 'cli/notes'
-require 'cli/chord'
-require 'cli/scale'