From 801f12936617abb8f12938fd2e3ee133456469fc Mon Sep 17 00:00:00 2001
From: Dev Mohanty <dmohanty09@austincollege.edu>
Date: Wed, 4 Dec 2013 19:25:37 -0600
Subject: [PATCH 1/5] fixing state / added destroy to resources in compute

---
 lib/harp-runtime/cloud/cloud_mutator.rb       |  1 +
 .../resources/compute/elastic_ip.rb           |  5 ++-
 .../resources/compute/security_group.rb       |  7 ++--
 lib/harp-runtime/resources/compute/volume.rb  |  5 ++-
 spec/compute_cloud_spec.rb                    | 35 +++++++++++++------
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/lib/harp-runtime/cloud/cloud_mutator.rb b/lib/harp-runtime/cloud/cloud_mutator.rb
index 7418626..27c410d 100644
--- a/lib/harp-runtime/cloud/cloud_mutator.rb
+++ b/lib/harp-runtime/cloud/cloud_mutator.rb
@@ -123,6 +123,7 @@ def get_state(resource_name,resource_def)
         
         resource.name = resource_name
         service = establish_connect(resource)
+        
         return resource.get_state(service)
       end
       private
diff --git a/lib/harp-runtime/resources/compute/elastic_ip.rb b/lib/harp-runtime/resources/compute/elastic_ip.rb
index f9d9d0c..ecc7cf0 100644
--- a/lib/harp-runtime/resources/compute/elastic_ip.rb
+++ b/lib/harp-runtime/resources/compute/elastic_ip.rb
@@ -44,9 +44,8 @@ def create(service)
       end
 
       def destroy(service)
-        destroy_attribs = self.attribs
-        if @id
-          address = service.addresses.destroy(destroy_attribs)
+        if id
+          address = service.addresses.destroy(id)
         else
           puts "No ID set, cannot delete."
         end
diff --git a/lib/harp-runtime/resources/compute/security_group.rb b/lib/harp-runtime/resources/compute/security_group.rb
index bcbb2a1..aa93e65 100644
--- a/lib/harp-runtime/resources/compute/security_group.rb
+++ b/lib/harp-runtime/resources/compute/security_group.rb
@@ -45,13 +45,12 @@ def create(service)
       end
       
       def destroy(service)
-        destroy_attribs = self.attribs
-        if @id
-          security_group = service.security_groups.destroy(destroy_attribs)
+        if id
+          security_groups = service.security_groups.destroy(id)
         else
           puts "No ID set, cannot delete."
         end
-        return security_group
+        return security_groups
       end
 
     end
diff --git a/lib/harp-runtime/resources/compute/volume.rb b/lib/harp-runtime/resources/compute/volume.rb
index bb6e152..563d159 100644
--- a/lib/harp-runtime/resources/compute/volume.rb
+++ b/lib/harp-runtime/resources/compute/volume.rb
@@ -41,9 +41,8 @@ def create(service)
       end
 
       def destroy(service)
-        destroy_attribs = self.attribs
-        if @id
-          volume = service.volumes.destroy(destroy_attribs)
+        if id
+          volume = service.volumes.destroy(id)
         else
           puts "No ID set, cannot delete."
         end
diff --git a/spec/compute_cloud_spec.rb b/spec/compute_cloud_spec.rb
index 4e40905..fc74ea3 100644
--- a/spec/compute_cloud_spec.rb
+++ b/spec/compute_cloud_spec.rb
@@ -37,7 +37,6 @@
 
   it "creates a cloud instance" do
     result = mutator.create("test_inst1", instance_resource)
-    
     expect(result.class).to eq(ComputeInstance)
     expect(result.name).to eq("test_inst1")
     expect(result.state).to eq(Harp::Resources::AvailableResource::CREATED)
@@ -47,7 +46,6 @@
     result = mutator.create("test_sg1", security_group_resource)
     expect(result.class).to eq(SecurityGroup)
     expect(result.name).to eq("test_sg1")
-
     expect(result.description).to eq("A web security group")
   end
   
@@ -59,19 +57,34 @@
 end
 
 describe Harp::Cloud::CloudMutator, "#destroy" do
+  include_context "when have mutator"
+  
 	it "destroys a cloud instance" do
