screenxtv 0.0.11 → 0.0.12

data/lib/screenxtv.rb

@@ -7,9 +7,21 @@ require 'yaml'
 require 'optparse'
 require 'readline'
 require 'tempfile'
+require './lib/version.rb'
+
+if `which screen`.empty?
+  print %(Warning: you don't have gnu screen in your machine.)
+  commands = [
+    ['zsh','RPROMPT'=>'(screenxtv)% '],
+    ['bash','PS1'=>'bash(screenxtv)$ '],
+    ['sh','PS1'=>'sh(screenxtv)$ ']
+  ]
+  exec_cmd, env = commands.find{|cmd, _| !`which #{cmd}`.empty?}
+  env.each{|k,v|ENV[k]=v}
+end
 
 def showVersion
-  print "ScreenX TV Ruby Client 0.0.11\n" #is there any good way to do this?
+  print "ScreenX TV Ruby Client #{ScreenXTV::VERSION}\n" #is there any good way to do this?
   exit
 end
 def showHelp
@@ -23,6 +35,7 @@ Options:
   -t, [--title]    # Select a title (e.g. Joe's Codestream)
   -r, [--reset]    # Reset your default configuration (e.g. url, color, title)
   -f CONFIG_FILE   # Path to a preset configuration
+  -e, [--execute]  # Execute specified Program
   -p, [--private]  # Broadcast your terminal privately (anyone who has the link can access)
   -h, [--help]     # Show this help message and quit
   -v, [--version]  # Show ScreenX TV Ruby Client version number and quit
@@ -82,7 +95,7 @@ def readpswd(prompt='> ')
       else
         print "\a"
       end
-      print "\r\e[K#{prompt}#{s.gsub /./,'*'}"
+      print "\r\e[K#{prompt}#{s.gsub /./,'*'}" # delete this
     end
   }
 end
@@ -121,7 +134,7 @@ end
 
 def auth(conf)
   loop do
-    username=readline "user name> "
+    username=readline "username> "
     return false if username.size==0
     password=readpswd "password> "
     return false if password.nil? || password.size==0
@@ -162,6 +175,8 @@ parser=OptionParser.new do |op|
   op.on("-c [color]"){|v|argv[:color]=v||true}
   op.on("-t [title]"){|v|argv[:title]=v||true}
   op.on("--reset"){|v|argv[:new]=true}
+  op.on("-e program"){|v|exec_cmd=v}
+  op.on("--execute program"){|v|exec_cmd=v}
   op.on("-p"){|v|argv[:private]=true}
   op.on("--private"){|v|argv[:private]=true}
   op.on("-f config_file"){|v|argv[:file]=v}
@@ -190,6 +205,7 @@ else
   conf['url']=argv[:url]==true ? nil : argv[:url] if argv[:url]
   conf['title']=argv[:title]==true ? nil : argv[:title] if argv[:title]
   conf['color']=argv[:color]==true ? nil : argv[:color] if argv[:color]
+  conf['execute']=argv[:execute]==true ? nil : argv[:execute] if argv[:execute]
 end
 
 conf_scan.delete :url if argv[:private]
@@ -262,24 +278,45 @@ info={
 }
 ENV['SCREENXTV_BROADCASTING']=info.to_json
 show_info(info)
+message="http://#{HOST}/#{info['url']}    #{conf['title']}"
 
 print "\npress enter to start broadcasting"
 readline
 
-screenrc=Tempfile.new("screenrc");
-begin
+unless exec_cmd
+  unless File.exists? "#{ENV['HOME']}/.screenrc"
+    begin
+      #disable C-a if not screen user
+      Tempfile.open("screenrc_sxtv_alt_conf") do |f|
+        f.write "term xterm-256color\n"
+        f.write "escape ^Jj\n"
+        ENV['SCREENRC']=f.path
+      end
+    rescue
+    end
+  end
+
   begin
-    File.open("#{ENV['HOME']}/.screenrc"){|file|
-      screenrc.write "#{file.read}\n"
-    }
+    #screenxtv -> screen(target)
+    #screenxtv -> screen(hardstatus) -> screen(target)
+    status_rc=Tempfile.open("screenrc_sxtv_status") do |f|
+      f.write "term xterm-256color\n"
+      f.write "hardstatus alwayslastline #{message.inspect}\n"
+      f.write "escape ^Qq\n"
+      f.write "autodetach off\n"
+      next f
+    end
   rescue
   end
-  screenrc.write "term xterm-256color\n"
-  screenrc.write "hardstatus alwayslastline 'http://#{HOST}/#{url}'\n"
-  screenrc.flush
-rescue
+
+  screen_name=argv[:private] ? conf['screen_private'] : conf['screen']
+
+  cmd_stat=["screen","-c",status_rc.path,"-S","sx.#{url.gsub('/','.')}.tv"]
+  cmd_attach=["screen","-x",screen_name,"-R"]
+  exec_cmd=cmd_stat+cmd_attach
 end
-ENV['SCREENRC']=screenrc.path
+
+
 
 Thread.new{
   begin
@@ -293,8 +330,8 @@ Thread.new{
 
 begin
   ENV['LANG']='en_US.UTF-8'
-  screen_name=argv[:private] ? conf['screen_private'] : conf['screen']
-  PTY::getpty "screen -x #{screen_name} -R" do |rr,ww|
+  
+  PTY::getpty *exec_cmd do |rr,ww|
     winsize=->{
       height,width=ww.winsize=rr.winsize=STDOUT.winsize
       socket.send 'winch',{width:width,height:height}.to_json

data/lib/version.rb

@@ -0,0 +1,3 @@
+module ScreenXTV
+  VERSION = '0.0.12'
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: screenxtv
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
+  prerelease: 
 platform: ruby
 authors:
 - Tomoya Ishida
@@ -13,15 +14,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Software for broadcasting your terminal to http://screenx.tv/
@@ -32,28 +35,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/screenxtv.rb
+- lib/version.rb
 - bin/screenxtv
 homepage: http://screenx.tv/
 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: 2.0.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: ScreenX TV client
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 979011c1517589151acb14fe09ae8e5fab986533
-  data.tar.gz: 2b50177569b9092a9ab67affd1db0d8fd084bd56
-SHA512:
-  metadata.gz: baf303d80164a5dea891b652c90ae84bb70fc347e356a44615bc56b87454a42956cf4febb9b79dfea97daaaf96984d2fa583a221c727fcb833e8b18c86742187
-  data.tar.gz: 765daed474392f54b31e9ddd023f67f8fd8619bde843040a6d717595c2ef6c9196d097d8efca082ce57f98a2c87a83ff54cdda0ae6b56e8880b220918cad9efe