aboutsummaryrefslogtreecommitdiff
path: root/lib/leap_cli/commands
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-10-10 00:09:31 -0700
committerelijah <elijah@riseup.net>2012-10-10 00:09:31 -0700
commit47062a50e9bba238191838a6625b81793afa8472 (patch)
treeb4b9603f37ba79c522edcc7193cc8e360c36f442 /lib/leap_cli/commands
parent2a4dffe29da16dec1147a7f20715a1fa657368ac (diff)
downloadleap_cli-47062a50e9bba238191838a6625b81793afa8472.tar.gz
leap_cli-47062a50e9bba238191838a6625b81793afa8472.tar.bz2
hierarchical yaml output.
Diffstat (limited to 'lib/leap_cli/commands')
-rw-r--r--lib/leap_cli/commands/compile.rb1
-rw-r--r--lib/leap_cli/commands/deploy.rb2
-rw-r--r--lib/leap_cli/commands/list.rb8
3 files changed, 5 insertions, 6 deletions
diff --git a/lib/leap_cli/commands/compile.rb b/lib/leap_cli/commands/compile.rb
index 6b38de5..8764e52 100644
--- a/lib/leap_cli/commands/compile.rb
+++ b/lib/leap_cli/commands/compile.rb
@@ -4,7 +4,6 @@ module LeapCli
desc 'Compile json files to hiera configs'
command :compile do |c|
c.action do |global_options,options,args|
- manager = ConfigManager.new
manager.load(Path.provider)
Path.ensure_dir(Path.hiera)
manager.export(Path.hiera)
diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb
index 3694a38..9ec984c 100644
--- a/lib/leap_cli/commands/deploy.rb
+++ b/lib/leap_cli/commands/deploy.rb
@@ -6,7 +6,7 @@ module LeapCli
arg_name '<node filter>'
command :deploy do |c|
c.action do |global_options,options,args|
- nodes = ConfigManager.filter(args)
+ nodes = manager.filter(args)
say "Deploying to these nodes: #{nodes.keys.join(', ')}"
if agree "Continue? "
say "deploy not yet implemented"
diff --git a/lib/leap_cli/commands/list.rb b/lib/leap_cli/commands/list.rb
index a186049..166ed2a 100644
--- a/lib/leap_cli/commands/list.rb
+++ b/lib/leap_cli/commands/list.rb
@@ -48,11 +48,11 @@ module LeapCli
command :list do |c|
c.action do |global_options,options,args|
if args.any?
- print_config_table(:nodes, ConfigManager.filter(args))
+ print_config_table(:nodes, manager.filter(args))
else
- print_config_table(:services, ConfigManager.services)
- print_config_table(:tags, ConfigManager.tags)
- print_config_table(:nodes, ConfigManager.nodes)
+ print_config_table(:services, manager.services)
+ print_config_table(:tags, manager.tags)
+ print_config_table(:nodes, manager.nodes)
end
end
end