osc-vnc 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: becc51f5142aefc3ad5609f5de415125c1842c78
-  data.tar.gz: aaec78e6639e2275c0a11d9566de77ac861318b4
+  metadata.gz: 96f77f60bce20b1df652cbbfd9f8bff6233dfebf
+  data.tar.gz: f57bacfcd76f7e0a7fefac145d925ed965064cb9
 SHA512:
-  metadata.gz: 294cf4c83bc13e5770863ec55ca24c5620f8d18e612a7f09efffe3452d45d445b4c37ed5cd1622ab33f3d3bb47ab14cd17b70314136d7b163ee9c4826ff82676
-  data.tar.gz: aa2e3015bfb73cd98f866e64c6e03e1381d09ebfeb9a41ca4cbb090de9c008ef185accead04ceeae27f1a94ba9e828ca9be69d0ef78d11c12af5edbbe00c1686
+  metadata.gz: e201792b877662d8f37eb67fccd51445d88508d33cbfb31c1a9d6e29e3cda929005596589615e5cb3ee633bbb0ba3f60f52c16990f0c5419073918c1237b8ecd
+  data.tar.gz: 73352f9e221c68d52e4fb143c5fecf9016e9e410a75e17d56cdaf7e4779157390b0ce7e7a63e712bf5b9b82b0d0ffbff4571c9695f42b398ef45b6fd82d25761

data/lib/osc/vnc/session.rb

@@ -61,6 +61,7 @@ module OSC
           PBS::ATTR[:o] => "#{script.outdir}/$PBS_JOBID.output",
           PBS::ATTR[:j] => "oe",
           PBS::ATTR[:S] => "/bin/bash",
+          PBS::ATTR[:init_work_dir] => script.outdir
         }.merge headers
         h[PBS::ATTR[:N]] = "#{ENV['APP_TOKEN']}/#{h[PBS::ATTR[:N]]}" if ENV['APP_TOKEN']
 

data/lib/osc/vnc/version.rb

@@ -1,6 +1,6 @@
 module OSC
   module VNC
     # The current version of osc-vnc.
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

data/osc-vnc.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "pbs", "~> 2.0"
+  spec.add_runtime_dependency "pbs", "~> 2.0", ">= 2.0.3"
   spec.add_runtime_dependency "mustache", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/templates/conn/awesim.mustache

@@ -1 +1 @@
-awesim://{{#password}}:{{password}}@{{/password}}{{host}}:{{port}}
+awesim://{{host}}:{{port}}

data/templates/conn/awesim_vnc.mustache

@@ -0,0 +1 @@
+awesim://{{#password}}:{{password}}@{{/password}}{{host}}:{{port}}

data/templates/conn/osc.mustache

@@ -1 +1 @@
-osc://{{#password}}:{{password}}@{{/password}}{{host}}:{{port}}
+osc://{{host}}:{{port}}

data/templates/conn/osc_vnc.mustache

@@ -0,0 +1 @@
+osc://{{#password}}:{{password}}@{{/password}}{{host}}:{{port}}

data/templates/script/_bash_helpers.mustache

@@ -0,0 +1,25 @@
+# Generate random integer in range [$1..$2]
+function random () {
+  shuf -i ${1}-${2} -n 1
+}
+
+# Check if port $1 is in use
+function used_port () {
+  local PORT=${1}
+  nc -z localhost ${PORT} &>/dev/null
+}
+
+# Find available port in range [$1..$2]
+# Default: [2000..65535]
+function find_port () {
+  local PORT=$(random ${1:-2000} ${2:-65535})
+  while $(used_port ${PORT}); do
+    PORT=$(random ${1:-2000} ${2:-65535})
+  done
+  echo ${PORT}
+}
+
+# Generate random alphanumeric password with $1 (default: 32) characters
+function create_passwd () {
+  tr -cd '[:alnum:]' < /dev/urandom 2>/dev/null | head -c${1:-32}
+}

data/templates/script/server.mustache

@@ -2,15 +2,15 @@
 {{> _setup_env}}
 
 {{#xinit}}
-# Port helpers
-{{> _port_helpers}}
+# Bash helper functions
+{{> _bash_helpers}}
 
 # Run developer supplied xinit script
 source {{xinit}}
 {{/xinit}}
 
 # Function that creates a connection information file
-function create_connfile {
+function create_yml {
     echo "Host: ${HOST}" > ${VNC_OUTFILE}
     echo "Port: ${HOST_PORT}" >> ${VNC_OUTFILE}
     echo "Password: ${PASSWORD}" >> ${VNC_OUTFILE}
@@ -34,13 +34,23 @@ SCRIPT_PID=$(pgrep -s 0 -f {{xstartup}})
 
 {{> _ssh_tunnel}}
 
+{{#after}}
+# Run developer supplied after script
+source {{after}}
+{{/after}}
+
 # Create the connection file
-create_connfile
+create_yml
 
 {{> _tcp_server}}
 
 # Wait for main process to finish
 while [ -e /proc/${SCRIPT_PID} ]; do sleep 0.1; done
 
+{{#clean}}
+# Run developer supplied clean script
+source {{clean}}
+{{/clean}}
+
 # Exit cleanly
 exit 0

data/templates/script/vnc.mustache

@@ -55,11 +55,11 @@ SCRIPT_PID=$(pgrep -s 0 -f {{xstartup}})
 {{> _ssh_tunnel}}
 
 {{#novnc?}}
-# Port helpers
-{{> _port_helpers}}
+# Bash helper functions
+{{> _bash_helpers}}
 
 # Launch noVNC on available port
-export WEB_PORT=$(get_port)
+export WEB_PORT=$(find_port)
 {{{novnc_launcher}}} --vnc localhost:${HOST_PORT} --listen ${WEB_PORT} >> ${VNC_LOGFILE} 2>&1 &
 {{/novnc?}}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osc-vnc
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Jeremy Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pbs
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -106,15 +112,17 @@ files:
 - lib/osc/vnc/version.rb
 - osc-vnc.gemspec
 - templates/conn/awesim.mustache
+- templates/conn/awesim_vnc.mustache
 - templates/conn/jnlp.mustache
 - templates/conn/novnc.mustache
 - templates/conn/osc.mustache
+- templates/conn/osc_vnc.mustache
 - templates/conn/osxvnc.mustache
 - templates/conn/terminal.mustache
 - templates/conn/txt.mustache
 - templates/conn/vnc.mustache
 - templates/conn/yaml.mustache
-- templates/script/_port_helpers.mustache
+- templates/script/_bash_helpers.mustache
 - templates/script/_setup_env.mustache
 - templates/script/_ssh_tunnel.mustache
 - templates/script/_start_vncserver.mustache

data/templates/script/_port_helpers.mustache

@@ -1,28 +0,0 @@
-# Generate random integer in range [$1..$2)
-function random () {
-    local MIN=$1
-    local MAX=$2
-    local RANGE=$((MAX - MIN))
-    local RAND=$(od -An -N4 -t uL /dev/urandom | tr -d " ")
-    local RAND_MAX=$((2**(4*8)))
-
-    local FLOAT=$(echo "$RANGE * ($RAND / $RAND_MAX) + $MIN" | bc -l)
-
-    echo $(echo "$FLOAT / 1" | bc)
-}
-
-# Check if port is used
-function used_ports () {
-    local PORT=$1
-
-    echo $(netstat -lnt | awk -v port=$PORT '$6 == "LISTEN" && $4 ~ ":"port"$"' | wc -l)
-}
-
-# Get available port
-function get_port () {
-  local PORT=$(random 2000 65535)
-  while [[ $(used_ports ${PORT}) -ne 0 ]]; do
-      PORT=$(random 2000 65535)
-  done
-  echo ${PORT}
-}