jenkins_shell 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62684f8fbf197dfe7f84b10e6f1360da5bf35ab0eb27007c8b13a6e284441679
-  data.tar.gz: 6dbcab48ec5d32b1c1a84c50c96f242cc40d7b7197a507f4e693be51e63f3eb4
+  metadata.gz: 8b75e3e5e33e080ce9171c0b0ee8db6516c0ac65caf40f6439f2ab29d46a8f48
+  data.tar.gz: 8d6e7aa40827b25a6c0ae21be8189aa91e2117100578a033dadfbb8d9adab657
 SHA512:
-  metadata.gz: a1ee32220ec85235db0fd0c0e0251d66afc9dcf1b3d6a6882653b0811586c3c4590bef39bc3d1ae0fc2765176a0861f4ba7c236704d82a386de01d2ac861e86c
-  data.tar.gz: d6ef8f8919d86791d3c1ffe7e393fe1e9df2c68629e04f9e41d42ab08788ccee98ad776d1694fb967f928e1d16699de72f087b749333a08ccddad3c16f33d28d
+  metadata.gz: ac037325b5a840fb70578e5dc11705b22d21653d0f26e8d8cae5afb550220d483076d4e992c137cbc7260fe5626a3a3d6eb0443fc8acf79caeae6bce598aa6fa
+  data.tar.gz: 317538957c5d1f4d0d4e16f170926d0e67cca4612652cf1acaeba0406030fac8cd3096e006274f72e359d16d4fc8ad08c8e5224ba2c919e0c85394ae81c9b4e6

data/bin/jsh

@@ -115,6 +115,9 @@ rescue Interrupt
 rescue Errno::EPIPE
     # Do nothing. This can happen if piping to another program such as
     # less. Usually if less is closed before we're done with STDOUT.
+rescue JenkinsShell::Error => e
+    puts e.message
+    exit JShExit::EXCEPTION
 rescue Exception => e
     $stderr.puts "Oops! Looks like an error has occured! If the " \
         "error persists, file a bug at:".wrap

data/lib/jenkins_shell/error/connection_refused.rb

@@ -0,0 +1,5 @@
+class JenkinsShell::Error::ConnectionRefused < JenkinsShell::Error
+    def initialize(host, port)
+        super("Connection to #{host}:#{port} refused")
+    end
+end

data/lib/jenkins_shell/error/invalid_html_received.rb

@@ -0,0 +1,5 @@
+class JenkinsShell::Error::InvalidHTMLReceived < JenkinsShell::Error
+    def initialize
+        super("Invalid HTML received")
+    end
+end

data/lib/jenkins_shell/error.rb

@@ -0,0 +1,5 @@
+class JenkinsShell::Error < RuntimeError
+end
+
+require "jenkins_shell/error/connection_refused"
+require "jenkins_shell/error/invalid_html_received"

data/lib/jenkins_shell.rb

@@ -26,14 +26,24 @@ class JenkinsShell
         gs = "println(\"cmd /c cd #{fix} && #{cmd}\".execute().text)"
         enc = URI::encode(URI::encode(gs), "&()/").gsub("%20", "+")
 
-        # Establish connection and send script
-        http = Net::HTTP.new(@host, @port)
-        xml = REXML::Document.new(
-            http.post("/script", "script=#{enc}").body
-        )
-
-        # Parse response and return script output
-        return xml.get_elements("html/body/div/div/pre")[1].text
+        begin
+            # Establish connection and send script
+            http = Net::HTTP.new(@host, @port)
+            xml = REXML::Document.new(
+                http.post("/script", "script=#{enc}").body
+            )
+
+            # Parse response and return script output
+            return xml.get_elements("html/body/div/div/pre")[1].text
+        rescue Errno::ECONNREFUSED
+            raise JenkinsShell::Error::ConnectionRefused.new(
+                @host,
+                @port
+            )
+        rescue REXML::ParseException
+            raise JenkinsShell::Error::InvalidHTMLReceived.new
+        end
+        return ""
     end
 
     def initialize(host, port = 8080)
@@ -50,3 +60,5 @@ class JenkinsShell
         return ""
     end
 end
+
+require "jenkins_shell/error"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_shell
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,9 @@ extra_rdoc_files: []
 files:
 - bin/jsh
 - lib/jenkins_shell.rb
+- lib/jenkins_shell/error.rb
+- lib/jenkins_shell/error/connection_refused.rb
+- lib/jenkins_shell/error/invalid_html_received.rb
 - lib/jenkins_shell/wish/cd_wish.rb
 - lib/jenkins_shell/wish/cmd_wish.rb
 - lib/jenkins_shell/wish/ls_wish.rb