style fix(es)

Rakefile

@@ -162,7 +162,7 @@ end
 # this module groups useful git commands together
 module GitCommands
   def self.ensure_branch(branch = 'master')
-    raise '[GIT] You must specify a branch.' if branch.blank?
+    raise '[GIT] You must specify a branch.' if branch.empty?
 
     return if /#{branch}/ =~ GeneralCommands.run('git rev-parse --abbrev-ref HEAD', 0, 1)
     raise '[GIT] Currently working on unexpected branch'
@@ -197,18 +197,15 @@ module KnifeCommands
 end
 
 namespace :style do
+  require 'cookstyle'
   require 'rubocop/rake_task'
-  require 'foodcritic'
-
-  desc 'Run Ruby style checks (RuboCop)'
-  RuboCop::RakeTask.new(:ruby)
 
-  desc 'Run Chef style checks (FoodCritic)'
-  FoodCritic::Rake::LintTask.new(:chef)
+  desc 'Run Cookstyle checks'
+  RuboCop::RakeTask.new(:cookstyle)
 end
 
 desc 'Run all syntax/lint checks'
-task :style => ['style:ruby', 'style:chef']
+task style: ['style:cookstyle']
 
 desc 'Run ChefSpec tests'
 RSpec::Core::RakeTask.new(:spec)
@@ -243,27 +240,27 @@ namespace :publish do
     end
   end
 
-  task :all => ['scm', 'chef:supermarket', 'chef:server']
+  task all: ['scm', 'chef:supermarket', 'chef:server']
 end
 
 desc 'Run lint checks'
-task :lint => %w(style)
+task lint: %w(style)
 
 desc 'Run unit tests'
-task :unit => %w(spec)
+task unit: %w(spec)
 
 desc 'Run Travis CI tests'
-task :travis => %w(lint unit)
+task travis: %w(lint unit)
 
 desc 'Run all integration tests'
-task :integration => %w(integration:vagrant)
+task integration: %w(integration:vagrant)
 
 desc 'Publish'
-task :publish => %w(publish:scm publish:chef:supermarket publish:chef:server)
+task publish: %w(publish:scm publish:chef:supermarket publish:chef:server)
 
 desc 'Release'
 task :release do
   ReleaseCommands.release(environment)
 end
 
-task :default => %w(lint unit integration)
+task default: %w(lint unit integration)

attributes/composer.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Attributes:: composer
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 default['pdepend']['prefix'] = '/usr/bin'

attributes/default.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Attributes:: default
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 default['pdepend']['install_method'] = 'composer'

attributes/phar.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Attributes:: phar
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 default['pdepend']['phar_url'] = 'http://static.pdepend.org/php/latest/pdepend.phar'

libraries/helpers.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Library:: helpers
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 # PDEPEND module
@@ -13,7 +13,7 @@ module Helpers
     # Package names returned are determined by the platform running this recipe.
     def pdepend_prerequisite_packages
       value_for_platform(
-        'default' => ['libmagickwand-dev', 'libmagickcore-dev']
+        'default' => %w(libmagickwand-dev libmagickcore-dev)
       )
     end
   end

metadata.rb

@@ -3,20 +3,14 @@
 maintainer_email '[email protected]'
 license 'MIT'
 description 'Installs/Configures pdepend'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version '1.2.0'
 
 %w(debian ubuntu redhat centos fedora scientific amazon).each do |os|
   supports os
 end
 
-source_url 'https://github.com/djoos-cookbooks/pdepend' if respond_to?(:source_url)
-issues_url 'https://github.com/djoos-cookbooks/pdepend/issues' if respond_to?(:issues_url)
+source_url 'https://github.com/djoos-cookbooks/pdepend'
+issues_url 'https://github.com/djoos-cookbooks/pdepend/issues'
 
 depends 'php'
 depends 'composer'
-
-recipe 'pdepend', 'Installs pdepend.'
-recipe 'pdepend::composer', 'Installs pdepend using composer.'
-recipe 'pdepend::pear', 'Installs pdepend using pear.'
-recipe 'pdepend::phar', 'Installs pdepend using phar.'

recipes/composer.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Recipe:: composer
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 include_recipe 'composer'
@@ -12,7 +12,7 @@
 directory pdepend_dir do
   owner 'root'
   group 'root'
-  mode 0755
+  mode '755'
   action :create
 end
 
@@ -28,10 +28,10 @@
   source 'composer.json.erb'
   owner 'root'
   group 'root'
-  mode 0600
+  mode '600'
   variables(
-    :version => version,
-    :bindir => node['pdepend']['prefix']
+    version: version,
+    bindir: node['pdepend']['prefix']
   )
 end
 

recipes/default.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Recipe:: default
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 case node['pdepend']['install_method']

recipes/pear.rb

@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Recipe:: pear
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 include_recipe 'php'

recipes/phar.rb

@@ -1,11 +1,11 @@
 #
-# Cookbook Name:: pdepend
+# Cookbook:: pdepend
 # Recipe:: phar
 #
-# Copyright (c) 2016, David Joos
+# Copyright:: (c) 2016, David Joos
 #
 
 remote_file "#{node['pdepend']['install_dir']}/pdepend" do
   source node['pdepend']['phar_url']
-  mode 0755
+  mode '755'
 end

spec/spec_helper.rb

@@ -1,5 +1,3 @@
 require 'rspec/expectations'
 require 'chefspec'
 require 'chefspec/berkshelf'
-
-at_exit { ChefSpec::Coverage.report! }