chordy 0.7.1 → 0.7.2

data/lib/chordy/util/section.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+module Util
+
+  class Section
+    attr_accessor :separator_length
+
+    def initialize(title="", separator_length=40)
+      @title = title
+      @separator_length = separator_length
+    end
+    
+    def to_s
+      title_str = @title.to_s
+      title_str.rjust(title_str.length + 2, "-").ljust(@separator_length, "-")
+    end
+  end
+end

data/lib/chordy/util/text.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+module Util
+
+  class Text < String
+  end
+end

data/lib/chordy/util/tuning.rb

@@ -0,0 +1,113 @@
+# encoding: utf-8
+
+module Util
+
+  module Tuning
+
+    def is_tuning? tuning
+      Tuning.instance_methods.include? tuning.to_s
+      true
+    end
+
+    def tuning_6_standard
+      ["e", "a", "d", "g", "b", "e"]
+    end
+
+    def tuning_6_a
+      ["a", "d", "g", "c", "e", "a"]
+    end
+
+    def tuning_6_b
+      ["b", "e", "a", "d", "f#", "b"]
+    end
+
+    def tuning_6_c
+      ["c", "f", "a#", "d#", "g", "c"]
+    end
+
+    def tuning_6_d
+      ["d", "g", "c", "f", "a", "d"]
+    end
+
+    def tuning_6_drop_a
+      ["a", "e", "a", "d", "f#", "b"]
+    end
+
+    def tuning_6_drop_c
+      ["c", "g", "c", "f", "a", "d"]
+    end
+
+    def tuning_6_drop_d
+      ["d", "a", "d", "g", "b", "e"]
+    end
+
+    def tuning_7_standard
+      ["b", "e", "a", "d", "g", "b", "e"]
+    end
+
+    def tuning_7_a
+      ["a", "d", "g", "c", "f", "a", "d"]
+    end
+
+    def tuning_7_a_sharp
+      ["a#", "d#", "g#", "c#", "f#", "a#", "d#"]
+    end
+
+    def tuning_7_c
+      ["c", "f", "a#", "d#", "g#", "c", "f"]
+    end
+
+    def tuning_7_d
+      ["d", "g", "c", "f", "a#", "d", "g"]
+    end
+
+    def tuning_7_drop_a
+      ["a", "e", "a", "d", "f#", "b", "e"]
+    end
+
+    def tuning_7_drop_g
+      ["g", "d", "g", "c", "f", "a", "d"]
+    end
+
+    def tuning_7_drop_g_sharp
+      ["g#", "d#", "g#", "c#", "f#", "a#", "d#"]
+    end
+
+    def tuning_8_standard
+      ["f#", "b", "e", "a", "d", "g", "b", "e"]
+    end
+
+    def tuning_8_a
+      ["a", "d", "g", "c", "f", "a", "d", "g"]
+    end
+
+    def tuning_8_e
+      ["e", "a", "d", "g", "c", "f", "a", "d"]
+    end
+
+    def tuning_8_f
+      ["fb", "bb", "eb", "ab", "db", "gb", "bb", "eb"]
+    end
+
+    def tuning_8_drop_d_sharp
+      ["eb", "bb", "eb", "ab", "db", "gb", "bb", "eb"]
+    end
+
+    def tuning_8_drop_e
+      ["e", "b", "e", "a", "d", "g", "b", "e"]
+    end
+
+    alias :tuning_standard :tuning_6_standard
+    alias :tuning_a :tuning_6_a
+    alias :tuning_b :tuning_6_b
+    alias :tuning_c :tuning_6_c
+    alias :tuning_d :tuning_6_d
+    alias :tuning_drop_a :tuning_6_drop_a
+    alias :tuning_drop_c :tuning_6_drop_c
+    alias :tuning_drop_d :tuning_6_drop_d
+    alias :tuning_7 :tuning_7_standard
+    alias :tuning_7_a! :tuning_7_a_sharp
+    alias :tuning_7_drop_g! :tuning_7_drop_g_sharp
+    alias :tuning_8_drop_d! :tuning_8_drop_d_sharp
+  end
+end

