juicy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDk5YWVkNTIyMzU4OWQyOGE3NmM4MTllYWMwODFhMTJiNmZmMmU1Nw==
+    YjIwNTk4OWI5YjJhM2M1N2Q2MjEwMGRiN2Q5ZjVlNjk0YzgzMzQzNg==
   data.tar.gz: !binary |-
-    MGRiOTRkYzRiOWQzYmFhNWUyNjZmOWIzNzNlY2JmNzJjYjA5NTBjOQ==
+    MGNjOWNlMDBkMzVmMWUzNjE5YTQxY2RiZmVjMTJjOWQxOWExZWQ2ZA==
 SHA512:
   metadata.gz: !binary |-
-    MzMyOTllNGI2ZmRhODIzYjg4ZjA4ODIwYWMwMGYwNTUyN2Y3MTdiODQ0N2Uw
-    N2I0MjJhN2MwZjk1ZjAxMTM4YTdiOGEzNWMxZWUwYmJjNWJjZTAyZjVkN2Uw
-    YWRmZjM3ZDUyOTMwZGIyNDY4MjMyOGEyM2M5ZTZhMzY5YzVjYTM=
+    NWYyOTgxNzQ5ZjViZDIxNzA3YjFiMTdlZjA3ODRjMWZmOGUwODAxZTk3YWFk
+    ZTA1M2JjMTMzMTk3YzllZjhkZGU3MGY2ZGEwN2RlM2U2M2U3NzExODYxZmU4
+    NTVmODFiODE0YmY4ZGNlNWNhN2I2OWIzYzZhOGJlODY2ZjU2YmU=
   data.tar.gz: !binary |-
-    NjlkMjZmNGNlMmUxMzU3NzUyNmFlNGViNzM0MWU4MTMzNjYwNmIwMzk5Yjdl
-    YjhmYjdlOWUzYjMzZmRlNmZlMzhkOTBmMjQyZGNlMmNkOTBjNzc1MmZkZjlm
-    MzFkYzg4NDU0YjJiNzE3MjYyZGFhYWZkMzQwYTQ1NjMyZTU5MDY=
+    ZTA5N2E4NDA1NWRlZmJkMTdhOWQ5M2VlN2Y0ZjM5ZDhkZDI1MmNmZmZlY2Fm
+    NDlkYzA0ZDI2Nzk5ODlhMTQ2MDlhMDQ3Nzg5MWM3NGE5Y2Y5ZTE4YzA1YjY4
+    MmNlMzIzODNjMGZmNTkyMWE1MjRkMjFiYTY5NWQ1Yzc5MDUzNzQ=

data/{bin → examples}/juicy.rb

@@ -1,4 +1,4 @@
-require_relative '../lib/juicy.rb'
+require 'juicy'
 include Juicy
 play = true
 # To make a pitch, give it a frequency.
@@ -45,7 +45,8 @@ sleep 0.3
 puts "----------"
 # Of course, this is cumbersome to do all on our own,
 # so you have a Scale available to you.
-scale = Scale.new(:major, Note.new(name: "D", octave_change: -1))
+root = Note.new(name: "D", octave_change: -1)
+scale = Scale.new(mode: :major, root: root)
 puts scale
 scale.each_note do |note|
   note.play if play
@@ -63,13 +64,13 @@ end
 # and a beat sequencer to bring it all together.
 
 sleep 0.3
-scale = Scale.new(:major, Note.new(name: "G", octave_change: -1))
+root = Note.new(name: "G", octave_change: -1)
+scale = Scale.new(mode: :major, root: root)
 puts scale
 scale.each_note do |note|
   note.play if play
 end
 
-puts
 
 # threads = []
 # 

data/lib/juicy.rb

@@ -1,19 +1,18 @@
-# require 'win32-sound'
+
 #require 'pry'
 require 'sound'
 
