Merge pull request #147 from artem-sidorenko/gem-update

Update and cleanup of Gemfile

Author: chris-rock

.travis.yml

@@ -16,29 +16,29 @@ matrix:
   # verify lint and unit
   - rvm: 2.3.1
     gemfile: Gemfile
-    bundler_args: "--without integration guard tools"
+    bundler_args: "--without integration development"
   # integration tests
   - rvm: 2.3.1
-    bundler_args: "--without guard tools"
+    bundler_args: "--without development"
     script: bundle exec rake $SUITE
     env: SUITE=test:integration OS='centos'
   - rvm: 2.3.1
-    bundler_args: "--without guard tools"
+    bundler_args: "--without development"
     script: bundle exec rake $SUITE
     env: SUITE=test:integration OS='oracle'
   - rvm: 2.3.1
-    bundler_args: "--without guard tools"
+    bundler_args: "--without development"
     script: bundle exec rake $SUITE
     env: SUITE=test:integration OS='ubuntu'
   - rvm: 2.3.1
-    bundler_args: "--without guard tools"
+    bundler_args: "--without development"
     script: bundle exec rake $SUITE
     env: SUITE=test:integration OS='debian'
   - rvm: 2.3.1
-    bundler_args: "--without guard tools"
+    bundler_args: "--without development"
     script: bundle exec rake $SUITE
     env: SUITE=test:integration OS='fedora'
   - rvm: 2.3.1
-    bundler_args: "--without guard tools"
+    bundler_args: "--without development"
     script: bundle exec rake $SUITE
     env: SUITE=test:integration OS='opensuse'

Gemfile

@@ -2,41 +2,30 @@
 
 source 'https://rubygems.org'
 
-gem 'berkshelf',  '~> 4.0'
-gem 'chef',       '>= 12.0'
-
-# pin dependency for Ruby 1.9.3 since bundler is not
-# detecting that net-ssh 3 does not work with 1.9.3
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
-  gem 'net-ssh', '~> 2.9'
-end
+gem 'berkshelf', '~> 5.3'
+gem 'chef', '~> 12.5'
 
 group :test do
+  gem 'chefspec', '~> 5.3.0'
+  gem 'coveralls', require: false
+  gem 'foodcritic', '~> 6.0'
   gem 'rake'
-  gem 'chefspec',   '~> 4.2.0'
-  gem 'foodcritic', '~> 6.3'
-  gem 'thor-foodcritic'
-  gem 'rubocop',    '~> 0.43.0'
-  gem 'coveralls',  require: false
-  gem 'minitest', '~> 5.5'
+  gem 'rubocop', '~> 0.46.0'
   gem 'simplecov', '~> 0.10'
 end
 
 group :development do
   gem 'guard'
+  gem 'guard-foodcritic', '~>2.1'
   gem 'guard-rspec'
-  # gem 'guard-kitchen' # guard-kitchen is not compatable with Guard 2.x
   gem 'guard-rubocop'
-  gem 'guard-foodcritic'
 end
 
 group :integration do
-  gem 'test-kitchen', '~> 1.0'
-  gem 'kitchen-vagrant'
-  gem 'kitchen-inspec'
-  gem 'kitchen-sharedtests', '~> 0.2.0'
-  gem 'concurrent-ruby', '~> 0.9'
   gem 'kitchen-dokken'
+  gem 'kitchen-inspec'
+  gem 'kitchen-vagrant'
+  gem 'test-kitchen', '~> 1.0'
 end
 
 group :tools do

Guardfile

@@ -20,14 +20,3 @@ guard :rspec do
   watch(/^(recipes)\/(.+)\.rb$/) { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb') { 'spec' }
 end
-
-# guard-kitchen is not compatable with Guard 2.x
-# guard :kitchen, all_on_start: false do
-#   watch(/test\/.+/)
-#   watch(/^recipes\/(.+)\.rb$/)
-#   watch(/^attributes\/(.+)\.rb$/)
-#   watch(/^files\/(.+)/)
-#   watch(/^templates\/(.+)/)
-#   watch(/^providers\/(.+)\.rb/)
-#   watch(/^resources\/(.+)\.rb/)
-# end