Merge pull request #2 from dmitriy-kiriyenko/1-tag-correct-commit-on-…

…deployment

Closes #1. Tag correct commit on deployment.

lib/releaser/capistrano.rb

@@ -2,7 +2,7 @@
   abort "Soprano requires Capistrano 2"
 end
 
-Capistrano::Configuration.instance.load do
+Capistrano::Configuration.instance(:must_exist).load do
   Dir["#{File.dirname(__FILE__)}/capistrano/*.rb"].each do |recipe|
     load(recipe)
   end

lib/releaser/capistrano/release_tagging.rb

@@ -6,7 +6,7 @@
   end
 
   task :tag_deploy_commit do
-    run_locally "bundle exec releaser deploy --push"
+    run_locally "bundle exec releaser deploy --push --object=#{branch}"
   end
 end
 
@@ -16,7 +16,7 @@
   end
 
   if fetch(:write_version, true)
-    after "deploy:symlink", "releaser:write_current"
+    after "deploy:create_symlink", "releaser:write_current"
   end
 
   if fetch(:tag_deploy_commit, true)

lib/releaser/cli.rb

@@ -11,7 +11,8 @@ class CLI < ::Thor
     include Rails::Generators::Actions
     add_runtime_options!
     class_option :message, :type => :string, :aliases => "-m", :desc => "Specify a tag message (-m option for git tag)"
-    class_option :push, :type => :boolean, :default => true
+    class_option :object, :type => :string, :aliases => "-o", :desc => "Specify a tag object (which commit to tag with version)"
+    class_option :push, :type => :boolean, :default => true, :desc => "Whether to push the commit (provide --no-push to override)"
     default_task :info
 
     desc "major [CODENAME]", "Issue a major release"
@@ -66,7 +67,7 @@ def tag(tag, config = {})
         opts.push "-f" if config[:force]
       end
 
-      run "git tag #{tag_options.join(" ")} -- #{tag}"
+      run "git tag #{tag_options.join(" ")} -- #{tag} #{options.object}"
       run "git push origin #{tag}" if options.push?
     end