Merge 6a41625 into c61a447

.rspec

@@ -1,4 +1,3 @@
 --require spec_helper
---format Fuubar
 --order random
 --color

.travis.yml

@@ -12,11 +12,6 @@ rvm:
   - 2.1.0
   - ruby-head
 
-branches:
-  only:
-    - master
-    - develop
-
 matrix:
   allow_failures:
     - rvm: ruby-head

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## develop (unreleased)
 
+### Changes
+
+* Updated bundled gems.
+* Modernize Gemfile and .gemspec.
+
+
 ## 0.6.1 (5/26/2014)
 
 ### Changes

Gemfile

@@ -2,35 +2,4 @@
 
 source 'https://rubygems.org'
 
-gemspec
-
-group :docs do
-  gem 'inch', '~> 0.4.6'
-  gem 'relish', '~> 0.7'
-  gem 'yard', '~> 0.8.7.4'
-end
-
-group :development do
-  gem 'guard', '~> 2.6.1'
-  gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-cucumber', '~> 1.4.1'
-  gem 'guard-rspec', '~> 4.2.9'
-  gem 'guard-rubocop', '~> 1.1.0'
-  gem 'rb-fchange', '~> 0.0.6', require: false
-  gem 'rb-fsevent', '~> 0.9.4', require: false
-  gem 'rb-inotify', '~> 0.9.3', require: false
-  gem 'terminal-notifier-guard', '~> 1.5.3'
-end
-
-group :test do
-  gem 'aruba', '~> 0.5.4'
-  gem 'coveralls', '~> 0.7.0', require: false
-  gem 'cucumber', '~> 1.3.15'
-  gem 'flay', '~> 2.4.0'
-  gem 'flog', '~> 4.2.0'
-  gem 'fuubar', '~> 1.3.3'
-  gem 'reek', '~> 1.3.7'
-  gem 'rspec', '~> 2.14.1'
-  gem 'rspec-given', '~> 3.5.4'
-  gem 'rubocop', '~> 0.22.0', platforms: [:ruby_19, :ruby_20, :ruby_21]
-end
+gemspec development_group: :test

paper_house.gemspec

@@ -30,6 +30,34 @@ Gem::Specification.new do |gem|
   gem.test_files += Dir.glob('features/**/*')
 
   gem.required_ruby_version = '>= 1.9.3'
+
   gem.add_dependency 'POpen4', '~> 0.1.4'
   gem.add_dependency 'rake'
+
+  # guard
+  gem.add_development_dependency 'guard', '~> 2.6.1'
+  gem.add_development_dependency 'guard-bundler', '~> 2.0.0'
+  gem.add_development_dependency 'guard-cucumber', '~> 1.4.1'
+  gem.add_development_dependency 'guard-rspec', '~> 4.2.9'
+  gem.add_development_dependency 'guard-rubocop', '~> 1.1.0'
+  gem.add_development_dependency 'rb-fchange', '~> 0.0.6'
+  gem.add_development_dependency 'rb-fsevent', '~> 0.9.4'
+  gem.add_development_dependency 'rb-inotify', '~> 0.9.3'
+  gem.add_development_dependency 'terminal-notifier-guard', '~> 1.5.3'
+
+  # docs
+  gem.add_development_dependency 'inch', '~> 0.4.6'
+  gem.add_development_dependency 'relish', '~> 0.7'
+  gem.add_development_dependency 'yard', '~> 0.8.7.4'
+
+  # test
+  gem.add_development_dependency 'aruba', '~> 0.5.4'
+  gem.add_development_dependency 'coveralls', '~> 0.7.0'
+  gem.add_development_dependency 'cucumber', '~> 1.3.15'
+  gem.add_development_dependency 'flay', '~> 2.5.0'
+  gem.add_development_dependency 'flog', '~> 4.2.1'
+  gem.add_development_dependency 'reek', '~> 1.3.7'
+  gem.add_development_dependency 'rspec', '~> 3.0.0'
+  gem.add_development_dependency 'rspec-given', '~> 3.5.4'
+  gem.add_development_dependency 'rubocop', '~> 0.23.0'
 end

tasks/rubocop.rake

@@ -2,9 +2,9 @@
 
 begin
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
+  RuboCop::RakeTask.new
 rescue LoadError
   task :rubocop do
-    $stderr.puts 'Rubocop is disabled'
+    $stderr.puts 'RuboCop is disabled'
   end
 end