showterm 0.2.1.pre.2 → 0.2.1.pre.3

data/lib/showterm.rb

@@ -25,6 +25,38 @@ module Showterm
     ret
   end
 
+  # Get the current width of the terminal
+  #
+  # @return [Integer] number of columns
+  def terminal_width
+    guess = `tput cols`.to_i
+    guess == 0 ? 80 : guess
+  end
+
+  # Upload the termshow to showterm.io
+  #
+  # @param [String] scriptfile  The ANSI dump of the terminal
+  # @param [String] timingfile  The timings
+  # @param [Integer] cols  The width of the terminal
+  def upload!(scriptfile, timingfile, cols=terminal_width)
+    puts 'uploading, please wait.'
+    request = Net::HTTP::Post.new("/scripts")
+    request.set_form_data(:scriptfile => scriptfile,
+                          :timingfile => timingfile,
+                          :cols => cols)
+
+    response = http(request)
+    raise response.body unless Net::HTTPSuccess === response
+    puts response.body
+  rescue => e
+    raise if retried
+    retried = true
+    retry
+  end
+
+  private
+
+  # Get a temporary file that will be deleted when the program exits.
   def temp_file
     f = Tempfile.new('showterm')
     f.close(false)
@@ -32,11 +64,33 @@ module Showterm
     f
   end
 
+  # Should we try recording using `script`?
+  #
+  # This is a hard question to answer, so we just try it and see whether it
+  # looks like it gives sane results.
+  #
+  # We prefer to use script if it works because ttyrec gives really horrible
+  # errors about missing ptys. This might be fixable by compiling with the
+  # correct flags; but as script seems to work on these platforms, let's just
+  # use that.
+  #
+  # @return [Boolean] whether the script command looks like it's working.
+  def use_script?
+    scriptfile, timingfile = record_with_script('echo', 'foo')
+
+    scriptfile =~ /foo/ && timingfile =~ /^[0-9]/
+  end
+
+  # Record using the modern version of 'script'
+  #
+  # @param [*String] command to run
+  # @return [scriptfile, timingfile]
   def record_with_script(*cmd)
     scriptfile, timingfile = [temp_file, temp_file]
 
     args = ['script']
     args << '-c' + cmd.join(" ") if cmd.size > 0
+    args << '-q'
     args << '-t'
     args << scriptfile.path
 
@@ -45,15 +99,13 @@ module Showterm
     [scriptfile.open.read, timingfile.open.read]
   end
 
-  def use_script?
-    scriptfile, timingfile = record_with_script('echo', 'foo')
-
-    scriptfile =~ /foo/ && timingfile =~ /^[0-9]/
-  end
 
+  # Record using the bundled version of 'ttyrec'
+  #
+  # @param [*String] command to run
+  # @return [scriptfile, timingfile]
   def record_with_ttyrec(*cmd)
-    scriptfile = Tempfile.new('showterm.script')
-    scriptfile.close(false)
+    scriptfile = temp_file
 
     args = [File.join(File.dirname(File.dirname(__FILE__)), 'ext/ttyrec')]
     if cmd.size > 0
@@ -63,41 +115,9 @@ module Showterm
 
     system(*args)
 
-    ret = scriptfile.open.read
-    scriptfile.close(true)
-    convert(ret)
-  end
-
-  # Get the current width of the terminal
-  #
-  # @return [Integer] number of columns
-  def terminal_width
-    guess = `tput cols`.to_i
-    guess == 0 ? 80 : guess
+    convert(scriptfile.open.read)
   end
 
-  # Upload the termshow to showterm.io
-  #
-  # @param [String] scriptfile  The ANSI dump of the terminal
-  # @param [String] timingfile  The timings
-  # @param [Integer] cols  The width of the terminal
-  def upload!(scriptfile, timingfile, cols=terminal_width)
-    puts 'uploading, please wait.'
-    request = Net::HTTP::Post.new("/scripts")
-    request.set_form_data(:scriptfile => scriptfile,
-                          :timingfile => timingfile,
-                          :cols => cols)
-
-    response = http(request)
-    raise response.body unless Net::HTTPSuccess === response
-    puts response.body
-  rescue => e
-    raise if retried
-    retried = true
-    retry
-  end
-
-  private
 
   # The original version of showterm used the 'script' binary.
   #

data/showterm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "showterm"
-  s.version = "0.2.1.pre.2"
+  s.version = "0.2.1.pre.3"
   s.platform = Gem::Platform::RUBY
   s.author = "Conrad Irwin"
   s.email = "conrad.irwin@gmail.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showterm
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre.2
+  version: 0.2.1.pre.3
   prerelease: 6
 platform: ruby
 authors: