simple_deploy 0.6.4 → 0.6.5

data/CHANGELOG

@@ -1,3 +1,16 @@
+## v0.6.5:
+
+* Fixed instances command handling of nil IP addresses
+* Upgraded to stackster 0.4.1
+* Remove 'ssh' command
+* Update output format for 'attributes', 'instances', 'parameters' commands
+* Update help output
+* Minor internal cli refactor
+* Removed unused env argument passed into Stackster::Stack
+* Added log_level to clone cli class
+* Catching stackster exceptions in CLI
+* Refactored shared specs
+
 ## v0.6.4:
 
 * Check for artifact encryption via attribute name_encrypted (where name is name of archive)

data/lib/simple_deploy/cli/attributes.rb

@@ -4,6 +4,8 @@ module SimpleDeploy
   module CLI
 
     class Attributes
+      include Shared
+
       def show
         @opts = Trollop::options do
           version SimpleDeploy::VERSION
@@ -23,15 +25,22 @@ EOS
           opt :name, "Stack name to manage", :type => :string
         end
 
-        CLI::Shared.valid_options? :provided => @opts,
-                                   :required => [:environment, :name]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name]
 
         @opts[:as_command_args] ? command_args_output : default_output
       end
 
+      def command_summary
+        'Show attributes for stack'
+      end
+
       private
+
       def attribute_data
-        Hash[stack.attributes.sort]
+        rescue_stackster_exceptions_and_exit do
+          Hash[stack.attributes.sort]
+        end
       end
 
       def command_args_output
@@ -43,7 +52,7 @@ EOS
       end
 
       def default_output
-        attribute_data.each_pair { |k, v| puts "#{k}=#{v}" }
+        attribute_data.each_pair { |k, v| puts "#{k}: #{v}" }
       end
 
       def logger

data/lib/simple_deploy/cli/clone.rb

@@ -3,7 +3,10 @@ require 'tempfile'
 
 module SimpleDeploy
   module CLI
+
     class Clone
+      include Shared
+
       def clone
         @opts = Trollop::options do
           version SimpleDeploy::VERSION
@@ -16,6 +19,8 @@ simple_deploy clone -s SOURCE_STACK_NAME -n NEW_STACK_NAME -e ENVIRONMENT -a ATT
 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 :source_name, "Stack name for the stack to clone", :type => :string
           opt :new_name, "Stack name for the new stack", :type => :string
           opt :attributes, "= separated attribute and it's value", :type  => :string,
@@ -23,11 +28,10 @@ EOS
           opt :template, "Path to a new template file", :type => :string
         end
 
-        CLI::Shared.valid_options? :provided => @opts,
-                                   :required => [:environment, :source_name, :new_name]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :source_name, :new_name]
 
-        override_attributes = CLI::Shared.parse_attributes :attributes => @opts[:attributes],
-                                                           :logger     => logger
+        override_attributes = parse_attributes :attributes => @opts[:attributes]
 
         cloned_attributes = filter_attributes source_stack.attributes
         new_attributes = merge_attributes cloned_attributes, override_attributes
@@ -40,12 +44,17 @@ EOS
           File::open(template_file, 'w') { |f| f.write source_stack.template.to_json }
         end
 
-        new_stack.create :attributes => new_attributes,
-                         :template   => template_file
+        rescue_stackster_exceptions_and_exit do
+          new_stack.create :attributes => new_attributes,
+                           :template   => template_file
+        end
       end
 
-      private
+      def command_summary
+        'Clone a stack'
+      end
 
+      private
       def filter_attributes(source_attributes)
         selected = source_attributes.select { |k| k !~ /^deployment/ }
         selected.map { |k,v| { k => v } }
@@ -88,6 +97,8 @@ EOS
                                  :config      => config,
                                  :logger      => logger
       end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/create.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Create
+      include Shared
+
       def create
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -23,24 +26,33 @@ EOS
           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]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name, :template]
 
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+        config = Config.new.environment @opts[:environment]
 
