gitara 0.7.0 → 0.8.0

data/examples/tab-with-line-with-no-break.rb

@@ -0,0 +1,37 @@
+Gitara.define do
+  title "Walking After You"
+  composer "Foo Fighters"
+  arranger "Arranged by George Mendoza"
+  instrument "DADGBE (capo on second fret)"
+  midi_instrument "acoustic guitar (nylon)"
+
+  string_tunings "#guitar-drop-d-tuning"
+  tempo "4 = 100"
+  transposition "d"
+  
+  score do
+    line :manual_break => false do 
+      bar do
+        notes "<fs'/1>4. <d'/2>4 <a/3>4 <d'~/2>8 "
+        notes "<d,/6>4 <d/4>4 <d,/6>4 <d/4>4 "
+      end
+
+      bar do
+        notes "<d'/2>8 <a/3>4 <d'/2>4 <a/3>8 /skip 4 "
+        notes "<d,/6>4 <d/4>4 <d,/6>4 <d/4>4 "
+      end
+    end
+    
+    line do 
+      bar do
+        notes "/skip 4 r8 <d'/2 fs'/1 >4 <d'/2 fs'/1 >4 <d'~/2 fs'~/1 >8 "
+        notes "<d,/6>4 <d/4>4 r4 <d/4>4 "
+      end
+
+      bar do
+        notes "<d'/2 fs'/1 >8 <d'/2 fs'/1 >4 <d'/2>8 <d'/2>8 <e'/1>4. "
+        notes "r4 <d/4>4 r4 r4 "
+      end
+    end
+  end
+end

data/gitara.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "active_support"
   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"

data/lib/gitara/dsl.rb

@@ -31,7 +31,12 @@ module Gitara
       names = options[:names].empty? ? [nil] : options[:names]
       node_class = options[:node_class]
 
-      names.map{|name| node_class.new(:name => name) }.each do |child|
+      children = names.map{|name| 
+        attributes = (options[:options] || {}).merge(:name => name)
+        node_class.new(attributes) 
+      }
+      
+      children.each do |child|
         add child, &block
       end
     end
@@ -49,7 +54,10 @@ module Gitara
     end
 
     def line(*names, &block)
-      add_names :names => names, :node_class => Node::Line, &block
+      args = {}
+      args[:options] = names.pop if names.last.is_a?(Hash)
+      args.merge!(:names => names, :node_class => Node::Line)
+      add_names args, &block
     end
 
     def notes(value)

data/lib/gitara/node/line.rb

@@ -1,6 +1,7 @@
 module Gitara
   module Node
     class Line < Base
+      has_value :manual_break, :klass => :boolean, :default => true
     end
   end
 end

data/lib/gitara/template/line.erb

@@ -1,5 +1,5 @@
 <% self.voiced_as(self.root.voices).each do |voiced_line| %>
-<%= voiced_line.definition_name %> = { <%= voiced_line.value %> \break }
+<%= voiced_line.definition_name %> = { <%= voiced_line.value %> <%= voiced_line.node.manual_break? ? '\break' : '' %> }
 <% end %>
 <%= self.chorded.definition_name %> = { <%= self.chorded.value %> }
 <%= self.stanza_version.definition_name %> = { <%= self.stanza_version.value %> }

data/lib/gitara/version.rb

@@ -1,3 +1,3 @@
 module Gitara
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/lib/gitara/app_spec.rb

@@ -37,5 +37,11 @@ describe Gitara::App do
       app_test.run
       app_test.actual.should == app_test.expected
     end
+
+    it "can convert a tab with a line without a break to lilypond" do
+      app_test = AppTester.new(:name => 'tab-with-line-with-no-break')
+      app_test.run
+      app_test.actual.should == app_test.expected
+    end
   end
 end

data/spec/lib/gitara/dsl_spec.rb

@@ -109,6 +109,15 @@ describe Gitara::Dsl do
       line.children.should have(1).bar
       line.children[0].should == bar
     end
+    
+    it "should allow breaking to be toggled" do
+      dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
+      dsl.line :manual_break => false
+      
+      dsl.node.children.should have(1).line
+      dsl.node.children[0].name.should == 'TabOneLineOne' # not manual_breaking=false
+      dsl.node.children[0].manual_break?.should be_false
+    end
   end
 
   describe "#add_names" do
