wtf_chord 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ffe99b5205f9a4cbde1ebdd815a41dc9f8f0836
-  data.tar.gz: d08a21cf109465b729d171e88e7a3f3631ca95df
+  metadata.gz: 6659fef8eb5eb71f547c1186e3d676a600f4b075
+  data.tar.gz: b4bff9c2a9251ece5fb9fc21b6ff03b0484dd102
 SHA512:
-  metadata.gz: e250bfa2ee065d20208dfca8831b33c216b2a4c2c450fecae75bef2a9b8c69189c2d6fd244dff31c25c00c38f9549d579f42b7ba6fca557509fb5a88460a2290
-  data.tar.gz: 25a18c48cecc08247ccfa78c6c396d2edd9c4481b0c86f39cf23636fb1b7bf51ba038d15b5e2fd0db8cd89c904aaf5d939cacb1a78233dcd0e7108495e1fd4cc
+  metadata.gz: b6c5b2ac510e44764a577b3af1744bfd71cc573047866a9cfed73e79cb882a299c894d62c664fcd8ae04814faebf04ef7740168045edccf2a304630fb9f05cc5
+  data.tar.gz: 18342e90f1af73920ee3d5974bb662c5d1e506af50c9bc822f67367dcc04f68717d4649ce5a925afc671edb184bf0339b200d5c64f822c4b72457e56328f9eee

data/README.md

@@ -31,13 +31,13 @@ Or install it yourself as:
 
     Finds fingerings of the requested chord.
 
-    v0.2.1
+    v0.3.1
 
     Options:
         -h, --help                       Show command line help
             --version                    Show help/version info
         -n, --amount N                   Amount of fingering variants to output.
-                                         (default: 3)
+                                         (default: 5)
         -o, --output FORMAT              Output format.
                                          (default: default)
         -R, --[no-]rates                 Output fingering complexity rates
@@ -57,25 +57,25 @@ For example, to print two fingering variants of the `Dm` chord, just run:
 And you'll get the visual presentation of chords' fingerings:
 
     [ ×  ×  0  2  3  1 ]
-     ––––––––––––––––––
-      |  |  |  |  |  •
-      |  |  |  •  |  |
-      |  |  |  |  •  |
+     ——————————————————
+      |  |  |  |  |  ◉
+      |  |  |  ◉  |  |
+      |  |  |  |  ◉  |
       |  |  |  |  |  |
       |  |  |  |  |  |
       |  |  |  |  |  |
-     ––––––––––––––––––
+     ——————————————————
             D  A  D  F
 
     [ ×  5  7  7  6  5 ]
-     ––––––––––––––––––
-      |  •  |  |  |  •    V
-      |  |  |  |  •  |
-      |  |  •  •  |  |
+     ——————————————————
+      |  ◉  |  |  |  ◉   ← V
+      |  |  |  |  ◉  |
+      |  |  ◉  ◉  |  |
       |  |  |  |  |  |
       |  |  |  |  |  |
       |  |  |  |  |  |
-     ––––––––––––––––––
+     ——————————————————
          D  A  D  F  A
 
 You can get simpler output, using the `--output` option:

data/lib/wtf_chord/cli.rb

@@ -14,7 +14,7 @@ module WTFChord
       debug { "Output using formatter: #{formatter.formatter.to_s}\n" }
 
       puts chord.inspect, nil
-      formatter.(*fingerings)
+      puts formatter[*fingerings] * formatter.separator
     end
 
     version VERSION

data/lib/wtf_chord/fingerings_generator.rb

@@ -51,7 +51,10 @@ module WTFChord
 
       !fingerings.include?(variant) &&
       basetone?(used_strings[0]) &&
-      (third?(used_strings[1]) || third?(used_strings[2])) &&
+      (
+        (third?(used_strings[1]) || third?(used_strings[2])) ||
+        (last?(used_strings[1]) || last?(used_strings[2]))
+      ) &&
       all_notes?(used_notes) &&
       used_notes.each_cons(2).none? { |(l, r)| l == r } &&
       tones_count.all? { |n| tones_count[0] >= n || tones_count[notes.index(third_tone)] >= n } &&
@@ -81,5 +84,9 @@ module WTFChord
     def third?(string)
       string && (string.note == third_tone)
     end
+
+    def last?(string)
+      string && (string.note == notes[-1])
+    end
   end
 end

data/lib/wtf_chord/formatter.rb

@@ -9,19 +9,21 @@ module WTFChord
     end
 
     def call(*fingerings)
-      formatter.with_rates(@with_rates) do |f|
-        puts (fingerings.map(&f) * f.separator)
-      end
+      formatter.with_rates(@with_rates) { |f| fingerings.map(&f) }
     end
 
     alias :[] :call
 
+    def separator
+      formatter.separator
+    end
+
     def formatter
