From 99999e1d9e1941d527d471186ce49917c7a8aace Mon Sep 17 00:00:00 2001
From: Brian Dupras <bdupras@rallydev.com>
Date: Tue, 27 May 2014 10:43:47 -0600
Subject: [PATCH] tidy up Rakefile

---
 .gitignore |  1 +
 CHANGELOG  |  1 +
 Rakefile   | 23 +++++------------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7411da8..3e115171 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 .rvmrc
 .testrc
 .idea/
+pkg/
diff --git a/CHANGELOG b/CHANGELOG
index b9584b8e..7263f9df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ knife-vsphere changelog
 1.0.0.pre.2 *
         bdupras - added property subcommand
         bdupras - fixed prerelease naming -pre to .pre
+        bdupras - tidy up Rakefile
 
 1.0-pre *
         mheidenr - added option to select a datatstorecluster in vm clone
diff --git a/Rakefile b/Rakefile
index ad5d03ec..927782b8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,19 +1,6 @@
-require 'rubygems/package_task'
-require 'fileutils'
+require 'bundler'
+require 'bundler/gem_tasks'
+require 'rake/clean'
+CLEAN.include('pkg')
 
-GEMSPEC = eval(File.read('knife-vsphere.gemspec'))
-
-spec = Gem::Specification.load(Dir['*.gemspec'].first)
-gem = Gem::PackageTask.new(GEMSPEC)
-gem.define
-
-desc "Push gem to rubygems.org"
-task :push => :gem do
-  sh "gem push #{gem.package_dir}/#{gem.gem_file}"
-end
-
-desc "Clean old gem build"
-task :clean do
-  pkg_dir = File.join(File.dirname(__FILE__), 'pkg')
-  FileUtils.rm_rf(pkg_dir) if Dir.exists? pkg_dir
-end
+task default: :build