wtf_chord 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6659fef8eb5eb71f547c1186e3d676a600f4b075
-  data.tar.gz: b4bff9c2a9251ece5fb9fc21b6ff03b0484dd102
+  metadata.gz: ff26ad0548f061f6982cfa47df59f0ffff78b136
+  data.tar.gz: 073b2e5c14ac65a19c6aa806f97467c618f10145
 SHA512:
-  metadata.gz: b6c5b2ac510e44764a577b3af1744bfd71cc573047866a9cfed73e79cb882a299c894d62c664fcd8ae04814faebf04ef7740168045edccf2a304630fb9f05cc5
-  data.tar.gz: 18342e90f1af73920ee3d5974bb662c5d1e506af50c9bc822f67367dcc04f68717d4649ce5a925afc671edb184bf0339b200d5c64f822c4b72457e56328f9eee
+  metadata.gz: 40326155782d5c90b1e99f6b1e0d117d06d6c6b10139636fe7d27bcc5a9207c72073a205298e870405fd5af1aee6865ffb8271d80c3e47b940d86a65d54ca74b
+  data.tar.gz: 33d25bb0f14caaa21278dfdce45ef553656c29a77eb29bab409c80910e3f7f5c2aeeb97e5b99f580c2f2949d4ca2c1359594ce80d0798bdc7fadde366ceac4ca

data/lib/wtf_chord/cli.rb

@@ -7,14 +7,13 @@ module WTFChord
     include Methadone::CLILogging
 
     main do |name|
-      chord      = WTFChord.chord(name)
-      fingerings = chord.fingerings(options['amount'])
-      formatter  = WTFChord::Formatter.new(options['output'], options['rates'])
+      chord     = WTFChord.chord(name)
+      formatter = WTFChord::Formatter.new(options['output'], options['rates'])
 
       debug { "Output using formatter: #{formatter.formatter.to_s}\n" }
 
       puts chord.inspect, nil
-      puts formatter[*fingerings] * formatter.separator
+      puts formatter[*chord.fingerings(options['amount'])] * formatter.separator
     end
 
     version VERSION

data/lib/wtf_chord/fingerings_generator.rb

@@ -26,18 +26,16 @@ module WTFChord
     private
 
     def generate(fret_range)
-      combinations = GUITAR.strings.map.with_index do |s, index|
-        fret_range.select do |dist|
-          pitch = s.original + dist
-          has_note?(pitch)
-        end.tap do |frets|
-          frets << nil if frets.size == 0
-        end
+      combinations = WTFChord.guitar.strings.map.with_index do |s, index|
+        fret_range.
+          select { |dist| pitch = s.original + dist; has_note?(pitch) }.
+          tap    { |frets| frets << nil if frets.size == 0 }
       end
 
       combinations.inject(&:product).each do |fingers|
         fingers.flatten!
-        Fingering.new(GUITAR, fingers) do |variant|
+
+        Fingering.new(WTFChord.guitar, fingers) do |variant|
           adjust(variant)
           yield(variant)
         end

data/lib/wtf_chord/fretboard.rb

@@ -23,6 +23,14 @@ module WTFChord
       self
     end
 
+    def with_capo(capo)
+      capo_was = @capo
+      set_capo(capo)
+      yield
+    ensure
+      set_capo(capo_was)
+    end
+
     def fingers
       @strings.map { |string| string.dead? ? DEAD : string.fret  }
     end

data/lib/wtf_chord/scale.rb

@@ -63,5 +63,11 @@ module WTFChord
     ScaleArray.build(*chromatic_scale).freeze
   end
 
-  GUITAR ||= Fretboard.new(*%w(E2 A2 D3 G3 B3 E4))
+  def self.guitar=(guitar)
+    Thread.current[:wtf_guitar] = guitar
+  end
+
+  def self.guitar
+    Thread.current[:wtf_guitar] ||= Fretboard.new(*%w(E2 A2 D3 G3 B3 E4))
+  end
 end

data/lib/wtf_chord/version.rb

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

data/wtf_chord.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "methadone"
 
-  spec.add_development_dependency "bundler", ">= 1.11", "< 2"
-  spec.add_development_dependency "rake", ">= 10.0", "< 12"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.0", "< 4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wtf_chord
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -30,40 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: "‘WTF Chord?’ is the Ruby guitar chords generator library."