chord_diagrams 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd5808f4c95547936f46bd3c6e6012f5d6fcfea5940c9b4674c2ed5caab6d1c8
-  data.tar.gz: d7307034e5ccd952930e2bb5a0e25722096d4ffa969ed8ddce1fe1d4ec522def
+  metadata.gz: 7e2ac822f1ea38010bcf65ba0dc0415f13632e8659bfc31682b635d95a7a25e5
+  data.tar.gz: 44764d69a88c4a22882fc5bcb886f82c3dd05a4d7b45edecd5ffb1d92df10ce7
 SHA512:
-  metadata.gz: b812b32121a8647a0b6e5dafe3547742be2d8c6c2202ca534a424b2dfae768e4bf60637feddf2e6922c9034a37292cbb072620374b74a557befe8199111d6031
-  data.tar.gz: dcc129ecd9af3344a04552be7a0878996d47fdad743077519b7633c64272dbc5b2a99ac4427441c79f32eaa9fff4fb01d6c0cec1558919389185e728d3efdbde
+  metadata.gz: 735fb4df05dd7b428da25f1d5c6aba8f966901cc13151dba0e5410ec0d2bf8c71d98842e9321c22de1b2be6a0193c7c8c9e839631e235e1fa0fddaf31510010d
+  data.tar.gz: 555afb42e5da751cfd45b36bc79c6323372b7ea39ebc22050f8c3ed46c695dfa3c264de6d5ace7589da3bb7fb0c031f51a80f431cb7c71bb0307819d495a4f86

data/.github/workflows/build.yml

@@ -0,0 +1,22 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [3.0, 3.1, 3.2, head]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake

data/.ruby-version

@@ -1 +1 @@
-2.7.3
+3.2.0

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.0

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in chord_diagrams.gemspec
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# ChordDiagrams [![Build Status](https://www.travis-ci.com/spilth/chord_diagrams.svg?branch=master)](https://www.travis-ci.com/spilth/chord_diagrams)
+# ChordDiagrams [![Build Status](https://www.travis-ci.com/spilth/chord_diagrams.svg?branch=main)](https://www.travis-ci.com/spilth/chord_diagrams)
 
 Generate SVGs for Guitar and Ukulele Chord Diagrams
 

data/Rakefile

@@ -1,29 +1,33 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'chord_diagrams'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "chord_diagrams"
+require "standard/rake"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: [:spec, :standard]
 
+desc "Generate all diagrams"
 task sheets: %i[guitar ukulele]
 
+desc "Generate guitar diagrams"
 task :guitar do
-  html = ''
+  html = ""
 
   ChordDiagrams::GUITAR_FINGERINGS.keys.each do |name|
     html << ChordDiagrams.guitar_svg(name)
   end
 
-  File.open('guitar.html', 'w') { |file| file.write(html) }
+  File.write("guitar.html", html)
 end
 
+desc "Generate ukulele diagrams"
 task :ukulele do
-  html = ''
+  html = ""
 
   ChordDiagrams::UKULELE_FINGERINGS.keys.each do |name|
     html << ChordDiagrams.ukulele_svg(name)
   end
 
-  File.open('ukulele.html', 'w') { |file| file.write(html) }
+  File.write("ukulele.html", html)
 end

data/chord_diagrams.gemspec

