avst-wizard 0.0.23 → 0.0.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzM2Y2M3ZTg4ZmIyNDI3MGUyNzI1OTk4NmMwZGM1NzA1MjQ2YjY3Yw==
+    ZWU2YzdhN2Y2NjE3MTlmZDI0NDJlZTVjZjk4YzQwNGJjNWQ2ZjFkOQ==
   data.tar.gz: !binary |-
-    M2IzZjIyOWUxMWMxOGQzNDE5ZjVjOGQwZTU2NTA2MzhjMDAxNTgzMA==
+    ZmI4ZjA2ODcxMTNiYzk0NDg0NTM3YjNjNzEzYWZkZWVmOTg0NWZmNA==
 SHA512:
   metadata.gz: !binary |-
-    MjFjNTI1YzE0OWI1OGJjNmZjNmI5NzhiNmE3YWE5OGEzZTAyNjJjMmQ1M2Zj
-    MTAxOTUwNDgwMGJhYjQ3NzM2MjVlNWQxOTgwYWRmMmI4NTRmNTM3MTNjNzZk
-    NWJlMTA5YTc1NjVmYjI0MDM0Y2YwMDQ4NTc0MzI4MTcyY2RkODE=
+    ZTdiN2YzM2RmZjBhNTRlOWZjYjk2ZjQxMjlkY2Q4NjNiMTE1ZjFhNzdjNWZl
+    MmJmMTM5ZDhlZWFjZTdiNzkyODk0ZjkwNTkxYmZhOTk4ZWMxMDM1NWQ0ODA1
+    YTQxNDVhMzFiNjBlY2QxMmQ5OTI1NjVjYWIxMTllOGMyYzIwN2Q=
   data.tar.gz: !binary |-
-    YjIzYzU1NDQyNWQxMzRhMDY5ZTdkZDNhNzYyODQ5NzI2NjEzZmQ0ZDMwMDE1
-    ZTRiY2M4OTg3YmQ4YjFhYTI2M2Q3Y2JlNjFmMTE5MjBmZGViMmU0YWViMjUy
-    N2UxNWJmODdhMWU3MDQ3ZTQ5OTBlNTRjNWVmOTI1ZDE0ZTlhMmY=
+    NmY3ZmFjMDU1NDIxOTQ2ZDA2NzEwMThhMDhlN2Y1NjU1Njg1NGFjMmYyMjQz
+    ZGU5MmI2ZmFkMTcwNGQzNGIwZTI0NWU3MGQyOTEzNWE1Y2ExZDFhZTdiZjk1
+    ZWFjM2JhZjgzY2I5ZDYyNTMyMWEyOGI2MzhjN2I3ZDdkMTI2NzY=

data/README.md

@@ -118,7 +118,7 @@ Tested with versions:
 - crowd - 2.7.2, 2.6.4, 2.8.0, 2.8.3
 - confl - 5.6.3, 5.2.5, 5.3.1, 5.8.10, 5.7.3
 - bamboo - 5.7.1, 5.6.0, 5.9.4
-- jira  - 6.3.6, 6.2.7, 6.4.11
+- jira  - 6.3.6, 6.2.7, 6.4.11, 7.0.9, 7.1.7
 - bitbucket - 2.0.3, 3.6.0, 4.0.0
 
 ## License

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.23'
+  spec.version       = '0.0.24'
   spec.authors       = ["Martin Brehovsky"]
   spec.email         = ["mbrehovsky@adaptavist.com"]
   spec.summary       = %q{Avstwizard}

data/bin/avst-wizard

@@ -134,7 +134,8 @@ unless base_url
     abort("Please provide base_url and product_type options!!!").red
 end
 begin
-    runner = AvstWizard::AvstWizard.new(base_url, required_config)
+    url_required_part = conf.get_config("url_required_part", false)
+    runner = AvstWizard::AvstWizard.new(base_url, required_config, url_required_part)
 
 
     # wait for app to start  

data/config/hiera/confluence/5.7.4/default.yaml

@@ -0,0 +1,59 @@
+---
+
+required_config:
+    '/setup/setuplicense.action':
+        licenseString: "license"
+    '/setup/setupdbchoice-start.action':
+        dbConfigInfo.databaseUrl: "database_url"
+        dbConfigInfo.userName: "database_user"
+        dbConfigInfo.password: "database_pass"
+    '/setup/setupadministrator-start.action':
+        username: "admin_user"
+        fullName: "admin_full_name"
+        email: "admin_email"
+        password: "admin_pass"
+
+stages:
+    '/setup/setupstart.action':
+        post_url: 'setup/dosetupstart.action'
+        values:
+            setupTypeCustom: "Next"
+    '/setup/setuplicense.action':
+        post_url: 'setup/dosetuplicense.action'
+        values:
+            licenseString: "%{license}"
+            setupTypeCustom: "Next"
+    '/setup/setupdbchoice-start.action':
+        post_url: 'setup/setupstandarddb.action'
+        values:
+            dbConfigInfo.driverClassName: "%{database_driver_class}" #"com.mysql.jdbc.Driver"
+            dbConfigInfo.databaseUrl: "%{database_url}"
+            dbConfigInfo.userName: "%{database_user}"
+            dbConfigInfo.password: "%{database_pass}"
+            database: "%{database_type}"
+            edit: "Next"
+    '/setup/setupdata-start.action':
+        post_url: 'setup/setupdata.action'
+        values:
+            dbchoiceSelect: "Empty+Site"
+            contentChoice: "blank"
+    '/setup/setupusermanagementchoice-start.action':
+        post_url: 'setup/setupusermanagementchoice.action'
+        values:
+            userManagementChoice: "internal"
+            internal: "Manage+users+and+groups+within+Confluence"
+    '/setup/setupadministrator-start.action':
+        post_url: 'setup/setupadministrator.action'
+        values:
+            username: "%{admin_user}"
+            fullName: "%{admin_full_name}"
+            email: "%{admin_email}"
+            password: "%{admin_pass}"
+            confirm: "%{admin_pass}"
+            edit: "Next"
+    '/setup/finishsetup.action':
+        final: true
+    '/dashboard.action':
+        final: true
+    '/login.action':
+        final: true

data/config/hiera/jira/7.0.9/default.yaml

@@ -0,0 +1,103 @@
+---
+
+required_config:
+    '/secure/SetupLicense!default.jspa':
+        setupLicenseKey: "license"
+    '/secure/SetupApplicationProperties!default.jspa':
+        baseURL: "base_url" # "http://localhost"
+        title: "instance_name"
+    '/secure/SetupDatabase!default.jspa':
+        jdbcHostname: "database_url" #"localhost"
+        jdbcDatabase: "database_name"
+        jdbcUsername: "database_user"
+        jdbcPassword: "database_pass"
+    '/secure/SetupAdminAccount!default.jspa':
+        fullname: "admin_full_name"
+        email: "admin_email"
+        username: "admin_user"
+        password: "admin_pass"
+        confirm: "admin_pass"
+
+optional_config:
+    analytics-enabled: "mail_analytics_enabled"
+    from: "mail_notification_from"
+    serverName: "mail_server_name"
+    port: "mail_server_port"
+    username: "mail_server_user"
+    password: "mail_server_pass"
+
+stages:
+    '/secure/SetupMode!default.jspa':
+        post_url: 'secure/SetupMode.jspa'
+        values:
+            setupOption: "classic"
+    '/secure/SetupDatabase!default.jspa':
+        post_url: 'secure/SetupDatabase.jspa'
+        values:
+            databaseOption: "external"
+            databaseType: "%{database_type}" #"mysql/postgres72"
+            jdbcHostname: "%{database_url}" #"localhost"
+            jdbcPort: "%{database_port}" #"3306/5432"
+            jdbcDatabase: "%{database_name}"
+            jdbcSid: ""
+            jdbcUsername: "%{database_user}"
+            jdbcPassword: "%{database_pass}"
+            schemaName: "%{database_schema_name}" #""/public
+            testingConnection: "false"
+    '/secure/SetupApplicationProperties!default.jspa':
+        post_url: 'secure/SetupApplicationProperties.jspa'
+        values:
+            title: "%{instance_name}"
+            mode: "private"
+            baseURL: "%{base_url}"
+            nextStep: "true"
+    '/secure/SetupProductBundle!default.jspa':
+        post_url: 'secure/SetupProductBundle.jspa'
+        values:
+            selectedBundle: "TRACKING" # Choices: TRACKING, DEVELOPMENT, SERVICEDESK
+    '/secure/SetupLicense!default.jspa':
+        post_url: 'secure/SetupLicense.jspa'
+        values:
+            setupLicenseKey: "%{license}"
+            setupFirstName: ""
+            setupLastName: ""
+            setupEmail: ""
+            setupPluginLicenseKey: ""
+    '/secure/SetupAdminAccount!default.jspa':
+        complex: true
+        substages:
+            'action="SetupAdminAccount.jspa"':
+                post_url: 'secure/SetupAdminAccount.jspa'
+                values:
+                    fullname: "%{admin_full_name}"
+                    email: "%{admin_email}"
+                    username: "%{admin_user}"
+                    password: "%{admin_pass}"
+                    confirm: "%{admin_pass}"
+            'action="SetupMailNotifications.jspa"':
+                post_url: 'secure/SetupMailNotifications.jspa'
+                values:
+                    analytics-enabled: "%{mail_analytics_enabled}"
+                    noemail: "true"
+                    name: "Default+SMTP+Server"
+                    from: "%{mail_notification_from}"
+                    prefix: "[JIRA]"
+                    mailservertype: "smtp"
+                    serviceProvider: "custom"
+                    serverName: "%{mail_server_name}"
+                    protocol: "smtp"
+                    port: "%{mail_server_port}"
+                    timeout: "10000"
+                    username: "%{mail_server_user}"
+                    password: "%{mail_server_pass}"
+                    jndiLocation: ""
+                    type: "smtp"
+                    testingMailConnection: "false"
+    '/secure/SetupProductBundleReport!default.jspa':
+        post_url: 'secure/SetupProductBundleReport.jspa'
+    '/secure/Dashboard.jspa?src=SetupComplete':
+        final: true
+    '/secure/WelcomeToJIRA.jspa':
+        final: true
+    '/secure/WelcomeToJIRASoftware.jspa':
+        final: true

data/config/hiera/jira/default.yaml

@@ -1,5 +1,7 @@
 ---
 
+# tested on Jira 7.1.7
+
 required_config:
     '/secure/SetupLicense!default.jspa':
         setupLicenseKey: "license"
@@ -18,6 +20,8 @@ required_config:
         password: "admin_pass"
         confirm: "admin_pass"
 
+url_required_part: 'secure'
+
 optional_config:
     analytics-enabled: "mail_analytics_enabled"
     from: "mail_notification_from"

data/lib/avst-wizard.rb

@@ -24,12 +24,13 @@ module AvstWizard
 
         attr_writer :atl_token
 
-        def initialize(url, required_config = {})
+        def initialize(url, required_config = {}, url_required_part=nil)
             @url = url
             @cookie = ""
             @current_url = ""
             @atl_token = ""
             @required_config = required_config
+            @url_required_part = url_required_part
         end
 
         # Does GET requests to url, follows redirects, stores cookies and xsrf.token if present
@@ -50,7 +51,7 @@ module AvstWizard
             if response['set-cookie']
                 @cookie = response['set-cookie'].split('; ')[0]
                 response['set-cookie'].split(';').each do |part|
-                    if ((part.include? "atl.xsrf.token") and (part.match(/atl.xsrf.token=(.*)/)))
+                    if ((part and part.include? "atl.xsrf.token") and (part.match(/atl.xsrf.token=(.*)/)))
                         # parse only the token
                         @atl_token = part.match(/atl.xsrf.token=(.*)/).captures[0]
                         break
@@ -59,14 +60,15 @@ module AvstWizard
                 puts "Found new cookie #{get_cookie}".yellow
             end
             if response['location']
-                puts "Redirected to: #{response['location']}".yellow
+                redirection_url = compose_redirection_url(response['location'])
+                puts "Redirected to: #{redirection_url}".yellow
             else
                 @current_url = url.request_uri
                 puts "Ended in: #{@current_url}".yellow
             end
             case response
             when Net::HTTPSuccess     then response.code.to_i
-            when Net::HTTPRedirection then get_stage_and_fetch_cookie(response['location'], limit - 1)
+            when Net::HTTPRedirection then get_stage_and_fetch_cookie(redirection_url, limit - 1)
             else
                 puts response.body
                 puts response.code.to_s
@@ -74,6 +76,23 @@ module AvstWizard
             end
         end
 
+        def compose_redirection_url(location)
+            # in case response['location'] is not full url we need to compose it
+            # if it does contain base_url we assume it is ok
+            if location.include? @url
+                location
+            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}"
+                else
+                    # if required url part is present prepend url
+                    # TODO: better check with regexp
+                    "#{@url}#{location}"
+                end
+            end 
+        end
+
         # add atl_token to cookie in case it is present
         def get_cookie
             resp = @cookie
@@ -165,8 +184,9 @@ module AvstWizard
                 puts "Current : #{@url}#{@current_url}".yellow
                 # puts "BODY: #{response.body}"
                 redirected = true
-                if response['location'] and response['location'] != "#{@url}#{@current_url}"
-                    @current_url = URI.parse(response['location'].to_s).request_uri
+                if response['location'] and !"#{@url}/#{@current_url}".include? response['location']
+                    redirection_url = compose_redirection_url(response['location'])
+                    @current_url = URI.parse(redirection_url).request_uri
                 else
                     puts "Was not redirected, staying on page...".yellow
                     redirected = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avst-wizard
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Martin Brehovsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,7 @@ files:
 - config/hiera/confluence/5.3.1/default.yaml
 - config/hiera/confluence/5.6.3/default.yaml
 - config/hiera/confluence/5.7.3/default.yaml
+- config/hiera/confluence/5.7.4/default.yaml
 - config/hiera/confluence/5.7/default.yaml
 - config/hiera/confluence/default.yaml
 - config/hiera/confluence/test.yaml
@@ -146,6 +147,7 @@ files:
 - config/hiera/jira/6.2.7/default.yaml
 - config/hiera/jira/6.3.12/default.yaml
 - config/hiera/jira/6.3.6/default.yaml
+- config/hiera/jira/7.0.9/default.yaml
 - config/hiera/jira/default.yaml
 - config/hiera/jira/test.yaml
 - lib/advanced_hash.rb