capistrano-fiesta 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83eb008c0ff57b874de422572d34b5fc038d520f
-  data.tar.gz: c0246dab3ff8c418901878ddcfd288b53bfae27f
+  metadata.gz: 8569d071a7d622c8c77e09c37a2004c1b2dda7f3
+  data.tar.gz: fc09af141ae0face70f402820bfde64239922b86
 SHA512:
-  metadata.gz: 0fed3a91cd8b169f48e81f618bfbd93c51b784c7010514b36c6d516630a8325d387266bf3b752e77edf3c7c77a6eb99a46f0b3ce901f5d9dfd4b2878605a76d0
-  data.tar.gz: 4f63d07a21119757ad1d599ae641c75ae4998afe5a4c7c403737b20d7f1dacc220f4b02142041c195b97ec0323bc29ee5611f560335bcdd46b3f44f3c189763a
+  metadata.gz: ea945561cd5903e6873f09f674c791655ede9a14ec5605d93aee0076639c95806962b5c10e9bffef6d3cf15198364af5b7b652d2b306f0de36961b0bde7082cf
+  data.tar.gz: 1b1a5981d4a29bb94adf3825e6d1a68c26f03fbcc3ad3264496f1b656b8298d5439f9c1646da7671b45c99f9dc1a79ec4d13c194468787181c197c2f175f4381

data/.travis.yml

@@ -1,4 +1,5 @@
-language: ruby
+notifications:
+  email: false
 rvm:
-  - 2.1.5
-before_install: gem install bundler -v 1.10.6
+  - 2.2.2
+sudo: false

data/lib/capistrano/fiesta/draft.rb

@@ -0,0 +1,23 @@
+require "erb"
+
+module Capistrano
+  module Fiesta
+    class Draft
+      attr_reader :comment, :stories
+
+      def initialize(comment:, stories: [])
+        @comment, @stories = comment, stories
+      end
+
+      def render
+        ERB.new(File.read(template), nil, '-').result(binding)
+      end
+
+      private
+
+        def template
+          File.join(File.expand_path('../../templates', __FILE__), 'draft.erb')
+        end
+    end
+  end
+end

data/lib/capistrano/fiesta/editor.rb

@@ -7,9 +7,9 @@ module Capistrano
         @content = content
       end
 
-      def open
+      def edit
         create_temp_file
-        edit
+        open
         read
       end
 
@@ -20,8 +20,8 @@ module Capistrano
           file.close
         end
 
-        def edit
-          Kernel.system(ENV["EDITOR"] || "vi", file.path)
+        def open
+          system(ENV["EDITOR"] || "vi", file.path)
         end
 
         def read

data/lib/capistrano/fiesta/github.rb

@@ -0,0 +1,29 @@
+require "octokit"
+require "yaml"
+
+module Capistrano
+  module Fiesta
+    class Github
+      def client
+        Octokit::Client.new(config)
+      end
+
+      private
+
+        def config
+          { access_token: hub_config["oauth_token"] }
+        end
+
+        def hub_config_path
+          Dir.home + "/.config/hub"
+        end
+
+        def hub_config
+          YAML.load_file(hub_config_path)["github.com"].first
+        rescue Errno::ENOENT
+          Logger.warn "No github config found at #{hub_config_path}, using ENV defaults (https://github.com/octokit/octokit.rb/blob/master/lib/octokit/default.rb)"
+          {}
+        end
+    end
+  end
+end

data/lib/capistrano/fiesta/logger.rb

@@ -0,0 +1,15 @@
+module Capistrano
+  module Fiesta
+    class Logger
+      @logs = []
+
+      def self.warn(message)
+        @logs << "[FIESTA] #{message}"
+      end
+
+      def self.logs
+        @logs
+      end
+    end
+  end
+end

data/lib/capistrano/fiesta/report.rb

@@ -1,47 +1,70 @@
 Encoding.default_internal = Encoding.default_external = 'utf-8'
 
-require "capistrano/fiesta/story"
+require "capistrano/fiesta/github"
+require "capistrano/fiesta/draft"
 require "capistrano/fiesta/editor"
-require "erb"
-require "octokit"
-require "yaml"
+require "capistrano/fiesta/logger"
+require "capistrano/fiesta/story"
 
 module Capistrano
   module Fiesta
     class Report
-      attr_accessor :logs, :comment
+      class << self
+        attr_accessor :chat_client
+      end
+
+      attr_reader :announcement
+
+      def self.create(*args)
+        report = new(*args)
+        report.save
+        report
+      end
 
       def initialize(github_url, last_release: nil, comment: nil)
         @github_url, @last_release, @comment = github_url, last_release, comment
-        @logs = []
       end
 