-        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
-                                                  :logger     => logger
+        attributes = parse_attributes :attributes => @opts[:attributes]
 
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
+        stack = Stack.new :environment => @opts[:environment],
+                          :name        => @opts[:name],
                           :config      => config,
                           :logger      => logger
 
-        stack.create :attributes => attributes,
-                     :template   => opts[:template]
+        rescue_stackster_exceptions_and_exit do
+          stack.create :attributes => attributes,
+                       :template   => @opts[:template]
+        end
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Create a new stack'
       end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/deploy.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Deploy
+      include Shared
+
       def deploy
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -48,30 +51,39 @@ EOS
           opt :internal, "Use internal IP for ssh commands"
         end
 
-        CLI::Shared.valid_options? :provided => opts,
-                                   :required => [:environment, :name]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name]
 
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+        new_attributes = parse_attributes :attributes => @opts[:attributes]
 
-        new_attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
-                                                      :logger     => logger
-        opts[:name].each do |name|
+        @opts[:name].each do |name|
           notifier = Notifier.new :stack_name  => name,
-                                  :environment => opts[:environment],
+                                  :environment => @opts[:environment],
                                   :logger      => logger
 
-          stack = Stack.new :environment => opts[:environment],
+          stack = Stack.new :environment => @opts[:environment],
                             :name        => name,
                             :logger      => logger,
-                            :internal    => opts[:internal]
+                            :internal    => @opts[:internal]
 
           proceed = true
-          proceed = stack.update :force => opts[:force], :attributes => new_attributes if new_attributes.any?
+
+          if new_attributes.any?
+            rescue_stackster_exceptions_and_exit do
+              proceed = stack.update :force      => @opts[:force], 
+                                     :attributes => new_attributes
+            end
+          end
+
+          stack.wait_for_stable
 
           if proceed
-            notifier.send_deployment_start_message unless opts[:quiet]
-            if stack.deploy opts[:force]
-              notifier.send_deployment_complete_message unless opts[:quiet]
+            notifier.send_deployment_start_message unless @opts[:quiet]
+
+            result = stack.deploy @opts[:force]
+
+            if result
+              notifier.send_deployment_complete_message unless @opts[:quiet]
             else
               logger.error "Deployment to #{name} did not complete succesfully."
               exit 1
@@ -83,6 +95,16 @@ EOS
 
         end
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Execute deployment on given stack(s)'
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/destroy.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Destroy
+      include Shared
+
       def destroy
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -20,24 +23,28 @@ EOS
           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]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name]
 
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+        config = Config.new.environment @opts[:environment]
 
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
+        stack = Stack.new :environment => @opts[:environment],
+                          :name        => @opts[:name],
                           :config      => config,
                           :logger      => logger
 
-        if stack.destroy
-          exit 0
-        else
-          exit 1
-        end
+        exit 1 unless stack.destroy
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Destroy a stack'
       end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/environments.rb

@@ -0,0 +1,32 @@
+require 'trollop'
+
+module SimpleDeploy
+  module CLI
+
+    class Environments
+      include Shared
+
+      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
+
+      def command_summary
+        'List environments'
+      end
+
+    end
+
+  end
+end

data/lib/simple_deploy/cli/events.rb

@@ -2,13 +2,16 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Events
+      include Shared
+
       def show
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
-Show attributes for stack.
+Show events for stack.
 
 simple_deploy attributes -n STACK_NAME -e ENVIRONMENT
 
@@ -19,20 +22,31 @@ EOS
           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]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name]
 
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+        config = Config.new.environment @opts[:environment]
 
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
+        stack = Stack.new :environment => @opts[:environment],
+                          :name        => @opts[:name],
                           :config      => config,
                           :logger      => logger
 
-        jj stack.events opts[:count]
+        rescue_stackster_exceptions_and_exit do
+          jj stack.events @opts[:count]
+        end
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
       end