data/test/helper.rb

@@ -13,7 +13,7 @@ end
 require 'test/unit'
 require 'shoulda'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib', 'chordy'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'chordy'
 

data/test/test_chordy.rb

@@ -3,14 +3,24 @@
 require 'helper'
 
 class TestChordy < Test::Unit::TestCase
-  should "have private methods and constants for all chord flags" do
-    c = Chord.new(:M, 6)
-    methods = c.private_methods
-    flags = Chord::CHORD_FLAGS
+  def test_chord
+    Chord.new(:M, 6)
+  end
+
+  should "have methods and constants for all chord flags" do
+    c = test_chord
+    methods = c.methods
+    class_flags = Chord::CHORD_FLAGS
     consts = Chord.constants
 
-    flags.each { |f| assert(methods.include?(f.to_sym), "no method '#{f}' in Chord") }
-    flags.each { |f| assert(consts.include?(f.upcase.to_sym), "no constant '#{f}' in Chord") }
+    # class methods
+    class_flags.each { |f| assert(consts.include?(f.upcase.to_sym), "no constant '#{f}' in Chord") }
+    class_flags.each { |method| assert(methods.include?(method.to_sym), "no class method '#{method}' in Chord") }
+
+    instance_flags = class_flags.select { |c| c!= "dont_play"}.map { |c| "play_" + c.to_s }
+
+    # instance methods
+    instance_flags.each { |method| assert(methods.include?(method.to_sym), "no instance method '#{method}' in Chord") }
   end
 
   should "knows all chord types" do
@@ -32,11 +42,6 @@ class TestChordy < Test::Unit::TestCase
     end
   end
 
-  should "know all effects" do
-    # TODO implement
-    true
-  end
-
   should "have 6,7 or 8 strings" do
     # TODO implement
     true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chordy
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -92,13 +92,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.4
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,9 +106,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Chordy is a DSL written in Ruby to print guitar chords diagrams
+description: A Ruby DSL for printing guitar chords diagrams
 email: akhil.wali.10@gmail.com
 executables: []
 extensions: []
@@ -136,24 +136,25 @@ files:
 - LICENSE.rdoc
 - README.rdoc
 - Rakefile
-- lib/a_chords.rb
-- lib/a_sharp_chords.rb
-- lib/b_chords.rb
-- lib/c_chords.rb
-- lib/c_sharp_chords.rb
-- lib/chord.rb
+- VERSION
 - lib/chordy.rb
+- lib/chordy/chord.rb
+- lib/chordy/chords/a.rb
+- lib/chordy/chords/a_sharp.rb
+- lib/chordy/chords/b.rb
+- lib/chordy/chords/c.rb
+- lib/chordy/chords/c_sharp.rb
+- lib/chordy/chords/d.rb
+- lib/chordy/chords/d_sharp.rb
+- lib/chordy/chords/e.rb
+- lib/chordy/chords/f.rb
+- lib/chordy/chords/f_sharp.rb
+- lib/chordy/chords/g.rb
+- lib/chordy/chords/g_sharp.rb
+- lib/chordy/util/section.rb
+- lib/chordy/util/text.rb
+- lib/chordy/util/tuning.rb
 - lib/chordy_script.rb
-- lib/d_chords.rb
-- lib/d_sharp_chords.rb
-- lib/e_chords.rb
-- lib/f_chords.rb
-- lib/f_sharp_chords.rb
-- lib/g_chords.rb
-- lib/g_sharp_chords.rb
-- lib/section.rb
-- lib/text.rb
-- lib/tuning.rb
 - test/helper.rb
 - test/test_chordy.rb
 homepage: http://github.com/darth10/chordy
@@ -171,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -257714063
+      hash: -115352785
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/a_chords.rb