-      def write
-        editor.open if stories.any?
+      def save
+        @announcement = editor.edit if stories.any?
       end
 
       def stories
         @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"
+      end
+
+      def create_release(name = nil)
+        return Logger.warn 'No new stories, skipping GitHub release' if stories.none?
+        name ||= Time.now.to_i.to_s
+        github.create_release(repo, "release-#{name}", name: name, body: stories.map(&:to_markdown).join("\n"))
+      end
+
       private
 
         def editor
-          Editor.new(draft)
+          Editor.new(draft.render)
         end
 
         def draft
-          ERB.new(File.read(template), nil, '-').result(binding)
+          Draft.new(comment: @comment, stories: stories)
         end
 
-        def template
-          File.join(File.expand_path('../../templates', __FILE__), 'fiesta.erb')
+        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
-          log "Unable to access GitHub. Message given was: #{e.message}"
+          Logger.warn "Unable to access GitHub. Message given was: #{e.message}"
           []
         end
 
@@ -54,26 +77,11 @@ module Capistrano
         end
 
         def github
-          @github ||= Octokit::Client.new(config)
-        end
-
-        def config
-          { access_token: hub_config["oauth_token"] }
-        end
-
-        def hub_config_path
-          Dir.home + "/.config/hub"
-        end
-
-        def hub_config
-          YAML.load_file(hub_config_path)["github.com"].first
-        rescue Errno::ENOENT
-          log "No github config found at #{hub_config_path}, using ENV defaults (https://github.com/octokit/octokit.rb/blob/master/lib/octokit/default.rb)"
-          {}
+          @github ||= Github.new.client
         end
 
-        def log(message)
-          @logs << "[FIESTA] #{message}"
+        def chat
+          self.class.chat_client || Slackistrano
         end
     end
   end

data/lib/capistrano/fiesta/story.rb

@@ -12,6 +12,14 @@ module Capistrano
       def images
         @pr.body.scan(/https?:\/\/\S*\.(?:png|jpg|gif)/i)
       end
+
+      def url
+        @pr.html_url
+      end
+
+      def to_markdown
+        "- [#{title}](#{url})"
+      end
     end
   end
 end

data/lib/capistrano/fiesta/version.rb

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

data/lib/capistrano/tasks/fiesta.rake

@@ -1,6 +1,5 @@
-
 namespace :fiesta do
-  desc 'Generate a release report for pasting in Slack'
+  desc 'Generate a release report and post it on Slack'
   task :report do
     invoke 'fiesta:set_last_release'
     invoke 'fiesta:generate'
@@ -16,28 +15,22 @@ namespace :fiesta do
 
   task :generate do
     run_locally do
-      next warn 'Install Slackistrano to post Fiesta reports to Slack' unless defined?(Slackistrano)
-      report = Capistrano::Fiesta::Report.new(repo_url, last_release: fetch(:last_release), comment: fetch(:fiesta_comment))
-      result = report.write
-
-      if result && !result.empty?
-        Slackistrano.post(
-          team: fetch(:slack_team),
-          token: fetch(:slack_token),
-          webhook: fetch(:slack_webhook),
-          via_slackbot: fetch(:slack_via_slackbot),
-          payload: {
-            channel: fetch(:fiesta_slack_channel),
-            username: 'New Releases',
-            icon_emoji: ':tada:',
-            text: result
-          }
-        )
-      else
-        report.logs.each { |log| warn log }
-      end
+      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'
+      Capistrano::Fiesta::Logger.logs.each { |log| warn log }
     end
   end
+
+  def slack
+    {
+      team: fetch(:slack_team),
+      token: fetch(:slack_token),
+      webhook: fetch(:slack_webhook),
+      via_slackbot: fetch(:slack_via_slackbot),
+      channel: fetch(:fiesta_slack_channel)
+    }
+  end
 end
 
 before 'deploy:starting', 'fiesta:set_last_release'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiesta
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -169,12 +169,15 @@ files:
 - capistrano-fiesta.gemspec
 - lib/capistrano-fiesta.rb
 - lib/capistrano/fiesta.rb
+- lib/capistrano/fiesta/draft.rb
 - lib/capistrano/fiesta/editor.rb
+- lib/capistrano/fiesta/github.rb
+- lib/capistrano/fiesta/logger.rb
 - lib/capistrano/fiesta/report.rb
 - lib/capistrano/fiesta/story.rb
 - lib/capistrano/fiesta/version.rb
 - lib/capistrano/tasks/fiesta.rake
-- lib/capistrano/templates/fiesta.erb
+- lib/capistrano/templates/draft.erb
 homepage: https://github.com/balvig/capistrano-fiesta
 licenses:
 - MIT