nyancat 0.0.3 → 0.1.0

data/bin/nyancat

@@ -32,16 +32,20 @@
 #  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 #  WITH THE SOFTWARE.
 
-require 'yaml'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'nyancat'
+require 'optparse'
 
-path = File.dirname(__FILE__)
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: nyancat [options]"
 
-begin
-  frames = YAML::load(IO.read(path + '/../lib/nyancat/frames.yml'))
-  palette = YAML::load(IO.read(path + '/../lib/nyancat/palette.yml'))
-rescue Exception => e
-  puts "Unable to read frames or palette YAML"
-end
+  opts.on("-s", "--silent", "Don't play audio") do |s|
+    options[:mute] = s
+  end
+  opts.on("-f", "--flavour FLAVOUR", "Available flavours: #{NyanCat.flavours.join(', ')}") do |f|
+    options[:flavour] = f
+  end
+end.parse!
 
-NyanCat.nyancat(frames, palette)
+NyanCat.nyancat(options)

data/lib/nyancat.rb

@@ -30,30 +30,41 @@
 #  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 #  WITH THE SOFTWARE.
 
-module NyanCat
+require 'yaml'
 
+module NyanCat
   OUTPUT_CHAR = "  "
 
-  def self.nyancat(frames, palette)
-    
+  def self.flavours
+    return Dir.entries(File.expand_path("../nyancat/", __FILE__)).select { |entry| !(entry =='.' || entry == '..') }
+  end
+
+  def self.nyancat(options = {})
+    flavour = options[:flavour] || 'original'
+    mute = options[:mute] || false
+
+    frames  = YAML.load_file(File.expand_path("../nyancat/#{flavour}/frames.yml", __FILE__))
+    palette = YAML.load_file(File.expand_path("../nyancat/#{flavour}/palette.yml", __FILE__))
+    audio = File.expand_path("../nyancat/#{flavour}/audio.mp3", __FILE__)
+
     # Get TTY size
     term_width, term_height = `stty size`.split.map { |x| x.to_i }.reverse
 
     # Calculate the width in terms of the output char
     term_width = term_width / OUTPUT_CHAR.length
-    
+
     min_row = 0
     max_row = frames[0].length
-    
+
     min_col = 0
     max_col = frames[0][0].length
-    
+
     min_row = (max_row - term_height) / 2 if max_row > term_height
     max_row = min_row + term_height if max_row > term_height
-    
+
     min_col = (max_col - term_width) / 2 if max_col > term_width
     max_col = min_col + term_width if max_col > term_width
-    
+
     frames = frames.map do |frame|
       frame[min_row...max_row].map do |line|
         line.chars.to_a[min_col...max_col].map do |c|
@@ -62,6 +73,8 @@ module NyanCat
       end.join + "\033[H"
     end
 
+    audio_thread = Thread.new { IO.popen("mpg123 -loop 0 -q #{audio} > /dev/null 2>&1") } unless mute
+    
     start_time = Time.now
     printf("\033[H\033[2J\033[?25l")
     begin
@@ -80,4 +93,4 @@ module NyanCat
       raise e
     end
   end
-end 
+end

metadata

@@ -1,70 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nyancat
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  prerelease: 
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Ben Arblaster
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 +00:00
-default_executable: 
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies: []
-
 description: A Ruby port of Kevin Lange's nyancat
 email: ben@andatche.com
-executables: 
+executables:
 - nyancat
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/nyancat.rb
-- lib/nyancat/frames.yml
-- lib/nyancat/palette.yml
+- lib/nyancat/original/audio.mp3
+- lib/nyancat/original/frames.yml
+- lib/nyancat/original/palette.yml
 - bin/nyancat
-has_rdoc: true
 homepage: https://github.com/andatche/ruby_nyancat/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: nyancat on your terminal
 test_files: []
-