From d4ee04322ce642c602269738e45f63b800d78cf7 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 21 Jun 2016 15:59:27 -0700
Subject: fix ruby deprecation warnings

---
 lib/leap_cli.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/leap_cli.rb')

diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index 0563327..fc8ab2b 100644
--- a/lib/leap_cli.rb
+++ b/lib/leap_cli.rb
@@ -55,7 +55,7 @@ require 'leap_cli/markdown_document_listener'
 # allow everyone easy access to log() command.
 #
 module LeapCli
-  Util.send(:extend, LeapCli::Log)
-  Config::Manager.send(:include, LeapCli::Log)
-  extend LeapCli::Log
+  Util.send(:extend, LeapCli::LogCommand)
+  Config::Manager.send(:include, LeapCli::LogCommand)
+  extend LeapCli::LogCommand
 end
-- 
cgit v1.2.3


From 263bb5699350a04484463aabde563679c4fed505 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 28 Jun 2016 14:34:47 -0700
Subject: mv sshkey to platform

---
 lib/leap_cli.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/leap_cli.rb')

diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index fc8ab2b..b74f7e6 100644
--- a/lib/leap_cli.rb
+++ b/lib/leap_cli.rb
@@ -33,12 +33,10 @@ require 'leap_cli/log'
 require 'leap_cli/path'
 require 'leap_cli/util'
 require 'leap_cli/util/secret'
-require 'leap_cli/util/remote_command'
 require 'leap_cli/util/x509'
 require 'leap_cli/logger'
 require 'leap_cli/bootstrap'
 
-require 'leap_cli/ssh_key'
 require 'leap_cli/config/object'
 require 'leap_cli/config/node'
 require 'leap_cli/config/tag'
-- 
cgit v1.2.3


From 334e37c6e3686d17d9d7d47c2cefd1bbfe78cf47 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 29 Jun 2016 13:48:49 -0700
Subject: remove capistrano logger, new log filtering

---
 lib/leap_cli.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/leap_cli.rb')

diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index b74f7e6..36718e3 100644
--- a/lib/leap_cli.rb
+++ b/lib/leap_cli.rb
@@ -11,7 +11,6 @@ $:.unshift(File.expand_path('../leap_cli/override',__FILE__))
 # for a few gems, things will break if using earlier versions.
 # enforce the compatible versions here:
 require 'rubygems'
-gem 'net-ssh', '~> 2.7'
 gem 'gli', '~> 2.12', '>= 2.12.0'
 
 require 'leap/platform'
@@ -34,7 +33,6 @@ require 'leap_cli/path'
 require 'leap_cli/util'
 require 'leap_cli/util/secret'
 require 'leap_cli/util/x509'
-require 'leap_cli/logger'
 require 'leap_cli/bootstrap'
 
 require 'leap_cli/config/object'
-- 
cgit v1.2.3


From 64704deccddd9db46ea9ec4992207b8b2d51f1f8 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 29 Jun 2016 16:52:31 -0700
Subject: move everything we can to leap_platform/lib/leap_cli

---
 lib/leap_cli.rb | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'lib/leap_cli.rb')

diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index 36718e3..c0e139e 100644
--- a/lib/leap_cli.rb
+++ b/lib/leap_cli.rb
@@ -1,6 +1,6 @@
 module LeapCli
-  module Commands; end  # for commands in leap_cli/commands
-  module Macro; end     # for macros in leap_platform/provider_base/lib/macros
+  module Commands; end  # for commands in leap_platform/lib/leap_cli/commands
+  module Macro; end     # for macros in leap_platform/lib/leap_cli/macros
 end
 
 $ruby_version = RUBY_VERSION.split('.').collect{ |i| i.to_i }.extend(Comparable)
@@ -13,8 +13,6 @@ $:.unshift(File.expand_path('../leap_cli/override',__FILE__))
 require 'rubygems'
 gem 'gli', '~> 2.12', '>= 2.12.0'
 
-require 'leap/platform'
-
 require 'leap_cli/version'
 require 'leap_cli/exceptions'
 
@@ -31,27 +29,13 @@ require 'leap_cli/core_ext/yaml'
 require 'leap_cli/log'
 require 'leap_cli/path'
 require 'leap_cli/util'
-require 'leap_cli/util/secret'
-require 'leap_cli/util/x509'
 require 'leap_cli/bootstrap'
 
-require 'leap_cli/config/object'
-require 'leap_cli/config/node'
-require 'leap_cli/config/tag'
-require 'leap_cli/config/provider'
-require 'leap_cli/config/secrets'
-require 'leap_cli/config/object_list'
-require 'leap_cli/config/filter'
-require 'leap_cli/config/environment'
-require 'leap_cli/config/manager'
-
 require 'leap_cli/markdown_document_listener'
 
 #
 # allow everyone easy access to log() command.
 #
 module LeapCli
-  Util.send(:extend, LeapCli::LogCommand)
-  Config::Manager.send(:include, LeapCli::LogCommand)
   extend LeapCli::LogCommand
 end
-- 
cgit v1.2.3