capistrano-rocketdeploy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb0d9b6602f4506569134aae9ebe39d495d2976e8651e343226a6615aead04b2
-  data.tar.gz: 238befbd588aafdf073f268e00c60703dabc5d6a5cdf5679d95e83a499317496
+  metadata.gz: 382e7ff574ae14db5f4db05443e4b921ac1f49bbbd01d1fdcb662a1935b1b00d
+  data.tar.gz: dea2c9a063acd8a659a69c1b7f63d3984ffdbf6cd3a9a102b7fc4114edf457a4
 SHA512:
-  metadata.gz: 509cd7ed770d1aa06dd078796130590dfea29d2fd9613c3023be6a0d52f81e4b11901dce5158632904a338325569ee4992a8c7c17e7c799bcc8ed40de9eb6d25
-  data.tar.gz: 7e479858f29fce529e220a8e390d35143b6f359bd651a3152c89b073c9825ffc55651693c33389ba132e0acd17be246845d3c6695f1ef59596a6f357b990b9ad
+  metadata.gz: a3062e158b714e514978e9d85533880728a3cddd8ecebb7c66d49b8d65707b62ff25384220f0baa54c3c17e1e2e49880a39713cbf7cd5cbcf860de8ca142e11c
+  data.tar.gz: bef75c1451d1963e9d06eac9497ef5ed4dda31d5546a7dd72ddbe04ebef573f2d5d3e91eb8a683bec0faa6b469e25b7cb15f0f6812fb92e72c2c9929dee43883

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    capistrano-rocketdeploy (0.1.0)
+    capistrano-rocketdeploy (0.2.0)
       capistrano (~> 3.0)
-      httparty (~> 0.16)
+      rest-client
 
 GEM
   remote: https://rubygems.org/
@@ -18,23 +18,28 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
     diff-lcs (1.3)
-    httparty (0.16.3)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     i18n (1.5.1)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    multi_xml (0.6.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (5.1.0)
+    netrc (0.11.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rake (10.5.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -51,6 +56,9 @@ GEM
     sshkit (1.18.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
 
 PLATFORMS
   ruby

data/README.md

@@ -33,7 +33,7 @@ require 'capistrano/rocketdeploy'
 Set in `config/deploy.rb`
 
 ```
-set :rocketdeploy_token, 'secret_and_very_long_project_token' # generate by rocketdeploy
+set :rocketdeploy_token, 'secret_token' # generate by rocketdeploy
 ```
 
 

data/capistrano-rocketdeploy.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'capistrano', '~> 3.0'
-  spec.add_dependency 'httparty', '~> 0.16'
+  spec.add_dependency 'rest-client'
 
   spec.add_development_dependency 'pry', '~> 0.12.2'
   spec.add_development_dependency 'bundler', '~> 1.16'

data/lib/capistrano/rocketdeploy.rb

@@ -1,3 +1,5 @@
+require 'httparty'
+
 require "capistrano/rocketdeploy/version"
 require "capistrano/rocketdeploy/client"
 

data/lib/capistrano/rocketdeploy/client.rb

@@ -1,33 +1,43 @@
+require 'rest-client'
+
 module Capistrano
   module Rocketdeploy
     class Client
-      include HTTParty
-      base_uri 
 
-      def initialize(service, page)
-        @options = { query: { site: service, page: page } }
+      def initialize(base_url, token)
+        puts "rocketdeploy base url: #{base_url}"
+        @base_url = base_url
+        @token = token
       end
 
       def deploy_started(params)
-        self.class.post("/deploy/started", body(params))
+        post("", params)
       end
 
-      def deploy_finished(params)
-        self.class.post("/deploy/finished", body(params))
+      def deploy_finished(deploy_id)
+        post("/#{deploy_id}/finished")
       end
 
-      def deploy_failed(params)
-        self.class.post("/deploy/failed", body(params))
+      def deploy_failed(deploy_id)
+        post("/#{deploy_id}/failed")
       end
 
       private
-      def body(params)
-        {
-          body: params.to_json,
-          headers: {
-            'Content-Type' => 'application/json'
+      def post(url, params = {})
+        resp = RestClient.post(
+          "#{@base_url}api/deploys#{url}",
+          params.to_json,
+          {
+            content_type: :json,
+            accept: :json,
+            'Access-Token' => @token,
           }
-        }
+        )
+        JSON.parse(resp)
+      rescue Exception => e
+        puts "RocketDeploy error: #{e.class.name}: #{e.message}"
+        puts e.backtrace[0..10].join("\n")
+        nil
       end
     end
   end

data/lib/capistrano/rocketdeploy/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Rocketdeploy
-    VERSION = "0.1.0".freeze
+    VERSION = "0.2.0".freeze
   end
 end

data/lib/capistrano/tasks/notify.rake

@@ -1,44 +1,66 @@
 namespace :rocketdeploy do
   task :collect_env do
     @data = {
-      local_user: fetch(:local_user),
+      #local_user: fetch(:local_user),
+      git_user: `git config user.name`,
+      git_email: `git config user.email`,
       branch: fetch(:branch),
-      current_revision: fetch(:current_revision),
+      commit_hash: fetch(:current_revision, "HEAD"),
       stage: fetch(:stage),
+      environment: fetch(:rails_env),
       repo_url: fetch(:repo_url),
       hosts: [],
     }
   end
 
   task :notify_deploy_started => [:collect_env] do
+    data = @data
     on roles(:app) do |host|
       host_url = "#{host&.user}.#{host&.hostname}"
-      p @data
-      @data.hosts.push(host_url)
+      data[:hosts].push(host_url)
     end
 
     client = fetch(:rocketdeploy_client)
-    client.deploy_started(@data)
+    r = client.deploy_started(@data)
+    unless r.nil?
+      @deploy_id = r['id']
+    end
   end
 
   task :notify_deploy_finished => [:collect_env] do
     client = fetch(:rocketdeploy_client)
-    client.deploy_finished(@data)
+    if @deploy_id.nil?
+      puts "RocketDeploy: no deploy_id, cant report"
+    else
+      client.deploy_finished(@deploy_id)
+    end
   end
 
   task :notify_deploy_failed => [:collect_env] do
     client = fetch(:rocketdeploy_client)
-    client.deploy_failed(@data)
+    p 'iiiiiiiiiiiiiiiiiiiiii'
+    p @deploy_id
+    if @deploy_id.nil?
+      puts "RocketDeploy: no deploy_id, cant report"
+    else
+      client.deploy_failed(@deploy_id)
+    end
   end
 
-  before "deploy:updated", "rocketdeploy:notify_deploy_started"
+  puts "install rocketdeploy cap tasks"
+  #before "deploy:check:directories", "rocketdeploy:notify_deploy_started"
+  after "git:set_current_revision", "rocketdeploy:notify_deploy_started"
   after "deploy:finished", "rocketdeploy:notify_deploy_finished"
+  before "deploy:failed", "rocketdeploy:notify_deploy_failed"
   before "deploy:reverted", "rocketdeploy:notify_deploy_failed"
 end
 
 namespace :load do
   task :defaults do
-    require 'capistrano-rocketdeploy'
-    set(:rocketdeploy_client, -> { Capistrano::Rocketdeploy::Client.new(fetch(:hipchat_token))[fetch(:hipchat_room_name)] })
+    set(:rocketdeploy_client, -> {
+      base_url = fetch(:rocketdeploy_server) || "https://rocketdeploy.ru"
+      token = fetch(:rocketdeploy_token)
+      Capistrano::Rocketdeploy::Client.new(base_url, token)
+    })
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rocketdeploy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Artem Yegorov
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement