From 7b0347b447a820283de14e29d5c65dbebb4d0d82 Mon Sep 17 00:00:00 2001
From: Yasuhito Takamiya <yasuhito@gmail.com>
Date: Thu, 5 Jun 2014 10:47:47 +0900
Subject: [PATCH 1/7] Modernize Gemfile.

---
 Gemfile             | 33 +--------------------------------
 paper_house.gemspec | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index 91fc139..fc9489a 100644
--- a/Gemfile
+++ b/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
diff --git a/paper_house.gemspec b/paper_house.gemspec
index 1b71220..8118e63 100644
--- a/paper_house.gemspec
+++ b/paper_house.gemspec
@@ -30,6 +30,35 @@ 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.4.0'
+  gem.add_development_dependency 'flog', '~> 4.2.0'
+  gem.add_development_dependency 'fuubar', '~> 1.3.3'
+  gem.add_development_dependency 'reek', '~> 1.3.7'
+  gem.add_development_dependency 'rspec', '~> 2.14.1'
+  gem.add_development_dependency 'rspec-given', '~> 3.5.4'
+  gem.add_development_dependency 'rubocop', '~> 0.22.0'
 end

From a9b283fc9157090d84dda7619131ef5a48fdbcae Mon Sep 17 00:00:00 2001
From: Yasuhito Takamiya <yasuhito@gmail.com>
Date: Thu, 5 Jun 2014 10:49:02 +0900
Subject: [PATCH 2/7] CI all branches.

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d137e44..7a89a5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,6 @@ rvm:
   - 2.1.0
   - ruby-head
 
-branches:
-  only:
-    - master
-    - develop
-
 matrix:
   allow_failures:
     - rvm: ruby-head

From abceaf0802e0812b933efb70302258667ba272a1 Mon Sep 17 00:00:00 2001
From: Yasuhito Takamiya <yasuhito@gmail.com>
Date: Thu, 5 Jun 2014 10:58:14 +0900
Subject: [PATCH 3/7] Update flay gem.

---
 paper_house.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper_house.gemspec b/paper_house.gemspec
index 8118e63..1b790f9 100644
--- a/paper_house.gemspec
+++ b/paper_house.gemspec
@@ -54,7 +54,7 @@ Gem::Specification.new do |gem|
   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.4.0'
+  gem.add_development_dependency 'flay', '~> 2.5.0'
   gem.add_development_dependency 'flog', '~> 4.2.0'
   gem.add_development_dependency 'fuubar', '~> 1.3.3'
   gem.add_development_dependency 'reek', '~> 1.3.7'

From d35e872e96acf34cd1bf3114829da4f6bbd5694b Mon Sep 17 00:00:00 2001
From: Yasuhito Takamiya <yasuhito@gmail.com>
Date: Thu, 5 Jun 2014 10:59:02 +0900
Subject: [PATCH 4/7] Update flog gem.

---
 paper_house.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper_house.gemspec b/paper_house.gemspec
index 1b790f9..b13da05 100644
--- a/paper_house.gemspec
+++ b/paper_house.gemspec
@@ -55,7 +55,7 @@ Gem::Specification.new do |gem|
   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.0'
+  gem.add_development_dependency 'flog', '~> 4.2.1'
   gem.add_development_dependency 'fuubar', '~> 1.3.3'
   gem.add_development_dependency 'reek', '~> 1.3.7'
   gem.add_development_dependency 'rspec', '~> 2.14.1'

From 9ee2db506e6d68860366b1efbcac1bea4bd56c96 Mon Sep 17 00:00:00 2001
From: Yasuhito Takamiya <yasuhito@gmail.com>
Date: Thu, 5 Jun 2014 11:01:51 +0900
Subject: [PATCH 5/7] Update rspec gem.

---
 .rspec              | 1 -
 paper_house.gemspec | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.rspec b/.rspec
index 314c681..4b68033 100644
--- a/.rspec
+++ b/.rspec
@@ -1,4 +1,3 @@
 --require spec_helper
---format Fuubar
 --order random
 --color
\ No newline at end of file
diff --git a/paper_house.gemspec b/paper_house.gemspec
index b13da05..032de6b 100644
--- a/paper_house.gemspec
+++ b/paper_house.gemspec
@@ -56,9 +56,8 @@ Gem::Specification.new do |gem|
   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 'fuubar', '~> 1.3.3'
   gem.add_development_dependency 'reek', '~> 1.3.7'
-  gem.add_development_dependency 'rspec', '~> 2.14.1'
+  gem.add_development_dependency 'rspec', '~> 3.0.0'
   gem.add_development_dependency 'rspec-given', '~> 3.5.4'
   gem.add_development_dependency 'rubocop', '~> 0.22.0'
 end

From c64ea3726ab8bb9f79472b7f0bd70d2ce87b5d8a Mon Sep 17 00:00:00 2001
From: Yasuhito Takamiya <yasuhito@gmail.com>
Date: Thu, 5 Jun 2014 11:03:48 +0900
Subject: [PATCH 6/7] Update RuboCop gem.

---
 paper_house.gemspec | 2 +-
 tasks/rubocop.rake  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/paper_house.gemspec b/paper_house.gemspec
index 032de6b..d797e74 100644
--- a/paper_house.gemspec
+++ b/paper_house.gemspec
@@ -59,5 +59,5 @@ Gem::Specification.new do |gem|
   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.22.0'
+  gem.add_development_dependency 'rubocop', '~> 0.23.0'
 end
diff --git a/tasks/rubocop.rake b/tasks/rubocop.rake
index cdece0f..69f208a 100644
--- a/tasks/rubocop.rake
+++ b/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

From 6a41625a2cb9e2eaab87d2ae7c0d841b45b78d56 Mon Sep 17 00:00:00 2001
From: Yasuhito Takamiya <yasuhito@gmail.com>
Date: Thu, 5 Jun 2014 11:38:26 +0900
Subject: [PATCH 7/7] Updated changelog.

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0efb6a9..1f18d13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## develop (unreleased)
 
+### Changes
+
+* Updated bundled gems.
+* Modernize Gemfile and .gemspec.
+
+
 ## 0.6.1 (5/26/2014)
 
 ### Changes