@@ -1,81 +0,0 @@
-# encoding: utf-8
-
-require 'chord'
-
-class A < Chord
-  def play_major
-    [0, 0, 2, 2, 2, 0]
-  end
-
-  def play_minor
-    [0, 0, 2, 2, 1, 0]
-  end
-
-  def play_dominant_7
-    [0, 0, 2, 0, 2, 0]
-  end
-
-  def play_dominant_7_5
-    [-1, 0, 1, 0, 2, 3]
-  end
-
-  def play_major_6
-    [0, 0, 2, 2, 2, 2]
-  end
-
-  def play_major_7
-    [0, 0, 2, 1, 2, 0]
-  end
-
-  def play_major_9
-    [-1, 2, 2, 2, 2, 3]
-  end
-
-  def play_minor_6
-    [2, 0, 2, 2, 1, 2]
-  end
-
-  def play_minor_7
-    [0, 0, 2, 0, 1, 0]
-  end
-
-  def play_half_diminished_7
-    [-1, 0, 1, 0, 1, 3]
-  end
-
-  def play_minor_major_7
-    [0, 0, 2, 1, 1, 0]
-  end
-
-  def play_augmented_5
-    [1, 0, 3, 2, 2, 1]
-  end
-
-  def play_augmented_7
-    [1, 4, 3, 0, 2, 1]
-  end
-
-  def play_augmented_major_7
-    [-1, 0, -1, 1, 2, 1]
-  end
-
-  def play_diminished_5
-    [5, 6, 7, 5, 4, 5]
-  end
-
-  def play_diminished_7
-    [-1, -1, 1, 2, 1, 2]
-  end
-
-  def play_diminished_9
-    [2, -1, 5, 3, 2, 5]
-  end
-
-  def play_suspended_4
-    [0, 0, 2, 2, 3, 0]
-  end
-
-  def play_suspended_7
-    [0, 0, 2, 0, 3, 0]
-  end
-end

data/lib/a_sharp_chords.rb

@@ -1,83 +0,0 @@
-# encoding: utf-8
-
-require 'chord'
-
-class ASharp < Chord
-  def play_major
-    [1, 1, 3, 3, 3, 1]
-  end
-
-  def play_minor
-    [1, 1, 3, 3, 2, 1]
-  end
-
-  def play_dominant_7
-    [1, 1, 3, 1, 3, 1]
-  end
-
-  def play_dominant_7_5
-    [0, 1, 2, 1, 3, 4]
-  end
-  
-  def play_major_6
-    [1, 1, 3, 3, 3, 3]
-  end
-
-  def play_major_7
-    [1, 1, 3, 2, 3, 1]
-  end
-
-  def play_major_9
-    [-1, 1, 0, 1, 1, 1]
-  end
-
-  def play_minor_6
-    [-1, -1, 3, 3, 2, 3]
-  end
-
-  def play_minor_7
-    [1, 1, 3, 1, 2, 1]
-  end
-  
-  def play_half_diminished_7
-    [1, 1, 2, 1, 2, 4]
-  end
-
-  def play_minor_major_7
-    [1, 1, 3, 2, 2, 1]
-  end
-
-  def play_augmented_5
-    [2, -1, 4, 3, 3, 2]
-  end
-
-  def play_augmented_7
-    [-1, 1, 4, 1, 3, 2]
-  end
-
-  def play_augmented_major_7
-    [-1, 1, 0, 2, 3, 2]
-  end
-
-  def play_diminished_5
-    [0, 1, 2, 3, 2, 0]
-  end
-
-  def play_diminished_7
-    [-1, -1, 2, 3, 2, 3]
-  end
-
-  def play_diminished_9
-    [1, 1, 0, 1, 0, 1]
-  end
-
-  def play_suspended_4
-    [1, 1, 1, 3, 4, 1]
-  end
-
-  def play_suspended_7
-    [1, 1, 1, 1, 3, 1]
-  end
-end
-
-BFlat = ASharp