capistrano-rails-console 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28df9dd56e64741c6c5fbf00e96e0657ec1ee9dc
-  data.tar.gz: b0f6f288d6a2e6cc3a3c4ab89ca469721d572ebb
+  metadata.gz: bd5df65487ade200f469b97095907831ec9ce960
+  data.tar.gz: 1389b6f30993c23c59ba439e95bbe633c708845d
 SHA512:
-  metadata.gz: fe29712b0796ee81a00c1ae34302de5eb892430a52ca36eb7663a72adbc8a0c78cf80d110e4c0daf645b0073155ebd010f26187e2911674d1e67f7cd02ed3bf0
-  data.tar.gz: a8819ba78eb4d1b7c82a58a413f4e0fd5a8cf5c08e0e686458cfef5079c72c3e59752bce77258b0dbf8aace13ee71da64b5c8907535c66e7185c13a0e03aa146
+  metadata.gz: 06c86499b33afc6e11bc4085f3a4666b5a913632a9a5a530b94155ce12bfc3b86430765cf2498966147fceef6d2f260d8ec5da7777432fc50617bce855174d57
+  data.tar.gz: 0464abcce5528d84e45d475dfacb575029f90218d415293ca888e2bf6cf7efda899968cdaf087d751bb4a7a7a263bb0e52f27c08fb866fcfbec16119ac5f4d4a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.0.0 (2016-09-16)
+### Changed
+- switched connection part to _sshkit-interactive_
+- allow setting rails environment separately deployment environment
+- allow setting user to run rails console separately from ssh user
+
 ## 1.0.2 (2015-12-06)
 ### Fixed
 - works with sshkit 1.8

data/README.md

@@ -43,6 +43,20 @@ You can also start a sandbox session:
 
     $ cap production rails:console sandbox=1
 
+## Options
+
+### Rails environment
+
+```ruby
+set :console_env, :production
+```
+
+### User
+
+```ruby
+set :console_user, :appuser
+```
+
 
 ## Contributing
 

data/capistrano-rails-console.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '>= 3.1.0', '< 4.0.0'
+  spec.add_dependency 'capistrano',         '>= 3.5.0', '< 4.0.0'
+  spec.add_dependency 'sshkit-interactive', '~> 0.2.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'yard'
 end

data/lib/capistrano-rails-console.rb

@@ -0,0 +1 @@
+require 'capistrano/rails/console'

data/lib/capistrano/rails/console/remote.rb

@@ -1 +1,3 @@
+require 'sshkit/interactive'
+
 load File.expand_path('../tasks/remote.cap', __FILE__)

data/lib/capistrano/rails/console/tasks/remote.cap

@@ -1,54 +1,26 @@
 namespace :load do
   task :defaults do
-    # add rails to rvm_map_bins
+    # Add rails to rvm_map_bins
     set :rvm_map_bins, fetch(:rvm_map_bins, []).push(:rails)
+
+    # Default values
+    set :console_env,  -> { fetch(:rails_env, fetch(:stage, 'production')) }
+    set :console_user, -> { fetch(:app_user, nil) }
   end
 end
 
 namespace :rails do
   desc 'Interact with a remote rails console'
   task :console do
-    on primary :app do |host|
-      test(:true) # initialize ssh_options on host
-
-      ssh_cmd_args       = []
-      rails_console_args = []
-
-      if host.ssh_options && host.ssh_options[:proxy]
-        template = host.ssh_options[:proxy].command_line_template
-        ssh_cmd_args << "-o ProxyCommand=\"#{template}\""
-      end
-
-      if host.ssh_options && host.ssh_options[:host_name]
-        ssh_cmd_args << "-o HostName=\"#{host.ssh_options[:host_name]}\""
-      end
-
-      rails_console_args << '--sandbox' if ENV.key?('sandbox') || ENV.key?('s')
-
-      rails_env = fetch(:rails_env, fetch(:stage, 'production'))
-
-      port = host.port || (host.ssh_options || {})[:port]
-      ssh_cmd_args << "-p #{port}" if port
-
-      ssh_user = if host.ssh_options && host.ssh_options[:user]
-        host.ssh_options[:user]
-      else
-        host.user
-      end
-      ssh_cmd_args << [ssh_user, host.hostname].compact.join('@')
-
-      if host.ssh_options && host.ssh_options[:keys] && host.ssh_options[:keys].length > 0
-        identity = host.ssh_options[:keys][0]
-        ssh_cmd_args << "-i #{identity}"
+    args  = []
+    args << '--sandbox' if ENV.key?('sandbox') || ENV.key?('s')
+
+    run_interactively primary(:app) do
+      within current_path do
+        as user: fetch(:console_user) do
+          execute(:rails, :console, fetch(:console_env), *args)
+        end
       end
-
-      cmd = SSHKit::Command.new(:rails, :console, rails_env, *rails_console_args, host: host)
-
-      ssh_cmd = %Q(ssh #{ssh_cmd_args.join(' ')} -t '$SHELL -l -c "cd #{current_path} && (#{cmd.environment_string} #{cmd})"')
-
-      debug("Running #{ssh_cmd} on #{host.hostname}")
-
-      exec(ssh_cmd)
     end
   end
 end

data/lib/capistrano/rails/console/version.rb

@@ -4,8 +4,8 @@ module Capistrano
   module Rails
     # Console
     module Console
-      # gem version
-      VERSION = '1.0.2'
+      # Gem version
+      VERSION = '2.0.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rails-console
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -26,26 +26,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sshkit-interactive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Remote rails console for capistrano
 test_files: []
-has_rdoc: