capistrano-fiesta 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8569d071a7d622c8c77e09c37a2004c1b2dda7f3
-  data.tar.gz: fc09af141ae0face70f402820bfde64239922b86
+  metadata.gz: 7af830bd829413e7e61665a095eaa27523fd445a
+  data.tar.gz: e5bd5aae82e6a19fdf64c63223667b73bed5a107
 SHA512:
-  metadata.gz: ea945561cd5903e6873f09f674c791655ede9a14ec5605d93aee0076639c95806962b5c10e9bffef6d3cf15198364af5b7b652d2b306f0de36961b0bde7082cf
-  data.tar.gz: 1b1a5981d4a29bb94adf3825e6d1a68c26f03fbcc3ad3264496f1b656b8298d5439f9c1646da7671b45c99f9dc1a79ec4d13c194468787181c197c2f175f4381
+  metadata.gz: aff19be736c3ce0728dee1188527e47ba0e8d2d2917e1148983fe67dd7391fdba4a27627869e9748d292f29b6e8c1924d5fc403d37bdaa558447ae7abcd8e070
+  data.tar.gz: f32b823bcbb84862dafbb45e5d0eb6140d68271353cee33ff680286ad6d94cd6b854a36baef14adf0a954f6f40e42a0080c8c87de9ede390ed7d7a225363dcbf

data/lib/capistrano/fiesta/editor.rb

@@ -7,7 +7,7 @@ module Capistrano
         @content = content
       end
 
-      def edit
+      def compose
         create_temp_file
         open
         read

data/lib/capistrano/fiesta/logger.rb

@@ -5,6 +5,7 @@ module Capistrano
 
       def self.warn(message)
         @logs << "[FIESTA] #{message}"
+        nil
       end
 
       def self.logs

data/lib/capistrano/fiesta/report.rb

@@ -13,32 +13,20 @@ module Capistrano
         attr_accessor :chat_client
       end
 
-      attr_reader :announcement
-
-      def self.create(*args)
-        report = new(*args)
-        report.save
-        report
-      end
+      attr_reader :stories
 
       def initialize(github_url, last_release: nil, comment: nil)
         @github_url, @last_release, @comment = github_url, last_release, comment
-      end
-
-      def save
-        @announcement = editor.edit if stories.any?
-      end
-
-      def stories
-        @stories ||= merged_pull_requests.map { |pr| Story.new(pr) }
+        @stories = merged_pull_requests.map { |pr| Story.new(pr) }
       end
 
       def announce(channel: 'releases', **options)
-        return Logger.warn 'Announcement blank, nothing posted to Slack' unless announcement?
-        options[:payload] = { channel: channel, username: 'New Releases', icon_emoji: ':tada:', text: announcement }
-        chat.post(options)
-      rescue NameError
-        Logger.warn "Install Slackistrano to announce releases on Slack"
+        text = editor.compose if stories.any?
+        return Logger.warn('Announcement blank, nothing posted to Slack') if text.nil? || text.empty?
+        chat.post options.merge(payload: { channel: channel, username: 'New Releases', icon_emoji: ':tada:', text: text })
+        text
+      rescue NameError => e
+        Logger.warn "Install Slackistrano to announce releases on Slack (#{e.message})"
       end
 
       def create_release(name = nil)
@@ -57,10 +45,6 @@ module Capistrano
           Draft.new(comment: @comment, stories: stories)
         end
 
-        def announcement?
-          announcement && !announcement.empty?
-        end
-
         def merged_pull_requests
           github.search_issues("base:master repo:#{repo} merged:>#{last_released_at}").items
         rescue Octokit::UnprocessableEntity => e

data/lib/capistrano/fiesta/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiesta
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

data/lib/capistrano/tasks/fiesta.rake

@@ -1,27 +1,38 @@
 namespace :fiesta do
-  desc 'Generate a release report and post it on Slack'
-  task :report do
-    invoke 'fiesta:set_last_release'
+  desc 'Run a fiesta report'
+  task :run do
     invoke 'fiesta:generate'
+    invoke 'fiesta:announce'
   end
 
-  task :set_last_release do
-    on roles(:web).first do
-      last_release_path = capture("readlink #{current_path}")
-      last_release = last_release_path.split('/').last
-      set(:last_release, last_release)
+  task :generate do
+    run_locally do
+      set :fiesta_report, Capistrano::Fiesta::Report.new(repo_url, last_release: last_release, comment: fetch(:fiesta_comment))
+      info "Deploying #{report.stories.size} new story(ies)"
     end
   end
 
-  task :generate do
+  task :announce do
     run_locally do
-      report = Capistrano::Fiesta::Report.create(repo_url, last_release: fetch(:last_release), comment: fetch(:fiesta_comment))
       report.announce(slack)
-      report.create_release(fetch(:release_name)) if fetch(:branch) == 'master'
+      report.create_release fetch(:release_timestamp) if fetch(:branch) == 'master'
       Capistrano::Fiesta::Logger.logs.each { |log| warn log }
     end
   end
 
+  def report
+    fetch(:fiesta_report)
+  end
+
+  def last_release
+    last_release = nil
+    on roles(:web).first do
+      last_release_path = capture("readlink #{current_path}")
+      last_release = last_release_path.split('/').last
+    end
+    last_release
+  end
+
   def slack
     {
       team: fetch(:slack_team),
@@ -33,5 +44,5 @@ namespace :fiesta do
   end
 end
 
-before 'deploy:starting', 'fiesta:set_last_release'
-after 'deploy:finished', 'fiesta:generate'
+before 'deploy:starting', 'fiesta:generate'
+after 'deploy:finished', 'fiesta:announce'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiesta
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -203,3 +203,4 @@ signing_key:
 specification_version: 4
 summary: Celebrate your releases!
 test_files: []
+has_rdoc: