j-cap-recipes 0.0.5 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b82b43c06483b389c1bf2dcde05f074ce223283d
+  data.tar.gz: d1b2ed07ce382788f30576da2a7ff9ab82490018
+SHA512:
+  metadata.gz: 46891dd595e3a9e03345051290a2d3d951f16ef729e20715b06646349b5e97df1c124962f8628b4001cec8bcb81ecceca5ca73b1b085a6f087ee679cbe45da29
+  data.tar.gz: 8b8c43da7b32fe0ad16f2f9373a9363067c891029f6ca5a6b70e70d82d7d0d7e790674811cccae3339164213b449d79249e2bad8790227efdaa5f73c7bc96267

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.7
+
+* monkey patch SSHKit because capistrano wont to use blocks for execute.
+
+## 0.0.6
+
+* Added deploy notifiction of the Honeybadger service.
+
 ## 0.0.5
 
 * fixed bug: Removed the custom command bin mapping for rails. Updated the rails console behavior.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    j-cap-recipes (0.0.5)
+    j-cap-recipes (0.0.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -34,6 +34,7 @@ If you want to load only specified recipe:
     require 'j-cap-recipes/log'
     require 'j-cap-recipes/rails'
     require 'j-cap-recipes/unicorn'
+    require 'j-cap-recipes/honeybadger'
 
 ### Nginx
 ### Setup
@@ -44,6 +45,10 @@ If you want to load only specified recipe:
 To run remote rails console you should update to the latest gems `capistrano-rbenv` and `capistrano-bundler`
 and run command `cap production rails:console`.
 
+### Honeybadger
+
+`honeybadger:deploy` - notify the service about deploy and it would be invoked after `deploy:migrate`
+
 ## Contributing
 
 1. Fork it

data/lib/j-cap-recipes/honeybadger.rb

@@ -0,0 +1 @@
+load File.expand_path('../tasks/honeybadger.rake', __FILE__)

data/lib/j-cap-recipes/rails.rb

@@ -1 +1,66 @@
+module SSHKit
+  module Backend
+    class Netssh
+      def execute(*args, &block)
+        _execute(*args, &block).success?
+      end
+
+      private
+      def _execute(*args, &block)
+        command(*args).tap do |cmd|
+          output << cmd
+          cmd.started = true
+          ssh.open_channel do |chan|
+            chan.request_pty if Netssh.config.pty
+            chan.exec cmd.to_command do |ch, success|
+              chan.on_data do |ch, data|
+                if block_given?
+                  block.call(ch, data)
+                else
+                  cmd.stdout      = data
+                  cmd.full_stdout += data
+                  output << cmd
+                end
+              end
+              chan.on_extended_data do |ch, type, data|
+                cmd.stderr      = data
+                cmd.full_stderr += data
+                output << cmd
+              end
+              chan.on_request("exit-status") do |ch, data|
+                cmd.stdout      = ''
+                cmd.stderr      = ''
+                cmd.exit_status = data.read_long
+                output << cmd
+              end
+              #chan.on_request("exit-signal") do |ch, data|
+              #  # TODO: This gets called if the program is killed by a signal
+              #  # might also be a worthwhile thing to report
+              #  exit_signal = data.read_string.to_i
+              #  warn ">>> " + exit_signal.inspect
+              #  output << cmd
+              #end
+              chan.on_open_failed do |ch|
+                # TODO: What do do here?
+                # I think we should raise something
+              end
+              chan.on_process do |ch|
+                # TODO: I don't know if this is useful
+              end
+              chan.on_eof do |ch|
+                # TODO: chan sends EOF before the exit status has been
+                # writtend
+              end
+            end
+            chan.wait
+          end
+          ssh.loop
+        end
+      end
+    end
+  end
+end
+
+
+
 load File.expand_path("../tasks/rails.rake", __FILE__)

data/lib/j-cap-recipes/tasks/honeybadger.rake

@@ -0,0 +1,38 @@
+after 'deploy', 'honeybadger:deploy'
+after 'deploy:migrate', 'honeybadger:deploy'
+
+namespace :honeybadger do
+  desc <<-DESC
+            Notify Honeybadger of the deployment by running the notification on the REMOTE machine.
+              - Run remotely so we use remote API keys, environment, etc.
+  DESC
+  task :deploy do
+    on roles(:app), reject: lambda { |h| h.properties.no_release } do
+      dry_run         = fetch(:dry_run)
+      honeybadger_env = fetch(:honeybadger_env, fetch(:rails_env, 'production'))
+      user            = local_user || ENV['USER'] || ENV['USERNAME']
+      async_notify    = fetch(:honeybadger_async_notify, false)
+
+      rake_task_args  = "TO=#{honeybadger_env} REPO=#{repo_url} USER=#{user}"
+      rake_task_args  << " #{ENV['API_KEY']}" if ENV['API_KEY']
+      rake_task_args  << ' DRY_RUN=true' if dry_run
+
+      if async_notify
+        rake_task_args << ' nohup'
+        rake_task_args << ' >> /dev/null 2>&1 &'
+      end
+
+      if dry_run
+        info 'DRY RUN: Notification not actually run.'
+      else
+        within fetch(:release_path) do
+          with(rails_env: fetch(:rails_env)) do
+            execute :rake, fetch(:honeybadger_deploy_task, 'honeybadger:deploy'), rake_task_args
+          end
+        end
+      end
+
+      info 'Honeybadger Notification Complete.'
+    end
+  end
+end

data/lib/j-cap-recipes/tasks/rails.rake

@@ -4,79 +4,20 @@ namespace :rails do
     on roles(:app) do
       within release_path do
         with rails_env: fetch(:rails_env) do
-          _execute_interactive(:rails, :console)
-        end
-      end
-    end
-  end
-end
-
-
-module SSHKit
-  module Backend
-    class Netssh
-      def _execute_interactive(*args)
-        command(*args).tap do |cmd|
-          output << cmd
-          cmd.started = true
-          ssh.open_channel do |chan|
-            chan.request_pty if Netssh.config.pty
-            chan.exec cmd.to_command do |ch, success|
-
-              chan.on_data do |ch, data|
-                #Rails specific console handler
-                @row ||= ''
-                @row += data
-                if data.include?("\n")
-                  cmd.stdout      = @row
-                  cmd.full_stdout += @row
-                  output << cmd
-                  @row = ''
-                else
-                  if data.include?('irb(main):')
-                    print data
-                    @row = ''
-                    command = $stdin.gets
-                    command = "exit\n" if command == nil
-                    ch.send_data command
-                  end
-                end
-              end
-
-              chan.on_extended_data do |ch, type, data|
-                cmd.stderr      = data
-                cmd.full_stderr += data
-                output << cmd
-              end
-
-              chan.on_request("exit-status") do |ch, data|
-                cmd.stdout      = ''
-                cmd.stderr      = ''
-                cmd.exit_status = data.read_long
-                output << cmd
-              end
-              #chan.on_request("exit-signal") do |ch, data|
-              #  # TODO: This gets called if the program is killed by a signal
-              #  # might also be a worthwhile thing to report
-              #  exit_signal = data.read_string.to_i
-              #  warn ">>> " + exit_signal.inspect
-              #  output << cmd
-              #end
-              chan.on_open_failed do |ch|
-                # TODO: What do do here?
-                # I think we should raise something
-              end
-              chan.on_process do |ch|
-                # TODO: I don't know if this is useful
-              end
-              chan.on_eof do |ch|
-                # TODO: chan sends EOF before the exit status has been
-                # writtend
-              end
+          row , command = '', ''
+          execute(:rails, :console) do |ch, data|
+            row += data
+            if data.include?("\n")
+              print row if command.chomp != row.chomp
+              row = ''
+            elsif data.include?('irb(main):')
+              print row
+              row     = ''
+              command = $stdin.gets
+              command = "exit\n" if command == nil
+              ch.send_data command
             end
-            chan.wait
           end
-          ssh.loop
         end
       end
     end

data/lib/j-cap-recipes/version.rb

@@ -1,5 +1,5 @@
 module JCap
   module Recipes
-    VERSION = "0.0.5"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: j-cap-recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Michael Nikitochkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: A litle knife to deploy Rails application
@@ -77,6 +70,7 @@ files:
 - lib/j-cap-recipes/check.rb
 - lib/j-cap-recipes/database.rb
 - lib/j-cap-recipes/delayed_job.rb
+- lib/j-cap-recipes/honeybadger.rb
 - lib/j-cap-recipes/hpusher.rb
 - lib/j-cap-recipes/log.rb
 - lib/j-cap-recipes/monit.rb
@@ -87,6 +81,7 @@ files:
 - lib/j-cap-recipes/tasks/check.rake
 - lib/j-cap-recipes/tasks/database.rake
 - lib/j-cap-recipes/tasks/delayed_job.rake
+- lib/j-cap-recipes/tasks/honeybadger.rake
 - lib/j-cap-recipes/tasks/hpusher.rake
 - lib/j-cap-recipes/tasks/log.rake
 - lib/j-cap-recipes/tasks/monit.rake
@@ -95,39 +90,31 @@ files:
 - lib/j-cap-recipes/tasks/rake.rake
 - lib/j-cap-recipes/tasks/setup.rake
 - lib/j-cap-recipes/tasks/templates/database.yml.erb
-- lib/j-cap-recipes/tasks/templates/nginx/site.conf.erb
 - lib/j-cap-recipes/tasks/unicorn.rake
 - lib/j-cap-recipes/unicorn.rb
 - lib/j-cap-recipes/version.rb
 homepage: https://github.com/jetthoughts/j-cap-recipes
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3379381580228172657
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3379381580228172657
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Capistrano 3 recipes for nginx, monit, rails log, setup, unicorn
 test_files: []

data/lib/j-cap-recipes/tasks/templates/nginx/site.conf.erb

@@ -1,28 +0,0 @@
-upstream <%= fetch(:application) %>_upstream {
-  server unix:<%= shared_path.join('tmp/sockets/unicorn.sock') %> fail_timeout=0;
-}
-
-server {
-  listen 80;
-  server_name <%= fetch(:application) %>;
-
-  error_log <%= shared_path.join('log/nginx-error.log') %>;
-  access_log <%= shared_path.join('log/nginx-access.log') %>;
-
-  root <%= current_path.join('public') %>;
-
-  try_files $uri/index.html $uri.html $uri @app;
-
-  location @app {
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-
-    proxy_pass http://<%= fetch(:application) %>_upstream;
-  }
-
-  error_page 500 502 503 504 /500.html;
-  location = /500.html {
-    root <%= current_path.join('public') %>;
-  }
-}