simple_deploy 0.3.7 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+## v0.4.0:
+
+* Added support for passing updates with deploy command
+* Added support for deploying updates to multiple stacks
+* Updated log outputs
+* Abstracted CLI into individual classes
+
 ## v0.3.7:
 
 * Updated stackster

data/README.md

@@ -12,21 +12,15 @@ gem install simple_deploy
 Create a file **~/.simple_deploy.yml** and include within it:
 
 ```
-deploy:
-  script: /opt/intu/admin/bin/configure.sh
-  artifacts: 
-    - name: live_community_chef_repo
-      bucket_prefix: intu-lc
-      variable: CHEF_REPO_URL
-      cloud_formation_url: ChefRepoURL
-    - name: live_community
-      bucket_prefix: intu-lc
-      variable: APP_URL
-      cloud_formation_url: AppArtifactURL
-    - name: cookbooks
-      bucket_prefix: intu-artifacts
-      variable: COOKBOOKS_URL
-      cloud_formation_url: CookbooksURL
+artifacts: 
+  chef_repo:
+    bucket_prefix: bucket1
+    domain: app1-chef_repo
+  app:
+    bucket_prefix: bucket2
+    domain: app1
+  cookbooks:
+    bucket_prefix: bucket2
 
 environments:
   preprod_shared_us_west_1:
@@ -53,6 +47,7 @@ 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

data/lib/simple_deploy/cli/attributes.rb

@@ -0,0 +1,38 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Attributes
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show attributes for stack.
+
+simple_deploy attributes -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'info'
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+        Hash[stack.attributes.sort].each_pair { |k, v| puts "#{k}=#{v}" }
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/create.rb

@@ -0,0 +1,46 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Create
+      def create
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Create a new stack.
+
+simple_deploy create -n STACK_NAME -t PATH_TO_TEMPLATE -e ENVIRONMENT -a KEY1=VAL1 -a KEY2=VAL2
+
+EOS
+          opt :help, "Display Help"
+          opt :attributes, "= seperated attribute and it's value", :type  => :string,
+                                                                   :multi => true
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'info'
+          opt :name, "Stack name(s) of stack to deploy", :type => :string
+          opt :template, "Path to the template file", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name, :template]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
+                                                  :logger     => logger
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        stack.create :attributes => attributes,
+                     :template   => opts[:template]
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/deploy.rb

@@ -0,0 +1,46 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Deploy
+      def deploy
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Execute deployment on given stack(s).
+
+simple_deploy deploy -n STACK_NAME -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :attributes, "= seperated attribute and it's value", :type  => :string,
+                                                                   :multi => true
+          opt :environment, "Set the target environment", :type => :string
+          opt :force, "Force a deployment to proceed"
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'info'
+          opt :name, "Stack name(s) of stack to deploy", :type => :string,
+                                                         :multi => true
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
+                                                  :logger     => logger
+        opts[:name].each do |name|
+          stack = Stack.new :environment => opts[:environment],
+                            :name        => name,
+                            :config      => config,
+                            :logger      => logger
+          stack.update(:attributes => attributes) if attributes.any?
+          stack.deploy opts[:force]
+        end
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/destroy.rb

@@ -0,0 +1,39 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Destroy
+      def destroy
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Destroy a stack.
+
+simple_deploy destroy -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'info'
+          opt :name, "Stack name(s) of stack to deploy", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        stack.destroy
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/events.rb

@@ -0,0 +1,38 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Events
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show attributes for stack.
+
+simple_deploy attributes -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :count, "Count of events returned.", :type    => :integer,
+                                                   :default => 3
+          opt :environment, "Set the target environment", :type => :string
+          opt :name, "Stack name to manage", :type => :string
+        end
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        jj stack.events opts[:count]
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/instances.rb

@@ -0,0 +1,37 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Instances
+      def list
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+List instances for stack.
+
+simple_deploy instances -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        jj stack.instances
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/list.rb

@@ -0,0 +1,53 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class List
+      def stacks
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+List stacks in an environment
+
+simple_deploy list -e ENVIRONMENT
+
+EOS
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,                                          
+                                                                  :default => 'info'
+          opt :help, "Display Help"
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment]
+
+        config = Config.new.environment opts[:environment]
+        stacks = Stackster::StackLister.new(:config => config).all.sort
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+        puts stacks
+      end
+
+      def environments
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+List environments
+
+simple_deploy environments
+
+EOS
+          opt :help, "Display Help"
+        end
+        Config.new.environments.keys.each { |e| puts e }
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/outputs.rb

@@ -0,0 +1,39 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Outputs
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show outputs of a stack.
+
+simple_deploy outputs -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'warn'
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        puts stack.outputs
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/parameters.rb

@@ -0,0 +1,39 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Parameters
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show parameters of a stack.
+
+simple_deploy parameters -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'warn'
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        jj stack.parameters
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/resources.rb

@@ -0,0 +1,39 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Resources
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show resources of a stack.
+
+simple_deploy resources -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'warn'
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        jj stack.resources
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/shared.rb

@@ -0,0 +1,41 @@
+module SimpleDeploy
+  module CLI
+    module Shared
+
+      def self.parse_attributes(args)
+        attributes = args[:attributes]
+        logger = args[:logger]
+
+        attrs = []
+        attributes.each do |attribs|
+          key = attribs.split('=').first.gsub(/\s+/, "")
+          value = attribs.gsub(/^.+?=/, '')
+          logger.info "Read #{key}=#{value}"
+          attrs << { key => value }
+        end
+        attrs
+      end
+
+      def self.valid_options?(args)
+        provided = args[:provided]
+        required = args[:required]
+
+        required.each do |opt|
+          unless provided[opt]
+            puts "Option '#{opt} (-#{opt[0]})' required but not specified."
+            exit 1
+          end
+        end
+
+        if required.include? :environment
+          unless Config.new.environments.keys.include? provided[:environment]
+            puts "Environment '#{provided[:environment]}' does not exist."
+            exit 1
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/simple_deploy/cli/ssh.rb

@@ -0,0 +1,39 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class SSH
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show ssh connection string.
+
+simple_deploy ssh -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'warn'
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        puts stack.ssh
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/status.rb

@@ -0,0 +1,37 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Status
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show status of a stack.
+
+simple_deploy status -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        puts stack.status
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/template.rb

@@ -0,0 +1,37 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Template
+      def show
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Show current template for stack.
+
+simple_deploy template -n STACK_NAME -e ENVIRONMENT
+
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :name, "Stack name to manage", :type => :string
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        stack = Stack.new :environment => opts[:environment],
+                          :name        => opts[:name],
+                          :config      => config,
+                          :logger      => logger
+
+        jj stack.template
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli/update.rb

@@ -0,0 +1,46 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+    class Update
+      def update
+        opts = Trollop::options do
+          version SimpleDeploy::VERSION
+          banner <<-EOS
+
+Update the attributes for one more stacks.
+
+simple_deploy update -n STACK_NAME1 -n STACK_NAME2 -e ENVIRONMENT -a KEY1=VAL1 -a KEY2=VAL2
+
+EOS
+          opt :help, "Display Help"
+          opt :attributes, "= seperated attribute and it's value", :type  => :string,
+                                                                   :multi => true
+          opt :environment, "Set the target environment", :type => :string
+          opt :log_level, "Log level:  debug, info, warn, error", :type    => :string,
+                                                                  :default => 'info'
+          opt :name, "Stack name(s) of stack to deploy", :type => :string,
+                                                         :multi => true
+        end
+
+        CLI::Shared.valid_options? :provided => opts,
+                                   :required => [:environment, :name]
+
+        config = Config.new.environment opts[:environment]
+
+        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+
+        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
+                                                  :logger     => logger
+
+        opts[:name].each do |name|
+          stack = Stack.new :environment => opts[:environment],
+                            :name        => name,
+                            :config      => config,
+                            :logger      => logger
+          stack.update :attributes => attributes
+        end
+      end
+    end
+  end
+end

data/lib/simple_deploy/cli.rb

@@ -1,166 +1,70 @@
 require 'trollop'
-require 'simple_deploy/cli/variables'
+
+require 'simple_deploy/cli/shared'
+
+require 'simple_deploy/cli/attributes'
+require 'simple_deploy/cli/create'
+require 'simple_deploy/cli/deploy'
+require 'simple_deploy/cli/destroy'
+require 'simple_deploy/cli/events'
+require 'simple_deploy/cli/instances'
+require 'simple_deploy/cli/list'
+require 'simple_deploy/cli/outputs'
+require 'simple_deploy/cli/parameters'
+require 'simple_deploy/cli/resources'
+require 'simple_deploy/cli/ssh'
+require 'simple_deploy/cli/status'
+require 'simple_deploy/cli/template'
+require 'simple_deploy/cli/update'
 
 module SimpleDeploy
   module CLI
     def self.start
-      @opts = Trollop::options do
-        version SimpleDeploy::VERSION
-        banner <<-EOS
-
-Deploy and manage resources in AWS
-
-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
-simple_deploy parameters -n STACK_NAME -e ENVIRONMENT
-
-Attributes are specified as '=' 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
-
-You must setup a simple_deploy.yaml file in your home directory.  Format as follows:
-
-  artifacts:
-    chef_repo:
-      domain: app_specific_domain
-      bucket_prefix: chef-bucket-prefix
-    app:
-      domain: app_specific_app
-      bucket_prefix: app-bucket-prefix
-    cookbooks:
-      domain: app_specific_cookbooks
-      bucket_prefix: cookbooks-bucket-prefix
-
-  environments:
-    preprod_shared_us_west_1:
-      access_key: XXXXXXXXXXXXXXXXXXX
-      secret_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      region: us-west-1
-    infrastructure_us_west_1:
-      access_key: XXXXXXXXXXXXXXXXXXX
-      secret_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      region: us-west-1
-    infrastructure_us_west_2:
-      access_key: XXXXXXXXXXXXXXXXXXX
-      secret_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      region: us-west-2
-
-Bucket prefixes will append -us-west-1 (or appropriate region) when deploying based on the environment.
+      cmd = ARGV.shift
 
-For example app-bucket-prefix will be tranlated to app-bucket-prefix-us-west-1.
-
-The domain is the specific domain that is set when the artifact is created by heirloom.
-
-EOS
-        opt :help, "Display Help"
-        opt :attributes, "= seperated attribute and it's value", :type  => :string,
-                                                                 :multi => true
-        opt :environment, "Set the target environment", :type => :string
-        opt :force, "Force a deployment to proceed"
-        opt :count, "Count of events returned.", :type    => :integer,
-                                                 :default => 3
-        opt :log_level, "Log level to output. Valid levels:  debug, info, warn, error", :type    => :string,
-                                                                                        :default => 'info'
-        opt :name, "Stack name to manage", :type => :string
-        opt :template, "Path to the template file", :type => :string
-      end
-
-      @cmd = ARGV.shift
-
-      unless @cmd
+      unless cmd
         puts "\nPlease specify a command.\n"
         exit 1
       end
 
-      read_attributes
-      
-      unless @cmd == 'environments'
-
-        environments = Config.new.environments
-        unless environment_provided?
-          puts "\nPlease specify an environment.\n\n"
-          environments.keys.each { |e| puts e }
-          exit 1
-        end
-
-        unless environments.include? @opts[:environment]
-          puts "\nEnvironment #{@opts[:environment]} not found.\n"
-          exit 1
-        end
-
-        @config = Config.new.environment @opts[:environment]
-      end
-
-      @stacks = Stackster::StackLister.new(:config => @config).all.sort
-
-
-      case @cmd
-      when 'ssh'
-        @log_level = 'warn'
-      else
-        @log_level = 'info'
-      end
-
-      @log_level = @opts[:log_level] if @opts[:log_level]
-
-      @logger = SimpleDeployLogger.new :log_level => @log_level
-
-      case @cmd
-      when 'create', 'delete', 'deploy', 'destroy', 'instances',
-           'status', 'attributes', 'events', 'resources',
-           'outputs', 'template', 'update', 'parameters',
-           'ssh'
-
-        @stack = Stack.new :environment => @opts[:environment],
-                           :name        => @opts[:name],
-                           :config      => @config,
-                           :logger      => @logger
-      end
-
-      case @cmd
+      case cmd
       when 'attributes'
-        @stack.attributes.each_pair { |k, v| puts "#{k}=#{v}" }
+        CLI::Attributes.new.show
       when 'create'
-        @stack.create :attributes => attributes,
-                      :template => @opts[:template]
-        @logger.info "#{@opts[:name]} created."
-      when 'delete', 'destroy'
-        @stack.destroy
-        @logger.info "#{@opts[:name]} destroyed."
+        CLI::Create.new.create
+      when 'destroy', 'delete'
+        CLI::Destroy.new.destroy
       when 'deploy'
-        @stack.update :attributes => attributes
-        @stack.deploy @opts[:force]
+        CLI::Deploy.new.deploy
       when 'environments'
-        Config.new.environments.keys.each { |e| puts e }
-      when 'update'
-        @stack.update :attributes => attributes
-        @logger.info "#{@opts[:name]} updated."
+        CLI::List.new.environments
+      when 'events'
+        CLI::Events.new.show
       when 'instances'
-        @stack.instances.each { |s| puts s }
+        CLI::Instances.new.list
       when 'list'
-        puts @stacks
+        CLI::List.new.stacks
+      when 'outputs'
+        CLI::Outputs.new.show
+      when 'parameters'
+        CLI::Parameters.new.show
+      when 'resources'
+        CLI::Resources.new.show
+      when 'status'
+        CLI::Status.new.show
       when 'template'
-        jj @stack.template
-      when 'outputs', 'resources', 'status', 'parameters'
-        puts (@stack.send @cmd.to_sym).to_yaml
+        CLI::Template.new.show
       when 'ssh'
-        puts @stack.send @cmd.to_sym
-      when 'events'
-        puts (@stack.events @opts[:count]).to_yaml
+        CLI::SSH.new.show
+      when 'update'
+        CLI::Update.new.update
+      when '-h'
+        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update]"
+        puts "Append -h for help on specific subcommand."
       else
-        puts "Unknown command.  Use -h for help."
+        puts "Unknown command: '#{cmd}'."
+        puts "simple_deploy [attributes|create|destroy|environments|events|instances|list|template|outputs|parameters|resources|ssh|status|update]"
+        puts "Append -h for help on specific subcommand."
       end
     end
 

data/lib/simple_deploy/stack/deployment.rb

@@ -40,6 +40,7 @@ module SimpleDeploy
         get_artifact_endpoints.each_pair do |k,v|
           cmd += "#{k}=#{v} "
         end
+        cmd += "PRIMARY=#{primary_instance} "
         cmd += @deploy_script
 
         @logger.info "Executing '#{cmd}.'"
@@ -48,6 +49,10 @@ module SimpleDeploy
         end"
       end
 
+      def primary_instance 
+        @instances.first
+      end
+
       def get_artifact_endpoints
         h = {}
         @config.artifacts.each do |artifact|
@@ -65,7 +70,7 @@ module SimpleDeploy
       end
 
       def ssh_options
-        @logger.info "Setting key to #{@ssh_key}."
+        @logger.debug "Setting key to #{@ssh_key}."
         { 
           :keys => @ssh_key,
           :paranoid => false
@@ -75,7 +80,7 @@ module SimpleDeploy
       def create_deployment 
         @deployment = Capistrano::Configuration.new
         if @ssh_user
-          @logger.info "Setting user to #{@ssh_user}."
+          @logger.debug "Setting user to #{@ssh_user}."
           @deployment.set :user, @ssh_user
         end
 
@@ -89,7 +94,7 @@ module SimpleDeploy
         @deployment.variables[:ssh_options] = ssh_options
         
         @instances.each do |i| 
-          @logger.info "Adding instance #{i}."
+          @logger.debug "Deploying to instance #{i}."
           @deployment.server i, :instances
         end
       end

data/lib/simple_deploy/stack.rb

@@ -20,17 +20,21 @@ module SimpleDeploy
     end
 
     def update(args)
+      @logger.info "Updating #{@name}."
       stack.update :attributes => stack_attribute_formater.updated_attributes(args[: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 "Checking deployment status."
+      @logger.info "Deploying to #{@name}."
+      @logger.debug "Checking deployment status for #{@name}."
       if deployment_in_progress?
-        @logger.info "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."
@@ -38,11 +42,12 @@ module SimpleDeploy
           exit 1
         end
       else
-        @logger.info "No other deployments in progress."
+        @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}."
     end
 
     def ssh
@@ -54,19 +59,20 @@ module SimpleDeploy
     end
 
     def set_deployment_in_progress
-      @logger.info "Setting deployment in progress by #{ssh_user}."
+      @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.info "Clearing deployment status."
+      @logger.debug "Clearing deployment status for #{@name}."
       stack.update :attributes => [ { 'deployment_in_progress' => '' } ]
     end
 
     def destroy
       stack.destroy
+      @logger.info "#{@name} destroyed."
     end
 
     def events(limit)

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.3.7"
+  VERSION = "0.4.0"
 end

data/simple_deploy.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
 
   s.add_runtime_dependency "capistrano"
-  s.add_runtime_dependency "stackster", '= 0.2.6'
+  s.add_runtime_dependency "stackster", '= 0.2.7'
   s.add_runtime_dependency "trollop"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70195905609800 !ruby/object:Gem::Requirement
+  requirement: &70136111742480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195905609800
+  version_requirements: *70136111742480
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70195905608900 !ruby/object:Gem::Requirement
+  requirement: &70136111740700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195905608900
+  version_requirements: *70136111740700
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70195905607560 !ruby/object:Gem::Requirement
+  requirement: &70136111738160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70195905607560
+  version_requirements: *70136111738160
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70195905606500 !ruby/object:Gem::Requirement
+  requirement: &70136111737680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195905606500
+  version_requirements: *70136111737680
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -74,7 +74,21 @@ files:
 - lib/simple_deploy.rb
 - lib/simple_deploy/artifact.rb
 - lib/simple_deploy/cli.rb
-- lib/simple_deploy/cli/variables.rb
+- lib/simple_deploy/cli/attributes.rb
+- lib/simple_deploy/cli/create.rb
+- lib/simple_deploy/cli/deploy.rb
+- lib/simple_deploy/cli/destroy.rb
+- lib/simple_deploy/cli/events.rb
+- lib/simple_deploy/cli/instances.rb
+- lib/simple_deploy/cli/list.rb
+- lib/simple_deploy/cli/outputs.rb
+- lib/simple_deploy/cli/parameters.rb
+- lib/simple_deploy/cli/resources.rb
+- lib/simple_deploy/cli/shared.rb
+- lib/simple_deploy/cli/ssh.rb
+- lib/simple_deploy/cli/status.rb
+- lib/simple_deploy/cli/template.rb
+- lib/simple_deploy/cli/update.rb
 - lib/simple_deploy/config.rb
 - lib/simple_deploy/logger.rb
 - lib/simple_deploy/stack.rb
@@ -101,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 224391392022516916
+      hash: 2716701710085273471
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 224391392022516916
+      hash: 2716701710085273471
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16

data/lib/simple_deploy/cli/variables.rb

@@ -1,23 +0,0 @@
-module SimpleDeploy
-  module CLI
-    def self.attributes
-      attrs = []
-      read_attributes.each do |attribs|
-        key = attribs.split('=').first.gsub(/\s+/, "")
-        value = attribs.gsub(/^.+?=/, '')
-        @logger.info "Read #{key}=#{value}"
-        attrs << { key => value }
-      end
-      attrs
-    end
-
-    def self.read_attributes
-      @opts[:attributes].nil? ? [] : @opts[:attributes]
-    end                                         
-
-    def self.environment_provided?
-      @opts[:environment].nil? != true
-    end
-
-  end
-end