lib/kakine/cli.rb in kakine-0.3.0 vs lib/kakine/cli.rb in kakine-0.4.0

@@ -1,39 +1,22 @@
-require 'thor'
-require 'fog'
-require 'yaml'
-require 'hashdiff'
+require 'kakine'
+
 module Kakine
   class CLI < Thor
 
     option :tenant, type: :string, aliases: '-t'
     desc 'show', 'show Security Groups specified tenant'
     def show
-      puts Kakine::Resource.security_groups_hash(options[:tenant]).to_yaml
+      Kakine::Option.set_options(options)
+      Kakine::Director.show_current_security_group
     end
 
     option :tenant, type: :string, aliases: "-t"
     option :dryrun, type: :boolean, aliases: "-d"
     option :filename, type: :string, aliases: "-f"
     desc 'apply', "apply local configuration into OpenStack"
     def apply
-      filename = options[:filename] ? options[:filename] : "#{options[:tenant]}.yaml"
-      Kakine::Adapter.set_option(options[:dryrun])
-
-      current_security_groups  = Kakine::Resource.get_current(options[:tenant])
-      new_security_groups = Kakine::Resource.load_security_group_by_yaml(filename, options[:tenant])
-
-      return unless new_security_groups
-      new_security_groups.each do |new_sg|
-        registered_sg  = current_security_groups.find { |cur_sg| cur_sg.name == new_sg.name }
-        if registered_sg
-          new_sg.convergence!(registered_sg) if new_sg != registered_sg
-        else
-          new_sg.register!
-        end
-      end
-      current_security_groups.each do |current_sg|
-        current_sg.unregister! if new_security_groups.none? { |new_sg| current_sg.name == new_sg.name }
-      end
+      Kakine::Option.set_options(options)
+      Kakine::Director.apply
     end
   end
 end