aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-10-28 23:43:23 -0700
committerelijah <elijah@riseup.net>2014-10-28 23:43:23 -0700
commit4e858db55c914094cd8b99f7581767d56e67ec70 (patch)
tree19dca714b4aa393a8cccf847513bf35adce36098
parentead1110d69470c191447e4420b3751a035357b06 (diff)
downloadleap_cli-4e858db55c914094cd8b99f7581767d56e67ec70.tar.gz
leap_cli-4e858db55c914094cd8b99f7581767d56e67ec70.tar.bz2
pin net-ssh version to 2.7.0. later versions break interactive password authentication in capistrano. boo.
-rwxr-xr-xbin/leap1
-rw-r--r--leap_cli.gemspec6
-rw-r--r--lib/leap_cli.rb3
3 files changed, 6 insertions, 4 deletions
diff --git a/bin/leap b/bin/leap
index c492127..6067164 100755
--- a/bin/leap
+++ b/bin/leap
@@ -18,7 +18,6 @@ rescue LoadError
# This allows you to run the command directly while developing the gem, and also lets you
# run from anywhere (I like to link 'bin/leap' to /usr/local/bin/leap).
#
- require 'rubygems'
base_dir = File.expand_path('..', File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__))
require File.join(base_dir, 'lib','leap_cli','load_paths')
require 'leap_cli'
diff --git a/leap_cli.gemspec b/leap_cli.gemspec
index d0b9a99..10ed371 100644
--- a/leap_cli.gemspec
+++ b/leap_cli.gemspec
@@ -56,14 +56,14 @@ spec = Gem::Specification.new do |s|
s.add_runtime_dependency('tee')
# network gems
+ s.add_runtime_dependency('net-ssh', '~> 2.7.0')
+ # ^^ we can upgrade once we get off broken capistrano
+ # https://github.com/net-ssh/net-ssh/issues/145
s.add_runtime_dependency('capistrano', '~> 2.15.5')
- #s.add_runtime_dependency('supply_drop')
- # ^^ currently vendored
# crypto gems
#s.add_runtime_dependency('certificate_authority', '>= 0.2.0')
# ^^ currently vendored
- s.add_runtime_dependency('net-ssh')
s.add_runtime_dependency('gpgme') # not essential, but used for some minor stuff in adding sysadmins
# misc gems
diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index e8f7ecf..2ca68c4 100644
--- a/lib/leap_cli.rb
+++ b/lib/leap_cli.rb
@@ -8,6 +8,9 @@ $ruby_version = RUBY_VERSION.split('.').collect{ |i| i.to_i }.extend(Comparable)
# ensure leap_cli/lib/overrides has the highest priority
$:.unshift(File.expand_path('../override',__FILE__))
+require 'rubygems'
+gem 'net-ssh', '~> 2.7.0'
+
require 'leap/platform'
require 'leap_cli/version'