gitara 1.0.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 2e2826f811fba5feb695cbc7031ede9780218536fe398cd8e97bf644b4cb4da4
+  data.tar.gz: 074d686d39fe120c15259f1d6b58333201d49c22ef7eec7471715cbff7181474
+SHA512:
+  metadata.gz: f9516849fe5f9d5e48f44ecaa47ec88da8e80bcd9c2524dd15157751495723ae0c37e44ab9c31d4edc094f0f13f2928ea699e4d9149de149f61ad55b011b1f3e
+  data.tar.gz: 8498c45c544ade9df131ae16ff9e0f9edce49b9fdfd70002678539846c4a810203fce74a4544ac84d9b8eb79685143db93da7a79b3780050992fd10cc7159713

data/.gitignore

@@ -12,4 +12,5 @@ b/*
 doc/*
 files/*
 pkg/*
+spec/support/examples.txt
 tmp/*

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+1.2.0 - 2024-08-08
+-------------------
+
+* [#28] Support Ruby 3.3 and Lilypond 2.22
+* Chord names have moved between the staff and tab staffs. Still figuring out how to move it back under the tab staff.
+
 1.0.1 - 2013-01-24
 ------------------
 

data/README.markdown

@@ -10,7 +10,7 @@ To install,
 
 You need [lilypond](http://lilypond.org) in order to generate pdfs and midis.
 
-Gitara is tested on Ruby 1.9.3 and Lilypond 2.14. Patches are welcome.
+Gitara is tested on Ruby 3.3.3 and Lilypond 2.22. Patches are welcome.
 
 To run,
 

data/examples/aimee-man-wise-up.ly

@@ -1,4 +1,4 @@
-\version "2.14.2"
+\version "2.22.1"
 \include "english.ly"
 
 \paper {

data/gitara.gemspec

@@ -18,19 +18,18 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "active_support"
+  s.add_runtime_dependency "activesupport"
   s.add_runtime_dependency "erubis"
   s.add_runtime_dependency "linguistics"
   s.add_runtime_dependency "loggability"
-  s.add_runtime_dependency "pow"
   s.add_runtime_dependency "redwood"
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "valuable"
 
-  s.add_development_dependency "factory_girl"
+  s.add_development_dependency "factory_bot"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
-  s.add_development_dependency "pry"
+  s.add_development_dependency "byebug"
   s.add_development_dependency "rb-inotify"
   s.add_development_dependency "rspec"
   s.add_development_dependency "yard"

data/lib/gitara/app.rb

@@ -17,12 +17,12 @@ module Gitara
     def export(source_path)
       load source_path
       tab = Gitara.tab
-      lilypond_name = Pow(source_path).name(false) + '.ly'
-      lilypond_path = Pow(options['target-directory']) / lilypond_name
+      lilypond_name = Pathname.new(source_path).sub_ext('.ly')
+      lilypond_path = Pathname.new(options['target-directory']) / lilypond_name
       lilypond_path.write(Gitara.render('tab', tab))
 
       if options['run-lilypond']
-        `lilypond -o #{lilypond_path.parent / lilypond_path.name(false)} #{lilypond_path}`
+        `lilypond -o #{lilypond_path.parent / lilypond_path.basename.sub_ext('') } #{lilypond_path}`
       end
     end
   end

data/lib/gitara/node/base.rb

@@ -55,10 +55,7 @@ module Gitara
       end
 
       def definition_name
-        name.to_s.
-          gsub(/\W/, '_').
-          gsub(/\d+/){|s| Utilities.id_as_word(s)}.
-          camelize
+        name.to_s.gsub(/\d+/){ |s| Utilities.id_as_word(s) }.split(/\W/).map(&:camelize).join
       end
 
       def definition_of?(target)

data/lib/gitara/template/tab.erb

@@ -1,4 +1,4 @@
-\version "2.14.2"
+\version "2.22.1"
 \include "english.ly"
 
 \paper {

data/lib/gitara/utilities.rb

@@ -1,5 +1,8 @@
 module Gitara
   module Utilities
+    class PathnameDoesNotExist < StandardError
+    end
+
     def self.id_as_word(id)
       id.en.numwords.gsub('-', '_').camelize
     end
@@ -8,11 +11,11 @@ module Gitara
       "#{object.class}(" + attributes.collect{|a| "#{a}=#{object.send(a).inspect}"}.join(', ') + ")"
     end
 
-    def self.read!(pow)
-      if pow.exists?
-        pow.read
+    def self.read!(pathname)
+      if pathname.exist?
+        pathname.read
       else
-        raise PowError, "#{pow} does not exist"
+        raise PathnameDoesNotExist, "#{pathname} does not exist"
       end
     end
   end

data/lib/gitara/version.rb

@@ -1,3 +1,3 @@
 module Gitara
-  VERSION = "1.0.1"
+  VERSION = "1.2.0"
 end

data/lib/gitara.rb

@@ -1,7 +1,7 @@
 require "active_support/inflector"
 require "erubis"
 require "linguistics"
-require "pow"
+require "pathname"
 require "redwood"
 require "thor"
 require "valuable"
@@ -41,7 +41,7 @@ module Gitara
   end
 
   def self.render(path, object)
-    template = (Pow!('gitara/template') / "#{path}.erb")
+    template = Pathname.new(__FILE__).parent / "gitara/template/#{path}.erb"
     erb = Erubis::Eruby.new(Utilities.read!(template))
     erb.evaluate(object)
   end

data/spec/factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :note_set, :class => Node::NoteSet do
   end
 
@@ -9,7 +9,7 @@ FactoryGirl.define do
   end
 
   factory :bar, :class => Node::Bar do
-    children [FactoryGirl.build(:note_set)]
+    children { [FactoryBot.build(:note_set)] }
   end
 
   factory :base, :class => Node::Base do
@@ -28,25 +28,25 @@ FactoryGirl.define do
   end
 
   factory :line, :class => Node::Line do
-    children [FactoryGirl.build(:bar)]
+    children { [FactoryBot.build(:bar)] }
   end
 
   factory :repeat, :class => Node::Repeat do
   end
 
   factory :stanza, :class => Node::Stanza do
-    children [FactoryGirl.build(:line)]
+    children { [FactoryBot.build(:line)] }
   end
 
   factory :stanza_version_bar, :class => Node::Bar::StanzaVersion do
   end
 
   factory :score, :class => Node::Score do
-    children [FactoryGirl.build(:stanza)]
+    children { [FactoryBot.build(:stanza)] }
   end
 
   factory :tab, :class => Node::Tab do
-    children [FactoryGirl.build(:score)]
+    children { [FactoryBot.build(:score)] }
   end
 
   factory :time_signature, :class => TimeSignature do
@@ -60,4 +60,4 @@ FactoryGirl.define do
 
   factory :voiced_version, :class => Node::Base::VoicedVersion do
   end
-end
+end

data/spec/lib/gitara/app_spec.rb

@@ -4,18 +4,18 @@ describe Gitara::App do
   describe "#export" do
     let(:app_test){AppTester.new(:run_lilypond => run_lilypond?)}
     
-    Pow('examples').glob('/*.rb').each do |path|
+    Pathname.new('examples').glob('/*.rb').each do |path|
       it "can convert #{path.name(false)} to lilypond" do
         app_test.name = path.name(false)
         app_test.run
-        app_test.actual.should == app_test.expected
+        expect(app_test.actual).to eq(app_test.expected)
       end
     end
     
     after do
       if run_lilypond?
-        app_test.should be_midi_generated  
-        app_test.should be_pdf_generated  
+        expect(app_test).to be_midi_generated
+        expect(app_test).to be_pdf_generated
       end
     end
   end