middleman-deploy-with-notifications 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3e1ecf7ec07a01399eb4563426e637ec7afe669
-  data.tar.gz: 9638f7e4e69a433fe250208397a83c352b03406e
+  metadata.gz: 2a67629673a43d9cf77a074ddb1e97178d46f6ce
+  data.tar.gz: 78446ebb30f62a65a39e069c1ef73e4b550f421a
 SHA512:
-  metadata.gz: 4b624214ae6beddfe061439704454af0f4dfb628e100712954906cbb74455961f9c82789b9941009025668e31812f1a11daafc0812690e8abeec1c52f3e4af49
-  data.tar.gz: 239a6bcffa54ded3ecb78db45ac517d7007faf3b160af3b27829f79b46688d3f91eca5aeb84022dbf15dd4f8c76d09e2e2a36bd259e27961261aad59b75c46ae
+  metadata.gz: def2690f227fb81d4661ac0f2b23641d4bfed892d386ae570934d584822773b55174afb56f51361c5a5dedf22c4d02254541447883e2e0d3d395a94b64bccf4b
+  data.tar.gz: 4ebe364acf2017b7dabdaba68ded7f941a0e11ece0d814f5ba5dc64afac08762af520e517660a749d93ca801d992fb0d98c95113ae066fe5129c6ea090cab903

data/lib/middleman-deploy-with-notifications/commands.rb

@@ -2,10 +2,7 @@ require "middleman-core/cli"
 
 require "middleman-deploy-with-notifications/extension"
 require "middleman-deploy-with-notifications/pkg-info"
-
-# for hipchat notifications
-require "net/http"
-require "uri"
+require "middleman-deploy-with-notifications/notifications"
 
 PACKAGE = "#{Middleman::DeployWithNotifications::PACKAGE}"
 VERSION = "#{Middleman::DeployWithNotifications::VERSION}"
@@ -107,65 +104,14 @@ EOF
         options
       end
 
-      def notify_airbrake(short_rev, rev, who)
-        puts "Recording a timestamped deploy in Airbrake: #{short_rev}".green
-        url = "api_key=#{self.deploy_options.airbrake_api_key}" +
-          "&deploy[rails_env]=production" +
-          "&deploy[local_username]=#{who}" +
-          "&deploy[scm_repository]=git@github.com:140proof/280.140proof.com.git" +
-          "&deploy[scm_revision]=#{short_rev}"
-        `curl -d "#{url}" http://airbrake.io/deploys &> /dev/null`
-      end
-
-      def send_hc_mesg(mesg, fmt = "text")
-        uri = uri || URI.parse( "http://api.hipchat.com/v1/rooms/message" )
-        self.deploy_options.hipchat_rooms.each do |room|
-          Net::HTTP.post_form( uri, {
-            "format"          => "json",
-            "color"           => "random",
-            "auth_token"      => self.deploy_options.hipchat_token,
-            "room_id"         => room,
-            "from"            => "280 Deploy",
-            "message"         => mesg,
-            "message_format"  => fmt || "text"}
-          )
-        end
-      end
-
-      def hipchat_start(who, github_project)
-        send_hc_mesg( "Yo yo! @#{who} is deploying #{github_project}:" )
-      end
-
-      def hipchat_complete(who, github_project, github_user, rev, comment)
-        puts "Notifying hipchat room(s)".yellow
-
-        message =  "<a href='http://github.com/#{github_user}/#{github_project}/commit/#{rev}'>#{rev}</a> (#{comment}) is now live on <b><a href='http://#{github_project}'>production</a></b>."
-        send_hc_mesg(message, "html")
-      end
-
-      remove_task :send_hc_mesg, :hipchat_start, :hipchat_complete
-
       def deploy_rsync
         host = self.deploy_options.host
         port = self.deploy_options.port
         user = self.deploy_options.user
         path = self.deploy_options.path
 
-        airbrake_api_key = self.deploy_options.airbrake_api_key
-        hipchat_rooms    = self.deploy_options.hipchat_rooms
-        hipchat_token    = self.deploy_options.hipchat_token
-
-        github_user, github_project = `git remote -v | grep "/" | head -n1`.gsub( /.*:([\w_-]+)\/([\w_\.-]+).git.*/, '\1/\2' ).split( "/" )
-        github_project.chomp!
-
-        rev       = `git rev-parse HEAD`.gsub( /\s*$/, '' ).chomp
-        short_rev = `git rev-parse --short HEAD`.gsub( /\s*$/, '' ).chomp
-        branch    = `git rev-parse --abbrev-ref HEAD`.gsub( /\s*/, '' ).chomp
-        comment   = `git log -1 --pretty=%B`.gsub( /\s*$/, '' ).chomp
-        who       = `git config --get github.user`.chomp
-
-        notify_airbrake(short_rev, rev, who) if self.deploy_options.airbrake_api_key
-        hipchat_start(who, github_project) if self.deploy_options.hipchat_token
+        notify_airbrake if self.deploy_options.airbrake_api_key
+        notify_hipchat_start if self.deploy_options.hipchat_token
 
         puts "Deploying via rsync to #{user}@#{host}".red
 
@@ -183,8 +129,7 @@ EOF
 
         run command
 
-        hipchat_complete(who, github_project, github_user, rev, comment)
-
+        notify_hipchat_complete if self.deploy_options.hipchat_token
       end
 
       def deploy_git
@@ -193,6 +138,9 @@ EOF
 
         puts "## Deploying via git to remote=\"#{remote}\" and branch=\"#{branch}\""
 
+        notify_airbrake if self.deploy_options.airbrake_api_key
+        notify_hipchat_start if self.deploy_options.hipchat_token
+
         #check if remote is not a git url
         unless remote =~ /\.git$/
           remote = `git config --get remote.#{remote}.url`.chop
@@ -227,6 +175,7 @@ EOF
           `git commit --allow-empty -am 'Automated commit at #{Time.now.utc} by #{PACKAGE} #{VERSION}'`
           `git push -f origin #{branch}`
         end
+        notify_hipchat_complete if self.deploy_options.hipchat_token
       end
 
       def deploy_ftp
@@ -240,6 +189,9 @@ EOF
 
         puts "## Deploying via ftp to #{user}@#{host}:#{path}"
 
+        notify_airbrake if self.deploy_options.airbrake_api_key
+        notify_hipchat_start if self.deploy_options.hipchat_token
+
         ftp = Net::FTP.new(host)
         ftp.login(user, pass)
         ftp.chdir(path)
@@ -277,6 +229,7 @@ EOF
           end
         end
         ftp.close
+        notify_hipchat_complete if self.deploy_options.hipchat_token
       end
 
     end

data/lib/middleman-deploy-with-notifications/extension.rb

@@ -5,7 +5,7 @@ require "middleman-core"
 module Middleman
   module DeployWithNotifications
 
-    class Options < Struct.new(:whatisthis, :method, :host, :port, :user, :password, :path, :clean, :remote, :branch, :after_build, :airbrake_api_key, :hipchat_rooms, :hipchat_token); end
+    class Options < Struct.new(:whatisthis, :method, :host, :port, :user, :password, :path, :clean, :remote, :branch, :after_build, :airbrake_api_key, :hipchat_rooms, :hipchat_token, :revision, :revision_short, :deploy_user, :github_project, :github_user, :git_branch, :git_comment); end
 
     class << self
 
@@ -24,6 +24,15 @@ module Middleman
 
         options.after_build ||= false
 
+        options.revision        = `git rev-parse HEAD`.gsub( /\s*$/, '' ).chomp
+        options.revision_short  = `git rev-parse --short HEAD`.gsub( /\s*$/, '' ).chomp
+        options.deploy_user     = `git config --get github.user`.chomp
+        options.github_user, options.github_project = `git remote -v | grep "/" | head -n1`.gsub( /.*:([\w_-]+)\/([\w_\.-]+).git.*/, '\1/\2' ).split( "/" )
+        options.github_project.chomp!
+
+        options.git_branch          = `git rev-parse --abbrev-ref HEAD`.gsub( /\s*/, '' ).chomp
+        options.git_comment         = `git log -1 --pretty=%B`.gsub( /\s*$/, '' ).chomp
+
         app.after_build do |builder|
           ::Middleman::Cli::DeployWithNotifications.new.deploy if options.after_build
         end

data/lib/middleman-deploy-with-notifications/notifications.rb

@@ -0,0 +1,69 @@
+module Middleman
+  module Cli
+
+    class DeployWithNotifications < Thor
+
+      namespace :deploy
+
+      protected
+
+      desc "notify_airbrake", ""
+      def notify_airbrake
+        puts "Recording a timestamped deploy in Airbrake: #{self.deploy_options.revision_short}".green
+        url = "api_key=#{self.deploy_options.airbrake_api_key}" +
+          "&deploy[rails_env]=production" +
+          "&deploy[local_username]=#{self.deploy_options.deploy_user}" +
+          "&deploy[scm_repository]=git@github.com:140proof/280.140proof.com.git" +
+          "&deploy[scm_revision]=#{self.deploy_options.revision_short}"
+        `curl -d "#{url}" http://airbrake.io/deploys &> /dev/null`
+      end
+
+      desc "hipchat_start", ""
+      def notify_hipchat_start
+        send_hc_mesg( "#{exclaim} @#{self.deploy_options.deploy_user} is deploying #{self.deploy_options.github_project}:" )
+      end
+      remove_task :notify_hipchat_start
+
+      desc "hipchat_complete", ""
+      def notify_hipchat_complete
+        puts "Notifying hipchat room(s)".yellow
+
+        message =  "<a href='http://github.com/#{self.deploy_options.github_user}/#{self.deploy_options.github_project}/commit/#{self.deploy_options.revision}'>#{self.deploy_options.revision}</a> " +
+          "(#{self.deploy_options.git_comment}) is now live on <b><a href='http://#{self.deploy_options.github_project}'>production</a></b>."
+        send_hc_mesg(message, "html")
+      end
+      remove_task :notify_hipchat_complete
+
+      def exclaim
+        phrases = [
+          "Holy cannoli",
+          "Holy guacamole",
+          "Holy hot chocolate",
+          "Holy ravioli",
+          "Hot buttery biscuits",
+        ]
+        return phrases[rand(phrases.size)] + "!"
+      end
+      remove_task :exclaim
+
+      def send_hc_mesg(mesg, fmt = "text")
+        uri = uri || URI.parse( "http://api.hipchat.com/v1/rooms/message" )
+        puts mesg
+        self.deploy_options.hipchat_rooms.each do |room|
+          Net::HTTP.post_form( uri, {
+            "auth_token"      => self.deploy_options.hipchat_token,
+            "color"           => "random",
+            "format"          => "json",
+            "from"            => "280 Deploy",
+            "message"         => mesg,
+            "message_format"  => fmt || "text",
+            "room_id"         => room,
+            })
+        end
+      end
+      remove_task :send_hc_mesg
+
+    end
+
+  end
+end

data/lib/middleman-deploy-with-notifications/pkg-info.rb

@@ -1,6 +1,6 @@
 module Middleman
   module DeployWithNotifications
     PACKAGE = "middleman-deploy-with-notifications"
-    VERSION = "0.0.31"
+    VERSION = "0.0.32"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-deploy-with-notifications
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Tom Vaughan
@@ -100,6 +100,7 @@ files:
 - lib/middleman-deploy-with-notifications.rb
 - lib/middleman-deploy-with-notifications/commands.rb
 - lib/middleman-deploy-with-notifications/extension.rb
+- lib/middleman-deploy-with-notifications/notifications.rb
 - lib/middleman-deploy-with-notifications/pkg-info.rb
 - lib/middleman_extension.rb
 - middleman-deploy-with-notifications.gemspec