capistrano-fiesta 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206b3d96f5d723a65054af6140203b71e9ed0f1a
-  data.tar.gz: c833355aeb16cb88ecf619bea67cc610fe2f2c53
+  metadata.gz: ecec845a7285bc41b134999cceb95090623f2fe1
+  data.tar.gz: a24782784115a94194d7861543d959c50a06f3f3
 SHA512:
-  metadata.gz: 7b3f88316dd55c209298b7fa38531e8f323756fdee6da88053a169072a780187cb44d545c559a966ea7f7deced6eef89bbe54345a5d16322843626b5a0e194c4
-  data.tar.gz: 777207fcedb594c669fd69c58a96f8438b2b96b9c4a9658503ba99ac5427678a98665a9f037e9c5fae2c31a7f2d3127f12b5f2193e3becc90ca3a9b5105040e8
+  metadata.gz: 590a48205a81acf42956d2eba5cec3c414226633fe54be96319b30eae9d2f88615a165d6416d1c04b5926c0d884223bd99677a5ae9e59bada455d6d79209cbaa
+  data.tar.gz: daa8a49e565a56308f68b1e75e33ac2a1954f631f74e848bb061a1c5a27028877454778ea3f96987317818269bee76261c680cab315a7b6d6cf4382192e031dd

data/README.md

@@ -24,7 +24,7 @@ The edited content will be posted to Slack:
 3. Require in the capfile or appropriate stage and configure the Slack channel:
 
   ```ruby
-  require 'capybara-fiesta'
+  require 'capistrano-fiesta'
   set :fiesta_slack_channel, '#release'
   ```
 4. If you're using [hub](https://github.com/github/hub) or [pt-flow](https://github.com/balvig/pt-flow), your GitHub credentials should already be configured. Otherwise you can use the [ENV vars in Octokit](https://github.com/octokit/octokit.rb/blob/a98979107a4bf9741a05a1f751405f8a29f29b38/lib/octokit/default.rb#L42-L156) to configure GitHub access.

data/capistrano-fiesta.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-line"
+  spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "multi_json"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "webmock"

data/lib/capistrano/fiesta/editor.rb

@@ -0,0 +1,40 @@
+require "tempfile"
+
+module Capistrano
+  module Fiesta
+    class Editor
+      def initialize(content)
+        @content = content
+      end
+
+      def open
+        create_temp_file
+        edit
+        read
+      end
+
+      private
+
+        def create_temp_file
+          file << @content
+          file.close
+        end
+
+        def edit
+          Kernel.system(ENV["EDITOR"] || "vi", file.path)
+        end
+
+        def read
+          file.open
+          file.unlink
+          file.read.each_line.map do |line|
+            line unless line.start_with?("\n") || line.start_with?("#")
+          end.compact.join
+        end
+
+        def file
+          @file ||= Tempfile.new(['fiesta', '.md'])
+        end
+    end
+  end
+end

data/lib/capistrano/fiesta/report.rb

@@ -1,21 +1,23 @@
+Encoding.default_internal = Encoding.default_external = 'utf-8'
+
 require "capistrano/fiesta/story"
+require "capistrano/fiesta/editor"
 require "erb"
-require "tempfile"
 require "octokit"
 require "yaml"
 
 module Capistrano
   module Fiesta
     class Report
-      attr_accessor :logs
+      attr_accessor :logs, :comment
 
-      def initialize(github_url, last_release: Time.now)
-        @github_url, @last_release = github_url, last_release
+      def initialize(github_url, last_release: nil, comment: nil)
+        @github_url, @last_release, @comment = github_url, last_release, comment
         @logs = []
       end
 
       def write
-        open_in_editor if stories.any?
+        editor.open if stories.any?
       end
 
       def stories
@@ -24,17 +26,8 @@ module Capistrano
 
       private
 
-        def open_in_editor
-          file << draft
-          file.close
-          Kernel.system(ENV["EDITOR"] || "vi", file.path)
-          file.open
-          file.unlink
-          file.read.force_encoding("utf-8")
-        end
-
-        def file
-          @file ||= Tempfile.new(['fiesta', '.md'])
+        def editor
+          Editor.new(draft)
         end
 
         def draft
@@ -57,7 +50,7 @@ module Capistrano
         end
 
         def last_released_at
-          Time.parse(@last_release + 'Z00:00').iso8601
+          Time.parse(@last_release + 'Z00:00').iso8601 if @last_release
         end
 
         def github

data/lib/capistrano/fiesta/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiesta
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/capistrano/tasks/fiesta.rake

@@ -17,7 +17,7 @@ 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))
+      report = Capistrano::Fiesta::Report.new(repo_url, last_release: fetch(:last_release), comment: fetch(:fiesta_comment))
       result = report.write
 
       if result && !result.empty?

data/lib/capistrano/templates/fiesta.erb

@@ -1,3 +1,7 @@
+<% if comment -%>
+# <%= comment %>
+
+<% end -%>
 <% stories.sort_by(&:title).each do |story| -%>
 • <%= story.title %>
 <% story.images.each do |image| -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiesta
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-line
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +169,7 @@ files:
 - capistrano-fiesta.gemspec
 - lib/capistrano-fiesta.rb
 - lib/capistrano/fiesta.rb
+- lib/capistrano/fiesta/editor.rb
 - lib/capistrano/fiesta/report.rb
 - lib/capistrano/fiesta/story.rb
 - lib/capistrano/fiesta/version.rb