showterm 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d992ca33efcee43c76b0e0c5e3fc883ddba89c4f
-  data.tar.gz: 0f3efea05cea7538e05e7e267f079bb2f47aeca7
+  metadata.gz: 51ac2af8ec1bc2e5329f89820b48deb204925451
+  data.tar.gz: 96b842251c63b92f3095a86db2a7d07c17c50057
 SHA512:
-  metadata.gz: 86e9ecea75443c6268da1a15ce8b08eb0d3a7f828c3a40b408972d769d63f2086f17bb86feeac3b46c9e426a81b6460d739a2537cee24322397e6ac2d61e457b
-  data.tar.gz: f4b7f0ec1a9fa654487ba1f6d09e9018127e58570e4c8561d49363b6ea535c9d368c415573769ada296b1a120f4d7cc8544cacc732dbe93befe95390fcfc055a
+  metadata.gz: 73b01b3977a124c225ef810addf819c8c49fb4e53e4d3a3d2a00f80ab0951b27cfb146c2c4096457192c1a2e87f7efb144df0f5b9a152b48b241cf82aa427670
+  data.tar.gz: a83845e90eb7ba93ca1e3d2fb2317eac15ff04caf5d2acac48cb7e2c00ae08fdd7898160be8fb849dc68fd05dc64b2bc9618ef5f12cf32b0e7f74dc852a68019

data/lib/showterm.rb

