vamp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb9e8749153c14dfd71c3ebc974bef2404f03e7
-  data.tar.gz: 7ef8f88e0c884e12be551b293e8eb60824f81683
+  metadata.gz: 3ed0c28b4a5fa22a09ccafc6674d51076fb75816
+  data.tar.gz: 931968ca87c4c1cf6c4c5a4b8865625bece04ec0
 SHA512:
-  metadata.gz: f9eee26d68f6a3d7fcce7bb1d1d0bb25086f92bc5dec549ba931ea9c1599c83570bd112e9067947354edc8476241b443ba2a8d753be442259cb18d049ad6f839
-  data.tar.gz: ec9ca46d0488386fda25cf936ba58380886e118672ab1f4fcc208ba239c301d35dd82968f12e7da8179af232a72aebece2d616852bbb161b537814da6f2cab4f
+  metadata.gz: b196797bc06e8c60be048e59a4a9a11bcbf8fdece181c07d3e0832afd61616f79aee6caa725380f58b4be0bc61a6f04c72dde40dd5a8cfd33debf0c5fb1db91f
+  data.tar.gz: e122c443482653ceaa831f2dad9a6d84a010dd2040e710c89b159b6a6bbc5803d4ffb0738ed2fec214c9fb8da6b1cba24a307f03b3cd2bb998f0415310d6605b

data/lib/vamp/animator.rb

@@ -3,32 +3,37 @@ require_relative "colorize"
 module Vamp
   # play animation on console
   class Animator
-    attr_accessor :data   # complete animation lines
-    attr_accessor :number # animation source height
-    attr_accessor :width  # animation width
-    attr_accessor :height # animation height
-    attr_accessor :scroll # running text
+    attr_accessor :data           # complete animation lines
+    attr_accessor :number         # animation source height
+    attr_accessor :width          # animation width
+    attr_accessor :height         # animation height ( +1 if scroll_text)
+    attr_accessor :scroll_text    # running text data
+    attr_accessor :scroll_counter # for calculating running text offset
+    attr_accessor :ani_color      # animation color (if any: "red", "blue", ..)
+    attr_accessor :text_color     # text color (if any: "blue", "green", ...)
 
-    def initialize(file, number = 31, height = number, scroll)
+
+    def initialize(file, number = 31, start = 0, height = number, scroll_text = nil, cycles = 1)
       @data = []
       @number = number
-      @width = 80
-      @height = height
-      @scroll = scroll
-      @offset = 0
+      @height = height - start
+      @scroll_text = scroll_text
+      @cycles = cycles
+      @width = detect_terminal_width || 80
+      if scroll_text
+        @height += 1
+        @scroll_counter = 0
+        @scroll_text = (" " * @width) + scroll_text + (" " * @width)
+      end
+      @ani_color = "red"
+      @text_color = "blue"
       lines = IO.readlines(file)
       lines.each_slice(number) do |block|
         d = []
         block.each_with_index do |line, index|
-#          puts line.class
-#          puts printf("%-40s", line)
-#          d << line
-          d << (line.rstrip + (" " * 80))[0..80]
-#          d << sprintf("%80s", line)
-#          puts block.length
+          d << (line.rstrip + (" " * 80))[0..(width - 1)] if index >= start
           break if index >= height
         end
-#        puts lines
         @data << d
       end
     end
@@ -37,16 +42,12 @@ module Vamp
       print "\e[H\e[2J"
     end
 
-    def home
-      print "\e[H\e[#{height}F"
-    end
-
-    def home
-      print "\e[H\e[#{height}F"
+    def home(lines = height)
+      print "\e[H\e[#{lines}F"
     end
 
-    def down(lines = @height)
-      # number.times { puts }
+    def down(lines = height)
+      # lines.times { puts }
       print "\e[H\e[#{lines}E"
     end
 
@@ -54,14 +55,33 @@ module Vamp
       $stdout.flush
     end
 
+    def scroll_offset
+      @scroll_counter / 3
+    end
+
     def animate(msg)
       home
-      puts Vamp::Colorize.colorize("red", msg)
-      puts Vamp::Colorize.colorize("blue", animate_line) if scroll
+      if ani_color
+        puts Vamp::Colorize.colorize(ani_color, msg)
+      else
+        puts msg
+      end
+      if scroll_text
+        if text_color
+          puts Vamp::Colorize.colorize(text_color, running_line)
+        else
+          puts running_line
+        end
+      end
       flush
       sleep(1.0/48.0)
     end
 
+    def running_line
+      @scroll_counter += 1
+      "#{scroll_text[scroll_offset..(scroll_offset + width - 1)]}"
+    end
+
     def cursor_off
       print "\e[H\e[?25l"
     end
@@ -70,24 +90,50 @@ module Vamp
       print "\e[H\e[?25h"
     end
 
-    def animate_line
-      @offset += 1
-      "#{@scroll[(@offset / 2)..(@offset / 2 + @width - 1)]}"
-    end
-
     def play
       if $stdout.isatty
         begin
           cursor_off
           clear
-          data.each do
-            |lines| animate(lines.join("\n"))
-          end
+          data.each { |lines| animate(lines.join("\n")) } until finished?
         ensure
           cursor_on
-          down(@height + 2)
+          down(height + 1)
         end
+      else
+        puts "sorry, I must have a tty device to play an animation"
+      end
+    end
+
+    def finished?
+      if scroll_text
+        scroll_offset + width >= scroll_text.size
+      else
+        @cycle ||= 0
+        @cycle += 1
+        @cycle > @cycles
       end
     end
+
+    # stolen from <https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb>
+    # Returns width of terminal when detected, nil if not detected.
+    def detect_terminal_width
+      if ENV['COLUMNS'] =~ /^\d+$/
+        ENV['COLUMNS'].to_i
+      elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exists?('tput')
+        `tput cols`.to_i
+      elsif STDIN.tty? && command_exists?('stty')
+        `stty size`.scan(/\d+/)[1].to_i
+      else
+        nil
+      end
+    rescue
+      nil
+    end
+
+    # Determines if a shell command exists by searching for it in ENV['PATH'].
+    def command_exists?(command)
+      ENV['PATH'].split(File::PATH_SEPARATOR).any? {|d| File.exists? File.join(d, command) }
+    end
   end
 end

data/lib/vamp/version.rb

@@ -1,3 +1,3 @@
 module Vamp
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/sample/pyramid.rb

@@ -0,0 +1,4 @@
+require "vamp"
+
+animator = Vamp::Animator.new(File.join(Gem.loaded_specs["vamp"].gem_dir, "files", "pyramid.txt"), 31, 7, 27, nil, 2)
+animator.play

data/sample/vampire.rb

@@ -1,10 +1,8 @@
 require "vamp"
 
-animator = Vamp::Animator.new(File.join(Gem.loaded_specs["vamp"].gem_dir, "files", "vampire.txt"), 31, 24,
-  " " * 80 +
-      "No man knows till he has suffered from the night how sweet and how dear to his heart and eye the morning can be." \
+animator = Vamp::Animator.new(File.join(Gem.loaded_specs["vamp"].gem_dir, "files", "vampire.txt"), 31, 0, 24,
+  "No man knows till he has suffered from the night how sweet and how dear to his heart and eye the morning can be." \
   " When the sun grew so high this morning that it struck the top of the great gateway opposite my window," \
   " the high spot which it touched seemed to me as if the dove from the ark had lighted there. My fear fell from me" \
-  " as if it had been a vaporous garment which dissolved in the warmth." +
-  " " * 80)
-16.times { animator.play }
+  " as if it had been a vaporous garment which dissolved in the warmth.")
+animator.play

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vamp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Meyling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -62,6 +62,7 @@ files:
 - lib/vamp/ply/vampire.rb
 - lib/vamp/version.rb
 - sample/cli.rb
+- sample/pyramid.rb
 - sample/vampire.rb
 - spec/spec_helper.rb
 - spec/vamp_spec.rb