-require_relative 'juicy/pitch' #toned (or not) frequency in a chosen pitch space (temperament/intonation)
-  require_relative 'juicy/note' #named pitch
-  require_relative 'juicy/duration' #length of note in musical time (quarter note, eighth note, etc.)
-    require_relative 'juicy/chord' #collection of notes
-      require_relative 'juicy/chord_progression' #collection of chords in sequence
-      require_relative 'juicy/melody' #collection of chords in sequence
-      
-    require_relative 'juicy/scale' #sequence of relative pitch changes ex. chromatic, diatonic, whole-note, pentatonic
-  require_relative 'juicy/mode' #'flavor' of diatonic scale
-  require_relative 'juicy/scale_degree' #index of given scale relative to root/tonic
-  require_relative 'juicy/key' #scale at a given root note, i.e. Juicy::Note
-  require_relative 'juicy/voice' #an instrument
-  require_relative 'juicy/measure' #a measure of beats
-  require_relative 'juicy/track' #a track of notes
-  require_relative 'juicy/song' #
+require 'juicy/pitch' #toned (or not) frequency in a chosen pitch space (temperament/intonation)
+require 'juicy/note' #named pitch
+require 'juicy/duration' #length of note in musical time (quarter note, eighth note, etc.)
+require 'juicy/chord' #collection of notes
+require 'juicy/chord_progression' #collection of chords in sequence
+require 'juicy/melody' #collection of chords in sequence
+require 'juicy/scale' #sequence of relative pitch changes ex. chromatic, diatonic, whole-note, pentatonic
+require 'juicy/mode' #'flavor' of diatonic scale
+require 'juicy/scale_degree' #index of given scale relative to root/tonic
+require 'juicy/key' #scale at a given root note, i.e. Juicy::Note
+require 'juicy/voice' #an instrument
+require 'juicy/measure' #a measure of beats
+require 'juicy/track' #a track of notes
+require 'juicy/song' #

data/lib/juicy/chord.rb

@@ -6,8 +6,7 @@ module Juicy
       :major => [0, 4, 7],
       :minor => [0, 3, 7],
       :diminished => [0, 3, 6],
-      :augmented => [0, 4, 8],
-      
+      :augmented => [0, 4, 8]
     }
     
     attr_reader :duration, :notes

data/lib/juicy/mode.rb

@@ -5,23 +5,31 @@ module Juicy
 
   class Mode
   
-    attr_reader :rotate
+    attr_reader :rotate, :type
   
-	def initialize(type = :ionian)
-	  @type = type
-	  @rotate = case @type
-	  when :major
-		0
-	  when :minor
-	    -2
-	  else
-	    0
-	  end
-	end
-	
-	def to_s
-	  "#{@type}"
-	end
+    def initialize(type = :ionian)
+      @type = type
+      @rotate = case @type
+      when :major
+      0
+      when :minor
+        -2
+      else
+        0
+      end
+    end
+    
+    def to_s
+      "#{@type}"
+    end
+    
+    def ==(other_mode)
+      if other_mode.kind_of? Mode
+        type == other_mode.type
+      elsif other_mode.kind_of? Symbol
+        type == other_mode
+      end
+    end
 	
   end
   

data/lib/juicy/note.rb

@@ -4,7 +4,10 @@ module Juicy
   
     include Comparable
   
-	  @@default_octave = 5
+    class << self
+      attr_reader :default_octave
+    end
+    @default_octave = 5
     attr_reader :name, :pitch, :duration, :octave, :occupying_beat
     attr_accessor :sum_of_queued_note_durations, :how_far_into_the_song_you_are
     attr_accessor :distance_from_beat_in_milliseconds
@@ -16,7 +19,7 @@ module Juicy
       @name = parse_note_name(options[:name])
       @pitch = Pitch.new(@name)
       @duration = Duration.new(options[:duration])
-	    @octave = @@default_octave + options[:octave_change]
+      @octave = Note.default_octave + options[:octave_change]
     end
     
     def to_s
@@ -25,46 +28,38 @@ module Juicy
       name += "b" if @name=~/flat/
       "#{name}#{@octave}"
     end
-	  
+  
     def inspect
-      "#{@name}"
+      "#{@name}#{@octave}"
     end
     
-    def play(options = {duration: 200, octave: (@octave-@@default_octave)})
+    def play(options = {duration: 200, octave: (@octave-Note.default_octave)})
       if @name == :_
         options[:volume] = 0
       end
       @pitch.play(options)
     end
     
-    def prepare(options = {duration: 200, octave: (@octave-@@default_octave)})
+    def prepare(options = {duration: 200, octave: (@octave-Note.default_octave)})
       options[:duration] = options[:duration] || 200
-      options[:octave] = options[:octave] || (@octave-@@default_octave)
+      options[:octave] = options[:octave] || (@octave-Note.default_octave)
       if @name == :_
         options[:volume] = 0
       end
         Thread.pass
       @prepared_note = @pitch.prepare(options)
       @prepared_note[:sleep_time] = @distance_from_beat_in_milliseconds/1000.0
-      #puts @prepared_note.status
       until @prepared_note.status.eql? "sleep"
         sleep 0.001
-        #puts @prepared_note.status
       end
       @prepared_note
       self
     end
     
     def play_prepared
-      #puts @prepared_note.status
-      #puts "playing"
       until @prepared_note.status.eql? "sleep"
         sleep 0.001
-        #puts @prepared_note.status
-        #Thread.pass
       end
-      #Thread.pass
-      #puts "waking up"
       @prepared_note.wakeup
     end
     
@@ -114,10 +109,6 @@ module Juicy
       @duration.duration_in_milliseconds(tempo)
     end
     
-    def self.default_octave
-      @@default_octave
-    end
-    
     def plays_during(beat)
       @occupying_beat = beat
     end
@@ -133,7 +124,7 @@ module Juicy
     private
     
     def octave_change
-      @octave - @@default_octave + @step/12
+      @octave - Note.default_octave + @step/12
     end
     
     def step(interval)
@@ -147,21 +138,19 @@ module Juicy
     def parse_note_name(name)
       # parses note name input
       # user should be able to say "A#" or "a#" or "a sharp" or "A_sharp" or "a_s"
-      groups = name.to_s.match(/([a-gA-G])( |_)?(.*)/)
-      #binding.pry
-      puts "name: #{name}" if groups.nil?
-      if name.to_s.match "rest"
+      groups = name.to_s.match(/(?<name>[a-gA-G])(?<space> |_)?(?<accidental>.*)/)
+      if name.to_s.match "rest" || name.to_s.match(/^_$/)
         note_name = "_"
       else
-        note_name = groups[1].upcase
-        unless groups[3].nil? || groups[3].empty?
-          note_name += case groups[3]
+        note_name = groups[:name].upcase
+        unless groups[:accidental].nil? || groups[:accidental].empty?
+          note_name += case groups[:accidental]
           when /^(s|#)/
             "_sharp"
           when /^(f|b)/
             "_flat"
           else
-            puts "Unknown note modifier: '#{groups[3]}'"
+            puts "Unknown note modifier: '#{groups[:accidental]}'"
             ""
           end
         end

data/lib/juicy/pitch.rb

@@ -30,20 +30,25 @@ module Juicy
   class Pitch
 
     include Comparable
-    @@temperament = :equal
-    @@pitch_standard = 440.0
+    @temperament = :equal
+    @pitch_standard = 440.0
+    
+    class << self
+      attr_reader :temperament, :pitch_standard
+    end
 
     attr_reader :frequency, :confidence
 
-    def initialize(pitch = @@pitch_standard, tune_now = true)
+    def initialize(pitch = Pitch.pitch_standard, tune_now = true)
       
       if pitch.kind_of? Numeric
         @frequency = pitch
         @tuned = false
         tune if tune_now
       else
+        raise ArgumentError unless pitch.kind_of? Symbol
         step = PITCHES[pitch.to_sym]
-        @frequency = @@pitch_standard*2**(step/12.0)
+        @frequency = Pitch.pitch_standard*2**(step/12.0)
         @tuned = true
       end
       
@@ -57,7 +62,7 @@ module Juicy
       if out_of_tune
         step = Math.log(@frequency/440.0,2)*12
         @confidence = (1.0-2*(step - step.round).abs)*100.0
-        @frequency = @@pitch_standard*2**((step.round)/12.0)
+        @frequency = Pitch.pitch_standard*2**((step.round)/12.0)
         @tuned = true
       end
       self
@@ -80,7 +85,10 @@ module Juicy
       options[:duration] ||= 200
       options[:octave] ||= 0
       options[:volume] ||= 1
-      ::Sound::Out.play_freq(@frequency*2**(options[:octave]), options[:duration], options[:volume])
+      device = Sound::Device.new
+      data = Sound::Data.new(device.format)
+      data.generate_sine_wave(@frequency*2**(options[:octave]), options[:duration], options[:volume])
+      device.play data
     end
 
     def prepare(options = {duration: 200, octave: 0, volume: 1})
@@ -102,7 +110,7 @@ module Juicy
     end
 
     def change_by (interval)
-      if @@temperament.eql? :equal
+      if Pitch.temperament.eql? :equal
         Pitch.new(@frequency*2**(interval/12.0))
       end
     end

data/lib/juicy/scale.rb

@@ -24,9 +24,13 @@ module Juicy
 
     class Scale
     include Enumerable
+    
+    attr_reader :root, :mode
 
-    def initialize(type = :major, root = Note.new)
-      case type
+    def initialize(options = {mode: :major, root: Note.new})
+      options[:mode] ||= :major
+      options[:root] ||= Note.new
+      case options[:mode]
       when :major
       @type = :diatonic
       when :minor
@@ -34,8 +38,8 @@ module Juicy
       else
       @type = type
       end
-      @mode = Mode.new(type)
-      @root = root
+      @mode = Mode.new(options[:mode])
+      @root = options[:root]
       generate_notes
     
     end
@@ -49,7 +53,7 @@ module Juicy
     end
     
     def play
-    
+      each_note &:play
     end
     
     def mode=(type)
@@ -72,9 +76,13 @@ module Juicy
       end
     end
     
-    def each_note
-      (SCALE_TYPES[@type].size+1).times do
-        yield @notes.next
+    def each_note &block
+      if block_given?
+        (SCALE_TYPES[@type].size+1).times do
+          yield @notes.next
+        end
+      else
+        @notes
       end
     end
     
@@ -98,6 +106,48 @@ module Juicy
       half_steps
     end
     
+    def do
+      if @mode == :major
+        @root
+      end
+    end
+    
+    def re
+      if @mode == :major
+        @root + 2
+      end
+    end
+    
+    def mi
+      if @mode == :major
+        @root + 4
+      end
+    end
+    
+    def fa
+      if @mode == :major
+        @root + 5
+      end
+    end
+    
+    def so
+      if @mode == :major
+        @root + 7
+      end
+    end
+    
+    def la
+      if @mode == :major
+        @root + 9
+      end
+    end
+    
+    def ti
+      if @mode == :major
+        @root + 11
+      end
+    end
+    
     private
     
     def generate_notes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: juicy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dominic Muller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sound
@@ -19,7 +19,7 @@ dependencies:
         version: '0.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,14 +29,28 @@ dependencies:
         version: '0.0'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: Generates songs
 email: nicklink483@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/juicy.rb
+- examples/juicy.rb
 - lib/juicy.rb
 - lib/juicy/chord.rb
 - lib/juicy/chord_progression.rb