@@ -1,29 +1,31 @@
-lib = File.expand_path('lib', __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'chord_diagrams/version'
+require "chord_diagrams/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'chord_diagrams'
-  spec.version       = ChordDiagrams::VERSION
-  spec.authors       = ['Brian Kelly']
-  spec.email         = ['bkelly@carbonfive.com']
+  spec.name = "chord_diagrams"
+  spec.version = ChordDiagrams::VERSION
+  spec.authors = ["Brian Kelly"]
+  spec.email = ["bkelly@carbonfive.com"]
 
-  spec.summary       = 'Generate Chord Diagrams for Guitar and Ukulele'
-  spec.description   = 'Generate Chord Diagrams for Guitar and Ukulele'
-  spec.homepage      = 'https://github.com/spilth/chord_diagrams'
-  spec.license       = 'MIT'
+  spec.summary = "Generate Chord Diagrams for Guitar and Ukulele"
+  spec.description = "Generate Chord Diagrams for Guitar and Ukulele"
+  spec.homepage = "https://github.com/spilth/chord_diagrams"
+  spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = 'https://github.com/spilth/chord_diagrams'
+    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata["source_code_uri"] = "https://github.com/spilth/chord_diagrams"
     # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
   else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -31,13 +33,14 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'victor', '0.3.2'
-  spec.add_development_dependency 'bundler', '~> 2.2'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.8'
-  spec.add_development_dependency 'nokogiri', '~> 1.11'
+  spec.add_dependency "victor", "0.3.4"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "standardrb"
 end

data/lib/chord_diagrams/fingerings.csv

@@ -89,7 +89,9 @@ Dm/F,10323x,2210
 Gm/Bb,x10333,0231
 A7/G,302020,0100
 G#dim,4564xx,1202
+Adim,x01212,23x3
 D#dim7,xx1212,2323
 G#dim7,456464,1212
 Daug,xx0332,3221
 Aaug,x03221,2114
+Dadd11,xx0032,0220

data/lib/chord_diagrams/fingerings.rb

@@ -1,10 +1,10 @@
-require 'csv'
+require "csv"
 
 module ChordDiagrams
   guitar_fingerings = {}
   ukulele_fingerings = {}
 
-  fingerings_file = File.join(File.expand_path(File.dirname(__FILE__)), 'fingerings.csv')
+  fingerings_file = File.join(__dir__, "fingerings.csv")
 
   CSV.foreach(fingerings_file, headers: true) do |row|
     guitar_fingerings[row[0]] = row[1] unless row[1].nil?

data/lib/chord_diagrams/version.rb

@@ -1,3 +1,3 @@
 module ChordDiagrams
-  VERSION = '0.0.11'.freeze
+  VERSION = "0.0.13".freeze
 end

data/lib/chord_diagrams.rb

@@ -1,6 +1,6 @@
-require 'chord_diagrams/version'
-require 'chord_diagrams/fingerings'
-require 'victor'
+require "chord_diagrams/version"
+require "chord_diagrams/fingerings"
+require "victor"
 
 module ChordDiagrams
   LINE_STYLE = {
@@ -10,8 +10,8 @@ module ChordDiagrams
   }.freeze
 
   class << self
-    def ukulele_svg(name, _fingering = nil)
-      svg = Victor::SVG.new template: :minimal, width: 80, height: 100, viewBox: '0 0 160 200'
+    def ukulele_svg(name, fingering = nil)
+      svg = Victor::SVG.new template: :minimal, width: 80, height: 100, viewBox: "0 0 160 200"
 
       ChordDiagrams.draw_ukulele_name(name, svg)
       ChordDiagrams.draw_ukulele_frets(svg)
@@ -29,7 +29,7 @@ module ChordDiagrams
     end
 
     def guitar_svg(name, fingering = nil)
-      svg = Victor::SVG.new template: :minimal, width: 100, height: 100, viewBox: '0 0 200 200'
+      svg = Victor::SVG.new template: :minimal, width: 100, height: 100, viewBox: "0 0 200 200"
 
       ChordDiagrams.draw_guitar_name(name, svg)
       ChordDiagrams.draw_guitar_frets(svg)
@@ -47,14 +47,14 @@ module ChordDiagrams
     end
 
     def draw_ukulele_name(name, svg)
-      svg.text name, id: 'chordName', x: 80, y: 40, text_anchor: :middle, style: {
+      svg.text name, id: "chordName", x: 80, y: 40, text_anchor: :middle, style: {
         font_size: 36,
         font_weight: :bold
       }
     end
 
     def draw_guitar_name(name, svg)
-      svg.text name, id: 'chordName', x: 100, y: 40, text_anchor: :middle, style: {
+      svg.text name, id: "chordName", x: 100, y: 40, text_anchor: :middle, style: {
         font_size: 36,
         font_weight: :bold
       }
@@ -87,7 +87,7 @@ module ChordDiagrams
     def draw_guitar_missing_chord_diagram(name, svg)
       puts "Could't find fingerings for the Guitar chord '#{name}'"
 
-      svg.text '?', x: 102, y: 155, text_anchor: :middle, style: {
+      svg.text "?", x: 102, y: 155, text_anchor: :middle, style: {
         font_size: 96,
         font_weight: :bold,
         fill: :gray
@@ -95,9 +95,9 @@ module ChordDiagrams
     end
 
     def draw_ukulele_missing_chord_diagram(name, svg)
-      puts "Could't find fingerings for the Ukulele chord '#{name}'"
+      puts "Couldn't find fingerings for the Ukulele chord '#{name}'"
 
-      svg.text '?', x: 81, y: 155, text_anchor: :middle, style: {
+      svg.text "?", x: 81, y: 155, text_anchor: :middle, style: {
         font_size: 96,
         font_weight: :bold,
         fill: :gray
@@ -105,7 +105,7 @@ module ChordDiagrams
     end
 
     def draw_chord_diagram(fingerings, svg)
-      fingerings = fingerings.split('')
+      fingerings = fingerings.chars
 
       lowest_fret = fingerings.reject { |fret| fret.to_i < 1 }.min
       highest_fret = fingerings.reject { |fret| fret.to_i < 1 }.max
@@ -114,20 +114,18 @@ module ChordDiagrams
         draw_fret_number(lowest_fret, svg)
 
         fingerings = shift_guitar_fingerings(fingerings, lowest_fret)
+      elsif fingerings.size == 6
+        draw_guitar_nut(svg)
       else
-        if fingerings.size == 6
-          draw_guitar_nut(svg)
-        else
-          draw_ukulele_nut(svg)
-        end
+        draw_ukulele_nut(svg)
       end
 
       fingerings.each_with_index do |fingering, index|
         offset = 50 + (20 * index)
 
-        if fingering == 'x'
+        if fingering == "x"
           draw_muted_string(offset, svg)
-        elsif fingering == '0'
+        elsif fingering == "0"
           draw_open_string(offset, svg)
         else
           draw_fingered_string(fingering, offset, svg)
@@ -136,14 +134,14 @@ module ChordDiagrams
     end
 
     def draw_guitar_nut(svg)
-      svg.line id: 'nut', x1: 49, y1: 77, x2: 151, y2: 77, style: {
+      svg.line id: "nut", x1: 49, y1: 77, x2: 151, y2: 77, style: {
         stroke: :black,
         stroke_width: 8
       }
     end
 
     def draw_ukulele_nut(svg)
-      svg.line id: 'nut', x1: 49, y1: 77, x2: 111, y2: 77, style: {
+      svg.line id: "nut", x1: 49, y1: 77, x2: 111, y2: 77, style: {
         stroke: :black,
         stroke_width: 8
       }
@@ -169,12 +167,12 @@ module ChordDiagrams
     private
 
     def draw_fret_number(number, svg)
-      svg.text number, id: 'fretNumber', x: 37, y: 98, text_anchor: :end, style: {font_size: 24}
+      svg.text number, id: "fretNumber", x: 37, y: 98, text_anchor: :end, style: {font_size: 24}
     end
 
     def shift_guitar_fingerings(fingerings, lowest_fret)
       fingerings.map do |fingering|
-        if fingering != 'x' && fingering != '0'
+        if fingering != "x" && fingering != "0"
           fingering.to_i - lowest_fret.to_i + 1
         else
           fingering

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chord_diagrams
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Brian Kelly
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: victor
@@ -16,70 +16,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: standardrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate Chord Diagrams for Guitar and Ukulele
 email:
 - bkelly@carbonfive.com
@@ -87,10 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
+- ".tool-versions"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,7 +124,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/spilth/chord_diagrams
   source_code_uri: https://github.com/spilth/chord_diagrams
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.7
+signing_key:
 specification_version: 4
 summary: Generate Chord Diagrams for Guitar and Ukulele
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.2
-before_install: gem install bundler -v 2.2