@@ -135,6 +144,19 @@ describe Gitara::Dsl do
       dsl.node.children[0].attributes[:name].should be_nil
       dsl.node.children[0].should be_a(Node::Bar)
     end
+    
+    it "should set o[:options] as attributes of the nodes" do
+      dsl = FactoryGirl.build(:dsl, :node => FactoryGirl.build(:tab, :children => []))
+      dsl.node.children.should be_empty
+
+      dsl.add_names :names => [:Intro, :Intro], :options => {:value => 1 }, :node_class => Node::Base
+
+      dsl.node.children.should have(2).nodes
+      dsl.node.children.each do |child|
+        child.name.should == :Intro
+        child.value.should == 1
+      end
+    end
   end
 
   describe "#score" do

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

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Gitara::Node::Line do
+  describe "#manual_break?" do
+    it "should be true by default" do
+      described_class.new.manual_break?.should be_true
+    end
+    
+    it "should be based on #manual_break field" do
+      line = described_class.new
+      line.manual_break = false
+      line.manual_break?.should be_false
+    end
+  end
+end
+

metadata

@@ -1,181 +1,272 @@
 --- !ruby/object:Gem::Specification
 name: gitara
 version: !ruby/object:Gem::Version
-  version: 0.7.0
   prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: &72250440 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *72250440
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: &72250160 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: active_support
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72250160
-- !ruby/object:Gem::Dependency
-  name: linguistics
-  requirement: &72249910 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: erubis
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72249910
-- !ruby/object:Gem::Dependency
-  name: pow
-  requirement: &72249630 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: linguistics
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72249630
-- !ruby/object:Gem::Dependency
-  name: redwood
-  requirement: &72249330 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: loggability
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72249330
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &72249010 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pow
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72249010
-- !ruby/object:Gem::Dependency
-  name: valuable
-  requirement: &72248620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: redwood
+- !ruby/object:Gem::Dependency
   type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72248620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: thor
 - !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: &72248250 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *72248250
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &72248000 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: valuable
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72248000
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &72247730 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: factory_girl
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72247730
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &72247480 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: guard
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72247480
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: &72247170 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: guard-rspec
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72247170
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &72246840 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72246840
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &72246430 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rb-inotify
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72246430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: rspec
 - !ruby/object:Gem::Dependency
-  name: yard-rspec
-  requirement: &72245950 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: yard
+- !ruby/object:Gem::Dependency
   type: :development
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
-  version_requirements: *72245950
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: yard-rspec
 description: A Ruby DSL for generating Lilypond guitar tablatures.
 email:
 - gsmendoza@gmail.com
@@ -200,10 +291,16 @@ files:
 - examples/eraserheads-huling-el-bimbo/tab.midi
 - examples/eraserheads-huling-el-bimbo/tab.pdf
 - examples/eraserheads-huling-el-bimbo/tab.rb
+- examples/foo-fighters-walking-after-you/foo-fighters-walking-after-you.ly
+- examples/foo-fighters-walking-after-you/foo-fighters-walking-after-you.midi
+- examples/foo-fighters-walking-after-you/foo-fighters-walking-after-you.pdf
+- examples/foo-fighters-walking-after-you/foo-fighters-walking-after-you.rb
 - examples/tab-with-alternate-tuning.ly
 - examples/tab-with-alternate-tuning.rb
 - examples/tab-with-key-signature.ly
 - examples/tab-with-key-signature.rb
+- examples/tab-with-line-with-no-break.ly
+- examples/tab-with-line-with-no-break.rb
 - examples/tab-with-partial.ly
 - examples/tab-with-partial.rb
 - examples/tab-with-repeats.ly
@@ -262,6 +359,7 @@ files:
 - 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/line_spec.rb
 - spec/lib/gitara/node/note_set_spec.rb
 - spec/lib/gitara/node/repeat_spec.rb
 - spec/lib/gitara/node/stanza_spec.rb
@@ -291,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gitara
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby + Lilypond = pretty guitar tablatures.