gitara 0.5.0 → 0.6.0

data/spec/lib/gitara/node/stanza_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'Stanza' do
-  describe "heading_in_lilypond" do
+describe Gitara::Node::Stanza do
+  describe "#heading_in_lilypond" do
     it "should allow the stanza's name to be added as a heading to the lilypond template" do
       stanza = FactoryGirl.build(:stanza, :name => "Verse 1", :children => [
         FactoryGirl.build(:line, :children => [

data/spec/lib/gitara/node/tab_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe 'Tab' do
-  describe "voices" do
-    it "should create a <max_number_of_voices> voices" do
+describe Gitara::Node::Tab do
+  describe "#voices" do
+    it "should create a max_number_of_voices voices" do
       tab = FactoryGirl.build(:tab, :children => [
         FactoryGirl.build(:bar, :children => [
           FactoryGirl.build(:note_set),
@@ -17,7 +17,7 @@ describe 'Tab' do
     end
   end
 
-  describe "max_number_of_voices" do
+  describe "#max_number_of_voices" do
     it "should be the max number of note_sets in a bar" do
       tab = FactoryGirl.build(:tab, :children => [
         FactoryGirl.build(:bar, :children => [
@@ -30,7 +30,7 @@ describe 'Tab' do
     end
   end
 
-  describe "playable_child" do
+  describe "#playable_child" do
     it "should be the last child of the tab" do
       tab = FactoryGirl.build(:tab, :children => [
         FactoryGirl.build(:bar, :name => 'Intro', :children => [
@@ -44,7 +44,7 @@ describe 'Tab' do
     end
   end
 
-  describe "midi_instrument" do
+  describe "#midi_instrument" do
     it "should have acoustic guitar (nylon) as default" do
       tab = FactoryGirl.build(:tab)
       tab.midi_instrument.should == 'acoustic guitar (nylon)'

data/spec/lib/gitara/voice_spec.rb

@@ -1,37 +1,37 @@
 require 'spec_helper'
 
-describe Voice do
-  describe "call_name" do
+describe Gitara::Voice do
+  describe "#call_name" do
     it "should be the variable name of the node when called inside lilypond" do
       voice = FactoryGirl.build(:voice, :id => 1)
       voice.call_name.should == '\vOne'
     end
   end
 
-  describe "definition_name" do
+  describe "#definition_name" do
     it "should be the name of the voice in a lilypond variable definition statement" do
       voice = FactoryGirl.build(:voice, :id => 1)
       voice.definition_name.should == "vOne"
     end
   end
 
-  describe "id_as_word" do
+  describe "#id_as_word" do
     it "should convert the id to word" do
       node = FactoryGirl.build(:voice, :id => 1)
       node.id_as_word.should == "One"
     end
   end
 
-  describe "stem_type" do
+  describe "#stem_type" do
     it "should be the lilypond stem type for the voice" do
       voice = FactoryGirl.build(:voice, :id => 1)
       voice.stem_type.should == '\voiceOne'
     end
   end
 
-  describe "transposition" do
+  describe "#transposition" do
     it "should be based on the tab's transposition and the voice's octave" do
-      tab = FactoryGirl.build(:tab, 
+      tab = FactoryGirl.build(:tab,
         :transposition => 'd',
         :children => [
           FactoryGirl.build(:bar, :children => [
@@ -50,7 +50,7 @@ describe Voice do
     end
 
     it "should be blank if the tab has no transposition" do
-      tab = FactoryGirl.build(:tab, 
+      tab = FactoryGirl.build(:tab,
         :children => [
           FactoryGirl.build(:bar, :children => [
             FactoryGirl.build(:note_set),
@@ -65,7 +65,7 @@ describe Voice do
     end
   end
 
-  describe "octave" do
+  describe "#octave" do
     it "should be based on the voice's position in the tab" do
       tab = FactoryGirl.build(:tab, :children => [
         FactoryGirl.build(:bar, :children => [

data/spec/lib/gitara_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
 
 describe Gitara do
-  describe "tab" do
+  describe ".tab" do
     it "should create a tab instance if it does not exist" do
       Gitara.tab.should be_nil
       Gitara.define
       Gitara.tab.should be_a(Node::Tab)
     end
+  end
 
+  describe ".define" do
     it "should instance evaluate a block if given" do
       tab = Gitara.define do
         bar "Intro" do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'pry'
 RSpec.configure do |config|
   include Gitara
   require 'factories'
+  require 'support/app_tester'
 
   config.before :each do
     test_tmp_dir.delete! if test_tmp_dir.exists?

data/spec/support/app_tester.rb

@@ -0,0 +1,22 @@
+# @private
+class AppTester < Valuable
+  has_value :name
+
+  def run
+    app = FactoryGirl.build(:app)
+    app.invoke :export, ["examples/#{name}.rb"], "target-directory" => test_tmp_dir.path, "run-lilypond" => false
+    (Pow("tmp") / "#{name}.ly").write actual if self.expected != self.actual
+  end
+
+  def expected
+    @expected ||= Utilities.read!(Pow("examples/#{name}.ly")).gsub(/\n\s+\n/, "\n")
+  rescue PowError => e
+    puts "#{e.message}. Copying actual result..."
+    Pow("examples/#{name}.ly").write actual
+    retry
+  end
+
+  def actual
+    @actual ||= Utilities.read!((test_tmp_dir / "#{name}.ly")).gsub(/\n\s+\n/, "\n")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitara
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &78713260 !ruby/object:Gem::Requirement
+  requirement: &69443170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78713260
+  version_requirements: *69443170
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &78713040 !ruby/object:Gem::Requirement
+  requirement: &69442290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78713040
+  version_requirements: *69442290
 - !ruby/object:Gem::Dependency
   name: linguistics
-  requirement: &78712780 !ruby/object:Gem::Requirement
+  requirement: &69441980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78712780
+  version_requirements: *69441980
 - !ruby/object:Gem::Dependency
   name: pow
-  requirement: &78712550 !ruby/object:Gem::Requirement
+  requirement: &69441550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78712550
+  version_requirements: *69441550
+- !ruby/object:Gem::Dependency
+  name: redwood
+  requirement: &69441120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *69441120
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &78712320 !ruby/object:Gem::Requirement
+  requirement: &69440840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78712320
+  version_requirements: *69440840
 - !ruby/object:Gem::Dependency
   name: valuable
-  requirement: &78712070 !ruby/object:Gem::Requirement
+  requirement: &69440430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78712070
+  version_requirements: *69440430
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &78711790 !ruby/object:Gem::Requirement
+  requirement: &69440080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78711790
+  version_requirements: *69440080
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &78357910 !ruby/object:Gem::Requirement
+  requirement: &69439780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78357910
+  version_requirements: *69439780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &78357620 !ruby/object:Gem::Requirement
+  requirement: &69439500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78357620
+  version_requirements: *69439500
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &78357380 !ruby/object:Gem::Requirement
+  requirement: &69439160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78357380
+  version_requirements: *69439160
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &78357060 !ruby/object:Gem::Requirement
+  requirement: &69438880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78357060
+  version_requirements: *69438880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78356740 !ruby/object:Gem::Requirement
+  requirement: &69438580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69438580
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &69438320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69438320
+- !ruby/object:Gem::Dependency
+  name: yard-rspec
+  requirement: &69438040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78356740
+  version_requirements: *69438040
 description: A Ruby DSL for generating Lilypond guitar tablatures.
 email:
 - gsmendoza@gmail.com
@@ -152,6 +185,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - CHANGELOG.markdown
 - Gemfile
 - Guardfile
@@ -172,6 +206,8 @@ files:
 - examples/tab-with-key-signature.rb
 - examples/tab-with-partial.ly
 - examples/tab-with-partial.rb
+- examples/tab-with-repeats.ly
+- examples/tab-with-repeats.rb
 - examples/tab.ly
 - examples/tab.rb
 - gitara.gemspec
@@ -179,23 +215,24 @@ files:
 - lib/gitara/app.rb
 - lib/gitara/dsl.rb
 - lib/gitara/dsl_macros.rb
-- lib/gitara/is_node_version.rb
+- lib/gitara/node/alternative.rb
 - lib/gitara/node/bar.rb
 - lib/gitara/node/bar/chorded_version.rb
 - lib/gitara/node/bar/stanza_version.rb
 - lib/gitara/node/bar/voiced_version.rb
 - lib/gitara/node/base.rb
 - lib/gitara/node/base/chorded_version.rb
+- lib/gitara/node/base/node_version.rb
 - lib/gitara/node/base/stanza_version.rb
 - lib/gitara/node/base/voiced_version.rb
 - lib/gitara/node/chord_set.rb
 - lib/gitara/node/chord_set/chorded_version.rb
 - lib/gitara/node/line.rb
 - lib/gitara/node/note_set.rb
+- lib/gitara/node/repeat.rb
 - lib/gitara/node/score.rb
 - lib/gitara/node/stanza.rb
 - lib/gitara/node/tab.rb
-- lib/gitara/pow/base.rb
 - lib/gitara/template/bar.erb
 - lib/gitara/template/chord_set.erb
 - lib/gitara/template/line.erb
@@ -210,22 +247,25 @@ files:
 - spec/factories.rb
 - spec/lib/gitara/app_spec.rb
 - spec/lib/gitara/dsl_spec.rb
-- spec/lib/gitara/is_node_version_spec.rb
+- spec/lib/gitara/node/alternative_spec.rb
 - spec/lib/gitara/node/bar/chorded_version_spec.rb
 - spec/lib/gitara/node/bar/stanza_version_spec.rb
 - spec/lib/gitara/node/bar/voiced_version_spec.rb
 - spec/lib/gitara/node/bar_spec.rb
 - spec/lib/gitara/node/base/chorded_version_spec.rb
+- spec/lib/gitara/node/base/node_version_spec.rb
 - spec/lib/gitara/node/base/voiced_version_spec.rb
 - spec/lib/gitara/node/base_spec.rb
 - spec/lib/gitara/node/chord_set/chorded_version_spec.rb
 - spec/lib/gitara/node/chord_set_spec.rb
 - spec/lib/gitara/node/note_set_spec.rb
+- spec/lib/gitara/node/repeat_spec.rb
 - spec/lib/gitara/node/stanza_spec.rb
 - spec/lib/gitara/node/tab_spec.rb
 - spec/lib/gitara/voice_spec.rb
 - spec/lib/gitara_spec.rb
 - spec/spec_helper.rb
+- spec/support/app_tester.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -251,3 +291,4 @@ signing_key:
 specification_version: 3
 summary: Ruby + Lilypond = pretty guitar tablatures.
 test_files: []
+has_rdoc: 

data/lib/gitara/is_node_version.rb

@@ -1,23 +0,0 @@
-module Gitara
-  module IsNodeVersion
-    def call_name
-      "\\#{definition_name}"
-    end
-
-    def children
-      node.children.map{|child| self.class.new(:node => child)}
-    end
-
-    def definition_name
-      "#{prefix}#{node.class.to_s.split('::').last}#{node.definition_name}"
-    end
-
-    def prefix
-      self.class.to_s.split('::').last[0].downcase
-    end
-
-    def value
-      children.map(&:call_name).join(' ')
-    end
-  end
-end