shelr 0.14.1 → 0.15.0

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/antono/shelr.png?branch=master)](http://travis-ci.org/antono/shelr)
 
 `shelr` allows you to record/replay and publish your terminal on [http://shelr.tv](http://shelr.tv).
-[Code for Shelr.tv](https://github.com/antono/shelr.tv) service is also available on github.
+[Code for Shelr.tv](https://github.com/shelr/shelr.tv) service is also available on github.
 
 
 ## Installation
@@ -14,7 +14,7 @@ You'll need ruby and rubygems installed.
 
     [sudo] gem install shelr
 
-On ubuntu older than precise you should also add following to your `.bashrc` or `.zshrc`
+On ubuntu older than precise or debian older than wheezy you should also add following to your `.bashrc` or `.zshrc`
 
     export PATH=/var/lib/gems/1.8/bin:$PATH
 
@@ -22,9 +22,10 @@ See [shellcast](http://shelr.tv/records/4f49ea4ae557800001000004) for details :)
 
 ### From packages
 
-- [PPA](https://launchpad.net/~antono/+archive/shelr) for Debian/Ubuntu
+- [PPA](https://launchpad.net/~antono/+archive/shelr) for Ubuntu
 - [PKGBUILD](https://aur.archlinux.org/packages.php?ID=56945) for Arch Linux
 - [EBUILD](http://overlays.gentoo.org/proj/sunrise/browser/app-misc/shelr) for Gentoo Linux
+- [deb](http://mentors.debian.net/package/shelr) for Debian (Mentor Wanted)
 
 ## Watching other's records
 
@@ -60,18 +61,11 @@ If You use OS X - install `ttyrec` via homebrew and setup it as recording backen
      brew install ttyrec
      shelr backend ttyrec
      
-Also put the scriptreplay script somewhere in your PATH, e.g. /usr/local/bin
-
-    curl https://raw.github.com/gist/2343833/0287752171cb045205e88664a32f63bf3a45565f/scriptreplay > /usr/local/bin/scriptreplay
-    chmod +x /usr/local/bin/scriptreplay
-
 ## Copyright
 
 (Э) 2010, 2011, 2012 Antono Vasiljev and
-[contributors](https://github.com/antono/shelr/contributors).
+[contributors](https://github.com/shelr/shelr/contributors).
 
 See LICENSE.txt for details.
 
-[![endorse](http://api.coderwall.com/antono/endorsecount.png)](http://coderwall.com/antono)
-
 [TV]: http://shelr.tv/ "Shellcasts from shell ninjas"

data/bin/shelr

@@ -37,7 +37,7 @@ HELP     = <<-HELP
 
     Setup:
 
-      setup API_KEY   - set your API key
+      setup API_KEY [API_URL] - set your API key and API site
       backend [ttyrec|script] - setup recorder backend
 
     Visit: http://shelr.tv/ for more info.
@@ -85,6 +85,9 @@ when 'push'
     puts "Select one..."
   end
 when 'setup'
+  if ARGV[2]
+    Shelr.api_url = ARGV[2]
+  end
   if ARGV[1]
     Shelr.api_key = ARGV[1]
   else

data/lib/shelr/player.rb

@@ -44,7 +44,7 @@ module Shelr
         puts "=> Title: #{parts['title']}"
         puts "=> Description: #{parts['description']}t"
         Shelr.terminal.puts_line
-        system "scriptreplay #{File.join(dir, 'timing')} #{File.join(dir, 'typescript')}"
+        scriptreplay File.join(dir, 'typescript'), File.join(dir, 'timing')
         Shelr.terminal.puts_line
         puts "=> Title: #{parts['title']}"
         puts "=> Description: #{parts['description']}t"
@@ -57,24 +57,31 @@ module Shelr
     end
 
     def play
-      STDOUT.puts "-=" * (Shelr.terminal.size[:width] / 2)
-      puts
+      Shelr.terminal.puts_line
       system(scriptreplay_cmd)
-      puts
-      STDOUT.puts "-=" * (Shelr.terminal.size[:width] / 2)
-    end
-
-    def scriptreplay(typescript, timing)
+      Shelr.terminal.puts_line
     end
 
     private
 
+    def scriptreplay(typescript_file, timing_file)
+      typescript = File.open(typescript_file)
+      timing = File.open(timing_file)
+      frames = timing.read.split("\n").map { |line| line.split(" ") }
+      typescript.gets # skip first line
+
+      frames.each do |usec,length|
+        sleep(usec.to_f)
+        print typescript.read(length.to_i)
+      end
+    end
+
     def record_file(name)
       File.join(Shelr.data_dir(@record_id), name)
     end
 
     def scriptreplay_cmd
-      "scriptreplay #{record_file('timing')} #{record_file('typescript')}"
+      scriptreplay record_file('typescript'), record_file('timing')
     end
   end
 end

data/lib/shelr/publisher.rb

@@ -8,7 +8,7 @@ module Shelr
       @private = priv
       ensure_unlocked(id)
       with_exception_handler do
-        uri = URI.parse(Shelr::API_URL + '/records')
+        uri = URI.parse(Shelr.api_url + '/records')
         params = { 'record' => prepare(id) }
         params.merge!({'api_key' => Shelr.api_key}) if api_key
         handle_response Net::HTTP.post_form(uri, params)

data/lib/shelr/version.rb

@@ -1,3 +1,3 @@
 module Shelr
-  VERSION = '0.14.1'
+  VERSION = '0.15.0'
 end

data/lib/shelr.rb

@@ -4,12 +4,12 @@ require 'json'
 module Shelr
 
   APP_NAME       = 'shelr'
-  API_URL        = ENV['SHELR_LOCAL'] ? 'http://localhost:3000' : 'http://shelr.tv'
   XDG_DATA_DIR   = ENV['XDG_DATA_HOME']   || File.join(ENV['HOME'], '.local', 'share')
   XDG_CONFIG_DIR = ENV['XDG_CONFIG_HOME'] || File.join(ENV['HOME'], '.config')
   DATA_DIR       = File.join(XDG_DATA_DIR,   APP_NAME)
   CONFIG_DIR     = File.join(XDG_CONFIG_DIR, APP_NAME)
   API_KEY_CFG    = File.join(CONFIG_DIR, 'api_key')
+  API_URL_CFG    = File.join(CONFIG_DIR, 'api_url')
   BACKEND_CFG    = File.join(CONFIG_DIR, 'backend')
 
   autoload :Recorder,  'shelr/recorder.rb'
@@ -30,6 +30,16 @@ module Shelr
       File.open(API_KEY_CFG, 'w+') { |f| f.puts(key.strip) }
     end
 
+    def api_url
+      return ENV['SHELR_LOCAL'] ? 'http://localhost:3000' : 'http://shelr.tv' unless File.exist?(API_URL_CFG)
+      @api_url ||= File.read(API_URL_CFG).strip
+    end
+
+    def api_url=(url)
+      ensure_config_dir_exist
+      File.open(API_URL_CFG, 'w+') { |f| f.puts(url.strip) }
+    end
+
     def backend
       @backend ||= File.exist?(BACKEND_CFG) ? File.read(BACKEND_CFG).strip : 'script'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelr
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -87,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1621112883674477295
+      hash: 2426833572865576322
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1621112883674477295
+      hash: 2426833572865576322
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21