+
+      def command_summary
+        "Show events for a stack"
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/execute.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Execute
+      include Shared
+
       def execute
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -33,25 +36,38 @@ EOS
           opt :sudo, "Execute command with sudo"
         end
 
-        CLI::Shared.valid_options? :provided => opts,
-                                   :required => [:environment, :name]
-
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name]
 
-        opts[:name].each do |name|
+        @opts[:name].each do |name|
           notifier = Notifier.new :stack_name  => name,
-                                  :environment => opts[:environment],
+                                  :environment => @opts[:environment],
                                   :logger      => logger
 
-          stack = Stack.new :environment => opts[:environment],
+          stack = Stack.new :environment => @opts[:environment],
                             :name        => name,
                             :logger      => logger,
-                            :internal    => opts[:internal]
+                            :internal    => @opts[:internal]
 
-          stack.execute :command => opts[:command],
-                        :sudo    => opts[:sudo]
+          begin
+            stack.execute :command => @opts[:command],
+                          :sudo    => @opts[:sudo]
+          rescue SimpleDeploy::Exceptions::NoInstances
+            logger.error "Stack has no running instances."
+            exit 1
+          end
         end
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Execute command on given stack(s)'
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/instances.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Instances
+      include Shared
+
       def list
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -19,29 +22,37 @@ EOS
           opt :internal, "Use internal IP for ssh commands"
         end
 
-        CLI::Shared.valid_options? :provided => opts,
-                                   :required => [:environment, :name]
-
-        config = Config.new.environment opts[:environment]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name]
 
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+        config = Config.new.environment @opts[:environment]
 
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
+        stack = Stack.new :environment => @opts[:environment],
+                          :name        => @opts[:name],
                           :config      => config,
                           :logger      => logger,
-                          :internal    => opts[:internal]
+                          :internal    => @opts[:internal]
 
         exit 1 unless stack.exists?
 
         instances = stack.instances
 
         if instances.nil? || instances.empty?
-          logger.info "Stack '#{opts[:name]}' does not have any instances."
+          logger.info "Stack '#{@opts[:name]}' does not have any instances."
         else
-          jj stack.instances
+          puts stack.instances
         end
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'List instances for stack'
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/list.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class List
+      include Shared
+
       def stacks
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -14,40 +17,33 @@ 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,                                          
+          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]
+        valid_options? :provided => @opts,
+                       :required => [:environment]
 
-        config = Config.new.environment opts[: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],
+        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
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
 
-EOS
-          opt :help, "Display Help"
-        end
-        Config.new.environments.keys.each { |e| puts e }
+      def command_summary
+        'List stacks in an environment'
       end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/outputs.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Outputs
+      include Shared
+
       def show
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -20,26 +23,36 @@ EOS
           opt :name, "Stack name to manage", :type => :string
         end
 
-        CLI::Shared.valid_options? :provided => opts,
-                                   :required => [:environment, :name]
-
-        config = Config.new.environment opts[:environment]
+        valid_options? :provided => @opts,
+                       :required => [:environment, :name]
 
-        logger = SimpleDeployLogger.new :log_level => opts[:log_level]
+        config = Config.new.environment @opts[:environment]
 
-        stack = Stack.new :environment => opts[:environment],
-                          :name        => opts[:name],
+        stack = Stack.new :environment => @opts[:environment],
+                          :name        => @opts[:name],
                           :config      => config,
                           :logger      => logger
 
-        # we need a little whitespace
-        puts
+        rescue_stackster_exceptions_and_exit do
+          outputs = stack.outputs
 
-        outputs = stack.outputs
-        outputs.each do |hash|
-          puts "%s: %s" % [hash['OutputKey'], hash['OutputValue']]
+          logger.info "No outputs." unless outputs.any?
+
+          outputs.each do |hash|
+            puts "%s: %s" % [hash['OutputKey'], hash['OutputValue']]
+          end
         end
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Show outputs of a stack'
+      end
+
     end
+
   end
 end