simple_deploy 0.4.5 → 0.4.6

data/CHANGELOG

@@ -1,3 +1,12 @@
+## v0.4.6:
+
+* Added spec tests
+* Passing logger object into Capistrano deploy
+* Updated logger to accept puts from Capistrano
+* Refactored deployment
+* Added support for both classic & vpc deployments
+* Removed unused stack_reader & stack_lister classes
+
 ## v0.4.5:
 
 * Corrected SSL verification options

data/README.md

@@ -33,8 +33,13 @@ notifications:
     token: XXX
 ```
 
-Configuration File
-------------------
+Notifications
+-------------
+
+Currently Simple Deploy only supports Campfire for notifications.  To enable them, add your token, which can be obtained on the 'My Info' screen of Campfire in the notifications yaml above.  If you don't want notificaitons, omit this section.
+
+Advaned Configurations
+----------------------
 
 The configuration file supports additional optional deployment parameters.  Artifacts can have an **endpoint** specified to be passed in (by default they pass in the s3 url).
 
@@ -43,30 +48,7 @@ Deploy can have a ssh **user** and **key** set.  These will be used to connect t
 Commands
 --------
 
-You can issues the following commands:
-
-```
-simple_deploy environments
-simple_deploy list -e ENVIRONMENT
-simple_deploy create -n STACK_NAME -e ENVIRONMENT -a ATTRIBUTES -t TEMPLATE_PATH
-simple_deploy update -n STACK_NAME -e ENVIRONMENT -a ATTRIBUTES
-simple_deploy deploy -n STACK_NAME -e ENVIRONMENT
-simple_deploy ssh -n STACK_NAME -e ENVIRONMENT
-simple_deploy destroy -n STACK_NAME -e ENVIRONMENT
-simple_deploy instances -n STACK_NAME -e ENVIRONMENT
-simple_deploy status -n STACK_NAME -e ENVIRONMENT
-simple_deploy attributes -n STACK_NAME -e ENVIRONMENT
-simple_deploy events -n STACK_NAME -e ENVIRONMENT
-simple_deploy resources -n STACK_NAME -e ENVIRONMENT
-simple_deploy outputs -n STACK_NAME -e ENVIRONMENT
-simple_deploy template -n STACK_NAME -e ENVIRONMENT
-
-Attribute pairs are = seperated key value pairs.  Multiple can be specified.  For example:
-
-simple_deploy create -t ~/my-template.json -e my-env -n test-stack -a arg1=val1 -a arg2=vol2
-```
-
-For more information, run simple_deploy -h.
+For a list of commands, run simple_deploy -h.  To get more information about each subcommand, append a -h after the subcomand.  For example: **simple_deploy deploy -h**.
 
 Deploying
 ---------

data/lib/simple_deploy/artifact.rb

@@ -14,11 +14,7 @@ module SimpleDeploy
     end
 
     def endpoints
-      {
-        's3' => s3_url,
-        'http' => http_url,
-        'https' => https_url
-      }
+      { 's3' => s3_url, 'http' => http_url, 'https' => https_url }
     end
 
     private

data/lib/simple_deploy/cli/deploy.rb

@@ -42,9 +42,14 @@ EOS
                             :logger      => logger
 
           stack.update(:attributes => new_attributes) if new_attributes.any?
-          stack.deploy opts[:force]
 
-          notifier.send_deployment_complete_message unless opts[:quiet]
+          if stack.deploy opts[:force]
+            notifier.send_deployment_complete_message unless opts[:quiet]
+          else
+            logger.error "Deployment to #{name} did not complete succesfully."
+            exit 1
+          end
+
         end
       end
     end

data/lib/simple_deploy/logger.rb

@@ -7,12 +7,23 @@ module SimpleDeploy
 
     def_delegators :@logger, :debug, :error, :info, :warn
 
+    # For capistrano output
+    # Only output Cap commands in debug mode
+    def puts(msg, line_prefix=nil)
+      @logger.debug msg.chomp
+    end
+
     def initialize(args = {})
       @log_level = args[:log_level] ||= 'info'
       @logger    = args[:logger] ||= new_logger(args)
     end
 
+    def logger_level
+      Logger.const_get @log_level.upcase
+    end
+
     private
+
     def new_logger(args)
       Logger.new(STDOUT).tap do |l|
         l.datetime_format = '%Y-%m-%dT%H:%M:%S%z'
@@ -23,9 +34,5 @@ module SimpleDeploy
       end
     end
 
-    def logger_level
-      Logger.const_get @log_level.upcase
-    end
-
   end
 end

data/lib/simple_deploy/stack/deployment/status.rb

@@ -0,0 +1,58 @@
+module SimpleDeploy
+  class Stack
+    class Deployment
+      class Status
+
+        def initialize(args)
+          @config = args[:config]
+          @stack = args[:stack]
+          @ssh_user = args[:ssh_user]
+          @name = args[:name]
+          @logger = @config.logger
+        end
+
+        def cleared_to_deploy?(force=false)
+          return true unless deployment_in_progress?
+
+          if force          
+            @logger.info "Forcing. Clearing deployment status."
+            unset_deployment_in_progress
+          else
+            false
+          end
+        end
+
+        def deployment_in_progress?
+          @logger.debug "Checking deployment status for #{@name}."
+          if attributes['deployment_in_progress'] == 'true'
+            @logger.info "Deployment in progress for #{@name}."
+            @logger.info "Started by #{attributes['deployment_user']}@#{attributes['deployment_datetime']}."
+            true
+          else
+            @logger.debug "No other deployments in progress for #{@name}."
+            false
+          end
+        end
+
+        def set_deployment_in_progress
+          @logger.debug "Setting deployment in progress by #{@ssh_user} for #{@name}."
+          @stack.update :attributes => [ { 'deployment_in_progress' => 'true',
+                                           'deployment_user'        => @ssh_user,
+                                           'deployment_datetime'    => Time.now.to_s } ]
+        end
+
+        def unset_deployment_in_progress
+          @logger.debug "Clearing deployment in progress for #{@name}."
+          @stack.update :attributes => [ { 'deployment_in_progress' => 'false' } ]
+        end
+
+        private
+
+        def attributes
+          @stack.attributes
+        end
+
+      end
+    end
+  end
+end

data/lib/simple_deploy/stack/deployment.rb

@@ -1,30 +1,48 @@
 require 'capistrano'
 require 'capistrano/cli'
 
+require 'simple_deploy/stack/deployment/status'
+
 module SimpleDeploy
   class Stack
     class Deployment
       def initialize(args)
         @config = args[:config]
-        @logger = @config.logger
         @instances = args[:instances]
-        @attributes = args[:attributes]
         @environment = args[:environment]
-        @ssh_gateway = @attributes['ssh_gateway']
         @ssh_user = args[:ssh_user]
         @ssh_key = args[:ssh_key]
-
-        @region = @config.region(@environment)
-        @deploy_script = @config.deploy_script
-
-        create_deployment
+        @stack = args[:stack]
+        @name = args[:name]
+        @attributes = @stack.attributes
+        @logger = @config.logger
+        @region = @config.region @environment
       end
 
-      def execute
+      def create_deployment 
+        @deployment = Capistrano::Configuration.new :output => @logger
+        @deployment.logger.level = 3
+        @logger.info "Creating deployment to #{@name}."
+
+        set_ssh_gateway
+        set_ssh_user
+        set_ssh_options
+        set_instances
         set_deploy_command
-        @logger.info 'Starting deployment.'
-        @deployment.simpledeploy
-        @logger.info 'Deployment complete.'
+      end
+
+      def execute(force=false)
+        if status.cleared_to_deploy?(force)
+          status.set_deployment_in_progress
+          @logger.info 'Starting deployment.'
+          @deployment.simpledeploy
+          @logger.info 'Deployment complete.'
+          status.unset_deployment_in_progress
+          true
+        else
+          @logger.error "Not clear to deploy."
+          false
+        end
       end
 
       def ssh
@@ -37,22 +55,17 @@ module SimpleDeploy
 
       def set_deploy_command
         cmd = get_artifact_endpoints.any? ? "env " : ""
-        get_artifact_endpoints.each_pair do |k,v|
-          cmd += "#{k}=#{v} "
+        get_artifact_endpoints.each_pair do |key,value|
+          cmd += "#{key}=#{value} "
         end
-        cmd += "PRIMARY_HOST=#{primary_instance} "
-        cmd += @deploy_script
+        cmd += "PRIMARY_HOST=#{primary_instance} #{deploy_script}"
 
-        @logger.info "Executing '#{cmd}.'"
+        @logger.info "Deploy command: '#{cmd}'."
         @deployment.load :string => "task :simpledeploy do
         sudo '#{cmd}'
         end"
       end
 
-      def primary_instance 
-        @instances.first
-      end
-
       def get_artifact_endpoints
         h = {}
         @config.artifacts.each do |artifact|
@@ -64,39 +77,55 @@ module SimpleDeploy
                                   :region        => @region,
                                   :config        => @config,
                                   :bucket_prefix => bucket_prefix
+
           h[variable] = artifact.endpoints['s3']
         end
         h
       end
 
-      def ssh_options
-        @logger.debug "Setting key to #{@ssh_key}."
-        { 
-          :keys => @ssh_key,
-          :paranoid => false
-        }
+      def set_instances
+        @instances.each do |instance| 
+          @logger.debug "Deploying to instance #{instance}."
+          @deployment.server instance, :instances
+        end
       end
 
-      def create_deployment 
-        @deployment = Capistrano::Configuration.new
-        if @ssh_user
-          @logger.debug "Setting user to #{@ssh_user}."
-          @deployment.set :user, @ssh_user
-        end
+      def set_ssh_options
+        @logger.debug "Setting key to #{@ssh_key}."
+        @deployment.variables[:ssh_options] = { :keys     => @ssh_key, 
+                                                :paranoid => false }
+      end
 
-        if @ssh_gateway
-          @deployment.set :gateway, @ssh_gateway
-          @logger.info "Proxying via gateway #{@ssh_gateway}."
+      def set_ssh_gateway
+        ssh_gateway = @attributes['ssh_gateway']
+        if ssh_gateway && !ssh_gateway.empty?
+          @deployment.set :gateway, ssh_gateway
+          @logger.info "Proxying via gateway #{ssh_gateway}."
         else
           @logger.info "Not using an ssh gateway."
         end
+      end
 
-        @deployment.variables[:ssh_options] = ssh_options
-        
-        @instances.each do |i| 
-          @logger.debug "Deploying to instance #{i}."
-          @deployment.server i, :instances
-        end
+      def set_ssh_user
+        @logger.debug "Setting user to #{@ssh_user}."
+        @deployment.set :user, @ssh_user
+      end
+
+      def primary_instance 
+        @instances.first
+      end
+
+      def deploy_script
+        @config.deploy_script
+      end
+
+      def status
+        options = { :name        => @name,
+                    :environment => @environment,
+                    :ssh_user    => @ssh_user,
+                    :config      => @config,
+                    :stack       => @stack }
+        @status ||= SimpleDeploy::Stack::Deployment::Status.new options
       end
 
     end

data/lib/simple_deploy/stack/stack_attribute_formater.rb

@@ -20,6 +20,8 @@ module SimpleDeploy
       attributes + updates
     end
 
+    private
+
     def artifact_names
       @config.artifacts
     end
@@ -30,7 +32,7 @@ module SimpleDeploy
       a = @config.artifacts.select { |a| a['name'] == name }.first
 
       bucket_prefix = @config.artifact_bucket_prefix name
-      cloud_formation_url = @config.artifact_cloud_formation_url name
+      url_parameter = @config.artifact_cloud_formation_url name
 
       artifact = Artifact.new :name          => name,
                               :id            => id,
@@ -38,7 +40,7 @@ module SimpleDeploy
                               :config        => @config,
                               :bucket_prefix => bucket_prefix
 
-      { cloud_formation_url => artifact.endpoints['s3'] }
+      { url_parameter => artifact.endpoints['s3'] }
     end
 
   end

data/lib/simple_deploy/stack.rb

@@ -1,7 +1,5 @@
 require 'stackster'
 require 'simple_deploy/stack/deployment'
-require 'simple_deploy/stack/stack_reader'
-require 'simple_deploy/stack/stack_lister'
 require 'simple_deploy/stack/stack_attribute_formater'
 
 module SimpleDeploy
@@ -15,62 +13,29 @@ module SimpleDeploy
     end
 
     def create(args)
-      stack.create :attributes => stack_attribute_formater.updated_attributes(args[:attributes]),
-                   :template => args[:template]
+      attributes = stack_attribute_formater.updated_attributes args[:attributes]
+      stack.create :attributes => attributes,
+                   :template   => args[:template]
     end
 
     def update(args)
       @logger.info "Updating #{@name}."
-      stack.update :attributes => stack_attribute_formater.updated_attributes(args[:attributes])
+      attributes = stack_attribute_formater.updated_attributes args[:attributes]
+      stack.update :attributes => attributes
       @logger.info "Update complete for #{@name}."
     end
 
-    # To Do: Abstract deployment into it's own class
-    # Pass in required stack objects for attribut mgmt
     def deploy(force = false)
-      @logger.info "Deploying to #{@name}."
-      @logger.debug "Checking deployment status for #{@name}."
-      if deployment_in_progress?
-        @logger.info "Deployment in progress for #{@name}."
-        @logger.info "Started by #{attributes['deployment_user']}@#{attributes['deployment_datetime']}."
-        if force
-          @logger.info "Forcing.  Clearing deployment status."
-          clear_deployment_status
-        else
-          @logger.error "Exiting due to existing deployment."
-          @logger.error "Use -f to override."
-          exit 1
-        end
-      else
-        @logger.debug "No other deployments in progress for #{@name}."
-      end
-      set_deployment_in_progress
-      deployment.execute
-      clear_deployment_status
-      @logger.info "Deploy completed succesfully for #{@name}."
+      deployment.create_deployment
+      deployment.execute force
     end
 
     def ssh
       deployment.ssh
     end
 
-    def deployment_in_progress?
-      attributes['deployment_in_progress'] == 'true'
-    end
-
-    def set_deployment_in_progress
-      @logger.debug "Setting deployment in progress by #{ssh_user} for #{@name}."
-      stack.update :attributes => [ { 'deployment_in_progress' => 'true',
-                                      'deployment_user'        => ssh_user,
-                                      'deployment_datetime'    => Time.now.to_s } ]
-    end
-
-    def clear_deployment_status
-      @logger.debug "Clearing deployment status for #{@name}."
-      stack.update :attributes => [ { 'deployment_in_progress' => '' } ]
-    end
-
     def destroy
+      deployment.create_deployment
       stack.destroy
       @logger.info "#{@name} destroyed."
     end
@@ -88,10 +53,9 @@ module SimpleDeploy
     end
 
     def instances
-      stack.instances.map do |i| 
-        if i['instancesSet'].first['privateIpAddress']
-          i['instancesSet'].first['privateIpAddress']
-        end
+      stack.instances.map do |instance| 
+        info = instance['instancesSet'].first
+        info['vpcId'] ? info['privateIpAddress'] : info['ipAddress']
       end
     end
 
@@ -114,9 +78,10 @@ module SimpleDeploy
     private
 
     def stack
+      stackster_config = @config.environment @environment
       @stack ||= Stackster::Stack.new :environment => @environment,
                                       :name        => @name,
-                                      :config      => @config.environment(@environment),
+                                      :config      => stackster_config,
                                       :logger      => @logger
     end
     
@@ -128,8 +93,9 @@ module SimpleDeploy
     def deployment
       @deployment ||= Stack::Deployment.new :config      => @config,
                                             :environment => @environment,
+                                            :name        => @name,
+                                            :stack       => stack,
                                             :instances   => instances,
-                                            :attributes  => attributes,
                                             :ssh_user    => ssh_user,
                                             :ssh_key     => ssh_key
     end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/artifact_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe SimpleDeploy do
+
+  describe "an artifact" do
+
+    before do
+      @config_mock = mock 'config'
+      @config_mock.should_receive(:artifact_domain).and_return('us-west-1')
+      @artifact = SimpleDeploy::Artifact.new :bucket_prefix => 'test_prefix',
+                                             :config        => @config_mock,
+                                             :id            => 'abc123',
+                                             :name          => 'myapp',
+                                             :region        => 'us-west-1'
+    end
+
+    it "should return the endpoints for the artifact" do
+      endpoints = { "s3"    => "s3://test_prefix-us-west-1/us-west-1/abc123.tar.gz", 
+                    "http"  => "http://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz",
+                    "https" => "https://s3-us-west-1.amazonaws.com/test_prefix-us-west-1/us-west-1/abc123.tar.gz" }
+      @artifact.endpoints.should == endpoints
+    end
+
+  end
+end

data/spec/cli_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'simple_deploy/cli'
+
+describe SimpleDeploy do
+
+  it "should call the given sub command" do
+    status_mock = mock 'status mock'
+    ARGV = ['status', '-h']
+    status_mock.should_receive(:show)
+    SimpleDeploy::CLI::Status.should_receive(:new).and_return status_mock
+    SimpleDeploy::CLI.start
+  end
+
+end
+

data/spec/config_spec.rb

@@ -2,10 +2,74 @@ require 'spec_helper'
 
 describe SimpleDeploy do
 
-  it "should create a new config object" do
-    config = SimpleDeploy::Config.new
-    config.class.should == SimpleDeploy::Config
+  describe "after creating a configuration" do
+    before do
+      @config_data = { 'artifacts' => { 
+                         'test_repo' => {
+                           'bucket_prefix' => 'test_prefix',
+                           'domain' => 'test_domain'
+                          },
+                         'test_repo2' => { },
+                        },
+                        'environments' => {
+                          'test_env' => { 
+                            'secret_key' => 'secret',
+                            'access_key' => 'access',
+                            'region'     => 'us-west-1'
+                          }
+                        },
+                        'notifications' => {
+                          'campfire' => {
+                            'token' => 'my_token' 
+                          }
+                        }
+                      }
+
+      File.should_receive(:open).with("#{ENV['HOME']}/.simple_deploy.yml").
+                                 and_return(@config_data.to_yaml)
+      @config = SimpleDeploy::Config.new
+    end
+
+    it "should return the default artifacts to deploy" do
+      @config.artifacts.should == ['chef_repo', 'cookbooks', 'app']
+    end
+
+    it "should return the APP_URL for app" do
+      @config.artifact_deploy_variable('app').should == 'APP_URL'
+    end
+
+    it "should return the Cloud Formation camel case variables" do
+      @config.artifact_cloud_formation_url('app').should == 'AppArtifactURL'
+    end
+
+    it "should return the domain (the folder in the s3 bucket) for an artifact" do
+      @config.artifact_domain('test_repo').should == 'test_domain'
+    end
+
+    it "should return the name of an artifact for those without a set domain" do
+      @config.artifact_domain('test_repo2').should == 'test_repo2'
+    end
+
+    it "should return the bucket prefix for the artifact" do
+      @config.artifact_bucket_prefix('test_repo').should == 'test_prefix'
+    end
+
+    it "should return the environment requested" do
+      @config.environment('test_env').should == ({ 'secret_key' => 'secret', 'access_key' => 'access', 'region' => 'us-west-1' })
+    end
+
+    it "should return the notifications available" do
+      @config.notifications.should == ( { 'campfire' => { 'token' => 'my_token' } } )
+    end
+
+    it "should return the region for the environment" do
+      @config.region('test_env').should == 'us-west-1'
+    end
+
+    it "should return the deploy script" do
+      @config.deploy_script.should == '/opt/intu/admin/bin/configure.sh'
+    end
+
   end
 
 end
-

data/spec/logger_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe SimpleDeploy do
+
+  it "should create a new logger object from the hash passed as :logger" do
+    logger_mock = mock 'logger'
+    logger_mock.should_receive(:info).with 'a message'
+    logger = SimpleDeploy::SimpleDeployLogger.new :logger => logger_mock
+    logger.info 'a message'
+  end
+
+  it "should create a new logger object when one is not passed" do
+    logger_mock = mock 'logger'
+    Logger.should_receive(:new).with(STDOUT).and_return logger_mock
+    logger_mock.should_receive(:info).with 'a message'
+    logger_mock.should_receive(:datetime_format=).with '%Y-%m-%dT%H:%M:%S%z'
+    logger_mock.should_receive(:formatter=)
+    logger_mock.should_receive(:level=).with 1
+    logger = SimpleDeploy::SimpleDeployLogger.new
+    logger.info 'a message'
+  end
+
+  it "accept puts with msg and pass it to debug" do
+    logger_mock = mock 'logger'
+    Logger.should_receive(:new).with(STDOUT).and_return logger_mock
+    logger_mock.should_receive(:debug).with 'a message'
+    logger_mock.should_receive(:datetime_format=).with '%Y-%m-%dT%H:%M:%S%z'
+    logger_mock.should_receive(:formatter=)
+    logger_mock.should_receive(:level=).with 1
+    logger = SimpleDeploy::SimpleDeployLogger.new
+    logger.puts 'a message'
+  end
+
+end

data/spec/stack/deployment/status_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe SimpleDeploy do
+
+  it "should test status"
+
+end

data/spec/stack/deployment_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe SimpleDeploy do
+
+  before do
+    @attributes = { 'key' => 'val' }
+    @config_mock = mock 'config mock'
+    @stack_mock = mock 'stack mock'
+
+    @stack_mock.should_receive(:attributes).and_return @attributes
+    @config_mock.should_receive(:logger).and_return @logger_mock
+    @config_mock.should_receive(:region).with('test-us-west-1').
+                                         and_return 'us-west-1'
+
+    options = { :config      => @config_mock,
+                :instances   => ['1.2.3.4', '4.3.2.1'],
+                :environment => 'test-us-west-1',
+                :ssh_user    => 'user',
+                :ssh_key     => 'key',
+                :stack       => @stack_mock,
+                :name        => 'stack-name' }
+    @stack = SimpleDeploy::Stack::Deployment.new options
+  end
+
+  it "should not blow up creating a new deployment" do
+    @stack.class.should == SimpleDeploy::Stack::Deployment
+  end
+
+  it "should deploy if the stack is clear to deploy"
+  it "should deploy if the stack is not clear to deploy but forced"
+  it "should deploy if the stack is not clear to deploy but forced"
+
+end

data/spec/stack/stack_attribute_formater_spec.rb

@@ -0,0 +1,38 @@
+describe SimpleDeploy do
+  before do
+    @config_mock = mock 'config mock'
+    @logger_mock = mock 'logger mock'
+    @config_mock.should_receive(:region).with('preprod').
+                 and_return 'us-west-1'
+    @config_mock.should_receive(:logger).and_return @logger_mock
+
+    options = { :config      => @config_mock,
+                :environment => 'preprod' }
+    @formater = SimpleDeploy::StackAttributeFormater.new options
+  end
+
+  it "should return updated attributes including cloud formation url" do
+    artifact_mock = mock 'artifact'
+    SimpleDeploy::Artifact.should_receive(:new).exactly(2).times.
+                           with(:name => 'chef_repo',
+                                :id   => 'test123',
+                                :region => 'us-west-1',
+                                :config => @config_mock,
+                                :bucket_prefix => 'test-prefix').
+                           and_return artifact_mock
+    @config_mock.should_receive(:artifact_bucket_prefix).with('chef_repo').
+                 exactly(2).times.
+                 and_return('test-prefix')
+    @config_mock.should_receive(:artifact_cloud_formation_url).with('chef_repo').
+                 exactly(2).times.
+                 and_return('CookBooksURL')
+    @config_mock.should_receive(:artifacts).exactly(3).times.
+                 and_return ['chef_repo', 'cookbooks', 'app']
+    @logger_mock.should_receive(:info)
+    artifact_mock.should_receive(:endpoints).exactly(2).times.
+                                             and_return 's3' => 's3_url'
+    @formater.updated_attributes([ { 'chef_repo' => 'test123' } ]).
+              should == [ { "chef_repo" => "test123" }, 
+                          { "CookBooksURL" =>"s3_url" } ]
+  end
+end

data/spec/stack_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe SimpleDeploy do
+
+  describe "A stack" do
+    
+    before do
+      @config_mock = mock 'config mock'
+      @logger_mock = mock 'logger mock'
+      @config_mock.should_receive(:logger).and_return @logger_mock
+      SimpleDeploy::Config.should_receive(:new).
+                           with(:logger => 'my-logger').
+                           and_return @config_mock
+      @stack = SimpleDeploy::Stack.new :environment => 'test-env',
+                                       :name        => 'test-stack',
+                                       :logger      => 'my-logger',
+                                       :config      => @config_mock
+    end
+
+    it "should call create stack" do
+      saf_mock = mock 'stack attribute formater mock'
+      stack_mock = mock 'stackster stack mock'
+      environment_config_mock = mock 'environment config mock'
+      @config_mock.should_receive(:environment).with('test-env').
+                   and_return environment_config_mock
+      SimpleDeploy::StackAttributeFormater.should_receive(:new).
+                                           with(:config      => @config_mock,
+                                                :environment => 'test-env').
+                                           and_return saf_mock
+      Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
+                                                 :name        => 'test-stack',
+                                                 :config      => environment_config_mock,
+                                                 :logger      => @logger_mock).
+                                            and_return stack_mock
+      saf_mock.should_receive(:updated_attributes).with({'arg1' => 'val'}).
+               and_return('arg1' => 'new_val')
+      stack_mock.should_receive(:create).with :attributes => { 'arg1' => 'new_val' },
+                                              :template   => 'some_json'
+      @stack.create(:attributes => { 'arg1' => 'val' }, 
+                    :template => 'some_json')
+    end
+
+    it "should call update stack" do
+      saf_mock = mock 'stack attribute formater mock'
+      stack_mock = mock 'stackster stack mock'
+      environment_config_mock = mock 'environment config mock'
+      @logger_mock.should_receive(:info).exactly(2).times
+      @config_mock.should_receive(:environment).with('test-env').
+                   and_return environment_config_mock
+      SimpleDeploy::StackAttributeFormater.should_receive(:new).
+                                           with(:config      => @config_mock,
+                                                :environment => 'test-env').
+                                           and_return saf_mock
+      Stackster::Stack.should_receive(:new).with(:environment => 'test-env',
+                                                 :name        => 'test-stack',
+                                                 :config      => environment_config_mock,
+                                                 :logger      => @logger_mock).
+                                            and_return stack_mock
+      saf_mock.should_receive(:updated_attributes).with({'arg1' => 'val'}).
+               and_return('arg1' => 'new_val')
+      stack_mock.should_receive(:update).with :attributes => { 'arg1' => 'new_val' }
+      @stack.update :attributes => { 'arg1' => 'val' }
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137370194100 !ruby/object:Gem::Requirement
+  requirement: &70150787913560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137370194100
+  version_requirements: *70150787913560
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70137370156720 !ruby/object:Gem::Requirement
+  requirement: &70150787912240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137370156720
+  version_requirements: *70150787912240
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70137370155440 !ruby/object:Gem::Requirement
+  requirement: &70150787911000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70137370155440
+  version_requirements: *70150787911000
 - !ruby/object:Gem::Dependency
   name: tinder
-  requirement: &70137370154820 !ruby/object:Gem::Requirement
+  requirement: &70150787909440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137370154820
+  version_requirements: *70150787909440
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70137370154140 !ruby/object:Gem::Requirement
+  requirement: &70150787878560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137370154140
+  version_requirements: *70150787878560
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -106,16 +106,22 @@ files:
 - lib/simple_deploy/notifier/campfire.rb
 - lib/simple_deploy/stack.rb
 - lib/simple_deploy/stack/deployment.rb
+- lib/simple_deploy/stack/deployment/status.rb
 - lib/simple_deploy/stack/stack_attribute_formater.rb
-- lib/simple_deploy/stack/stack_lister.rb
-- lib/simple_deploy/stack/stack_reader.rb
 - lib/simple_deploy/version.rb
 - script/ci_setup
 - simple_deploy.gemspec
+- spec/artifact_spec.rb
+- spec/cli_spec.rb
 - spec/config_spec.rb
+- spec/logger_spec.rb
 - spec/notifier/campfire_spec.rb
 - spec/notifier_spec.rb
 - spec/spec_helper.rb
+- spec/stack/deployment/status_spec.rb
+- spec/stack/deployment_spec.rb
+- spec/stack/stack_attribute_formater_spec.rb
+- spec/stack_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -130,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1892996877575368211
+      hash: -5787533256512322
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1892996877575368211
+      hash: -5787533256512322
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16
@@ -147,7 +153,14 @@ signing_key:
 specification_version: 3
 summary: I help with deployments
 test_files:
+- spec/artifact_spec.rb
+- spec/cli_spec.rb
 - spec/config_spec.rb
+- spec/logger_spec.rb
 - spec/notifier/campfire_spec.rb
 - spec/notifier_spec.rb
 - spec/spec_helper.rb
+- spec/stack/deployment/status_spec.rb
+- spec/stack/deployment_spec.rb
+- spec/stack/stack_attribute_formater_spec.rb
+- spec/stack_spec.rb

data/lib/simple_deploy/stack/stack_lister.rb

@@ -1,13 +0,0 @@
-module SimpleDeploy
-  class StackLister
-
-    def initialize(args)
-      @config = args[:config]
-    end
-    
-    def all
-      Stackster::Stack.list :config => @config
-    end
-
-  end
-end

data/lib/simple_deploy/stack/stack_reader.rb

@@ -1,40 +0,0 @@
-require 'json'
-
-module SimpleDeploy
-  class StackReader
-
-    def initialize(args)
-      @sf = Stackster::StackFormater.new args
-      @sr = Stackster::StackReader.new args
-    end
-
-    def attributes
-      @sf.attributes
-    end
-
-    def instances
-      @sf.instances_public_ip_addresses
-    end
-
-    def status
-      @sr.status
-    end
-
-    def events
-      @sr.events
-    end
-
-    def outputs
-      @sr.outputs
-    end
-
-    def resources
-      @sr.resources
-    end
-
-    def template
-      @sr.template
-    end
-
-  end
-end