showterm 0.3.0 → 0.4.0

data/README.md

@@ -6,16 +6,22 @@ It's showtime for your terminal!
 Showterm lets your record a terminal session exactly as you experience it, right down to
 the syntax highlighting.
 
-Installation instructions (`gem install showterm`) and usage instructions (`showterm <program`) are available in the [showterm](https://showterm.herokuapp.com/b6803679cb1c9fbcf667cb7cfe8f605e3ce1fe03). :)
+Installation instructions (`gem install showterm`) and usage instructions (`showterm program`) are available in the [showterm](https://showterm.herokuapp.com/b6803679cb1c9fbcf667cb7cfe8f605e3ce1fe03). :)
 
 (yes, this is me using showterm inside showterm; it's like inception, but with more
 syntax highlighting)
 
+Configuration
+=============
+
+If you'd like to run your own showterm server, you can
+`export SHOWTERM_SERVER=http://showterm.myorg.local/` to configure your showterm
+client to talk to it.
+
 TODO
 ====
 
 * Allow embedders to chose colourschemes (at least light vs. dark background).
-* Fix problems with vim which sometimes goes out-of-bounds for term.js
 
 Meta-fu
 =======

data/bin/showterm

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'readline'
 require File.join(File.dirname(File.dirname(__FILE__)), 'lib/showterm')
 
 class Showterm::Main
@@ -45,6 +44,9 @@ class Showterm::Main
       You can pass `-e` as the first arg and it will allow you to edit the timings
       file before uploading. This can be nice if you want to take long pauses (such
       as searching an answer out) in between commands.
+
+      If you would like to attempt an upload again
+      showterm --retry <script> <times>
     EOF
   end
 

data/lib/showterm.rb

@@ -29,22 +29,32 @@ module Showterm
     guess == 0 ? 80 : guess
   end
 
+
+  # Get the current height of the terminal
+  #
+  # @return [Integer] number of lines
+  def terminal_height
+    guess = `tput lines`.to_i
+    guess == 0 ? 25 : 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)
+  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)
+                          :cols => cols,
+                          :lines => lines)
 
     response = http(request)
     raise response.body unless Net::HTTPSuccess === response
     response.body
-  rescue => e
+  rescue
     raise if retried
     retried = true
     retry
@@ -152,15 +162,21 @@ module Showterm
   end
 
   def http(request)
-    connection = Net::HTTP.new("showterm.herokuapp.com", 443)
-    connection.use_ssl = true
-    connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    connection = Net::HTTP.new(url.host, url.port)
+    if url.scheme =~ /https/i
+      connection.use_ssl = true
+      connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
     connection.open_timeout = 10
     connection.read_timeout = 10
     connection.start do |http|
       http.request request
     end
   rescue Timeout::Error
-    raise "Could not connect to https://showterm.herokuapp.com/"
+    raise "Could not connect to #{@url.to_s}"
+  end
+
+  def url
+    @url ||= URI(ENV["SHOWTERM_SERVER"] || "https://showterm.herokuapp.com")
   end
 end

data/showterm.gemspec

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

metadata

@@ -2,14 +2,14 @@
 name: showterm
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies: []
 description: Integrates with showterm.io for awesome sharability.
 email: conrad.irwin@gmail.com