autoload some of the external dependencies that are rarely used, so that we don't...

diff --git a/lib/leap_cli/commands/ca.rb b/lib/leap_cli/commands/ca.rb
index ecc324b2f01e2622efa82e7ded98a7d5e3e5af61..579e305c0d24e2cefbffeb7601a3a300c7590e04 100644 (file)
--- a/lib/leap_cli/commands/ca.rb
+++ b/lib/leap_cli/commands/ca.rb
@@ -1,6 +1,6 @@
-require 'openssl'
-require 'certificate_authority'
-require 'date'
+autoload :OpenSSL, 'openssl'
+autoload :CertificateAuthority, 'certificate_authority'
+autoload :Date, 'date'
 require 'digest/md5'
 
 module LeapCli; module Commands

diff --git a/lib/leap_cli/commands/node.rb b/lib/leap_cli/commands/node.rb
index 304d86bfe803d022d943f8a59540f394177b3d5d..ba637f87a63a22b4c18fdde0a41373b31d24751a 100644 (file)
--- a/lib/leap_cli/commands/node.rb
+++ b/lib/leap_cli/commands/node.rb
@@ -1,6 +1,4 @@
-require 'net/ssh/known_hosts'
-require 'tempfile'
-require 'ipaddr'
+autoload :IPAddr, 'ipaddr'
 
 module LeapCli; module Commands
 

diff --git a/lib/leap_cli/commands/user.rb b/lib/leap_cli/commands/user.rb
index d7c21dbe34b1b12b6e4d842a6fdef79f9b191800..a1b4c4370c6e9ebc408c55851d11d5057cc660af 100644 (file)
--- a/lib/leap_cli/commands/user.rb
+++ b/lib/leap_cli/commands/user.rb
@@ -1,4 +1,4 @@
-require 'gpgme'
+autoload :GPGME, 'gpgme'
 
 #
 # perhaps we want to verify that the key files are actually the key files we expect.

diff --git a/lib/leap_cli/commands/vagrant.rb b/lib/leap_cli/commands/vagrant.rb
index 24310e21d1f5132377861e30a1bd6da0d0dde701..6227ece7842d4f5eaece65903b6c6b0c8acffc56 100644 (file)
--- a/lib/leap_cli/commands/vagrant.rb
+++ b/lib/leap_cli/commands/vagrant.rb
@@ -1,4 +1,4 @@
-require 'ipaddr'
+autoload :IPAddr, 'ipaddr'
 require 'fileutils'
 
 module LeapCli; module Commands

diff --git a/lib/leap_cli/remote/rsync_plugin.rb b/lib/leap_cli/remote/rsync_plugin.rb
index 48f82d35a556569602f597d3f162a4e463bac868..a6708f4d8494fd8736aa1d9b0f25ec93bfe53a2a 100644 (file)
--- a/lib/leap_cli/remote/rsync_plugin.rb
+++ b/lib/leap_cli/remote/rsync_plugin.rb
@@ -3,7 +3,7 @@
 # (see RemoteCommand::new_capistrano)
 #
 
-require 'rsync_command'
+autoload :RsyncCommand, 'rsync_command'
 
 module LeapCli; module Remote; module RsyncPlugin
 

diff --git a/lib/leap_cli/util/secret.rb b/lib/leap_cli/util/secret.rb
index a6bd7a35baf05c0654855ab9203daf6d2871c7b1..837a0af6c9d8fbcf1819be3e96cd5a04875ffadb 100644 (file)
--- a/lib/leap_cli/util/secret.rb
+++ b/lib/leap_cli/util/secret.rb
@@ -4,7 +4,7 @@
 #
 # Uses OpenSSL random number generator instead of Ruby's rand function
 #
-require 'openssl'
+autoload :OpenSSL, 'openssl'
 
 module LeapCli; module Util
   class Secret

diff --git a/lib/leap_cli/util/x509.rb b/lib/leap_cli/util/x509.rb
index 9ecd92dc3c239e586e0a7e9e9470c3ee5aa9cfe2..787fdfac7c410af904cc45964989a1e17bacbe80 100644 (file)
--- a/lib/leap_cli/util/x509.rb
+++ b/lib/leap_cli/util/x509.rb
@@ -1,5 +1,6 @@
-require 'openssl'
-require 'certificate_authority'
+autoload :OpenSSL, 'openssl'
+autoload :CertificateAuthority, 'certificate_authority'
+
 require 'digest'
 require 'digest/md5'
 require 'digest/sha1'