showterm 0.2.1.pre.1 → 0.2.1.pre.2

data/lib/showterm.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'shellwords'
 require 'net/https'
 
 module Showterm
@@ -12,6 +13,45 @@ module Showterm
   # @param [*String] cmd
   # @return [scriptfile, timingfile]  the two halves of a termshow
   def record!(*cmd)
+    if use_script?
+      puts 'showterm recording with script, quit when done'
+      ret = record_with_script(*cmd)
+    else
+      puts 'showterm recording with , quit when done'
+      ret = record_with_ttyrec(*cmd)
+    end
+    puts 'showterm recording finished'
+
+    ret
+  end
+
+  def temp_file
+    f = Tempfile.new('showterm')
+    f.close(false)
+    at_exit{ f.close(true) }
+    f
+  end
+
+  def record_with_script(*cmd)
+    scriptfile, timingfile = [temp_file, temp_file]
+
+    args = ['script']
+    args << '-c' + cmd.join(" ") if cmd.size > 0
+    args << '-t'
+    args << scriptfile.path
+
+    system("#{args.map{ |x| Shellwords.escape(x) }.join(" ")} 2>#{Shellwords.escape(timingfile.path)}")
+
+    [scriptfile.open.read, timingfile.open.read]
+  end
+
+  def use_script?
+    scriptfile, timingfile = record_with_script('echo', 'foo')
+
+    scriptfile =~ /foo/ && timingfile =~ /^[0-9]/
+  end
+
+  def record_with_ttyrec(*cmd)
     scriptfile = Tempfile.new('showterm.script')
     scriptfile.close(false)
 
@@ -21,9 +61,7 @@ module Showterm
     end
     args << scriptfile.path
 
-    puts "showterm is recording, quit when you're done."
-    system(*args) or  raise "showterm recording failed"
-    puts 'showterm recording finished'
+    system(*args)
 
     ret = scriptfile.open.read
     scriptfile.close(true)

data/showterm.gemspec

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

metadata

@@ -1,34 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: showterm
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 1
-  - pre
-  - 1
-  version: 0.2.1.pre.1
+version: !ruby/object:Gem::Version
+  version: 0.2.1.pre.2
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-09 00:00:00 -07:00
-default_executable: 
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies: []
-
 description: Integrates with showterm.io for awesome sharability.
 email: conrad.irwin@gmail.com
-executables: 
+executables:
 - showterm
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE.MIT
 - README.md
 - bin/showterm
@@ -46,37 +36,29 @@ files:
 - ext/ttytime.c
 - lib/showterm.rb
 - showterm.gemspec
-has_rdoc: true
 homepage: http://github.com/Conradirwin/showterm
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Allows you to make screen casts of your terminal really easily
 test_files: []
-
+has_rdoc: