lib/simple_deploy/cli/clone.rb in simple_deploy-0.7.2 vs lib/simple_deploy/cli/clone.rb in simple_deploy-0.7.3

@@ -29,10 +29,13 @@
         end
 
         valid_options? :provided => @opts,
                        :required => [:environment, :source_name, :new_name]
 
+        SimpleDeploy.create_config @opts[:environment]
+        SimpleDeploy.logger @opts[:log_level]
+
         override_attributes = parse_attributes :attributes => @opts[:attributes]
 
         cloned_attributes = filter_attributes source_stack.attributes
         new_attributes = merge_attributes cloned_attributes, override_attributes
         new_attributes += add_attributes cloned_attributes, override_attributes
@@ -41,14 +44,14 @@
         template_file_path = template_file.path
 
         if @opts[:template]
           template_file_path = @opts[:template]
         else
-          template_file.write source_stack.template.to_json
+          template_file.write source_stack.template
         end
 
-        rescue_stackster_exceptions_and_exit do
+        rescue_exceptions_and_exit do
           new_stack.create :attributes => new_attributes,
                            :template   => template_file_path
         end
 
         template_file.close
@@ -78,31 +81,18 @@
           clone = cloned_attributes.find { |c| c.has_key? key }
           clone ? nil : override
         end.compact
       end
 
-      def config
-        @config ||= Config.new.environment @opts[:environment]
-      end
-
-      def logger
-        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
-      end
-
       def source_stack
-        @source_stack ||= Stack.new :environment => @opts[:environment],
-                                    :name        => @opts[:source_name],
-                                    :config      => config,
-                                    :logger      => logger
+        @source_stack = Stack.new :name        => @opts[:source_name],
+                                  :environment => @opts[:environment]
       end
 
       def new_stack
-        @new_stack ||= Stack.new :environment => @opts[:environment],
-                                 :name        => @opts[:new_name],
-                                 :config      => config,
-                                 :logger      => logger
+        @new_stack = Stack.new :name        => @opts[:new_name],
+                               :environment => @opts[:environment]
       end
-
     end
 
   end
 end