wtf_chord 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63e6deb4fcd84c93ca4b45c777e8510bc721cfb8
-  data.tar.gz: c8a5cd9fa823393c02b09670cb59094e48685fad
+  metadata.gz: 23feadfbf5375e890423135cc86a56d9b70af3e8
+  data.tar.gz: aaa6a0d46fbeb51e715306da3d127b86816ed293
 SHA512:
-  metadata.gz: 82eb003ec0978911c7806e8b1d338ec495fcd63f72d26262baa075209f29b4854a0237c885887177e26e4d3b438909023e07ad5201152b873ea456266fb7d14e
-  data.tar.gz: d2f439cd8f2dc14886520b8a5f72f16cce4c7934e250742cc1e5c5a2e9a107a967d25e470992411cf3e2d730d2d7d5698baf64467eab0b61441b69e3e6805295
+  metadata.gz: 711ef213b9ea7302e812c122fda26aee2bb305960a0a1fc3f687106948ea401dcfe17eaeac3972d9a42f6bdf22f6189d01255be790bf89194dbb5e6479a3d86c
+  data.tar.gz: 4c081a0a57e196422c13fa0a40f671e55d2b39ad49f96678c8b87da277d5e242d4d38fd19924d7e0d920444cc290af7d5984208e75f8a1cbc4dbeeddd10e7547

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.ruby-version
+/.ruby-version
+.tm_properties

data/README.md

@@ -31,7 +31,7 @@ Or install it yourself as:
 
     Finds fingerings of the requested chord.
 
-    v0.2.0
+    v0.2.1
 
     Options:
         -h, --help                       Show command line help
@@ -40,6 +40,7 @@ Or install it yourself as:
                                          (default: 3)
         -o, --output FORMAT              Output format.
                                          (default: default)
+        -R, --[no-]rates                 Output fingering complexity rates
             --log-level LEVEL            Set the logging level
                                          (debug|info|warn|error|fatal)
                                          (Default: info)

data/lib/wtf_chord/cli.rb

@@ -9,7 +9,7 @@ module WTFChord
     main do |name|
       chord      = WTFChord.chord(name)
       fingerings = chord.fingerings(options['amount'])
-      formatter  = WTFChord::Formatter.new(options['output'])
+      formatter  = WTFChord::Formatter.new(options['output'], options['rates'])
 
       debug { "Output using formatter: #{formatter.formatter.to_s}\n" }
 
@@ -33,9 +33,11 @@ module WTFChord
     #
     options['amount'] = 3
     options['output'] = 'default'
+    options['rates']  = false
 
-    on "-n N", "--amount N", Integer, "Amount of fingering variants to output."
-    on "-o FORMAT", "--output FORMAT", "Output format."
+    on "-n N",      "--amount N",      Integer, "Amount of fingering variants to output."
+    on "-o FORMAT", "--output FORMAT",          "Output format."
+    on "-R",        "--[no-]rates",             "Output fingering complexity rates"
 
     use_log_level_option
   end

data/lib/wtf_chord/complexity_counter.rb

@@ -6,15 +6,17 @@ module WTFChord
 
     def rate
       frets = @fingering.holded_strings.map(&:fret)
-      barre = frets.uniq.keep_if { |o| frets.count(o) > 3 }.max
+      barre = frets.uniq.keep_if { |o| frets.count(o) >= 2 }.min
       barre_strings = barre ? frets.count(barre).pred : 0
 
-      base_rate = (
-        Rational(holded_strings - barre_strings, total_strings) +
-        Rational(finger_dist(frets), 5)
-      ).to_f
+      base_rate = begin
+        Rational(holded_strings - barre_strings, 6).to_f +
+        Rational(finger_dist(frets), 5).to_f
+      end
 
-      base_rate += 1 if complex_barre?(barre, frets)
+      # p [@fingering, holded_strings, barre_strings]
+
+      base_rate += 1 if (barre_strings > 2 || frets.uniq.size > 3) && complex_barre?(barre, frets)
 
       base_rate
     end

data/lib/wtf_chord/fingering.rb

@@ -15,7 +15,11 @@ module WTFChord
     end
 
     def == other
-      other.is_a?(Fingering) ? other.code == code : super
+      case other
+      when Fingering then other.code == code
+      when Array     then other == @strings.map(&:fret)
+      else super
+      end
     end
 
     def complexity

data/lib/wtf_chord/formatter.rb

@@ -2,13 +2,16 @@ require 'wtf_chord/formatters/base'
 
 module WTFChord
   class Formatter
-    def initialize(name)
+    def initialize(name, with_rates = false)
       @name = name
+      @with_rates = with_rates
       require_formatter! unless formatter?
     end
 
     def call(*fingerings)
-      puts (fingerings.map(&formatter) * formatter.separator)
+      formatter.with_rates(@with_rates) do |f|
+        puts (fingerings.map(&f) * f.separator)
+      end
     end
 
     alias :[] :call

data/lib/wtf_chord/formatters/base.rb

@@ -13,16 +13,28 @@ module WTFChord
       end
 
       def self.to_proc
-        proc { |fret| new(fret).draw }
+        proc { |fret| new(fret, Thread.current[:with_rates]).draw }
       end
 
-      def initialize(fret)
+      def self.with_rates(value = false)
+        Thread.current[:with_rates], with_rates_was = !!value, !!Thread.current[:with_rates]
+        yield(self)
+      ensure
+        Thread.current[:with_rates] = with_rates_was
+      end
+
+      def initialize(fret, with_rates = false)
         @fret = fret
+        @with_rates = !!with_rates
       end
 
       def draw
       end
 
+      def with_rates?
+        !!@with_rates
+      end
+
       protected
 
       def min_fret
@@ -32,6 +44,12 @@ module WTFChord
           _min > 2 ? _min : 1
         end
       end
+
+      private
+
+      def rate
+        "  complexity: %.2f" % @fret.complexity if with_rates?
+      end
     end
   end
 end

data/lib/wtf_chord/formatters/default.rb

@@ -18,7 +18,7 @@ module WTFChord
           " #{border}",
           *fret_rows,
           " #{border}",
-          "  #{string_keys}"
+          "  #{string_keys}#{rate}"
         ] * NEWLINE
       end
 
@@ -32,6 +32,10 @@ module WTFChord
         "  (capo #{to_latin @fret.capo})" if @fret.capo > 0
       end
 
+      def rate
+        "  (complexity: %.2f)" % @fret.complexity if with_rates?
+      end
+
       def border
         @border ||= HORIZ * 3 * strings.length
       end

data/lib/wtf_chord/formatters/simple.rb

@@ -2,7 +2,7 @@ module WTFChord
   module Formatters
     class Simple < Base
       def draw
-        "[ #{@fret.fingers * " "} ]"
+        "[ #{@fret.fingers * " "} ]#{rate}"
       end
     end
   end

data/lib/wtf_chord/version.rb

@@ -1,3 +1,3 @@
 module WTFChord
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wtf_chord
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone