humpday 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c284c04206a1a7bd557ad3bd30d2b460201991a
-  data.tar.gz: 478694c7de0c4c6ea945449b104e231eff68c422
+  metadata.gz: dd6841aabda03227c9e48aaca75c26c9b5a27338
+  data.tar.gz: fbae404dc614756d824918c3059abb63a669a1d3
 SHA512:
-  metadata.gz: 352ddf9b96e7af8f3e9e6678cb8c315f29dc64ea7b8e37305d036b183cdc0040e577f2ad6d4212e27d0d3458d9ec7751df4d98bfa037e71fce8d836f2fc8c93c
-  data.tar.gz: 61f515db7bdeb3d09827b5b958a28109315cfeb0e2586cd9c7ada770e01b0e831066c521ba093379e3a8d6dd0aaa04c86bfc7a34a1550e0f4d81edde35f3531e
+  metadata.gz: 00f69fd1688fabb98eef9b87e82ebf5a857709b912572852c8a1cd97fce6060568228a25e17c5659ec9b3929be038842a6fe55d8c2a9b89af4af9ca8df5acc19
+  data.tar.gz: b0e012fd4edae921fad8878daa182360fa983d9118d925a41e9d6709f292ad5c368deda61660ec041f03a9ca2d3d700cc260b40edbebd1c25f288ff4ada94ada

data/bin/humpday

@@ -1,17 +1,41 @@
 #!/usr/bin/env ruby
 
 require 'sounder'
-require_relative '../lib/humpday'
+require 'humpday'
+
+sounds = {
+  'uhoh'            => 'uhoh',
+  'guess_what_day'  => 'guess_what_day_it_is',
+  'guess_what_day_2'=> 'guess_what_day_it_is2',
+  'huh'             => 'huh_anybody',
+  'cmon'            => 'aw_cmon_i_know_you_can_hear_me',
+  'laugh'           => 'laugh',
+  'whoowhoa'        => 'whoowhoa',
+  'humpday'         => 'humpday'
+}
+sound_files = {}
+sounds.each do |name, file|
+  sound_files[name] = File.expand_path("../../lib/support/#{file}.m4a", __FILE__)
+end
+
+humpday = Sounder::SoundGroup.new sound_files
+
+usage = humpday.usage.map do |line|
+  "  #{line}"
+end
+usage = ["humpday version #{Humpday::VERSION}","Usage:"] + usage
+usage = usage.join "\n"
 
 if ARGV.size == 1 && ARGV[0] == 'random'
-  Humpday.random
+  humpday.random
 elsif ARGV.size == 1 && ARGV[0] != '-h' && ARGV[0] != 'help' && ARGV[0] != '--help'
   begin
-    Humpday.play ARGV[0]
-  rescue Humpday::UnknownSoundError
-    abort "#{ARGV[0]} does not match a known sound"
+    humpday.play ARGV[0]
+  rescue Sounder::UnknownSoundError
+    puts "Error: #{ARGV[0]} does not match a known sound"
+    puts usage
   end
 else
-  puts Humpday.usage
+  puts usage
 end
 

data/humpday.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Humpday::VERSION
   spec.authors       = ["Adam Zaninovich"]
   spec.email         = ["adam.zaninovich@gmail.com"]
-  spec.description   = %q{says humpday}
-  spec.summary       = %q{says humpday}
+  spec.description   = %q{plays humpday sounds}
+  spec.summary       = %q{plays humpday sounds}
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sounder", "~> 0.0.2"
+  spec.add_dependency "sounder", "~> 1.0.1"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/humpday/version.rb

@@ -1,3 +1,3 @@
 module Humpday
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/humpday.rb

@@ -1,46 +1,4 @@
 require 'humpday/version'
 
 module Humpday
-
-  class UnknownSoundError < ArgumentError; end
-
-  SOUNDS = {
-    'uhoh'            => 'uhoh',
-    'guess_what_day'  => 'guess_what_day_it_is',
-    'guess_what_day_2'=> 'guess_what_day_it_is2',
-    'huh'             => 'huh_anybody',
-    'cmon'            => 'aw_cmon_i_know_you_can_hear_me',
-    'laugh'           => 'laugh',
-    'whoowhoa'        => 'whoowhoa',
-    'humpday'         => 'humpday'
-  }
-
-  def self.play name
-    sound_name = self.fuzzy_find name
-    raise UnknownSoundError if sound_name.nil?
-    sound = SOUNDS.fetch(sound_name) { raise UnknownSoundError }
-    audio_file = File.expand_path("../../lib/support/#{sound}.m4a", __FILE__)
-    Sounder.play audio_file
-  end
-
-  def self.random
-    self.play SOUNDS.keys.sample
-  end
-
-  def self.usage
-    usage = [ "humpday version #{Humpday::VERSION}",
-      "Usage: humpday help (this)",
-      "Usage: humpday random (picks a random sound)",
-      "Usage: humpday <sound name> (it will fuzzy match the name)",
-      "Sounds:"
-    ] + SOUNDS.keys.map do |sound|
-      "  #{sound}"
-    end
-    usage.join "\n"
-  end
-
-  private
-  def self.fuzzy_find name
-    SOUNDS.keys.select { |sn| sn.include? name }.first
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humpday
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Zaninovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sounder
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: says humpday
+description: plays humpday sounds
 email:
 - adam.zaninovich@gmail.com
 executables:
@@ -100,5 +100,5 @@ rubyforge_project:
 rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
-summary: says humpday
+summary: plays humpday sounds
 test_files: []