lib/aws_ec2/script.rb in aws-ec2-1.0.0 vs lib/aws_ec2/script.rb in aws-ec2-1.1.0

@@ -6,25 +6,41 @@
 
     def initialize(options={})
       @options = options
     end
 
+    def add_to_user_data!(user_data)
+      user_data
+    end
+
+    def auto_terminate_after_timeout
+      load_template("auto_terminate_after_timeout.sh")
+    end
+
     def auto_terminate
+      # set variables for the template
       @ami_name = @options[:ami_name]
       load_template("auto_terminate.sh")
     end
 
+    def cloudwatch
+      load_template("cloudwatch.sh")
+    end
+
     def create_ami
-      # set some variables for the template
+      # set variables for the template
       @ami_name = @options[:ami_name]
       @region = `aws configure get region`.strip rescue 'us-east-1'
       load_template("ami_creation.sh")
     end
 
+    def extract_aws_ec2_scripts
+      load_template("extract_aws_ec2_scripts.sh")
+    end
+
   private
     def load_template(name)
-      template = IO.read(File.expand_path("../scripts/#{name}", __FILE__))
+      template = IO.read(File.expand_path("script/templates/#{name}", File.dirname(__FILE__)))
       text = ERB.new(template, nil, "-").result(binding)
-      "#" * 60 + "\n#{text}"
     end
   end
 end