From 84f5a86e12919ee6aa60a430a9f86015391c6146 Mon Sep 17 00:00:00 2001
From: JJ Asghar <jj@getchef.com>
Date: Tue, 15 Sep 2015 11:35:17 -0500
Subject: [PATCH] updated the rakefile and dependancies

---
 Rakefile                | 35 +++++++----------------------------
 knife-openstack.gemspec |  2 +-
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/Rakefile b/Rakefile
index b1bf1b1b..8c0bf59d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,34 +2,13 @@
 # Copyright:: Copyright (c) 2013 Chef Software, Inc.
 
 require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+require 'rspec/core/rake_task'
 
-require 'rubygems'
-require 'rubygems/package_task'
+RuboCop::RakeTask.new
 
-task :default => :all
-task :all => [:spec, :uninstall, :install]
+RSpec::Core::RakeTask.new(:spec)
 
-# Packaging
-GEM_NAME = "knife-openstack"
-require File.dirname(__FILE__) + '/lib/knife-openstack/version'
-spec = eval(File.read("knife-openstack.gemspec"))
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "uninstall #{GEM_NAME}-#{Knife::OpenStack::VERSION}.gem from system..."
-task :uninstall do
-  sh %{gem uninstall #{GEM_NAME} -x -v #{Knife::OpenStack::VERSION} }
-end
-
-# rspec
-begin
-  require 'rspec/core/rake_task'
-  desc "Run all specs in spec directory"
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/unit/**/*_spec.rb'
-  end
-rescue LoadError
-  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
-end
\ No newline at end of file
+task default: [:rubocop, :spec]
diff --git a/knife-openstack.gemspec b/knife-openstack.gemspec
index a611e1ac..66516675 100644
--- a/knife-openstack.gemspec
+++ b/knife-openstack.gemspec
@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency "chef", ">= 11"
   s.add_dependency "knife-cloud", "~> 1.2.0"
 
-  %w(rake rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
+  %w(bundler rubocop rake rspec-core rspec-expectations rspec-mocks rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
 end