@@ -47,7 +47,7 @@ module Showterm
   # @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 = Net::HTTP::Post.new(actual_path "/scripts")
       request.set_form_data(:scriptfile => scriptfile,
                             :timingfile => timingfile,
                             :cols => cols,
@@ -140,24 +140,34 @@ module Showterm
   end
 
 
-  # Record using the bundled version of 'ttyrec'
+  # Record using system ttyrec
   #
   # @param [*String] command to run
   # @return [scriptfile, timingfile]
   def record_with_ttyrec(*cmd)
     scriptfile = temp_file
 
-    args = [File.join(File.dirname(File.dirname(__FILE__)), 'ext/ttyrec')]
+    args = ['ttyrec']
     if cmd.size > 0
       args << '-e' + cmd.join(" ")
     end
     args << scriptfile.path
 
-    system(*args)
+    status = system(*args)
+    raise TTYREC_NOT_INSTALLED_ERROR if status.nil? && `which ttyrec`.empty?
 
     convert(scriptfile.open.read)
   end
 
+  TTYREC_NOT_INSTALLED_ERROR = <<~HEREDOC
+
+
+      Showterm requires ttyrec to availible in your path.
+      Try installing via: `brew install ttyrec` if you can.
+      Brew patches ttyrec on installation in order to address 
+      a macOS openpty() issue (https://github.com/Homebrew/homebrew-core/pull/21922)
+      Also, definitely check out http://0xcc.net/ttyrec/
+    HEREDOC
 
   # The original version of showterm used the 'script' binary.
   #
@@ -208,6 +218,10 @@ module Showterm
     raise "Could not connect to #{@url.to_s}"
   end
 
+  def actual_path(path)
+    (url.path || '') + path
+  end
+
   def url
     @url ||= URI(ENV["SHOWTERM_SERVER"] || "https://showterm.herokuapp.com")
   end

data/showterm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "showterm"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
   s.platform = Gem::Platform::RUBY
   s.author = "Conrad Irwin"
   s.email = "conrad.irwin@gmail.com"
@@ -9,6 +9,6 @@ Gem::Specification.new do |s|
   s.description = "Integrates with showterm.io for awesome sharability."
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"
-  s.extensions = "ext/extconf.rb"
   s.executables << 'showterm'
+  s.requirements = 'ttyrec'
 end

metadata

@@ -1,39 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: showterm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies: []
 description: Integrates with showterm.io for awesome sharability.
 email: conrad.irwin@gmail.com
 executables:
 - showterm
-extensions:
-- ext/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - LICENSE.MIT
 - README.md
 - bin/showterm
-- ext/Makefile
-- ext/README
-- ext/extconf.rb
-- ext/io.c
-- ext/io.h
-- ext/ttyplay.1
-- ext/ttyplay.c
-- ext/ttyrec.1
-- ext/ttyrec.c
-- ext/ttyrec.h
-- ext/ttytime.1
-- ext/ttytime.c
 - lib/showterm.rb
 - showterm.gemspec
 homepage: http://github.com/Conradirwin/showterm
@@ -45,19 +32,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- ttyrec
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Allows you to make screen casts of your terminal really easily
 test_files: []
-has_rdoc: 

data/ext/Makefile

@@ -1,34 +0,0 @@
-CC = gcc
-CFLAGS = -O2
-VERSION = 1.0.8
-
-TARGET = ttyrec ttyplay ttytime
-
-DIST =	ttyrec.c ttyplay.c ttyrec.h io.c io.h ttytime.c\
-	README Makefile ttyrec.1 ttyplay.1 ttytime.1
-
-all: $(TARGET)
-
-ttyrec: ttyrec.o io.o
-	$(CC) $(CFLAGS) -o ttyrec ttyrec.o io.o
-
-ttyplay: ttyplay.o io.o
-	$(CC) $(CFLAGS) -o ttyplay ttyplay.o io.o
-
-ttytime: ttytime.o io.o
-	$(CC) $(CFLAGS) -o ttytime ttytime.o io.o
-
-clean:
-	rm -f *.o $(TARGET) ttyrecord *~
-
-dist:
-	rm -rf ttyrec-$(VERSION)
-	rm -f ttyrec-$(VERSION).tar.gz
-
-	mkdir ttyrec-$(VERSION)
-	cp $(DIST) ttyrec-$(VERSION)
-	tar zcf ttyrec-$(VERSION).tar.gz  ttyrec-$(VERSION)
-	rm -rf ttyrec-$(VERSION)
-
-install:
-	:

data/ext/README

@@ -1,27 +0,0 @@
-ttyrec is a tty recorder. ttyplay is a tty player.
-
-Installation:
-
-  % make
-
-or if your system is SVR4 system (Solaris etc.),
-
-  % make CFLAGS=-DSVR4
-
-or if your system supports getpt(3),
-
-  % make CFLAGS=-DHAVE_getpt
-
-HAVE_getpt is required if your linux system uses devfs.
-
-
-Usage:
-
-  % ttyrec
-  (In the excuted shell, do whatever you want and exit)
-
-  % ttyplay ttyrecord
-
-Have fun!
-
--- Satoru Takabayashi <satoru@namazu.org>

data/ext/io.c

@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2000 Satoru Takabayashi <satoru@namazu.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "ttyrec.h"
-
-#define SWAP_ENDIAN(val) ((unsigned int) ( \
-    (((unsigned int) (val) & (unsigned int) 0x000000ffU) << 24) | \
-    (((unsigned int) (val) & (unsigned int) 0x0000ff00U) <<  8) | \
-    (((unsigned int) (val) & (unsigned int) 0x00ff0000U) >>  8) | \
-    (((unsigned int) (val) & (unsigned int) 0xff000000U) >> 24)))
-
-static int 
-is_little_endian ()
-{
-    static int retval = -1;
-
-    if (retval == -1) {
-	int n = 1;
-	char *p = (char *)&n;
-	char x[] = {1, 0, 0, 0};
-
-	assert(sizeof(int) == 4);
-
-	if (memcmp(p, x, 4) == 0) {
-	    retval = 1;
-	} else {
-	    retval = 0;
-	}
-    }
-
-    return retval;
-}
-
-static int
-convert_to_little_endian (int x)
-{
-    if (is_little_endian()) {
-	return x;
-    } else {
-	return SWAP_ENDIAN(x);
-    }
-}
-
-int
-read_header (FILE *fp, Header *h)
-{
-    int buf[3];
-
-    if (fread(buf, sizeof(int), 3, fp) == 0) {
-	return 0;
-    }
-
-    h->tv.tv_sec  = convert_to_little_endian(buf[0]);
-    h->tv.tv_usec = convert_to_little_endian(buf[1]);
-    h->len        = convert_to_little_endian(buf[2]);
-
-    return 1;
-}
-
-int
-write_header (FILE *fp, Header *h)
-{
-    int buf[3];
-
-    buf[0] = convert_to_little_endian(h->tv.tv_sec);
-    buf[1] = convert_to_little_endian(h->tv.tv_usec);
-    buf[2] = convert_to_little_endian(h->len);
-
-    if (fwrite(buf, sizeof(int), 3, fp) == 0) {
-	return 0;
-    }
-
-    return 1;
-}
-
-static char *progname = "";
-void
-set_progname (const char *name)
-{
-    progname = strdup(name);
-}
-
-FILE *
-efopen (const char *path, const char *mode)
-{
-    FILE *fp = fopen(path, mode);
-    if (fp == NULL) {
-	fprintf(stderr, "%s: %s: %s\n", progname, path, strerror(errno));
-	exit(EXIT_FAILURE);
-    }
-    return fp;
-}
-
-int
-edup (int oldfd)
-{
-    int fd = dup(oldfd);
-    if (fd == -1) {
-	fprintf(stderr, "%s: dup failed: %s\n", progname, strerror(errno));
-	exit(EXIT_FAILURE);
-    }
-    return fd;
-}
-
-int
-edup2 (int oldfd, int newfd)
-{
-    int fd = dup2(oldfd, newfd);
-    if (fd == -1) {
-	fprintf(stderr, "%s: dup2 failed: %s\n", progname, strerror(errno));
-	exit(EXIT_FAILURE);
-    }
-    return fd;
-}
-
-FILE *
-efdopen (int fd, const char *mode)
-{
-    FILE *fp = fdopen(fd, mode);
-    if (fp == NULL) {
-	fprintf(stderr, "%s: fdopen failed: %s\n", progname, strerror(errno));
-	exit(EXIT_FAILURE);
-    }
-}

