avst-wizard 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7336268a84e10c7e0effc25dec1ecb0f2f94fa9a
-  data.tar.gz: d0b31a0eb531083c8fa1144f8ccee9f9e3dac378
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzM2Y2M3ZTg4ZmIyNDI3MGUyNzI1OTk4NmMwZGM1NzA1MjQ2YjY3Yw==
+  data.tar.gz: !binary |-
+    M2IzZjIyOWUxMWMxOGQzNDE5ZjVjOGQwZTU2NTA2MzhjMDAxNTgzMA==
 SHA512:
-  metadata.gz: c8de9471d223b86deabee4b37f31009991adfc79680d37e1c65b1f8b3d5de4625b618fb4d89cb22aa5c90a5b291031340940c67bc221707fdfdc033972a4ef50
-  data.tar.gz: bb5ddf1a1c706db1c01bdf99cef73cf210b38f7f4e5335b39003970a0c0f6605f7393c17fc955af50b1cbc4f1e6ad02510ac3e04269faa2ea9297d91bab1d0ed
+  metadata.gz: !binary |-
+    MjFjNTI1YzE0OWI1OGJjNmZjNmI5NzhiNmE3YWE5OGEzZTAyNjJjMmQ1M2Zj
+    MTAxOTUwNDgwMGJhYjQ3NzM2MjVlNWQxOTgwYWRmMmI4NTRmNTM3MTNjNzZk
+    NWJlMTA5YTc1NjVmYjI0MDM0Y2YwMDQ4NTc0MzI4MTcyY2RkODE=
+  data.tar.gz: !binary |-
+    YjIzYzU1NDQyNWQxMzRhMDY5ZTdkZDNhNzYyODQ5NzI2NjEzZmQ0ZDMwMDE1
+    ZTRiY2M4OTg3YmQ4YjFhYTI2M2Q3Y2JlNjFmMTE5MjBmZGViMmU0YWViMjUy
+    N2UxNWJmODdhMWU3MDQ3ZTQ5OTBlNTRjNWVmOTI1ZDE0ZTlhMmY=

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+notifications:
+  email: false
+  hipchat:
+    rooms:
+      secure: ihp1kldchHoVGm3egGVI/zysPtxCxXgpyb5UOI1fTQxwsYMhmQSoJ5HtnS1v6CFC2wcObGoSIwuGkUJYbdZiMPUMJa6Qu1prExgDcH4YeK2l0arUe4mHPVvl3hHjm0/xVQvSAgwBsw9lQ/ANrcliDEHej94vC00vp+zuEkW2UmjPlmtsu6+AVpyZR3zxedYX4fY/ZFlinDajpkn4N/wI5EYysostT0cYZbl6A2UJg1PAS1H2+UHwLJ6Muu9q6Z9I6fxa3dXrkaO9rE8cvKDhwKfn9gnxbA8lRylHqOY8Nty5F2tnSVbo5vs3RGIaHgGWZNj7ckp+jrEzSZfyEw8bialDjayDVKnNyLVN8/Zd4CbChHe2/I7ylUSEWxDz8G8nohZxJG59ERdmZ8wRI5VittanjkdOTH+Cq/fooK/fIu/zPm31iwhhydBkFzuKbrlQVIobptyYYnoX5JVU8Jte9A9biIuXiCeSFltZk650Vu9mTZBTAEshC5srHMrVtPhDgXxB3DG8+EjRnugmBt0RHeXW88j/LjRkruWOyr0Xv3VgXgLcZBUVKtpSNRno58HbOkIcG8ZPMKGPgOQhbBUFfRMzpRAdnGpGmm5Xq23uBd50VLq+qKp/DM2M37l8dC49Mm4sDvsTjqx3sK5mDbyGtFxx0pWhzHWD3UM0edR9t8g=
+    template:
+    - 'Gem - %{repository} #%{build_number} (%{build_url}) by %{author}: %{message}'
+rvm:
+- 2.0.0
+deploy:
+  provider: rubygems
+  api_key:
+    secure: PV1wcd2GAIw4MnhmfUddHGkZnjfryWaZVdEBHJJ8QP8+GyVCh9Sphd+719ACCvjIuijNskdVoxJOc4LC7UVlZEee28Ixun8Gsn6vb+0Pj9J1RpluDBBM9R7IsUnfaQRJmkPSgEfJ8sPZ9oqYbuBn4PUgDz1iA64rEyBoypu0F9q//q5fZ/DkzNtlvfXUHsClePcYvJZnCwjy2BmRnOMC89qn/8AVD6RyN9ZiCVGFyo1LZYSwfmGUiRrDOHBsqj0R+gdPBh7KRjC4znNR+Iw3URmaInUmwL+cek5GRMm7a9Ld9aS5kD/Q6mCQKZpSjMtyh9XMr3lj4DjU7CVJQgiMWYD1GD1ywOXlH08JummwGuEvAlJh5g9pyqCShOQtGXFZZMqVsjTMbddUKIaCmuCMCS0ktDUdaZPD4mmQz+BH7vwqLJhhpFPf4cMOGNdkgPE2NFfTer2ogrKI/lN7OzCNBPKouykjLgRyco1CpfUcvIjnkGjx8/ceiHoXQsRO/JbQqqprbNgTkHlG/CODpHoxaN//7IopGiZRjmMQX+KgLJuiTl974KPeStzjFlhM7Jx82fdJo1FlnQoJSuzAwm0fVFbsoNFcPD3iLV2hxLiAxMIPqk2kP/OPqOXwGwusTw9+kC27daA1LV4eqs+ToHzh1KOHgAO2yWhxucTk8ZdyEGU=
+  gem: avst-wizard
+  on:
+    tags: true
+    repo: Adaptavist/avst-wizard

data/Rakefile

@@ -1,2 +1,4 @@
 require "bundler/gem_tasks"
 
+task :default => [:build]
+

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

data/bin/avst-wizard

@@ -64,6 +64,12 @@ end
 unless File.exists?(custom_config)
     abort("ERROR: Please ensure the file #{custom_config} exists").red
 end
+
+run_file="#{File.dirname(custom_config)}/.wizard_done.lock"
+if File.exists?(run_file)
+    exit
+end
+
 # read config file with variables to config stages in hiera
 config = YAML.load_file(custom_config)
 
@@ -238,6 +244,7 @@ begin
             called=false
         end
     end
+    File.open(run_file, 'w') {|f| f.write "Wizard run. Delete this file if you want to rerun it." }
 # In case something went wrong on the way
 rescue Exception => e
     message = e.message.force_encoding("utf-8")

data/config/hiera/bamboo/default.yaml

@@ -4,7 +4,7 @@ required_config:
     '/setup/setupLicense.action':
         licenseString: "license"
     '/setup/setupGeneralConfiguration.action':
-        baseUrl: "base_url" # "http://bamboo.vagrant"
+        baseUrl: "base_url" # "http://vcmlprodwiki.vagrant"
         installDir: "install_dir" #/opt/bamboo
         instanceName: "instance_name"
     '/setup/setupDatabase.action':
@@ -40,10 +40,10 @@ stages:
         wait_for_next_state: 20
         post_url: 'setup/performSetupDatabaseConnection.action'
         values:
-            selectedDatabase: "mysql"
+            selectedDatabase: "%{database_type}"
             connectionChoice: "jdbcConnection"
             datasourceName: ""
-            dbConfigInfo.driverClassName: "com.mysql.jdbc.Driver"
+            dbConfigInfo.driverClassName: "%{database_driver_class}"
             dbConfigInfo.databaseUrl: "%{database_url}"
             dbConfigInfo.userName: "%{database_user}"
             dbConfigInfo.password: "%{database_pass}"

data/config/hiera/bitbucket/2.0.3/default.yaml

@@ -24,9 +24,9 @@ stages:
                 values:
                     step: "database"
                     internal: "false"
-                    type: "mysql"
+                    type: "%{database_type}"
                     hostname: "%{database_url}"
-                    port: "3306"
+                    port: "%{database_port}"
                     database: "%{database_name}"
                     username: "%{database_user}"
                     password: "%{database_pass}"

data/config/hiera/bitbucket/3.6.0/default.yaml

@@ -24,9 +24,9 @@ stages:
                 values:
                     step: "database"
                     internal: "false"
-                    type: "mysql"
+                    type: "%{database_type}"
                     hostname: "%{database_url}"
-                    port: "3306"
+                    port: "%{database_port}"
                     database: "%{database_name}"
                     username: "%{database_user}"
                     password: "%{database_pass}"

data/config/hiera/bitbucket/default.yaml

@@ -24,9 +24,9 @@ stages:
                 values:
                     step: "database"
                     internal: "false"
-                    type: "mysql"
+                    type: "%{database_type}"
                     hostname: "%{database_url}"
-                    port: "3306"
+                    port: "%{database_port}"
                     database: "%{database_name}"
                     username: "%{database_user}"
                     password: "%{database_pass}"

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

@@ -32,11 +32,11 @@ stages:
     '/setup/setupstandarddb-start.action':
         post_url: 'setup/setupstandarddb.action'
         values:
-            dbConfigInfo.driverClassName: "com.mysql.jdbc.Driver"
+            dbConfigInfo.driverClassName: "%{database_driver_class}" #"com.mysql.jdbc.Driver"
             dbConfigInfo.databaseUrl: "%{database_url}"
             dbConfigInfo.userName: "%{database_user}"
             dbConfigInfo.password: "%{database_pass}"
-            database: "mysql"
+            database: "%{database_type}"
             edit: "Next"
     '/setup/setupdata-start.action':
         post_url: 'setup/setupdata.action'

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

@@ -32,11 +32,11 @@ stages:
     '/setup/setupstandarddb-start.action':
         post_url: 'setup/setupstandarddb.action'
         values:
-            dbConfigInfo.driverClassName: "com.mysql.jdbc.Driver"
+            dbConfigInfo.driverClassName: "%{database_driver_class}" #"com.mysql.jdbc.Driver"
             dbConfigInfo.databaseUrl: "%{database_url}"
             dbConfigInfo.userName: "%{database_user}"
             dbConfigInfo.password: "%{database_pass}"
-            database: "mysql"
+            database: "%{database_type}"
             edit: "Next"
     '/setup/setupdata-start.action':
         post_url: 'setup/setupdata.action'

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

@@ -25,11 +25,11 @@ stages:
     '/setup/setupdbchoice-start.action':
         post_url: 'setup/setupstandarddb.action'
         values:
-            dbConfigInfo.driverClassName: "com.mysql.jdbc.Driver"
+            dbConfigInfo.driverClassName: "%{database_driver_class}" #"com.mysql.jdbc.Driver"
             dbConfigInfo.databaseUrl: "%{database_url}"
             dbConfigInfo.userName: "%{database_user}"
             dbConfigInfo.password: "%{database_pass}"
-            database: "mysql"
+            database: "%{database_type}"
             edit: "Next"
     '/setup/setupdata-start.action':
         post_url: 'setup/setupdata.action'

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

@@ -25,11 +25,11 @@ stages:
     '/setup/setupdbchoice-start.action':
         post_url: 'setup/setupstandarddb.action'
         values:
-            dbConfigInfo.driverClassName: "com.mysql.jdbc.Driver"
+            dbConfigInfo.driverClassName: "%{database_driver_class}" #"com.mysql.jdbc.Driver"
             dbConfigInfo.databaseUrl: "%{database_url}"
             dbConfigInfo.userName: "%{database_user}"
             dbConfigInfo.password: "%{database_pass}"
-            database: "mysql"
+            database: "%{database_type}"
             edit: "Next"
     '/setup/setupdata-start.action':
         post_url: 'setup/setupdata.action'

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

@@ -25,11 +25,11 @@ stages:
     '/setup/setupdbchoice-start.action':
         post_url: 'setup/setupstandarddb.action'
         values:
-            dbConfigInfo.driverClassName: "com.mysql.jdbc.Driver"
+            dbConfigInfo.driverClassName: "%{database_driver_class}" #"com.mysql.jdbc.Driver"
             dbConfigInfo.databaseUrl: "%{database_url}"
             dbConfigInfo.userName: "%{database_user}"
             dbConfigInfo.password: "%{database_pass}"
-            database: "mysql"
+            database: "%{database_type}"
             edit: "Next"
     '/setup/setupdata-start.action':
         post_url: 'setup/setupdata.action'

data/config/hiera/confluence/default.yaml

@@ -33,11 +33,11 @@ stages:
     '/setup/setupdbchoice-start.action':
         post_url: 'setup/setupstandarddb.action'
         values:
-            dbConfigInfo.driverClassName: "com.mysql.jdbc.Driver"
+            dbConfigInfo.driverClassName: "%{database_driver_class}" #"com.mysql.jdbc.Driver"
             dbConfigInfo.databaseUrl: "%{database_url}"
             dbConfigInfo.userName: "%{database_user}"
             dbConfigInfo.password: "%{database_pass}"
