Add a Rakefile and fix the unit tests

Author: surybala

.gitignore

@@ -0,0 +1,2 @@
+Gemfile.lock
+deployment/

Gemfile

@@ -13,6 +13,7 @@ gem 'rubyzip'
 gem 'rake'
 gem 'archive-tar-minitar'
 gem 'logging'
+gem 'process_manager'
 
 group :development do
 # this doesn't need to be a global or even a standard dependency

Rakefile

@@ -0,0 +1,29 @@
+require 'rake'
+require 'rake/testtask'
+require 'rspec/core/rake_task'
+require 'rubygems'
+
+# Check Ruby syntax in bin/ and lib/
+
+# Run all units tests in test/
+desc "Run unit tests in test/"
+Rake::TestTask.new(:test) do |t|
+  t.libs << ['test', 'lib', 'test/helpers']
+
+  test_files = FileList.new("test/**/*_test.rb")
+  t.test_files = test_files
+  t.verbose = true
+end
+task :default => :test
+
+# Run units tests in test/instance_agent/
+Rake::TestTask.new(:test_instance_agent) do |t|
+  t.libs << ['test', 'lib', 'test/helpers']
+  t.pattern = "test/instance_agent/**/*_test.rb"
+  t.verbose = true
+end
+
+# Clean up
+task :clean do
+  rm_rf 'deployment'
+end

codedeploy_agent-1.1.0.gemspec

@@ -15,4 +15,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency('rake', '~> 0.9')
   spec.add_dependency('logging', '~>1.8')
   spec.add_dependency('aws-sdk-core', '~>2.0')
-end
+end

lib/instance_agent.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 
 Gem.use_paths(nil, Gem.path << "/opt/codedeploy-agent/vendor")
-
 require 'core_ext'
 
 require 'rubygems'

test/instance_agent/plugins/codedeploy/application_specification_test.rb

@@ -6,18 +6,19 @@ module InstanceAgent
   module Plugins
     module CodeDeployPlugin
       module ApplicationSpecification
+
         class ApplicationSpecificationTest < InstanceAgentTestCase
+          def make_app_spec
+            ApplicationSpecification.new(YAML.load(@app_spec_string), {:revision_id => @test_revision_id})
+          end
+
           context 'The Application Specification' do
             setup do
               @test_revision_id = 'bar'
             end
 
             private
 
-            def make_app_spec
-              ApplicationSpecification.new(YAML.load(@app_spec_string), {:revision_id => @test_revision_id})
-            end
-
             context "With missing version" do
               setup do
                 @app_spec_string = <<-END
@@ -1710,4 +1711,4 @@ def make_app_spec
       end
     end
   end
-end
+end

test/instance_agent/plugins/codedeploy/command_executor_test.rb

@@ -1,11 +1,18 @@
 require 'test_helper'
+require 'certificate_helper'
 require 'stringio'
-require 'com/amazon/codedeploy/command/v20141006/host_command_instance'
 require 'aws-sdk-core/s3'
 
 class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
 
   include InstanceAgent::Plugins::CodeDeployPlugin
+      def generate_signed_message_for(map)
+        message = @cert_helper.sign_message(map.to_json)
+        spec = OpenStruct.new({ :payload => message })
+        spec.format = "PKCS7/JSON"
+
+        return spec
+      end
 
   context 'The CodeDeploy Plugin Command Executor' do
     setup do
@@ -33,13 +40,6 @@ class CodeDeployPluginCommandExecutorTest < InstanceAgentTestCase
     end
 
     context "when executing a command" do
-      def generate_signed_message_for(map)
-        message = @cert_helper.sign_message(map.to_json)
-        spec = OpenStruct.new({ :payload => message })
-        spec.format = "PKCS7/JSON"
-
-        return spec
-      end
 
       setup do
         @cert_helper = CertificateHelper.new
@@ -62,7 +62,7 @@ def generate_signed_message_for(map)
             "S3Revision" => @s3Revision
           }
         })
-        @command = Com::Amazon::Codedeploy::Command::V20141006::HostCommandInstance.new(
+        @command = Aws::CodeDeployCommand::Types::HostCommandInstance.new(
         :host_command_identifier => "command-1",
         :deployment_execution_id => "test-execution")
         @root_dir = '/tmp/codedeploy/'

test/instance_agent/plugins/codedeploy/deployment_specification_test.rb

@@ -3,15 +3,15 @@
 require 'certificate_helper'
 
 class DeploymentSpecificationTest < InstanceAgentTestCase
-  context 'The Deployment Specification' do
-    def generate_signed_message_for(map)
-      message = @cert_helper.sign_message(map.to_json)
-      spec = OpenStruct.new({ :payload => message })
-      spec.format = "PKCS7/JSON"
 
-      return spec
-    end
+  def generate_signed_message_for(map)
+    message = @cert_helper.sign_message(map.to_json)
+    spec = OpenStruct.new({ :payload => message })
+    spec.format = "PKCS7/JSON"
+    return spec
+  end
 
+  context 'The Deployment Specification' do
     setup do
       @cert_helper = CertificateHelper.new
       @deployment_id = SecureRandom.uuid.to_s
@@ -37,8 +37,8 @@ def generate_signed_message_for(map)
 
       @packed_message = generate_signed_message_for(@deployment_spec)
       InstanceAgent::Config.init
-    end
-
+    end 
+   
     context "with JSON format" do
       should "populate the deployment id" do
         parsed_deployment_spec = InstanceAgent::Plugins::CodeDeployPlugin::DeploymentSpecification.parse(@packed_message)

test/instance_agent/plugins/codedeploy/hook_executor_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 require 'stringio'
 require 'fileutils'
-require 'com/amazon/codedeploy/command/v20141006/host_command_instance'
 
 class HookExecutorTest < InstanceAgentTestCase
 

test/test_helper.rb

@@ -1,4 +1,7 @@
 # encoding: UTF-8
+$:.unshift "lib"
+Gem.use_paths(nil, Gem.path << "vendor")
+
 require 'thread'
 require 'rubygems'
 require "bundler"
@@ -14,3 +17,4 @@
 # require local test helpers. If you need a helper write,
 # keep this pattern or you'll be punished hard
 require 'instance_agent_helper'
+