Merge pull request ManageIQ#54 from Fryguy/cleanup_testing_deps

Cleanup testing dependencies

.travis.yml

@@ -5,19 +5,20 @@ sudo: false
 cache:
   bundler: true
   directories:
-    - spec/manageiq/vendor/assets/bower_components
-before_cache:
-- cat bower.json > spec/manageiq/vendor/assets/bower_components/bower.json
+  - vendor/assets/bower_components
 addons:
   postgresql: '9.4'
 env:
   matrix:
   - TEST_SUITE=spec
   - TEST_SUITE=spec:javascript
-before_install:
-- source ${TRAVIS_BUILD_DIR}/tools/ci/before_install.sh
+before_install: source tools/ci/before_install.sh
 before_script: bundle exec rake $TEST_SUITE:setup
 script: bundle exec rake $TEST_SUITE
+before_cache:
+- mkdir -p vendor/assets
+- mv spec/manageiq/vendor/assets/bower_components vendor/assets
+- cp bower.json vendor/assets/bower_components
 after_script: bundle exec codeclimate-test-reporter
 notifications:
   webhooks:

Gemfile

@@ -22,7 +22,3 @@ else
   puts "  Clone it from GitHub or symlink it from local source."
   exit 1
 end
-
-group :test do
-  gem "codeclimate-test-reporter", :require => false
-end

manageiq-ui-classic.gemspec

@@ -20,5 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "rails", "~> 5.0.0", ">= 5.0.0.1"
+
+  s.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
   s.add_development_dependency "simplecov"
 end

tools/ci/before_install.sh

@@ -1,27 +1,15 @@
 set -e
 
-# The bower cache already exists under spec/manageiq/vendor/assets/bower_components
-# and unfortunately it is not possible to git clone to a non-empty directory.
-mkdir -p spec/manageiq
-cd spec/manageiq
-git init
-git remote add origin https://github.com/ManageIQ/manageiq.git
-git pull origin master --depth=1
-cd -
-
-echo 'unless dependencies.detect { |d| d.name == "manageiq-ui-classic" }' >> spec/manageiq/Gemfile.dev.rb
-echo '  gem "manageiq-ui-classic", :path => "'$(/bin/pwd)'"' >> spec/manageiq/Gemfile.dev.rb
-echo 'end' >> spec/manageiq/Gemfile.dev.rb
+git clone https://github.com/ManageIQ/manageiq.git --branch master --depth 1 spec/manageiq
 
 cd spec/manageiq
 source tools/ci/setup_vmdb_configs.sh
-source tools/ci/setup_js_env.sh
 cd -
 
+source tools/ci/setup_js_env.sh
+
 # HACK: Temporary workaround until we can get the cross-repo scripts working properly
 # source spec/manageiq/tools/ci/setup_ruby_env.sh
 spec/manageiq/tools/ci/setup_ruby_environment.rb
-export BUNDLE_WITHOUT=development
-export BUNDLE_GEMFILE=${PWD}/Gemfile
 
 set +v

tools/ci/setup_js_env.sh

@@ -1,11 +1,14 @@
 which bower || npm install -g bower
 
 # Check if the bower cache is valid, otherwise delete it
-if ! cmp --silent bower.json spec/manageiq/vendor/assets/bower_components/bower.json; then
-  rm -rf spec/manageiq/vendor/assets/bower_components
+if ! cmp --silent bower.json vendor/assets/bower_components/bower.json; then
+  rm -rf vendor/assets/bower_components
 fi
 
-if [ -d spec/manageiq/vendor/assets/bower_components ]; then
+if [ -d vendor/assets/bower_components ]; then
+  # Restore the bower_components from cache
+  mkdir -p spec/manageiq/vendor/assets
+  mv vendor/assets/bower_components spec/manageiq/vendor/assets
   echo "bower assets installed... moving on."
 else
   bower install --allow-root -F --config.analytics=false