-		context = {}
-    context[:cloud_type] = :aws # for the moment, assume AWS cloud
-    context[:mock] = true
-    context[:debug] = true
-    context[:access] = "test"
-    context[:secret] = "test"
-    mutator = Harp::Cloud::CloudMutator.new(context)
-
+    state = mutator.get_state("test_inst1", instance_resource)
     result = mutator.destroy("test_inst1", instance_resource)
-    
     expect(result.class).to eq(ComputeInstance)
     expect(result.name).to eq("test_inst1")
     expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
+  end
+	it "destroys an elastic ip" do
+    result = mutator.destroy("test_eip1", elastic_ip_resource)
+    
+    expect(result.class).to eq(ElasticIP)
+    expect(result.name).to eq("test_eip1")
+    expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
+  end
+	it "destroys a security group" do
+    result = mutator.destroy("test_sg1", security_group_resource)
+    
+    expect(result.class).to eq(SecurityGroup)
+    expect(result.name).to eq("test_sg1")
+    expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
+  end
+	it "destroys a volume" do
+    result = mutator.destroy("test_vol1", volume_resource)
+    
+    expect(result.class).to eq(Volume)
+    expect(result.name).to eq("test_vol1")
+    expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
   end
 end

From d2797657edeb73b1aea68ec26fc5e26d379897c9 Mon Sep 17 00:00:00 2001
From: Dev Mohanty <dmohanty09@austincollege.edu>
Date: Thu, 5 Dec 2013 20:22:35 -0600
Subject: [PATCH 2/5] fixed persistence

---
 lib/harp-runtime/cloud/cloud_mutator.rb       | 19 ++++++--
 lib/harp-runtime/interpreter.rb               |  6 +--
 .../resources/compute/instance.rb             |  2 +
 spec/compute_cloud_spec.rb                    | 48 ++++++++++---------
 spec/interpreter_spec.rb                      | 26 +++++++---
 spec/rds_cloud_spec.rb                        | 29 +++++------
 spec/spec_helper.rb                           | 15 +++++-
 7 files changed, 91 insertions(+), 54 deletions(-)

diff --git a/lib/harp-runtime/cloud/cloud_mutator.rb b/lib/harp-runtime/cloud/cloud_mutator.rb
index 27c410d..08fb92f 100644
--- a/lib/harp-runtime/cloud/cloud_mutator.rb
+++ b/lib/harp-runtime/cloud/cloud_mutator.rb
@@ -18,6 +18,7 @@ def initialize(options)
         @cloud_type = options[:cloud_type]
         @mock = (options.include? :mock) ? true : false
         @service_connectors = {}
+        @harp_script = options[:harp_script]
       end
 
       def service_for_set(resource_set)
@@ -72,6 +73,7 @@ def create(resource_name, resource_def)
         created = resource.create(service)
         pr = persist_resource(resource_name, resource, created, "create")
         pr.state = Harp::Resources::AvailableResource::CREATED
+        pr.save
         return pr
       end
 
@@ -83,7 +85,7 @@ def destroy(resource_name, resource_def)
         end
         
         resource.populate(resource_def)
-        persisted = HarpResource.entries.select{|res| res.name == resource_name}.first
+        persisted = get_harp_resource(resource_name)
         
         if ! persisted.nil?
           resource.populate(persisted.attributes)
@@ -93,11 +95,17 @@ def destroy(resource_name, resource_def)
         service = establish_connect(resource)
         
         destroyed = resource.destroy(service)
-        pr = persist_resource(resource_name, resource, resource, "destroy")
-        pr.state = Harp::Resources::AvailableResource::DESTROYED
-        return pr
+        #pr = persist_resource(resource_name, resource, resource, "destroy")
+        persisted.live_resource = resource
+        persisted.state = Harp::Resources::AvailableResource::DESTROYED
+        persisted.save
+        return persisted
       end
 
+      def get_harp_resource(resource_name)
+        @harp_script.harp_resources.select{|res| res.name == resource_name}.first
+      end
+      
       def get_output(resource, persisted)
         resource = Harp::Resources::AvailableResource.from_name resource['type']
         if resource.nil?
@@ -116,7 +124,7 @@ def get_state(resource_name,resource_def)
         end
         resource.populate(resource_def)
         
-        persisted = HarpResource.entries.select{|res| res.name == resource_name}.first
+        persisted = get_harp_resource(resource_name)
         if ! persisted.nil?
           resource.populate(persisted.attributes)
         end
@@ -131,6 +139,7 @@ def persist_resource(resource_name, resource, live_resource, action)
             if live_resource
               persistable = resource.make_persistable(live_resource)
               persistable.name = resource_name
+              persistable.harp_script_id = @harp_script.id
               @@logger.debug "Perform: #{action} resource #{persistable.inspect}"
               persistable
             end
diff --git a/lib/harp-runtime/interpreter.rb b/lib/harp-runtime/interpreter.rb
index 7fe4667..714f36a 100644
--- a/lib/harp-runtime/interpreter.rb
+++ b/lib/harp-runtime/interpreter.rb
@@ -231,7 +231,6 @@ def call_sandbox(lifecycle)
   end
 
   def play(lifecycle, options)
-
     harp_file = options[:harp_file] || nil
 
     harp_id = options[:harp_id]
@@ -247,7 +246,6 @@ def play(lifecycle, options)
     @events.push({ :harp_id => harp_id})
 
     call_sandbox(lifecycle)
-
     respond
   end
 
@@ -314,9 +312,9 @@ def respond
   # Advance the program counter to the next instruction.
   def advance
     line_count = SandboxModule::line_count
-    #@@logger.debug "At line: #{line_count}, #{caller[0][/`.*'/][1..-2]}"
+    @@logger.debug "At line: #{line_count}, #{caller[0][/`.*'/][1..-2]}"
     if @break_at > 0
-      #@@logger.debug "Waiting for l:#{@break_at}, at l:#{line_count}"
+      @@logger.debug "Waiting for l:#{@break_at}, at l:#{line_count}"
       if @break_at <= line_count
         return false
       end
diff --git a/lib/harp-runtime/resources/compute/instance.rb b/lib/harp-runtime/resources/compute/instance.rb
index 902af8c..dd9a1db 100644
--- a/lib/harp-runtime/resources/compute/instance.rb
+++ b/lib/harp-runtime/resources/compute/instance.rb
@@ -52,8 +52,10 @@ class ComputeInstance < AvailableResource
       attribute :user_data
       attribute :virtualization_type,      :aliases => 'virtualizationType'
       attribute :vpc_id,                   :aliases => 'vpcId'
+      
       attribute :description
       attribute :type
+      attribute :live_resource
 
       register_resource :compute_instance, RESOURCES_COMPUTE
 
diff --git a/spec/compute_cloud_spec.rb b/spec/compute_cloud_spec.rb
index fc74ea3..fc273d6 100644
--- a/spec/compute_cloud_spec.rb
+++ b/spec/compute_cloud_spec.rb
@@ -40,6 +40,8 @@
     expect(result.class).to eq(ComputeInstance)
     expect(result.name).to eq("test_inst1")
     expect(result.state).to eq(Harp::Resources::AvailableResource::CREATED)
+    state = mutator.get_state("test_inst1", instance_resource)
+    expect(state).to eq("running")
   end
 
   it "creates a security group" do
@@ -60,31 +62,33 @@
   include_context "when have mutator"
   
 	it "destroys a cloud instance" do
-    state = mutator.get_state("test_inst1", instance_resource)
+    created = mutator.create("test_inst1", instance_resource)
     result = mutator.destroy("test_inst1", instance_resource)
     expect(result.class).to eq(ComputeInstance)
     expect(result.name).to eq("test_inst1")
     expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
+    state = mutator.get_state("test_inst1", instance_resource)
+    expect(state).to eq("shutting-down")
   end
-	it "destroys an elastic ip" do
-    result = mutator.destroy("test_eip1", elastic_ip_resource)
-    
-    expect(result.class).to eq(ElasticIP)
-    expect(result.name).to eq("test_eip1")
-    expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
-  end
-	it "destroys a security group" do
-    result = mutator.destroy("test_sg1", security_group_resource)
-    
-    expect(result.class).to eq(SecurityGroup)
-    expect(result.name).to eq("test_sg1")
-    expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
-  end
-	it "destroys a volume" do
-    result = mutator.destroy("test_vol1", volume_resource)
-    
-    expect(result.class).to eq(Volume)
-    expect(result.name).to eq("test_vol1")
-    expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
-  end
+	# it "destroys an elastic ip" do
+#     result = mutator.destroy("test_eip1", elastic_ip_resource)
+#     
+#     expect(result.class).to eq(ElasticIP)
+#     expect(result.name).to eq("test_eip1")
+#     expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
+#   end
+#   it "destroys a security group" do
+#     result = mutator.destroy("test_sg1", security_group_resource)
+#     
+#     expect(result.class).to eq(SecurityGroup)
+#     expect(result.name).to eq("test_sg1")
+#     expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
+#   end
+#   it "destroys a volume" do
+#     result = mutator.destroy("test_vol1", volume_resource)
+#     
+#     expect(result.class).to eq(Volume)
+#     expect(result.name).to eq("test_vol1")
+#     expect(result.state).to eq(Harp::Resources::AvailableResource::DESTROYED)
+#   end
 end