-      WTFChord::Formatters.const_get(formatter_name)
+      Formatters.const_get(formatter_name)
     end
 
     def formatter?
-      WTFChord::Formatters.const_defined?(formatter_name)
+      Formatters.const_defined?(formatter_name)
     end
 
     def formatter_name

data/lib/wtf_chord/formatters/default.rb

@@ -1,25 +1,28 @@
+require 'wtf_chord/helpers/roman_numbers_helper'
+
 module WTFChord
   module Formatters
     class Default < Base
       OPEN  = "|".freeze
-      HORIZ = "–".freeze
+      HORIZ = "—".freeze
       SPACE = "  ".freeze
-      BULL  = "\u2022".freeze
-      LATIN = %w(0 I II III IV V VI VII VIII IX X XII XIII).freeze
+      BULL  = "\u25C9".freeze
       NEWLINE = "\n".freeze
+      COMPLEXITY_FORMAT = "  (complexity: %.2f)".freeze
+      EMPTY_STRING = Array.new(FRETS, OPEN).freeze
 
-      def self.separator
-        "\n\n".freeze
-      end
+      include RomanNumbersHelper
 
       def draw
-        [
-          "[ #{head} ]#{capo}",
-          " #{border}",
-          *fret_rows,
-          " #{border}",
-          "  #{string_keys}#{rate}"
-        ] * NEWLINE
+        <<-EOF.gsub(/^\s+\|/, '')
+          |[ #{head} ]  #{capo}
+          | #{border}
+          #{fret_rows.map.with_index { |row, index|
+         "  |  #{row}  #{roman_min_fret if index == 0}"
+          }.join("\n")}
+          | #{border}
+          |  #{string_keys}#{rate}
+        EOF
       end
 
       private
@@ -29,11 +32,15 @@ module WTFChord
       end
 
       def capo
-        "  (capo #{to_latin @fret.capo})" if @fret.capo > 0
+        "(capo #{romanize(@fret.capo)})" if @fret.capo > 0
+      end
+
+      def roman_min_fret
+        " ← #{romanize(min_fret)}" if min_fret > 1
       end
 
       def rate
-        "  (complexity: %.2f)" % @fret.complexity if with_rates?
+        COMPLEXITY_FORMAT % @fret.complexity if with_rates?
       end
 
       def border
@@ -41,27 +48,21 @@ module WTFChord
       end
 
       def string_rows
-        strings.map { |string| draw_string(string.fret) }
+        strings.map { |string| draw_string(string) }
       end
 
       def fret_rows
-        string_rows.transpose.map! { |row| "  #{row * SPACE}  " }.tap do |rows|
-          rows[0] << "  #{to_latin min_fret}" if min_fret > 1
-        end
+        return to_enum(__method__) unless block_given?
+        string_rows.transpose.each { |row| yield(row * SPACE) }
       end
 
       def string_keys
         strings.map { |s| s.dead? ? SPACE : "%-2s" % s.key } * " "
       end
 
-      def to_latin(num)
-        LATIN[num]
-      end
-
-      def draw_string(fret)
-        Array.new(FRETS, OPEN).tap do |rows|
-          rows[(fret - min_fret.pred).pred] = BULL if fret.to_i > 0
-        end
+      def draw_string(string)
+        EMPTY_STRING.dup.
+          tap { |rows| rows[string.fret - min_fret] = BULL if string.holded? }
       end
     end
   end

data/lib/wtf_chord/helpers/roman_numbers_helper.rb

@@ -0,0 +1,9 @@
+module WTFChord
+  module RomanNumbersHelper
+    ROMAN_SYMBOLS ||= %w(I II III IV V VI VII VIII IX X XII XIII XIV XV XVI XVII).unshift(nil).freeze
+
+    def romanize(number)
+      ROMAN_SYMBOLS[number]
+    end
+  end
+end

data/lib/wtf_chord/note.rb

@@ -25,7 +25,7 @@ module WTFChord
 
     def == other
       case other
-      when String  then other.casecmp(@key).zero?
+      when String  then other.casecmp(@key).zero? || aliases.any? { |a| other.casecmp(a.key).zero? }
       when Integer then other == @position
       when Note    then other.position == @position
       end

data/lib/wtf_chord/version.rb

@@ -1,3 +1,3 @@
 module WTFChord
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wtf_chord
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -114,6 +114,7 @@ files:
 - lib/wtf_chord/formatters/simple.rb
 - lib/wtf_chord/fretboard.rb
 - lib/wtf_chord/guitar_string.rb
+- lib/wtf_chord/helpers/roman_numbers_helper.rb
 - lib/wtf_chord/note.rb
 - lib/wtf_chord/pitch.rb
 - lib/wtf_chord/rules.rb
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: "‘WTF Chord?’ is the Ruby guitar chords generator library."