capistrano-committed 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c79851f53c9c8aab71d209fb35f758b47875dfa
-  data.tar.gz: 3b371cb357bb6fee4577384df60116cfc622ac1f
+  metadata.gz: 76a62f71ee50726186e6435a2843b31ecd047028
+  data.tar.gz: ddc9454fa3a97efd3f13641961addfb3b88507aa
 SHA512:
-  metadata.gz: 8a9522aae999a3ab231431666a45bf3e08b3d78ee7968e709f3bbbbb91053eac9a335e31f3eb0121cec0413f0f6e9da3b422fb890768d8300d322c561cfa3255
-  data.tar.gz: 9c3fe861575f884fa029085f69ddda95337fba434c067f4af21d6a7e50cabbeca8dfe3ecc88a3e981d93286cb0a8359bc15cc4513be4e89d100620544d699522
+  metadata.gz: 5981643bccc97707dc3323a0758594b8704837a2b149fd5fbf0a0303d618de5526b3959f6d1146efa82d8951d39a9279300882cd334235756c6606a8163fdcbd
+  data.tar.gz: 25cd3b261aa9b62157ad152cb674ce5f32681bf49823ab46c9b348cc3b05ac9b16098f9916f0e9123365f396cc7c1f0778ada620812bdd6b2c4988829ec17b61

data/.travis.yml

@@ -1,11 +1,15 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - rbx-2
+  - 2.2.7
+  - 2.3.4
+matrix:
+  include:
+    - rvm: 2.4.1
+      after_success: bundle exec codeclimate-test-reporter
+
 addons:
   code_climate:
     repo_token: c19f4a2a864567e4dbf3e325b4423d9478c3bf025d9e3f85c6e2ffc0c9fb960f
-before_install: gem install bundler -v 1.11.2
+
+before_install: gem update bundler

data/README.md

@@ -4,7 +4,6 @@
 
 # Capistrano Committed
 
-[![Waffle Stories in Ready](https://badge.waffle.io/sambauers/capistrano-committed.svg?label=ready&title=waffle%20ready)](http://waffle.io/sambauers/capistrano-committed)
 [![Gem Version](https://badge.fury.io/rb/capistrano-committed.svg)](https://badge.fury.io/rb/capistrano-committed)
 [![Build Status](https://travis-ci.org/sambauers/capistrano-committed.svg?branch=master)](https://travis-ci.org/sambauers/capistrano-committed)
 [![Test Coverage](https://codeclimate.com/github/sambauers/capistrano-committed/badges/coverage.svg)](https://codeclimate.com/github/sambauers/capistrano-committed/coverage)

data/capistrano-committed.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.summary       = %q{Tells you what Capistrano 3 is going to deploy based on GitHub commits since the last release.}
-  spec.description   = %q{Tells you what Capistrano 3 is going to deploy based on GitHub commits since the last release.}
+  spec.description   = %q{Tells you what Capistrano 3 is going to deploy based on GitHub commits since the last release. See README.md for more info.}
   spec.homepage      = "https://github.com/sambauers/capistrano-committed"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -19,12 +19,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", "~> 1.6"
-  spec.add_dependency "capistrano", "~> 3.4"
-  spec.add_dependency "github_api", "~> 0.14.0"
+  spec.required_ruby_version = '>= 2.2.7'
+
+  spec.add_dependency "rack", "~> 2.0"
+  spec.add_dependency "capistrano", "~> 3.8"
+  spec.add_dependency "github_api", "~> 0.17"
   spec.add_dependency "mustache", "~> 1.0"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 11.0"
-  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency "rspec", "~> 3.6"
 end

data/lib/capistrano/committed/output.rb

@@ -101,12 +101,9 @@ module Capistrano
         return unless context.current[:info]
         case context.current[:type]
         when :commit
-          return unless context.current[:info][:commit]
-          return unless context.current[:info][:commit][:committer]
-          t('committed.output.committed_on', time: context.current[:info][:commit][:committer][:date])
+          commit_created_on(context.current[:info])
         when :pull_request
-          return unless context.current[:info][:merged_at]
-          t('committed.output.merged_on', time: context.current[:info][:merged_at])
+          pull_request_created_on(context.current[:info])
         end
       end
 
@@ -114,13 +111,11 @@ module Capistrano
         return unless context.current[:info]
         case context.current[:type]
         when :commit
-          return unless context.current[:info][:committer]
-          t('committed.output.committed_by', login: context.current[:info][:committer][:login])
+          format_created_by('committed.output.committed_by', context.current[:info][:committer])
         when :pull_request
-          return unless context.current[:info][:merged_by]
-          t('committed.output.merged_by', login: context.current[:info][:merged_by][:login])
+          format_created_by('committed.output.merged_by', context.current[:info][:merged_by])
         else
-
+          return
         end
       end
 
@@ -145,6 +140,21 @@ module Capistrano
       end
 
     private
+      
+      def commit_created_on(info)
+        return unless info[:commit] && info[:commit][:committer]
+        t('committed.output.committed_on', time: info[:commit][:committer][:date])
+      end
+      
+      def pull_request_created_on(info)
+        return unless info[:merged_at]
+        t('committed.output.merged_on', time: info[:merged_at])
+      end
+      
+      def format_created_by(t_key, user)
+        return unless user
+        t(t_key, login: user[:login])
+      end
 
       def format_link(url)
         case template_format

data/lib/capistrano/committed/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Committed
-    VERSION = '0.0.11'
+    VERSION = '0.0.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-committed
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Sam Bauers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: github_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,16 +100,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.6'
 description: Tells you what Capistrano 3 is going to deploy based on GitHub commits
-  since the last release.
+  since the last release. See README.md for more info.
 email:
 - sam@wopr.com.au
 executables: []
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Tells you what Capistrano 3 is going to deploy based on GitHub commits since