avst-wizard 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ee2da0daaa4a3ca100f74e05003691cce0cd4103c2f6552335a1261c0b027e4
-  data.tar.gz: 4b75fc0e27bcda51bc8f237890067c17b56033755b446e663c8f6c607b18e875
+  metadata.gz: a8d37c5820ea2f6fd92a477ccdee3c2e05678005cad08336d4872ccb7624ef71
+  data.tar.gz: 10c1045d59f7c9c2e1b4e935a790f784e26180b3c6098cfdf5e7240f3932087a
 SHA512:
-  metadata.gz: 39e7116d9b6ba67513541a3f0fb81866b7fde3ddb50df901f1fb141a9d80e54c2e45d94e9a16118d2062cd755f5d85c2c091269f3094ac07d4213c7570c8647d
-  data.tar.gz: bb5cc00b75e0ca00cf059a2436cdfa38d3ac49d66c9219204eb3fd2d22933053875f6062cb8e0056ddc6ce7877551f3727daf9ec5f9174596794f48da8aeaa7f
+  metadata.gz: 38dc274c2f493edd5313a2f56598b94311b18758b7828d6220dc6c8e4bfb847a7a230eb15dff67c9d378b531210a0e4506c80704f17b3515052f344a7861b74e
+  data.tar.gz: d4be9c5face01d2a53d450c8bd315304056d214de0fac8b1a351fad3a9dac40c36db5400cf8612ca549e80f3ee0dd56b70ce60c2169dd0d3a63af981307dcfcc

data/README.md

@@ -23,11 +23,14 @@ avst-wizard --hostname hostname --product_type product_type --base_url url --hie
 - hostname - will reference custom hiera config
 - product_type   - the product, one of (bamboo, confluence, crowd, fisheye, jira, stash)
 - url            - url to access the instance, http://jira.vagrant or http://jira.vagrant:8090
+- context_path   - context path of the url
 - hiera_config   - custom hiera.yaml file, defaults to hiera.yaml in project root
 - custom_config  - file with required params setup, defaults to config/config.yaml
 - ops            - Prints out required parameters to set for specified product
 -p, --use_tomcat_port PORT  - Use tomcat port to connect to the application
 
+An example: avst-wizard --custom_config /tmp/avst-wizard.yaml --product_type jira --base_url https://server.adaptavist.com/jira --context_path /jira --version 6.4.14
+
 ## Default usage and configuration
 
 Each Atlassian app requires in default usage parameters. The list per product_type can be displayed while running

data/avst-wizard.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "avst-wizard"
-  spec.version       = '0.0.36'
+  spec.version       = '0.0.37'
   spec.authors       = ["Martin Brehovsky"]
   spec.email         = ["mbrehovsky@adaptavist.com"]
   spec.summary       = %q{Avstwizard}

data/bin/avst-wizard

@@ -36,6 +36,7 @@ Options:
   -n, --hostname HOST                            Hostname for the server
   -p, --product_type PRODUCT_TYPE                Type of atlassian product (jira, confluence,...)
   -b, --base_url BASE_URL                        Url where the product is accessible
+  -t, --context_path CONTEXT_PATH               The context_path, if used, e.g /jira
   -c, --hiera_config CONFIG                      Hiera config file
   -f, --custom_config CUSTOM                     Contains key-values that will be available to hiera to configure stages [default: #{avst_wizard_base}/config/config.yaml]
   -p, --use_tomcat_port PORT                     Use tomcat port to connect to the application
@@ -54,6 +55,7 @@ end
 hostname     = options["--hostname"]
 product_type = options["--product_type"]
 base_url     = options["--base_url"]
+context_path     = options["--context_path"]
 use_tomcat_port = options["--use_tomcat_port"]
 
 hiera_config = options["--hiera_config"]
@@ -147,7 +149,7 @@ begin
         host_url = nil
         puts "Going via #{base_url}"
     end
-    runner = AvstWizard::AvstWizard.new(base_url, required_config, url_required_part, host_url)
+    runner = AvstWizard::AvstWizard.new(base_url, context_path, required_config, url_required_part, host_url)
 
 
     # wait for app to start  

data/lib/avst-wizard.rb

@@ -24,7 +24,7 @@ module AvstWizard
 
         attr_writer :atl_token
 
-        def initialize(url, required_config = {}, url_required_part=nil, host_url)
+        def initialize(url, context_path, required_config = {}, url_required_part=nil, host_url)
             @url = url
             @cookie = ""
             @current_url = ""
@@ -32,6 +32,7 @@ module AvstWizard
             @required_config = required_config
             @url_required_part = url_required_part
             @host_url = host_url
+            @context_path = context_path
         end
 
         # Does GET requests to url, follows redirects, stores cookies and xsrf.token if present
@@ -109,11 +110,11 @@ module AvstWizard
             else
                 # in Jira 7.1.7 location is databaseSetup.jspa not secure/databaseSetup.jspa
                 if @url_required_part and !location.include? "/#{@url_required_part}/"
-                    "#{@url}/#{@url_required_part}/#{location}"
+                    "#{@url}/#{@url_required_part}/#{remove_context_path(location)}"
                 else
                     # if required url part is present prepend url
                     # TODO: better check with regexp
-                    "#{@url}#{location}"
+                    "#{@url}#{remove_context_path(location)}"
                 end
             end 
             
@@ -131,7 +132,11 @@ module AvstWizard
         
         # get rid of params and other trash
         def get_current_url
-            @current_url.split(";")[0].split("?")[0]
+            remove_context_path(@current_url)
+        end
+
+        def remove_context_path(url)
+            @context_path ? url.split(";")[0].split("?")[0].sub(@context_path, "") : url.split(";")[0].split("?")[0]
         end
 
         #  get the value from the page's element
@@ -233,10 +238,10 @@ module AvstWizard
                 response = http.request(req)
                 puts "Response: #{response.inspect}".yellow
                 puts "Location: #{response['location'].to_s}".yellow
-                puts "Current : #{@url}#{@current_url}".yellow
+                puts "Current : #{@url}#{get_current_url}".yellow
                 # puts "BODY: #{response.body}"
                 redirected = true
-                if response['location'] and !"#{@url}/#{@current_url}".include? response['location']
+                if response['location'] and !"#{@url}/#{get_current_url}".include? response['location']
                     redirection_url = compose_redirection_url(response['location'])
                     @current_url = URI.parse(redirection_url).request_uri
                 else
@@ -255,7 +260,7 @@ module AvstWizard
                 # follow redirects, if redirected
                 if redirected and redirected == true
                     puts "Doing the redirection... #{redirected}".yellow
-                    get_stage_and_fetch_cookie("#{@url}#{@current_url}")
+                    get_stage_and_fetch_cookie("#{@url}#{get_current_url}")
                 else
                     # in case the app is waiting for an event
                     if wait_for_next_state != nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avst-wizard
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Martin Brehovsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler