capistrano-interactive 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496fc2ae0c8f29d78ab4ef5e056e5539617b646d
-  data.tar.gz: 5c5f3dd4ed5a217a0f6e4cb0df1666bbb2e964d4
+  metadata.gz: 883996c87061d05bc2199b5220de202381b8c02c
+  data.tar.gz: 1e59d44910cf0e15b0fae28c939a6fecda0fb2ca
 SHA512:
-  metadata.gz: 4daccbfa98652df1af42f647d873911a4c3c24ad5182396f7b2250e763e876ccea509951e15eff551db969b6f94b6c51c852f051a3b3ec4f99779a2738bf2581
-  data.tar.gz: 93d95b39436003db892ec564426433ef3fe70fd6d905575e2bcada2f6dd4847905639b9e90cebb371edbf280f00ec18eb3e9a27ff8b9ae8de73deb4cfcf072a4
+  metadata.gz: 2c9945665b9604c15f8e1bd4101942c865174cc82d060a6a73d5b7e26ffecebd1896d80f1f441699dbd7d8a671a937c561768e11f11336f7dce085ac3263a55f
+  data.tar.gz: 22ee85b3deb1d1747554acd6e99aa0a1974150ce34592e6eb3452e8819f802b69083fe77c3ba23507a2f8b8ca44237fb24906438d26cd0b1cbea942be7cbd453

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Change Log
+
+## Unreleased
+
+## 0.2.0 (2015-11-12)
+### Changed
+- extracted SSHKit stuff into separate gem (sshkit-interact)
+
+## 0.1.0 (2015-11-11) (Initial release)

data/README.md

@@ -9,8 +9,6 @@
 
 Interactive command execution for capistrano.
 
-TODO: Delete this and the text above, and describe your gem
-
 
 ## Installation
 

data/capistrano-interactive.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '>= 3.1.0', '< 4.0.0'
-  spec.add_dependency 'sshkit',     '~> 1.7.0'
+  spec.add_dependency 'capistrano',      '>= 3.1.0', '< 4.0.0'
+  spec.add_dependency 'sshkit-interact', '~> 0.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/capistrano/interactive/task.cap

@@ -0,0 +1,6 @@
+namespace :load do
+  task :defaults do
+    # Change SSHKit backend
+    set :sshkit_backend, fetch(:sshkit_backend, SSHKit::Interact::Backend)
+  end
+end

data/lib/capistrano/interactive/version.rb

@@ -1,5 +1,8 @@
+# Capistrano
 module Capistrano
+  # Interactive
   module Interactive
-    VERSION = '0.1.0'
+    # Gem version
+    VERSION = '0.2.0'
   end
 end

data/lib/capistrano/interactive.rb

@@ -1,5 +1,3 @@
-require 'capistrano/interactive/dsl'
-require 'capistrano/interactive/backend_hook'
+require 'sshkit/interact'
 
-SSHKit::Backend::Netssh.send(:include, Capistrano::Interactive::BackendHook)
-include Capistrano::Interactive::DSL
+load File.expand_path('../task.cap', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-interactive
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: sshkit
+  name: sshkit-interact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,9 +89,7 @@ files:
 - bin/setup
 - capistrano-interactive.gemspec
 - lib/capistrano/interactive.rb
-- lib/capistrano/interactive/backend_hook.rb
-- lib/capistrano/interactive/command.rb
-- lib/capistrano/interactive/dsl.rb
+- lib/capistrano/interactive/task.cap
 - lib/capistrano/interactive/version.rb
 homepage: https://github.com/ydkn/capistrano-interactive
 licenses:

data/lib/capistrano/interactive/backend_hook.rb

@@ -1,36 +0,0 @@
-module Capistrano
-  module Interactive
-    module BackendHook
-      def self.included(base)
-        base.class_eval do
-          alias_method :non_interactive_execute, :execute
-          def execute(*args)
-            if BackendHook.intercept_command?
-              BackendHook.last_command = command(*args)
-            else
-              non_interactive_execute(*args)
-            end
-          end
-        end
-      end
-
-      def self.intercept_command!
-        @intercept_command = true
-      end
-
-      def self.intercept_command?
-        !!@intercept_command
-      end
-
-      def self.last_command
-        @last_command
-      end
-
-      private
-
-      def self.last_command=(cmd)
-        @last_command = cmd
-      end
-    end
-  end
-end

data/lib/capistrano/interactive/command.rb

@@ -1,70 +0,0 @@
-module Capistrano
-  module Interactive
-    class Command
-      def initialize(host, command)
-        @host    = host
-        @command = command
-      end
-
-      def to_cmd
-        [
-          :ssh,
-          *ssh_cmd_args,
-          @host.hostname,
-          %Q{'$SHELL -l -c "#{@command.to_command}"'}
-        ].join(' ')
-      end
-
-      def execute
-        exec(to_cmd)
-      end
-
-      private
-
-      def ssh_option(attr_name)
-        (@host.netssh_options || {})[attr_name] || (@host.respond_to?(attr_name) ? @host.send(attr_name) : nil)
-      end
-
-      def host_name
-        ssh_option(:host_name)
-      end
-
-      def port
-        ssh_option(:port)
-      end
-
-      def user
-        ssh_option(:user)
-      end
-
-      def forward_agent?
-        !!ssh_option(:forward_agent)
-      end
-
-      def proxy_command
-        ssh_option(:proxy) ? ssh_option(:proxy).command_line_template : nil
-      end
-
-      def keys
-        Array(ssh_option(:keys))
-      end
-
-      def ssh_cmd_args
-        args = []
-
-        args << '-t'
-        args << '-A' if forward_agent?
-        args << "-p #{port}" if port
-        args << "-l #{user}"
-        args << %Q{-o "ProxyCommand #{proxy_command}"} if proxy_command
-        args << %Q{-o "HostName #{host_name}"} if host_name
-
-        keys.each do |key|
-          args << "-i #{key}"
-        end
-
-        args
-      end
-    end
-  end
-end

data/lib/capistrano/interactive/dsl.rb

@@ -1,13 +0,0 @@
-require 'capistrano/interactive/command'
-
-module Capistrano
-  module Interactive
-    module DSL
-      def interact(*args)
-        Capistrano::Interactive::BackendHook.intercept_command!
-        execute(*args)
-        Capistrano::Interactive::Command.new(host, Capistrano::Interactive::BackendHook.last_command).execute
-      end
-    end
-  end
-end