sounder 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8df9741d168eeba2db6c05ee1c6d1d9532ecd663
-  data.tar.gz: 1398cba28a6d833eb95fa07869db03492d9aec5e
+  metadata.gz: 8db35dd8172a5ff154d11235b32aa4a5d9b70432
+  data.tar.gz: 1eef09bfe03073ef9ea443b63b269361819fb883
 SHA512:
-  metadata.gz: 3e08ffcd9195685638dffec8ca961151067f31c0b0f0df7a916bbb1c7ecf1988d6a8ec1a637ea4b4537e9047f1aadedc53125b9c01c0abfdf7b45b0cf4e88428
-  data.tar.gz: 9c99e7251d3e7147ee47dc2d3c089d6870d79e84c59710d13aa43afea55463cb8a806ce7c92c49f74f1597ed5e935c419729aabe7501c7e8121511bd9ee94c6c
+  metadata.gz: 2c5ddc4f23231824dabbf3e6c7d7521c7162bf59b2b0980e16f0eaf6f0fffeca1e28a4d5b4dc16db9a0102d4c7fccd959fa8ee7664ed38a93ea8762e0c9dbd11
+  data.tar.gz: da9b1a6b2ec679b514be1fba75024fc55c4b798152fa6b0a5a1ae15dd493649aba3a363b210c8c7f9db75a021fa8d812c042984e7cfaef6f306244d14462c65d

data/lib/sounder.rb

@@ -2,6 +2,7 @@ require "sounder/version"
 require "sounder/system"
 require "sounder/sound"
 require "sounder/sound_group"
+require "sounder/soundboard"
 
 module Sounder
   def self.play path
@@ -9,4 +10,5 @@ module Sounder
   end
 
   class UnknownSoundError < ArgumentError; end
+  class RootNotSetError < ArgumentError; end
 end

data/lib/sounder/soundboard.rb

@@ -0,0 +1,67 @@
+module Sounder
+  class Soundboard
+    attr_reader :version_info
+    attr_accessor :root
+
+    def initialize sounds:, version_info: "Sounder Soundboard", root: nil
+      @soundgroup = {}
+      @version_info = version_info
+      @sounds = sounds
+      @root = root
+    end
+
+    def run args
+      case
+      when random?(args) then soundgroup.random
+      when help?(args)   then puts usage
+      when sound?(args)  then play_sound(args.join ' ')
+      else
+        puts usage
+      end
+    end
+
+    private
+
+    def soundgroup
+      @soundgroup[root] ||= begin
+        names_and_paths = Hash[@sounds.map { |name, file| [name, get_path(file)] }]
+        SoundGroup.new names_and_paths
+      end
+    end
+
+    def play_sound sound_name
+      soundgroup.play sound_name
+    rescue UnknownSoundError
+      unknown_sound_message
+    end
+
+    def unknown_sound_message
+      puts "Error: \"#{sound_name}\" does not match a known sound"
+      puts usage
+    end
+
+    def get_path file
+      raise RootNotSetError.new("You must set a support directory first") unless root
+      File.join root, "#{file}.m4a"
+    end
+
+    def sound? args
+      not args.empty?
+    end
+
+    def help? args
+      args.size == 1 && %w[-h --help].include?(args.first)
+    end
+
+    def random? args
+      args.size == 1 && args.first == 'random'
+    end
+
+    def usage
+      usage = soundgroup.usage.map { |line| "  #{line}" }
+      usage.unshift version_info, "Usage:"
+      usage.join "\n"
+    end
+
+  end
+end

data/lib/sounder/version.rb

@@ -1,3 +1,3 @@
 module Sounder
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/sounder/sound_group_spec.rb

@@ -16,7 +16,7 @@ describe Sounder do
       end
       it "creates sound objects" do
         sounds.each do |name, file|
-          Sounder::Sound.should_receive(:new).with file
+          expect(Sounder::Sound).to receive(:new).with file
         end
         Sounder::SoundGroup.new sounds
       end
@@ -26,14 +26,14 @@ describe Sounder do
       it "plays a sound corresponding to the argument passed in" do
         group = Sounder::SoundGroup.new sounds
         sound_b = group.sounds.fetch "sound_b"
-        sound_b.should_receive(:play)
+        expect(sound_b).to receive(:play)
         group.play "sound_b"
       end
 
       it "fuzzy matches the sound name" do
         group = Sounder::SoundGroup.new sounds
         sound_b = group.sounds.fetch "sound_b"
-        sound_b.should_receive(:play)
+        expect(sound_b).to receive(:play)
         group.play "b"
       end
 
@@ -46,7 +46,7 @@ describe Sounder do
     describe '#random' do
       it "plays a random sound" do
         group = Sounder::SoundGroup.new sounds
-        Sounder::Sound.any_instance.should_receive :play
+        expect_any_instance_of(Sounder::Sound).to receive :play
         group.random
       end
     end
@@ -54,9 +54,9 @@ describe Sounder do
     describe '#usage' do
       it "returns usage info in a string" do
         group = Sounder::SoundGroup.new sounds
-        group.usage.should include "random (picks a random sound)"
-        group.usage.should include "  sound_a"
-        group.usage.should include "  sound_b"
+        expect(group.usage).to include "random (picks a random sound)"
+        expect(group.usage).to include "  sound_a"
+        expect(group.usage).to include "  sound_b"
       end
     end
   end

data/spec/sounder/sound_spec.rb

@@ -1,26 +1,22 @@
 require 'spec_helper'
 
-describe Sounder do
-
-  describe Sounder::Sound do
-    let(:sound) { Sounder::Sound.new 'fake/file.m4a' }
-    describe 'initialization' do
-      it "saves the file as a path" do
-        sound.file.should == 'fake/file.m4a'
-      end
+describe Sounder::Sound do
+  let(:sound) { Sounder::Sound.new 'fake/file.m4a' }
+  describe 'initialization' do
+    it "saves the file as a path" do
+      expect(sound.file).to eq 'fake/file.m4a'
     end
+  end
 
-    describe '#play' do
-      it "plays a file" do
-        sound.should_receive(:system).with %{/usr/bin/afplay "fake/file.m4a" &}
-        sound.play
-      end
-      it "is not super insecure" do
-        bad_sound = Sounder::Sound.new '";echo doing bad things;"'
-        bad_sound.should_receive(:system).with %{/usr/bin/afplay \"\\\"\\;echo\\ doing\\ bad\\ things\\;\\\"\" &}
-        bad_sound.play
-      end
+  describe '#play' do
+    it "plays a file" do
+      expect(sound).to receive(:system).with %{/usr/bin/afplay "fake/file.m4a" &}
+      sound.play
+    end
+    it "is not super insecure" do
+      bad_sound = Sounder::Sound.new '";echo doing bad things;"'
+      expect(bad_sound).to receive(:system).with %{/usr/bin/afplay \"\\\"\\;echo\\ doing\\ bad\\ things\\;\\\"\" &}
+      bad_sound.play
     end
   end
-
 end

data/spec/sounder/soundboard_spec.rb

@@ -0,0 +1,45 @@
+require 'pry'
+require 'spec_helper'
+
+describe Sounder::Soundboard do
+  let(:sounds) { { 'sound name' => 'path' } }
+  subject(:soundboard) { Sounder::Soundboard.new sounds: sounds, root: root }
+
+  describe '#run' do
+    context "when root isn't set" do
+      let(:root) {}
+      it "raises an error if the root isn't set" do
+        expect { soundboard.run(['test']) }.to raise_error Sounder::RootNotSetError
+      end
+    end
+
+    context "when root is set" do
+      let(:root) { 'some/path' }
+      it "plays a random sound when given random" do
+        expect_any_instance_of(Sounder::SoundGroup).to receive :random
+        soundboard.run %w[random]
+      end
+      it "displays the usage if --help option is given" do
+        expect(soundboard).to receive(:usage).and_return []
+        soundboard.run %w[--help]
+      end
+      it "displays the usage if -h option is given" do
+        expect(soundboard).to receive(:usage).and_return []
+        soundboard.run %w[-h]
+      end
+      it "displays the usage if no option is given" do
+        expect(soundboard).to receive(:usage).and_return []
+        soundboard.run []
+      end
+      it "plays a sound if a valid sound name is given" do
+        expect_any_instance_of(Sounder::SoundGroup).to receive :play
+        soundboard.run %w[sound name]
+      end
+      it "displays usage if an invalid sound name is given" do
+        allow_any_instance_of(Sounder::SoundGroup).to receive(:play).and_raise Sounder::UnknownSoundError
+        expect(soundboard).to receive :unknown_sound_message
+        soundboard.run %w[invalid name]
+      end
+    end
+  end
+end

data/spec/sounder/system_spec.rb

@@ -1,22 +1,20 @@
 require 'spec_helper'
 
 describe Sounder do
-
   describe Sounder::System do
     describe '.set_volume' do
       it "uses system to set the volume" do
-        Sounder::System.should_receive(:system).with %{osascript -e "set volume 7.0"}
+        expect(Sounder::System).to receive(:system).with %{osascript -e "set volume 7.0"}
         Sounder::System.set_volume 100
       end
       it "converts the number to base 7" do
-        Sounder::System.should_receive(:system).with %{osascript -e "set volume 3.5"}
+        expect(Sounder::System).to receive(:system).with %{osascript -e "set volume 3.5"}
         Sounder::System.set_volume 50
       end
       it "doesn't make the call if it isn't given a number" do
-        Sounder::System.should_not_receive(:system)
+        expect(Sounder::System).to_not receive(:system)
         Sounder::System.set_volume "something bad"
       end
     end
   end
-
 end

data/spec/sounder_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Sounder do
   describe '#play' do
     it "plays a sound" do
-      Sounder::Sound.any_instance.should_receive(:system).with %{/usr/bin/afplay "fake/file.m4a" &}
+      expect_any_instance_of(Sounder::Sound).to receive(:system).with %{/usr/bin/afplay "fake/file.m4a" &}
       Sounder.play 'fake/file.m4a'
     end
   end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sounder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Zaninovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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: Play sounds on your Mac
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,11 +67,13 @@ files:
 - lib/sounder.rb
 - lib/sounder/sound.rb
 - lib/sounder/sound_group.rb
+- lib/sounder/soundboard.rb
 - lib/sounder/system.rb
 - lib/sounder/version.rb
 - sounder.gemspec
 - spec/sounder/sound_group_spec.rb
 - spec/sounder/sound_spec.rb
+- spec/sounder/soundboard_spec.rb
 - spec/sounder/system_spec.rb
 - spec/sounder_spec.rb
 - spec/spec_helper.rb
@@ -85,23 +87,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Play sounds on your Mac
 test_files:
 - spec/sounder/sound_group_spec.rb
 - spec/sounder/sound_spec.rb
+- spec/sounder/soundboard_spec.rb
 - spec/sounder/system_spec.rb
 - spec/sounder_spec.rb
 - spec/spec_helper.rb