From bc71bedbdc19d9af3fe12a6873411eaa22a9f657 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Thu, 7 May 2015 13:47:31 -0500
Subject: [PATCH] rework tasks to better integrate github release
 creation/tagging

---
 Rakefile                    | 15 +++++++--------
 lib/tasks/changelog_task.rb |  1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Rakefile b/Rakefile
index d7dbc0adba..2311736f62 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,6 +6,12 @@ require 'rubygems/package_task'
 require 'yard'
 require File.dirname(__FILE__) + '/lib/fog'
 
+require "tasks/changelog_task"
+Fog::Rake::ChangelogTask.new
+
+require "tasks/github_release_task"
+Fog::Rake::GithubReleaseTask.new
+
 #############################################################################
 #
 # Helper functions
@@ -160,12 +166,11 @@ end
 
 task :git_mark_release do
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
 end
 
 task :git_push_release do
   sh "git push origin master"
-  sh "git push origin v#{version}"
+  ::Rake::Task[:github_release].invoke
 end
 
 task :gem_push do
@@ -215,9 +220,3 @@ YARD::Rake::YardocTask.new do |t|
   t.files   = ['lib/**/*.rb', "README"]
   t.options = ["--output-dir", YARDOC_LOCATION, "--title", "#{name} #{version}"]
 end
-
-require "tasks/changelog_task"
-Fog::Rake::ChangelogTask.new
-
-require "tasks/github_release_task"
-Fog::Rake::GithubReleaseTask.new
diff --git a/lib/tasks/changelog_task.rb b/lib/tasks/changelog_task.rb
index 0deec267d5..d530ad2e61 100644
--- a/lib/tasks/changelog_task.rb
+++ b/lib/tasks/changelog_task.rb
@@ -18,7 +18,6 @@ def initialize
 
           add_commits_to_changelog
           save_changelog
-          ::Rake::Task[:github_release].invoke
         end
       end