Various fix

Gemfile

@@ -1,8 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in capistrano-telegram.gemspec
-gemspec
-
-gem 'pry'
-gem 'awesome_print'
-gem 'telegram-bot-ruby'
+gemspec

capistrano-telegram.gemspec

@@ -1,24 +1,25 @@
-# coding: utf-8
+# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'capistrano/telegram/version'
 
 Gem::Specification.new do |spec|
   spec.name = "capistrano-telegram"
-  spec.version = Capistrano::Telegram::VERSION
+  spec.version = '1.0.2'
   spec.authors = ["Mattia Malonni"]
   spec.email = ["[email protected]"]
   spec.summary = %q{Notify Capistrano deployment to Telegram.}
   spec.description = %q{Notify Capistrano deployment to Telegram.}
   spec.homepage = "https://github.com/MattiaMalonni/capistrano-telegram"
   spec.license = "MIT"
 
-  spec.files = `git ls-files -z`.split("\x0")
+  spec.files = `git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "telegram-bot-ruby", "~> 0.8"
+  spec.add_dependency 'capistrano', '>= 3.8.1'
+  spec.add_dependency 'telegram-bot-ruby', "~> 0.8"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

lib/capistrano/messaging/helpers.rb

@@ -0,0 +1,37 @@
+module Capistrano
+  module Messaging
+    module Helpers
+
+      def icon_emoji
+        options.fetch(:icon_emoji, nil)
+      end
+
+      def deployer
+        default = ENV['USER'] || ENV['USERNAME']
+        fetch(:local_user, default)
+      end
+
+      def branch
+        fetch(:branch)
+      end
+
+      def application
+        fetch(:application)
+      end
+
+      def stage(default = 'an unknown stage')
+        fetch(:stage, default)
+      end
+
+      #
+      # Return the elapsed running time as a string.
+      #
+      # Examples: 21-18:26:30, 15:28:37, 01:14
+      #
+      def elapsed_time
+        `ps -p #{$$} -o etime=`.strip
+      end
+
+    end        
+  end
+end

lib/capistrano/messaging/telegram.rb

@@ -0,0 +1,48 @@
+require_relative 'helpers'
+
+module Capistrano
+  module Messaging
+    class Telegram
+      include Helpers
+
+      extend Forwardable
+      def_delegators :env, :fetch
+
+      def payload_for_updating
+        {
+          text: "#{deployer} has started deploying branch #{branch} of #{application} to #{stage}"
+        }
+      end
+
+      def payload_for_reverting
+        {
+          text: "#{deployer} has started rolling back branch #{branch} of #{application} to #{stage}"
+        }
+      end
+
+      def payload_for_updated
+        {
+          text: "#{deployer} has finished deploying branch #{branch} of #{application} to #{stage}"
+        }
+      end
+
+      def payload_for_reverted
+        {
+          text: "#{deployer} has finished rolling back branch of #{application} to #{stage}"
+        }
+      end
+
+      def payload_for_failed
+        {
+          text: "#{deployer} has failed to #{deploying? ? 'deploy' : 'rollback'} branch #{branch} of #{application} to #{stage}"
+        }
+      end
+
+      def payload_for(action)
+        method = "payload_for_#{action}"
+        respond_to?(method) && send(method)
+      end
+
+    end
+  end
+end

lib/capistrano/telegram.rb

@@ -1,4 +1,4 @@
-require_relative 'telegram/messaging/base'
+require_relative 'messaging/telegram'
 
 require 'telegram/bot'
 
@@ -7,10 +7,13 @@
 module Capistrano
   class Telegram
 
+    extend Forwardable
+    def_delegators :env, :fetch
+
     def initialize(env)
       @telegram_bot_key = fetch(:telegram_bot_key, nil)
       @telegram_chat_id = fetch(:telegram_chat_id, nil)
-      @message = Capistrano::Telegram::Messaging::Base.new
+      @message = Capistrano::Messaging::Telegram.new
     end
 
     def send(action)
@@ -20,7 +23,7 @@ def send(action)
 
     private 
     def send_to_telegram(message)
-      Telegram::Bot::Client.run(@telegram_bot_key) do |bot|
+      ::Telegram::Bot::Client.run(@telegram_bot_key) do |bot|
         bot.api.send_message(chat_id: @telegram_chat_id, text: message)
       end
     end