showterm 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d992ca33efcee43c76b0e0c5e3fc883ddba89c4f
+  data.tar.gz: 0f3efea05cea7538e05e7e267f079bb2f47aeca7
+SHA512:
+  metadata.gz: 86e9ecea75443c6268da1a15ce8b08eb0d3a7f828c3a40b408972d769d63f2086f17bb86feeac3b46c9e426a81b6460d739a2537cee24322397e6ac2d61e457b
+  data.tar.gz: f4b7f0ec1a9fa654487ba1f6d09e9018127e58570e4c8561d49363b6ea535c9d368c415573769ada296b1a120f4d7cc8544cacc732dbe93befe95390fcfc055a

data/.gitignore

@@ -0,0 +1,4 @@
+ext/*.o
+ext/ttyrec
+ext/ttyplay
+ext/ttytime

data/README.md

@@ -23,6 +23,22 @@ TODO
 
 * Allow embedders to chose colourschemes (at least light vs. dark background).
 
+Bugs
+====
+
+Showterm doesn't preserve enough context for `rvm` to work correctly. This can cause some ruby programs (e.g. capistrano) to crash when used inside a showterm. To fix this run: `rvm use` before running any ruby programs:
+
+```
+[~/repo/www] > showterm
+Showterm recording. (Exit shell when done.)
+[~/repo/www] >  rvm use
+Using /Users/jasghar/.rvm/gems/ruby-1.9.3-p286
+[~/repo/www] > cap deploy
+...
+```
+
+
+
 Meta-fu
 =======
 

data/bin/showterm

@@ -14,6 +14,11 @@ class Showterm::Main
       ARGV.shift
       reupload
 
+    elsif ARGV[0] == '--delete'
+
+      ARGV.shift
+      delete
+
     else
 
       if '-e' == ARGV[0] || '--edit' == ARGV[0]
@@ -37,6 +42,8 @@ class Showterm::Main
   def help
     puts <<-EOF
       Usage: showterm [-e] <command to run>
+             showterm --retry <script> <times>
+             showterm --delete <url>
 
       showterm will record the exact output of your session, and upload it to the
       internet where it can be replayed by anyone to whom you give the URL.
@@ -47,6 +54,9 @@ class Showterm::Main
 
       If you would like to attempt an upload again
       showterm --retry <script> <times>
+
+      To delete a showterm you have uploaded from this computer
+      showterm --delete <url>
     EOF
   end
 
@@ -58,6 +68,18 @@ class Showterm::Main
     end
   end
 
+  def delete
+    if ARGV.size == 1
+      puts "Deleting..."
+      puts Showterm.delete! ARGV.first
+    else
+      puts "Usage: showterm --delete <url>"
+    end
+  rescue => e
+    puts [e] + e.backtrace
+    puts "-" * 80
+  end
+
   def upload(sf, tf)
     puts "Uploading..."
     puts Showterm.upload! sf, tf

data/lib/showterm.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 require 'shellwords'
 require 'net/https'
+require 'securerandom'
 
 module Showterm
   extend self
@@ -43,24 +44,55 @@ module Showterm
   # @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, lines=terminal_height)
-    retried ||= false
-    request = Net::HTTP::Post.new("/scripts")
-    request.set_form_data(:scriptfile => scriptfile,
-                          :timingfile => timingfile,
-                          :cols => cols,
-                          :lines => lines)
+  # @param [String] secret  The shared secret that will allow deleting this showterm.
+  def upload!(scriptfile, timingfile, cols=terminal_width, lines=terminal_height, secret=shared_secret)
+    with_retry do
+      request = Net::HTTP::Post.new("/scripts")
+      request.set_form_data(:scriptfile => scriptfile,
+                            :timingfile => timingfile,
+                            :cols => cols,
+                            :lines => lines,
+                            :secret => secret)
+
+      response = http(request)
+      raise response.body unless Net::HTTPSuccess === response
+      response.body
+    end
+  end
+
+  # Delete from showterm.io
+  #
+  # @param [String] url  The URL of the showterm to delete
+  # @param [String] secret  The secret with which it was uploaded.
+  def delete!(url, secret=shared_secret)
 
+    request = Net::HTTP::Delete.new(URI(url).path)
+    request.set_form_data(:secret => secret)
     response = http(request)
+
     raise response.body unless Net::HTTPSuccess === response
     response.body
+  end
+
+  private
+
+  def with_retry(n=1, &block)
+    yield
   rescue
-    raise if retried
-    retried = true
+    raise if n == 0
+    n -= 1
     retry
   end
 
-  private
+  def shared_secret
+    path = File.expand_path("~/.showterm")
+    unless File.exist?(path)
+      File.open(path, 'w') do |f|
+        f.write SecureRandom.hex(16)
+      end
+    end
+    File.read(path).strip
+  end
 
   # Get a temporary file that will be deleted when the program exits.
   def temp_file

data/showterm.gemspec

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showterm
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies: []
 description: Integrates with showterm.io for awesome sharability.
 email: conrad.irwin@gmail.com
@@ -19,6 +18,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- .gitignore
 - LICENSE.MIT
 - README.md
 - bin/showterm
@@ -38,27 +38,26 @@ files:
 - showterm.gemspec
 homepage: http://github.com/Conradirwin/showterm
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Allows you to make screen casts of your terminal really easily
 test_files: []
 has_rdoc: