Merge branch 'kyle-travis'

.travis.yml

-# Sets Travis to run the Ruby specs on OS X machines to be as close as possible
-# to the user environment.
-#
-language: objective-c
-addons:
- code_climate:
-   repo_token: 501acd9bc61d80ef6119b69ab42c52fa66cefddcc6724a1e93a79c3d3e32bf55  
-
-env:
-  - RVM_RUBY_VERSION=system
-  # - RVM_RUBY_VERSION=1.8.7-p358
+os:
+  - osx
+language: ruby
+cache: bundler
+rvm:
+  - system
 
 before_install:
-  - export LANG=en_US.UTF-8
-  - curl http://curl.haxx.se/ca/cacert.pem -o /usr/local/share/cacert.pem
-  - source ~/.rvm/scripts/rvm
-  - if [[ $RVM_RUBY_VERSION != 'system' ]]; then rvm install $RVM_RUBY_VERSION; fi
-  - rvm use $RVM_RUBY_VERSION
-  - if [[ $RVM_RUBY_VERSION == 'system' ]]; then sudo gem install bundler --no-ri --no-rdoc; else gem install bundler --no-ri --no-rdoc; fi
-
+  # There is a bug in travis. When using system ruby, bundler is not
+  # installed and causes the default install action to fail.
+  - sudo gem install bundler
 
-install:
-  - sudo bundle install --without=documentation
-
-  # CocoaPods/CocoaPods specific
+after_install:
   - ./bin/pod repo update --silent
 
-script: bundle exec rake spec
+addons:
+ code_climate:
+   repo_token: 501acd9bc61d80ef6119b69ab42c52fa66cefddcc6724a1e93a79c3d3e32bf55  
+

Rakefile

@@ -281,7 +281,10 @@ begin
 
   if RUBY_VERSION >= '1.9.3'
     require 'rubocop/rake_task'
-    RuboCop::RakeTask.new
+
+    RuboCop::RakeTask.new(:rubocop) do |task|
+      task.patterns = ['lib', 'spec']
+    end
   end
 
 rescue LoadError, NameError => e