nyancat 0.1.0 → 0.2.0

data/bin/nyancat

@@ -36,6 +36,8 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'nyancat'
 require 'optparse'
 
+port = 23
+telnet = false
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: nyancat [options]"
@@ -46,6 +48,40 @@ OptionParser.new do |opts|
   opts.on("-f", "--flavour FLAVOUR", "Available flavours: #{NyanCat.flavours.join(', ')}") do |f|
     options[:flavour] = f
   end
+  opts.on("-n", "--notime", "Don't show the time nyaned") do |n|
+    options[:hide_time] = n
+  end
+  opts.on("-l", "--listen [PORT]", "Run telnet server on PORT (default 21)") do |p|
+    telnet = true
+    port = p || 23
+  end
+  opts.on("-t", "--timeout SECONDS", "Timeout after SECONDS") do |t|
+    options[:timeout] = t.to_i
+  end
 end.parse!
 
-NyanCat.nyancat(options)
+if telnet
+  # Start a new server listening on specified port
+  server = NyanCat::NyanServer.new(port, "::", options)
+  server.audit = true
+  server.start
+  server.join
+else
+  stdout = IO.new STDOUT.fileno
+
+  # Get TTY size
+  options[:width], options[:height] = `stty size`.split.map { |x| x.to_i }.reverse
+
+  begin
+    n = NyanCat::NyanCat.new(stdout, options)
+    n.run
+  rescue SignalException => e
+    # Do nothing, exit gracefully
+  rescue Exception => e
+    puts "Oops, something went wrong..."
+    raise e
+  end
+end
+
+
+

data/lib/nyancat.rb

@@ -31,6 +31,8 @@
 #  WITH THE SOFTWARE.
 
 require 'yaml'
+require 'gserver'
+require 'timeout'
 
 module NyanCat
   OUTPUT_CHAR = "  "
@@ -39,58 +41,125 @@ module NyanCat
     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
+  class NyanCat
+    def initialize(io, options)
+      @running = false
+      @io = io
+      @term_width = options[:width] || 80
+      @term_height = options[:height] || 24
+      @mute = options[:mute] || false
+      @hide_time = options[:hide_time] || 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__)
+      flavour = options[:flavour] || 'original'
+      frames  = YAML.load_file(File.expand_path("../nyancat/#{flavour}/frames.yml", __FILE__))
+      palette = YAML.load_file(File.expand_path("../nyancat/#{flavour}/palette.yml", __FILE__))
 
-    # Get TTY size
-    term_width, term_height = `stty size`.split.map { |x| x.to_i }.reverse
+      @audio = File.expand_path("../nyancat/#{flavour}/audio.mp3", __FILE__) 
 
-    # Calculate the width in terms of the output char
-    term_width = term_width / OUTPUT_CHAR.length
+      # Calculate the width in terms of the output char
+      term_width = @term_width / OUTPUT_CHAR.length
+      term_height = @term_height
 
-    min_row = 0
-    max_row = frames[0].length
+      min_row = 0
+      max_row = frames[0].length
 
-    min_col = 0
-    max_col = frames[0][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_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
+      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|
-          "\033[48;5;%dm%s" % [palette[c], OUTPUT_CHAR]
-        end.join + "\033[m\n"
-      end.join + "\033[H"
+      # Calculate the final animation width
+      @anim_width = (max_col - min_col) * OUTPUT_CHAR.length
+
+      # Precompute frames
+      @frames = frames.map do |frame|
+        frame[min_row...max_row].map do |line|
+          line.chars.to_a[min_col...max_col].map do |c|
+            "\033[48;5;%dm%s" % [palette[c], OUTPUT_CHAR]
+          end.join + "\033[m\n"
+        end
+      end
     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
-      loop do
-        frames.each do |frame|
-          print frame
-          sleep(0.09)
+    def run()
+      @running = true
+      
+      begin
+        # Initialise term
+        @io.printf("\033[H\033[2J\033[?25l")
+
+        # Get start time
+        start_time = Time.now()
+
+        # Play audio
+        audio_t = Thread.new { IO.popen("mpg123 -loop 0 -q #{@audio} > /dev/null 2>&1") } unless @mute || nil
+
+        while @running
+          @frames.each do |frame|
+            # Print the next frame
+            @io.puts frame
+
+            # Print the time so far
+            unless @hide_time
+              time = "You have nyaned for %0.0f seconds!" % [Time.now() - start_time]
+              time = time.center(@anim_width)
+              @io.printf("\033[1;37;17m%s", time)
+            end
+
+            # Reset the frame and sleep
+            @io.printf("\033[H")
+            sleep(0.09)
+          end
         end
+
+      ensure
+        # Ensure the audio thread is killed, if it exists
+        audio_t.kill unless audio_t.nil?
+        stop
+        reset
+      end
+    end
+
+    def stop()
+      @running = false      
+    end
+
+    def reset()
+      begin
+        @io.puts("\033[0m\033c")
+      rescue Errno::EPIPE => e
+        # We failed to reset the TERM, IO stream is gone
       end
-    rescue SignalException => e
-      printf("\033c\033c")
-      printf("YOU NYANED FOR %4.2f SECONDS\n", Time.now - start_time)
-    rescue Exception => e
-      printf("\033c")
-      puts "Oops, something went wrong..."
-      raise e
     end
   end
+
+  class NyanServer < GServer
+    def initialize(port, address, options = {})
+      @options = options
+      @options[:mute] = true
+      @timeout = @options[:timeout]
+      super(port, address)
+    end
+
+    def serve(io)
+      n = NyanCat.new(io, @options)
+      begin    
+        # run the animation thread
+        t = Thread.new(n) { |nyan| nyan.run() }
+
+        # block until any input is received or timeout is reached, then die
+        Timeout::timeout(@timeout) { io.readline() }
+      rescue Exception => e
+        log("Client error: #{e}")
+      ensure
+        n.stop
+        t.join
+      end
+    end
+  end
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nyancat
 version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.0
 platform: ruby
 authors:
 - Ben Arblaster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby port of Kevin Lange's nyancat
 email: ben@andatche.com
@@ -30,20 +30,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: nyancat on your terminal