diff --git a/spec/interpreter_spec.rb b/spec/interpreter_spec.rb
index def7306..a8108ad 100644
--- a/spec/interpreter_spec.rb
+++ b/spec/interpreter_spec.rb
@@ -11,6 +11,12 @@
       c[:harp_contents] = VALID_SCRIPT
       c
     end
+    let(:interpreter_context_created) do
+      c = create_interpreter_context()
+      c[:harp_contents] = VALID_SCRIPT
+      c[:harp_id] = '123123'
+      c
+    end
     let(:interpreter) {
       Harp::HarpInterpreter.new(interpreter_context())
     }
@@ -29,15 +35,15 @@ def find_break_event(results)
     it "instruments for debug" do
       results = interpreter.play("create", interpreter_context)
       break_event = find_break_event(results)
-      break_event.should match ".*32$" # Should have broken at line 32
+      break_event.should match ".*37$" # Should have broken at line 37
     end
 
     context 'when in debug mode with breakpoint' do
 
       let(:breakpoint_context) do
         c = interpreter_context()
-        # 38 happens to be a reasonable breakpoint in VALID_SCRIPT
-        c[:break] = 38
+        # 42 happens to be a reasonable breakpoint in VALID_SCRIPT
+        c[:break] = 42
         c
       end
       let(:interpreter) {
@@ -45,20 +51,26 @@ def find_break_event(results)
       }
 
       it "instruments for debug and accepts breakpoint" do
+        interpreter.play("create", breakpoint_context)
         results = interpreter.play("destroy", breakpoint_context)
         break_event = find_break_event(results)
-        break_event.should match ".*38$" # Should have broken at line 38
+        require 'awesome_print'
+        ap results
+        break_event.should match ".*42$" # Should have broken at line 42
       end
     end
 
     it "invokes custom lifecycles" do
-      results = interpreter.play("custom", interpreter_context)
+      harp_script = FactoryGirl.create(:harp_script)
+      interpreter_context_created = interpreter_context.clone
+      interpreter_context_created[:harp_id] = harp_script.id
+      results = interpreter.play("custom", interpreter_context_created)
       expect(results).not_to be_empty
       destroyed = nil
       results.each do |result|
-        destroyed = result[:destroy] if result.include? (:destroy)
+        destroyed = result[:create] if result.include? (:create)
       end
-      destroyed.should match "computeInstance2" # Custom lifecycle should have destroyed this
+      destroyed.should match "computeInstance4" # Custom lifecycle should have destroyed this
     end
   end
 end
diff --git a/spec/rds_cloud_spec.rb b/spec/rds_cloud_spec.rb
index 154fc73..b440c0f 100644
--- a/spec/rds_cloud_spec.rb
+++ b/spec/rds_cloud_spec.rb
@@ -17,14 +17,15 @@
 }
 
 describe Harp::Cloud::CloudMutator, "#create" do
+  include_context "when have mutator"
   it "creates a db security group" do
-    context = {}
-    context[:cloud_type] = :aws # for the moment, assume AWS cloud
-    context[:mock] = true
-    context[:debug] = true
-    context[:access] = "test"
-    context[:secret] = "test"
-    mutator = Harp::Cloud::CloudMutator.new(context)
+    # context = {}
+#     context[:cloud_type] = :aws # for the moment, assume AWS cloud
+#     context[:mock] = true
+#     context[:debug] = true
+#     context[:access] = "test"
+#     context[:secret] = "test"
+    #mutator = Harp::Cloud::CloudMutator.new(context)
 
     result = mutator.create("test_db_sg1", db_security_group_resource)
     expect(result.class).to eq(DBSecurityGroup)
@@ -33,13 +34,13 @@
     expect(result.description).to eq("A web db security group")
   end
   it "creates a db instance" do
-    context = {}
-    context[:cloud_type] = :aws # for the moment, assume AWS cloud
-    context[:mock] = true
-    context[:debug] = true
-    context[:access] = "test"
-    context[:secret] = "test"
-    mutator = Harp::Cloud::CloudMutator.new(context)
+    # context = {}
+#     context[:cloud_type] = :aws # for the moment, assume AWS cloud
+#     context[:mock] = true
+#     context[:debug] = true
+#     context[:access] = "test"
+#     context[:secret] = "test"
+    #mutator = Harp::Cloud::CloudMutator.new(context)
 
     result = mutator.create("test_db_db1", db_instance_resource)
     expect(result.class).to eq(DBInstance)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 76125a9..032f211 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -5,6 +5,11 @@
 require 'coveralls'
 require 'factory_girl'
 
+# For debugging.
+require 'logging'
+Logging.logger.root.add_appenders(Logging.appenders.stdout)
+Logging.logger.root.level = :debug
+
 SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
@@ -52,6 +57,11 @@
       "type": "Std::ComputeInstance",
       "imageId": "ami-d0f89fb9",
       "instanceType": "t1.micro"
+    },
+    "computeInstance4": {
+      "type": "Std::ComputeInstance",
+      "imageId": "ami-d0f89fb9",
+      "instanceType": "t1.micro"
     }
   }
 }
@@ -62,7 +72,7 @@
 def create()
   engine.create("computeInstance1")
   engine.create("computeInstance2")
-  engine.break # should be line 32, from top of script
+  engine.break # should be line 37, from top of script
   engine.create("computeInstance3")
 end
 
@@ -72,7 +82,7 @@ def destroy()
 end
 
 def custom()
-  engine.destroy("computeInstance2")
+  engine.create("computeInstance4")
 end
 
 OUTER
@@ -85,6 +95,7 @@ def create_interpreter_context
     interpreter_context[:debug] = true
     interpreter_context[:access] = "test"
     interpreter_context[:secret] = "test"
+    interpreter_context[:harp_script] = FactoryGirl.create(:harp_script)
     interpreter_context
   end
 end

From ad8ac6b0aacf35ce13c7620afeab9fc48fd8ab08 Mon Sep 17 00:00:00 2001
From: Dev Mohanty <dmohanty09@austincollege.edu>
Date: Fri, 6 Dec 2013 19:41:05 -0600
Subject: [PATCH 3/5] debugging interpreter

---
 lib/harp-runtime/interpreter.rb | 22 ++++++++++++++++------
 spec/interpreter_spec.rb        |  4 +---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/harp-runtime/interpreter.rb b/lib/harp-runtime/interpreter.rb
index 714f36a..d4d0088 100644
--- a/lib/harp-runtime/interpreter.rb
+++ b/lib/harp-runtime/interpreter.rb
@@ -5,6 +5,7 @@
 require "harp-runtime/cloud/cloud_mutator"
 require "harp-runtime/lang/command"
 require "harp-runtime/lang/copy"
+require 'pry'
 
 module SandboxModule
   extend self
@@ -73,6 +74,7 @@ def initialize(context)
     @break_at = (context.include? :break) ? context[:break].to_i : 0
     @events.push ({ :nav => "[Mock mode]" }) if (context.include? :mock)
     compute_desired_pc(context)
+    @context = context
   end
 
   # Accept the resources from a template and add to the dictionary of resources
@@ -148,6 +150,7 @@ def updateTo(resource_start, resource_finish)
 
   # Destroy a named resource.
   def destroy(resource_name)
+    @break_at = (@context.include? :break) ? @context[:break].to_i : 0
     if ! advance() then return self end
     @@logger.debug "Destroying resource: #{resource_name}."
     result = {:destroy => resource_name}
@@ -200,7 +203,6 @@ def parse(content)
     priv.instances_of(HarpInterpreter).allow_all
 
     SandboxModule.set_engine(self)
-
     sandbox.run(priv, content, :base_namespace => SandboxModule)
   end
 
@@ -215,9 +217,10 @@ def load_harp(harp_file, harp_contents, harp_id)
     @harp_script = ::HarpScript.first_or_new({:id => harp_id},
       {:location => harp_location, :version => "1.0"})
     if !@harp_script.saved?
-      @harp_script.content = harp_contents
+      #@harp_script.content = harp_contents
       @harp_script.save
     end
+    @harp_script.content = harp_contents
   end
 
   def call_sandbox(lifecycle)
@@ -233,17 +236,24 @@ def call_sandbox(lifecycle)
   def play(lifecycle, options)
     harp_file = options[:harp_file] || nil
 
-    harp_id = options[:harp_id]
+    #harp_id = options[:harp_id]
+    if ! @harp_script.nil?
+      harp_id = @harp_script.id
+    else
+      harp_id = options[:harp_id]
+    end
+    
     if lifecycle.to_sym == Harp::Lifecycle::CREATE
       harp_id = SecureRandom.urlsafe_base64(16)
     end
-
+    
     load_harp(harp_file, options[:harp_contents], harp_id)
-
     # Now, instrument the script for debugging.
     harp_contents = parse(instrument_for_debug(@harp_script.content))
-
+    
     @events.push({ :harp_id => harp_id})
+    # require 'pry'
+#     binding.pry
 
     call_sandbox(lifecycle)
     respond
diff --git a/spec/interpreter_spec.rb b/spec/interpreter_spec.rb
index a8108ad..f8684a5 100644
--- a/spec/interpreter_spec.rb
+++ b/spec/interpreter_spec.rb
@@ -51,11 +51,9 @@ def find_break_event(results)
       }
 
       it "instruments for debug and accepts breakpoint" do
-        interpreter.play("create", breakpoint_context)
+        created = interpreter.play("create", breakpoint_context)
         results = interpreter.play("destroy", breakpoint_context)
         break_event = find_break_event(results)
-        require 'awesome_print'
-        ap results
         break_event.should match ".*42$" # Should have broken at line 42
       end
     end

From cbf5fc28a0d55d6fb47deb8f706de175dd047bce Mon Sep 17 00:00:00 2001
From: Dev Mohanty <dmohanty09@austincollege.edu>
Date: Mon, 9 Dec 2013 11:47:15 -0600
Subject: [PATCH 4/5] added resources hash table

---
 lib/harp-runtime/cloud/cloud_mutator.rb |  12 ++-
 lib/harp-runtime/interpreter.rb         | 104 +++++++++++++-----------
 2 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/lib/harp-runtime/cloud/cloud_mutator.rb b/lib/harp-runtime/cloud/cloud_mutator.rb
index 08fb92f..b01d915 100644
--- a/lib/harp-runtime/cloud/cloud_mutator.rb
+++ b/lib/harp-runtime/cloud/cloud_mutator.rb
@@ -19,6 +19,7 @@ def initialize(options)
         @mock = (options.include? :mock) ? true : false
         @service_connectors = {}
         @harp_script = options[:harp_script]
+        @resources = {}
       end
 
       def service_for_set(resource_set)
@@ -73,6 +74,7 @@ def create(resource_name, resource_def)
         created = resource.create(service)
         pr = persist_resource(resource_name, resource, created, "create")
         pr.state = Harp::Resources::AvailableResource::CREATED
+        remember(pr)
         pr.save
         return pr
       end
@@ -96,14 +98,16 @@ def destroy(resource_name, resource_def)
         
         destroyed = resource.destroy(service)
         #pr = persist_resource(resource_name, resource, resource, "destroy")
-        persisted.live_resource = resource
+        #persisted.live_resource = resource
         persisted.state = Harp::Resources::AvailableResource::DESTROYED
+        remember(persisted)
         persisted.save
         return persisted
       end
 
       def get_harp_resource(resource_name)
-        @harp_script.harp_resources.select{|res| res.name == resource_name}.first
+        #@harp_script.harp_resources.select{|res| res.name == resource_name}.first
+        @resources[resource_name]
       end
       
       def get_output(resource, persisted)
@@ -116,6 +120,10 @@ def get_output(resource, persisted)
         output = resource.get_output(service, persisted)
       end
 
+      def remember(resource)
+        @resources[resource.name] = resource
+      end
+      
       def get_state(resource_name,resource_def)
         resource = Harp::Resources::AvailableResource.from_name resource_def['type']
         if resource.nil?
diff --git a/lib/harp-runtime/interpreter.rb b/lib/harp-runtime/interpreter.rb
index d4d0088..da6802f 100644
--- a/lib/harp-runtime/interpreter.rb
+++ b/lib/harp-runtime/interpreter.rb
@@ -5,18 +5,21 @@
 require "harp-runtime/cloud/cloud_mutator"
 require "harp-runtime/lang/command"
 require "harp-runtime/lang/copy"
-require 'pry'
 
 module SandboxModule
   extend self
 
+  attr_accessor :line_count
+
   DIE = "die"
   @interpreter = nil
   @line_count = 0
   @breakpoint = false
 
-  def set_engine(engine)
+  def reset(engine)
     @interpreter = engine
+    @breakpoint = false
+    @line_count = 0
   end
 
   def engine()
@@ -27,10 +30,6 @@ def line_mark(line)
     @line_count = line unless @breakpoint
   end
 
-  def line_count()
-    @line_count
-  end
-
   def at_breakpoint?
     @breakpoint
   end
@@ -74,7 +73,6 @@ def initialize(context)
     @break_at = (context.include? :break) ? context[:break].to_i : 0
     @events.push ({ :nav => "[Mock mode]" }) if (context.include? :mock)
     compute_desired_pc(context)
-    @context = context
   end
 
   # Accept the resources from a template and add to the dictionary of resources
@@ -87,10 +85,12 @@ def consume(template)
 
   # Create a resource and wait for the resource to become available.
   def create(resource_name)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Launching resource: #{resource_name}."
     resource = @resourcer.get resource_name
-    created = @mutator.create(resource_name, resource)
+    deps     = @resourcer.get_dep(resource_name)
+    deps.each {|ref| create(ref)}
+    created  = @mutator.create(resource_name, resource)
     created.harp_script = @harp_script
     result = {:create => resource_name}
     args = {:action => :create}
@@ -106,7 +106,7 @@ def create(resource_name)
   # Create a set of resources; all resources must will be complete before
   # processing continues.
   def createParallel(*resources)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Launching resource(s) in parallel #{resources.join(',')}."
     resources.each do |resource|
       resource = @resourcer.get resource_name
@@ -126,7 +126,7 @@ def createParallel(*resources)
 
   # Update a resource to a new resource definition.
   def update(resource_name)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Updating resource: #{resource_name}."
     @events.push({ :update => resource_name})
     return self
@@ -134,7 +134,7 @@ def update(resource_name)
 
   # Update a set of resources in parallel to new resource definitions.
   def updateParallel(*resources)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Updating resource(s) in parallel #{resources.join(',')}."
     resources.each { |resource| @events.push( { :update => resource })}
     return self
@@ -142,7 +142,7 @@ def updateParallel(*resources)
 
   # Update a resource to an alternate definition.
   def updateTo(resource_start, resource_finish)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Updating resource: #{resource_start} to #{resource_finish}."
     @events.push({ :update => resource_name})
     return self
@@ -150,8 +150,7 @@ def updateTo(resource_start, resource_finish)
 
   # Destroy a named resource.
   def destroy(resource_name)
-    @break_at = (@context.include? :break) ? @context[:break].to_i : 0
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Destroying resource: #{resource_name}."
     result = {:destroy => resource_name}
     args = {:action => :destroy}
@@ -168,21 +167,21 @@ def destroy(resource_name)
 
   # Destroy a named resource.
   def destroyParallel(*resources)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Destroying resource(s) in parallel #{resources.join(',')}."
     resources.each { |resource| @events.push( { "destroy" => resource })}
     return self
   end
 
   def onFail(*fails)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Handle fail action: #{fails.join(',')}"
     return self
   end
 
   # Interpreter debug operation; break at current line.
   def break
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Handle break."
     SandboxModule::set_break
     @break_at = SandboxModule::line_count
@@ -202,7 +201,8 @@ def parse(content)
 
     priv.instances_of(HarpInterpreter).allow_all
 
-    SandboxModule.set_engine(self)
+    SandboxModule.reset(self)
+
     sandbox.run(priv, content, :base_namespace => SandboxModule)
   end
 
@@ -217,10 +217,9 @@ def load_harp(harp_file, harp_contents, harp_id)
     @harp_script = ::HarpScript.first_or_new({:id => harp_id},
       {:location => harp_location, :version => "1.0"})
     if !@harp_script.saved?
-      #@harp_script.content = harp_contents
+      @harp_script.content = harp_contents
       @harp_script.save
     end
-    @harp_script.content = harp_contents
   end
 
   def call_sandbox(lifecycle)
@@ -234,28 +233,23 @@ def call_sandbox(lifecycle)
   end
 
   def play(lifecycle, options)
+
     harp_file = options[:harp_file] || nil
 
-    #harp_id = options[:harp_id]
-    if ! @harp_script.nil?
-      harp_id = @harp_script.id
-    else
-      harp_id = options[:harp_id]
-    end
-    
+    harp_id = options[:harp_id]
     if lifecycle.to_sym == Harp::Lifecycle::CREATE
       harp_id = SecureRandom.urlsafe_base64(16)
     end
