papa 0.7.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7680cd9a9cfed387fe46e40c8d004b5ebfb585847437f59d5455a56c56693f94
-  data.tar.gz: 9aefb5cf418d21e414e413ab11eb0ae8d06e898987be284c2b8e704db08520f1
+SHA1:
+  metadata.gz: 93e515a20ac342699b7c436983d5d933baf38040
+  data.tar.gz: 5db8638e6d5ec42cb22c37af240d50500a8ed8de
 SHA512:
-  metadata.gz: a7d81c125053b3782e434492d6147cb0e1547652de7ccc95b18affb79c9e3b140c4cae44143964474c6c4d069dbb779cc056afe26a06844b2a0c299ccf282410
-  data.tar.gz: e58806be7839fa5b449d546c879634abec82e63c8640d148d4b3116c3f58746c4b37cdfa966ee11e52c043fb3dd71980e059b59182e0d74645b4926bcf1d060d
+  metadata.gz: 7e6b60ed370d216183b332550c34bc59c36cba9d6dccbabd5ef95760f62c18853df15eb1e3a409392822197b4270a6377976c3ee8ea5c5c0986d62a58ef73da5
+  data.tar.gz: d4f72fb75bbaa18ee91c04bfced7a99fecb62684c74763c1958d80ae2d82d25219a207e8be5c98af7ea7ea00ebd8895ba50bbb70ba0d4e640c27e38e9213e2fd

data/.ruby-version

@@ -0,0 +1 @@
+2.1.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.0
+* Add `whoami` and `hostname` to deployment message
+* Hard reset build branch before starting `papa [hotfix, release] finish`
+
 ## 0.7.2
 * Change log file file format to `{TIMESTAMP}_papa_{BUILD_TYPE}_{COMMAND}.log`
 * Disallow the use of `papa [hotfix, release] add` with release and hotfix branches

data/lib/papa/command/slack/send_message.rb

@@ -11,6 +11,9 @@ module Papa
           @hostname = hostname
           @action = action
 
+          @user_whoami = `whoami`.chomp
+          @user_hostname = `hostname`.chomp
+
           command = "curl -X POST --data-urlencode 'payload=#{payload.to_json}' #{webhook_url}"
           super(command)
         end
@@ -18,15 +21,20 @@ module Papa
         private
 
         def payload
-          url = "https://#{@hostname}.indinerocorp.com"
-          {
-            'text' => "<!channel> Deployment to <#{url}|#{@hostname}> #{@action}."
-          }
+          { 'text' => message }
         end
 
         def webhook_url
           Helper::Config.read["slack_webhook"]
         end
+
+        def message
+          url = "https://#{@hostname}.indinerocorp.com"
+          message = "<!channel> Deployment to <#{url}|#{@hostname}> #{@action}"
+          message << " by #{@user_whoami} at #{@user_hostname}" if @action == 'started'
+          message << '.'
+          message
+        end
       end
     end
   end

data/lib/papa/task/common/finish.rb

@@ -33,6 +33,7 @@ module Papa
         def queue(branch)
           queue = [
             Command::Git::Checkout.new(build_branch),
+            Command::Git::ResetHard.new('origin', build_branch),
             Command::Git::Checkout.new(branch),
             Command::Git::ResetHard.new('origin', branch),
             Command::Git::Merge.new(build_branch),

data/lib/papa/version.rb

@@ -1,3 +1,3 @@
 module Papa
-  VERSION = '0.7.2'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papa
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 1.0.0
 platform: ruby
 authors:
 - boggs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -77,6 +77,7 @@ files:
 - ".gitignore"
 - ".papa.config.yml.example"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Helper gem for inDinero's git workflow