jenkins_shell 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 434109caa1b231794f93f311a118f18f29eb4fbc43381e9f892221108546caae
-  data.tar.gz: 25eed219a7b6f17a681d6b4836d4a6f7e3c6fad49a087010849ab6d41c95d16b
+  metadata.gz: bc19a7e7ac0de4a5dac9e02f534850b0229fdf1e064983d666f25c9b50d6c263
+  data.tar.gz: ef12b53b7d2a6bc2fbecffd3fc3a9d394458ebe2861c9f30d775c8be3f14f8c9
 SHA512:
-  metadata.gz: 87c29f1f6ebd30db7a74cf0fa9e2a7bb02745c3236dbe77b2b23ce64fb990cc515e66622c60d744499e1273f5e468a88038256218e5c8f09d9718b65efc9fb51
-  data.tar.gz: a10a1dbbfefba19c70ade3082f7193ce8cc38fc53eb1f51084cc388233c33c8fa533fb1a1400be1477c5418d721462a07f0c52c05e19eab5f6bdbc97c0daf330
+  metadata.gz: c1a25c31edc94c4569e53853951dc2b2c7d4bcb647ef1e20965cf727b7e7a182202e40c0b0c11b9d31ebfdb474654afdef2703b56e957b6a5515bf9f3ae2fb58
+  data.tar.gz: e8e141572b92e44d76c73474e44829f25518f15f7bf32571c543db519e1e7acb2ecd2649fb17479b301de6d8c1bdb22c196217dd83905f072408bd0ab54d410c

data/bin/jsh

@@ -26,12 +26,17 @@ end
 def parse(args)
     options = Hash.new
     options["password"] = nil
+    options["path"] = ""
     options["port"] = "8080"
+    options["os"] = JenkinsShell::OS.WINDOWS
     options["ssl"] = false
     options["username"] = nil
     options["verbose"] = false
 
-    info = "Simulate a cmd prompt using Jenkins script functionality"
+    info = [
+        "Simulate a Linux/Windows prompt using Jenkins script",
+        "functionality"
+    ].join(" ")
 
     parser = OptionParser.new do |opts|
         opts.summary_width = 26
@@ -51,17 +56,26 @@ def parse(args)
             exit JShExit::GOOD
         end
 
+        opts.on("-l", "--linux", "Remote OS is Linux") do
+            options["os"] = JenkinsShell::OS.LINUX
+        end
+
         opts.on("--nocolor", "Disable colorized output") do
             Hilighter.disable
         end
 
         opts.on(
             "--password=PASSWORD",
-            "Use specified password (will prompt if not provided)"
+            "Use specified password (will prompt",
+            "if not provided)"
         ) do |password|
             options["password"] = password
         end
 
+        opts.on("--path=PATH", "Path from root of host") do |path|
+            options["path"] = path.gsub(/^\//, "")
+        end
+
         opts.on(
             "-p",
             "--port=PORT",
@@ -85,6 +99,14 @@ def parse(args)
         ) do
             options["verbose"] = true
         end
+
+        opts.on(
+            "-w",
+            "--windows",
+            "Remote OS is Windows (default)"
+        ) do
+            options["os"] = JenkinsShell::OS.WINDOWS
+        end
     end
 
     begin
@@ -125,20 +147,21 @@ options = parse(ARGV)
 begin
     passwd = options["password"]
     passwd = get_password if (options["username"] && passwd.nil?)
-    jsh = JenkinsShell.new(
-        options["host"],
-        options["port"],
-        options["ssl"],
-        options["username"],
-        passwd
-    )
+    options["password"] = passwd
+    jsh = JenkinsShell.new(options)
 
     djinni = Djinni.new
     djinni.fallback = "cmd"
     djinni.load_wishes(
         "#{File.dirname(__FILE__)}/../lib/jenkins_shell/wish"
     )
-    djinni.prompt({"jsh" => jsh}, "#{jsh.pwd}> ".light_white)
+    case options["os"]
+    when JenkinsShell::OS.LINUX
+        prompt = "#{jsh.pwd}$ ".light_white
+    when JenkinsShell::OS.WINDOWS
+        prompt = "#{jsh.pwd}> ".light_white
+    end
+    djinni.prompt({"jsh" => jsh, "os" => options["os"]}, prompt)
 rescue SystemExit
     # Quite from djinni
     # Exit gracefully

data/lib/jenkins_shell.rb

@@ -31,8 +31,21 @@ class JenkinsShell
         end
 
         # Create Groovy script
-        fix = dir.gsub(/\\/, "\\\\\\")
-        gs = "println(\"cmd /c cd #{fix} && #{cmd}\".execute().text)"
+        gs = [
+            "println(\"",
+            "#{
+                case @os
+                when JenkinsShell::OS.LINUX
+                    # FIXME
+                    # "cd #{dir} && #{cmd}"
+                    cmd
+                when JenkinsShell::OS.WINDOWS
+                    "cmd /c cd #{dir.gsub(/\\/, "\\\\\\")} && #{cmd}"
+                end
+            }",
+            "\".execute().text",
+            ")"
+        ].join
 
         # Make POST request and return command output
         xml = post("/script", "script=#{encode(gs)}")[1]
@@ -54,7 +67,7 @@ class JenkinsShell
             http.use_ssl = @ssl
 
             # Create request
-            req = Net::HTTP::Get.new(path)
+            req = Net::HTTP::Get.new("#{@path}#{path}")
             req["Cookie"] = @cookie if (@cookie)
 
             # Send request and get response
@@ -79,21 +92,40 @@ class JenkinsShell
     end
     private :get
 
-    def initialize(
-        host,
-        port = 8080,
-        ssl = false,
-        username = nil,
-        password = nil
-    )
+    def initialize(params)
         @cookie = nil
         @crumb = nil
         @int_cwd = "."
-        @host = host.gsub(/^https?:\/\/|(:[0-9]+)?\/.+/, "")
-        @password = password
-        @port = port
-        @ssl = ssl
-        @username = username
+
+        creds = "(([^:]+)(:(.+))?@)?"
+        host = "([^:/]+)"
+        path = "(/(.+))?"
+        port = "(:([0-9]+))?"
+        prot = "(https?)://"
+
+        params["host"].match(
+            /^#{prot}#{creds}#{host}#{port}#{path}/
+        ) do |m|
+            @host = m[6]
+            @password = m[5]
+            @path = m[10]
+            @port = m[8]
+            case m[1]
+            when "http"
+                @ssl = false
+            when "https"
+                @ssl = true
+            end
+            @username = m[3]
+        end
+
+        @os = params["os"]
+        @password ||= params["password"]
+        @path ||= params["path"]
+        @path = "/#{@path}" if (@path)
+        @port ||= params["port"] || 8080
+        @ssl ||= params["ssl"] || false
+        @username ||= params["username"]
 
         # Initialize @cwd
         @cwd = pwd
@@ -123,7 +155,7 @@ class JenkinsShell
             http.use_ssl = @ssl
 
             # Create request
-            req = Net::HTTP::Post.new(path)
+            req = Net::HTTP::Post.new("#{@path}#{path}")
             req.body = body.join("&")
             req["Cookie"] = @cookie if (@cookie)
 
@@ -150,8 +182,13 @@ class JenkinsShell
     private :post
 
     def pwd(dir = @int_cwd)
-        command("dir", dir).match(/^\s+Directory of (.+)/) do |m|
-            return m[1]
+        case @os
+        when JenkinsShell::OS.LINUX
+            return command("pwd", dir)
+        when JenkinsShell::OS.WINDOWS
+            command("dir", dir).match(/^\s+Directory of (.+)/) do |m|
+                return m[1]
+            end
         end
         return ""
     end
@@ -171,3 +208,4 @@ class JenkinsShell
 end
 
 require "jenkins_shell/error"
+require "jenkins_shell/os"

data/lib/jenkins_shell/os.rb

@@ -0,0 +1,9 @@
+class JenkinsShell::OS
+    def self.LINUX
+        return 1
+    end
+
+    def self.WINDOWS
+        return 2
+    end
+end

data/lib/jenkins_shell/wish/cd_wish.rb

@@ -11,6 +11,12 @@ class CDWish < Djinni::Wish
     end
 
     def execute(args, djinni_env = Hash.new)
+        case djinni_env["os"]
+        when JenkinsShell::OS.LINUX
+            puts "Currently unsupported for Linux"
+            return
+        end
+
         usage if (args.empty?)
 
         jsh = djinni_env["jsh"]
@@ -19,7 +25,12 @@ class CDWish < Djinni::Wish
             return
         end
 
-        djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+        case djinni_env["os"]
+        when JenkinsShell::OS.LINUX
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}$ ".light_white
+        when JenkinsShell::OS.WINDOWS
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+        end
     end
 
     def usage

data/lib/jenkins_shell/wish/cmd_wish.rb

@@ -14,7 +14,13 @@ class CmdWish < Djinni::Wish
 
         jsh = djinni_env["jsh"]
         puts jsh.command(args)
-        djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+
+        case djinni_env["os"]
+        when JenkinsShell::OS.LINUX
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}$ ".light_white
+        when JenkinsShell::OS.WINDOWS
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+        end
     end
 
     def usage

data/lib/jenkins_shell/wish/ls_wish.rb

@@ -11,8 +11,15 @@ class LSWish < Djinni::Wish
 
     def execute(args, djinni_env = Hash.new)
         jsh = djinni_env["jsh"]
-        puts jsh.command("dir #{args}")
-        djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+
+        case djinni_env["os"]
+        when JenkinsShell::OS.LINUX
+            puts jsh.command("ls #{args}")
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}$ ".light_white
+        when JenkinsShell::OS.WINDOWS
+            puts jsh.command("dir #{args}")
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+        end
     end
 
     def usage

data/lib/jenkins_shell/wish/pwd_wish.rb

@@ -14,7 +14,13 @@ class PwdWish < Djinni::Wish
 
         jsh = djinni_env["jsh"]
         puts jsh.pwd if (args.empty?)
-        djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+
+        case djinni_env["os"]
+        when JenkinsShell::OS.LINUX
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}$ ".light_white
+        when JenkinsShell::OS.WINDOWS
+            djinni_env["djinni_prompt"] = "#{jsh.cwd}> ".light_white
+        end
     end
 
     def usage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_shell
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Miles Whittaker
@@ -71,7 +71,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.3
 description: This gem will use the scripting functionality of Jenkins to simulate
-  a Windows cmd prompt.
+  a Linux shell or Windows cmd prompt.
 email: mjwhitta@gmail.com
 executables:
 - jsh
@@ -84,6 +84,7 @@ files:
 - lib/jenkins_shell/error/connection_refused.rb
 - lib/jenkins_shell/error/invalid_html_received.rb
 - lib/jenkins_shell/error/login_failure.rb
+- lib/jenkins_shell/os.rb
 - lib/jenkins_shell/wish/cd_wish.rb
 - lib/jenkins_shell/wish/cmd_wish.rb
 - lib/jenkins_shell/wish/ls_wish.rb
@@ -111,5 +112,5 @@ rubyforge_project:
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Simulate a cmd prompt using Jenkins.
+summary: Simulate a Linux/Windows prompt using Jenkins.
 test_files: []