-    
+
     load_harp(harp_file, options[:harp_contents], harp_id)
+
     # Now, instrument the script for debugging.
     harp_contents = parse(instrument_for_debug(@harp_script.content))
-    
+
     @events.push({ :harp_id => harp_id})
-    # require 'pry'
-#     binding.pry
 
     call_sandbox(lifecycle)
+
     respond
   end
 
@@ -287,7 +281,7 @@ def get_status(options)
   end
 
   def method_missing(meth, *args, &block)
-    if ! advance() then return self end
+    if ! advance? then return self end
     @@logger.debug "Invoking: #{meth}"
     begin
       require "harp-runtime/lang/#{meth}"
@@ -319,34 +313,48 @@ def respond
     done
   end
 
-  # Advance the program counter to the next instruction.
-  def advance
-    line_count = SandboxModule::line_count
-    @@logger.debug "At line: #{line_count}, #{caller[0][/`.*'/][1..-2]}"
-    if @break_at > 0
-      @@logger.debug "Waiting for l:#{@break_at}, at l:#{line_count}"
-      if @break_at <= line_count
-        return false
-      end
+  def at_breakpoint?
+    if SandboxModule::at_breakpoint?
+      return true
     end
-    @program_counter += 1
-    @current_line = line_count
+    # Check current line against breakpoint; skip execution if at break.
+    if @break_at > 0 and @break_at <= SandboxModule::line_count
+      SandboxModule::set_break
+      return true
+    end
+  end
+
+  def fast_forward?
     if @desired_pc && @program_counter < @desired_pc
-      #@@logger.debug "Waiting for pc:#{@desired_pc}, at pc:#{@program_counter}"
-      return false
+      #@@logger.warn "Waiting for pc:#{@desired_pc}, at pc:#{@program_counter}"
+      return true
     end
     if @desired_pc && @program_counter == @desired_pc
-      #@@logger.debug "Reached desired pc #{@desired_pc} at #{@current_line} #{line_count}"
+      #@@logger.warn "Reached desired pc #{@desired_pc} at #{SandboxModule::line_count} #{line_count}"
       if @continue
         @desired_pc = nil
       else
         @break_at = @current_line
       end
     end
+    false
+  end
+
+  # Advance the program counter to the next instruction.
+  def advance?
+    line_count = SandboxModule::line_count
+    #@@logger.warn "At line: #{line_count}, #{caller[0][/`.*'/][1..-2]}"
+    return false if at_breakpoint?
+    @program_counter += 1
+    @current_line = line_count
+    # If we're doing a step or continue, don't execute until at the right line.
+    return false if fast_forward?
     return true
   end
 
   # Decorate script with line number tags, to enable line number tracking for breakpoints.
+  # Currently only checking for here-documents.  Probably need fancier
+  # parsing for non-executable lines.
   def instrument_for_debug harp_contents
     if ! @is_debug
       return harp_contents
@@ -379,4 +387,4 @@ def compute_desired_pc(context)
 
 end
 
-end
+end
\ No newline at end of file

From d059785d3309ea9cc35dfb210a0d407ab28c4a0a Mon Sep 17 00:00:00 2001
From: Dev Mohanty <dmohanty09@austincollege.edu>
Date: Mon, 9 Dec 2013 11:58:42 -0600
Subject: [PATCH 5/5] modified intepreter spec test

---
 spec/interpreter_spec.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/interpreter_spec.rb b/spec/interpreter_spec.rb
index 80e51ec..d8b1ff2 100644
--- a/spec/interpreter_spec.rb
+++ b/spec/interpreter_spec.rb
@@ -52,8 +52,12 @@ def find_break_event(results)
       }
 
       it "instruments for debug and accepts breakpoint" do
-        created = interpreter.play("create", breakpoint_context)
-        results = interpreter.play("destroy", breakpoint_context)
+        harp_script = FactoryGirl.create(:harp_script)
+        breakpoint_context_created = breakpoint_context.clone
+        breakpoint_context_created[:harp_id] = harp_script.id
+        results = interpreter.play("destroy", breakpoint_context_created)
+        #created = interpreter.play("create", breakpoint_context)
+        #results = interpreter.play("destroy", breakpoint_context)
         break_event = find_break_event(results)
         break_event.should match ".*42$" # Should have broken at line 42
       end