.travis.yml in ridley-4.4.1 vs .travis.yml in ridley-4.4.2

@@ -1,13 +1,46 @@
-script: "bundle exec thor spec:$TEST_SUITE"
+sudo: false
 language: ruby
+addons:
+  apt:
+    packages:
+      - chef
+      - git
+      - graphviz
+      - libarchive12
+      - libarchive-dev
+      - libgecode-dev
+    sources:
+      - chef-stable-precise
+cache:
+  - apt
+  - bundler
+dist: precise
+
+script: "bundle exec thor spec:$TEST_SUITE"
+before_install:
+  - gem update --system
+  - gem install bundler
 env:
   - TEST_SUITE=unit
   - TEST_SUITE=acceptance
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 1.9
+  - 2.0
   - 2.1
-  - jruby-19mode
+#  - jruby-19mode
 matrix:
-  allow_failures:
-    - rvm: jruby-19mode
+  # allow_failures:
+  #   - rvm: jruby-19mode
+  include:
+    # Test against master of berkshelf
+    - rvm: 2.2
+      gemfile: berkshelf/Gemfile
+      before_install:
+        - gem update --system
+        - gem install bundler
+        - git clone --depth 1 https://github.com/berkshelf/berkshelf
+        - cd berkshelf
+        - echo "gem 'ridley', :path => '..'" >> Gemfile
+      install: bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+      env:
+      script: bundle exec thor spec:ci