-            database: "mysql"
+            database: "%{database_type}"
             setup-next-button: "Next"
     '/setup/setupdata-start.action':
         post_url: 'setup/setupdata.action'

data/config/hiera/crowd/default.yaml

@@ -40,12 +40,12 @@ stages:
         post_url: 'console/setup/setupdatabase!update.action'
         values:
             databaseOption: "db.jdbc"
-            jdbcDatabaseType: "mysql"
-            jdbcDriverClassName: "com.mysql.jdbc.Driver"
+            jdbcDatabaseType: "%{database_type}"
+            jdbcDriverClassName: "%{database_driver_class}"
             jdbcUrl: "%{database_url}"
             jdbcUsername: "%{database_user}"
             jdbcPassword: "%{database_pass}"
-            jdbcHibernateDialect: "org.hibernate.dialect.MySQL5InnoDBDialect"
+            jdbcHibernateDialect: "%{database_hibernate_dialect}"
             jdbcOverwriteData: "false"
             datasourceDatabaseType: ""
             datasourceJndiName: ""

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

@@ -31,14 +31,14 @@ stages:
         post_url: 'secure/SetupDatabase.jspa'
         values:
             databaseOption: "EXTERNAL"
-            databaseType: "mysql"
+            databaseType: "%{database_type}" #"mysql/postgres72"
             jdbcHostname: "%{database_url}" #"localhost"
-            jdbcPort: "3306"
+            jdbcPort: "%{database_port}" #"3306/5432"
             jdbcDatabase: "%{database_name}"
             jdbcSid: ""
             jdbcUsername: "%{database_user}"
             jdbcPassword: "%{database_pass}"
-            schemaName: ""
+            schemaName: "%{database_schema_name}" #""/public
             testingConnection: "false"
             language: ""
             changingLanguage: "false"

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

@@ -35,14 +35,14 @@ stages:
         post_url: 'secure/SetupDatabase.jspa'
         values:
             databaseOption: "EXTERNAL"
-            databaseType: "mysql"
+            databaseType: "%{database_type}" #"mysql/postgres72"
             jdbcHostname: "%{database_url}" #"localhost"
-            jdbcPort: "3306"
+            jdbcPort: "%{database_port}" #"3306/5432"
             jdbcDatabase: "%{database_name}"
             jdbcSid: ""
             jdbcUsername: "%{database_user}"
             jdbcPassword: "%{database_pass}"
-            schemaName: ""
+            schemaName: "%{database_schema_name}" #""/public
             testingConnection: "false"
             language: ""
             changingLanguage: "false"

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

@@ -31,14 +31,14 @@ stages:
         post_url: 'secure/SetupDatabase.jspa'
         values:
             databaseOption: "EXTERNAL"
-            databaseType: "mysql"
+            databaseType: "%{database_type}" #"mysql/postgres72"
             jdbcHostname: "%{database_url}" #"localhost"
-            jdbcPort: "3306"
+            jdbcPort: "%{database_port}" #"3306/5432"
             jdbcDatabase: "%{database_name}"
             jdbcSid: ""
             jdbcUsername: "%{database_user}"
             jdbcPassword: "%{database_pass}"
-            schemaName: ""
+            schemaName: "%{database_schema_name}" #""/public
             testingConnection: "false"
             language: ""
             changingLanguage: "false"

data/config/hiera/jira/default.yaml

@@ -35,14 +35,14 @@ stages:
         post_url: 'secure/SetupDatabase.jspa'
         values:
             databaseOption: "external"
-            databaseType: "mysql"
+            databaseType: "%{database_type}" #"mysql/postgres72"
             jdbcHostname: "%{database_url}" #"localhost"
-            jdbcPort: "3306"
+            jdbcPort: "%{database_port}" #"3306/5432"
             jdbcDatabase: "%{database_name}"
             jdbcSid: ""
             jdbcUsername: "%{database_user}"
             jdbcPassword: "%{database_pass}"
-            schemaName: ""
+            schemaName: "%{database_schema_name}" #""/public
             testingConnection: "false"
     '/secure/SetupApplicationProperties!default.jspa':
         post_url: 'secure/SetupApplicationProperties.jspa'

data/lib/avst-wizard.rb

@@ -50,7 +50,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"
+                    if ((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

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: avst-wizard
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Martin Brehovsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: hiera_loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: hiera-eyaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Avstwizard
@@ -116,8 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
+- .editorconfig
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -160,17 +161,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Avstwizard