data/ext/io.h

@@ -1,13 +0,0 @@
-#ifndef __TTYREC_IO_H__
-#define __TTYREC_IO_H__
-
-#include "ttyrec.h"
-
-int     read_header     (FILE *fp, Header *h);
-int     write_header    (FILE *fp, Header *h);
-FILE*   efopen          (const char *path, const char *mode);
-int     edup            (int oldfd);
-int     edup2           (int oldfd, int newfd);
-FILE*   efdopen         (int fd, const char *mode);
-
-#endif

data/ext/ttyplay.1

@@ -1,62 +0,0 @@
-.\"
-.\" This manual page is written by NAKANO Takeo <nakano@webmasters.gr.jp>
-.\"
-.TH TTYPLAY 1
-.SH NAME
-ttyplay \- player of the tty session recorded by ttyrec
-.SH SYNOPSIS
-.br
-.B ttyplay
-.I [\-s SPEED] [\-n] [\-p] file
-.br
-.SH DESCRIPTION
-.B Ttyplay
-plays the tty session in
-.IR file ,
-which was recorded previously by
-.BR ttyrec (1).
-.PP
-When
-.B \-p
-option is given,
-.B ttyplay
-output the
-.I file
-as it grows.
-It means that you can see the "live" shell session 
-running by another user.
-.PP
-If you hit any key during playback, it will go right to the next
-character typed.  This is handy when examining sessions where a user
-spends a lot of time at a prompt.
-.PP
-Additionally, there are some special keys defined:
-.TP
-.BI + " or " f
- double the speed of playback.
-.TP
-.BI \- " or " s
- halve the speed of playback.
-.TP
-.BI 1
-set playback to speed 1.0 again.
-
-.SH OPTIONS
-.TP
-.BI \-s " SPEED"
-multiple the playing speed by
-.I SPEED
-(default is 1).
-.TP
-.B \-n
-no wait mode.
-Ignore the timing information in
-.IR file .
-.TP
-.B \-p
-peek another person's tty session.
-.SH "SEE ALSO"
-.BR script (1),
-.BR ttyrec (1),
-.BR ttytime (1)
-