.gitlab-ci.yml in puppet-repl-0.2.3 vs .gitlab-ci.yml in puppet-repl-0.3.0

@@ -1,21 +1,35 @@
 stages:
   - test
   - deploy
   - web_deploy
 
-variables:
-  HEROKU_STAGING_APP: murmuring-plateau-62715
-  HEROKU_PROD_APP: still-tor-57873
-
 .puppet_def: &puppet_job_def
   stage: test
   script:
+    - gem update --system > /dev/null
+    - gem install bundler > /dev/null
     - bundle install --without development
     - bundle exec puppet module install puppetlabs-stdlib
     - bundle exec rake spec
 
+web_trigger_staging:
+  type: web_deploy
+  variables:
+    REF: staging
+  only:
+    - tags
+  script:
+    - "curl -X POST -F token=$PREPL_BUILD_TRIGGER_TOKEN -F ref=$REF https://gitlab.com/api/v3/projects/1146764/trigger/builds"
+
+web_trigger_production:
+  type: web_deploy
+  variables:
+    REF: production
+  script:
+    - "curl -X POST -F token=$PREPL_BUILD_TRIGGER_TOKEN -F ref=$REF https://gitlab.com/api/v3/projects/1146764/trigger/builds"
+
 .ruby_193: &ruby193
   image: ruby:1.9.3
 
 .ruby_20: &ruby20
   image: ruby:2.0
@@ -37,82 +51,64 @@
   script:
     - dpl --provider=rubygems --api-key=$RUBYGEMS_API_KEY
   only:
     - tags
 
-# web_staging:
-#   stage: web_deploy
-#   before_script:
-#     - gem install dpl
-#   script:
-#     - dpl --provider=heroku --strategy=git --app=$HEROKU_STAGING_APP --api-key=$HEROKU_API_KEY
-#   only:
-#     - master
-#
-# web_production:
-#   stage: web_deploy
-#   before_script:
-#     - gem install dpl
-#   script:
-#     - dpl --provider=heroku --strategy=git --app=$HEROKU_PROD_APP --api-key=$HEROKU_API_KEY
-#   only:
-#     - tags
-
 puppet_38_ruby193:
   variables:
-    PUPPET_GEM_VERSION: '3.8'
+    PUPPET_GEM_VERSION: "~> 3.8"
   <<: *puppet_job_def
   <<: *ruby193
 
 puppet_38_ruby20:
   variables:
-    PUPPET_GEM_VERSION: '3.8'
+    PUPPET_GEM_VERSION: "~> 3.8"
   <<: *puppet_job_def
   <<: *ruby20
 
 puppet_38_ruby21:
   variables:
-    PUPPET_GEM_VERSION: '3.8'
+    PUPPET_GEM_VERSION: "~> 3.8"
   <<: *puppet_job_def
   <<: *ruby21
 
 puppet_43_ruby20:
   variables:
-    PUPPET_GEM_VERSION: '4.4'
+    PUPPET_GEM_VERSION: "~> 4.3"
   <<: *puppet_job_def
   <<: *ruby20
 
 puppet_43_ruby21:
   variables:
-    PUPPET_GEM_VERSION: '4.4'
+    PUPPET_GEM_VERSION: "~> 4.3"
   <<: *puppet_job_def
   <<: *ruby21
 
 puppet_43_ruby22:
   variables:
-    PUPPET_GEM_VERSION: '4.4'
+    PUPPET_GEM_VERSION: "~> 4.3"
   <<: *puppet_job_def
   <<: *ruby22
 
 puppet_44_ruby21:
   variables:
-    PUPPET_GEM_VERSION: '4.4'
+    PUPPET_GEM_VERSION: "~> 4.4"
   <<: *puppet_job_def
   <<: *ruby21
 
 puppet_44_ruby22:
   variables:
-    PUPPET_GEM_VERSION: '4.4'
+    PUPPET_GEM_VERSION: "~> 4.4"
   <<: *puppet_job_def
   <<: *ruby22
 
 puppet_45_ruby21:
   variables:
-    PUPPET_GEM_VERSION: '4.5'
+    PUPPET_GEM_VERSION: "~> 4.5"
   <<: *puppet_job_def
   <<: *ruby21
 
 puppet_45_ruby22:
   variables:
-    PUPPET_GEM_VERSION: '4.5'
+    PUPPET_GEM_VERSION: "~> 4.5"
   <<: *puppet_job_def
   <<: *ruby22