simple_deploy 0.6.4 → 0.6.5

data/lib/simple_deploy/cli/parameters.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Parameters
+      include Shared
+
       def show
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -20,20 +23,30 @@ 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
 
-        jj stack.parameters
+        rescue_stackster_exceptions_and_exit do
+          puts stack.parameters.sort
+        end
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Show parameters of a stack'
       end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/protect.rb

@@ -3,9 +3,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Protect
+      include Shared
+
       def protect
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -23,21 +26,31 @@ EOS
                                                            :multi => true
         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]
 
-        opts[:name].each do |name|
-          stack = Stack.new :environment => opts[:environment],
+        @opts[:name].each do |name|
+          stack = Stack.new :environment => @opts[:environment],
                             :name        => name,
                             :config      => config,
                             :logger      => logger
-          stack.update :attributes => [{ 'protection' => opts[:protection] }]
+          rescue_stackster_exceptions_and_exit do
+            stack.update :attributes => [{ 'protection' => @opts[:protection] }]
+          end
         end
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Protect/Unprotect one or more stacks'
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/resources.rb

@@ -2,9 +2,13 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Resources
+
+      include Shared
+
       def show
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -16,24 +20,34 @@ 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'
+                                                                  :default => 'info'
           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]
 
-        config = Config.new.environment opts[:environment]
+        config = Config.new.environment @opts[:environment]
 
-        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
 
-        jj stack.resources
+        rescue_stackster_exceptions_and_exit do
+          jj stack.resources
+        end
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Show resources of a stack'
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/shared.rb

@@ -1,14 +1,14 @@
 module SimpleDeploy
   module CLI
+
     module Shared
 
-      def self.parse_attributes(args)
+      def parse_attributes(args)
         attributes = args[:attributes]
-        logger = args[:logger]
+        attrs      = []
 
-        attrs = []
         attributes.each do |attribs|
-          key = attribs.split('=').first.gsub(/\s+/, "")
+          key   = attribs.split('=').first.gsub(/\s+/, "")
           value = attribs.gsub(/^.+?=/, '')
           logger.info "Read #{key}=#{value}"
           attrs << { key => value }
@@ -16,26 +16,36 @@ module SimpleDeploy
         attrs
       end
 
-      def self.valid_options?(args)
+      def 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."
+            logger.error "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."
+            logger.error "Environment '#{provided[:environment]}' does not exist."
             exit 1
           end
         end
+      end
 
+      def command_name
+        self.class.name.split('::').last.downcase
+      end
+
+      def rescue_stackster_exceptions_and_exit
+        yield
+      rescue Stackster::Exceptions::Base
+        exit 1
       end
 
     end
+
   end
 end

data/lib/simple_deploy/cli/status.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Status
+      include Shared
+
       def show
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -18,20 +21,30 @@ 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
 
-        puts stack.status
+        rescue_stackster_exceptions_and_exit do
+          puts stack.status
+        end
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Show status of a stack'
       end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/template.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Template
+      include Shared
+
       def show
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -18,20 +21,30 @@ 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
 
-        jj stack.template
+        rescue_stackster_exceptions_and_exit do
+          jj stack.template
+        end
+      end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Show current template for stack'
       end
+
     end
+
   end
 end

data/lib/simple_deploy/cli/update.rb

@@ -2,9 +2,12 @@ require 'trollop'
 
 module SimpleDeploy
   module CLI
+
     class Update
+      include Shared
+
       def update
-        opts = Trollop::options do
+        @opts = Trollop::options do
           version SimpleDeploy::VERSION
           banner <<-EOS
 
@@ -24,24 +27,33 @@ EOS
                                                          :multi => true
         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]
 
-        attributes = CLI::Shared.parse_attributes :attributes => opts[:attributes],
-                                                  :logger     => logger
+        attributes = parse_attributes :attributes => @opts[:attributes]
 
-        opts[:name].each do |name|
-          stack = Stack.new :environment => opts[:environment],
+        @opts[:name].each do |name|
+          stack = Stack.new :environment => @opts[:environment],
                             :name        => name,
                             :config      => config,
                             :logger      => logger
-          stack.update :force => opts[:force], :attributes => attributes
+          rescue_stackster_exceptions_and_exit do
+            stack.update :force => @opts[:force], :attributes => attributes
+          end
         end
       end
+
+      def logger
+        @logger ||= SimpleDeployLogger.new :log_level => @opts[:log_level]
+      end
+
+      def command_summary
+        'Update the attributes for one more stacks'
+      end
+
     end
+
   end
 end

data/lib/simple_deploy/cli.rb

@@ -7,6 +7,7 @@ require 'simple_deploy/cli/clone'
 require 'simple_deploy/cli/create'
 require 'simple_deploy/cli/deploy'
 require 'simple_deploy/cli/destroy'
+require 'simple_deploy/cli/environments'
 require 'simple_deploy/cli/events'
 require 'simple_deploy/cli/execute'
 require 'simple_deploy/cli/instances'
@@ -15,13 +16,13 @@ require 'simple_deploy/cli/outputs'
 require 'simple_deploy/cli/parameters'
 require 'simple_deploy/cli/protect'
 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
       cmd = ARGV.shift
 
@@ -37,7 +38,7 @@ module SimpleDeploy
       when 'deploy'
         CLI::Deploy.new.deploy
       when 'environments'
-        CLI::List.new.environments
+        CLI::Environments.new.environments
       when 'events'
         CLI::Events.new.show
       when 'execute'
@@ -63,17 +64,40 @@ module SimpleDeploy
       when 'update'
         CLI::Update.new.update
       when '-h'
-        puts "simple_deploy [attributes|clone|create|deploy|destroy|environments|events|execute|instances|list|outputs|parameters|protect|resources|ssh|status|template|update] [options]"
-        puts "Append -h for help on specific subcommand."
+        usage
       when '-v'
         puts SimpleDeploy::VERSION
       else
         puts "Unknown command: '#{cmd}'."
-        puts "simple_deploy [attributes|clone|create|deploy|destroy|environments|events|execute|instances|list|outputs|parameters|protect|resources|ssh|status|template|update] [options]"
-        puts "Append -h for help on specific subcommand."
+        puts ''
+        usage
         exit 1
       end
     end
 
+    def self.usage
+      puts 'Usage: simple_deploy command'
+      puts ''
+      puts 'Append -h for help on specific subcommand.'
+      puts ''
+
+      puts 'Commands:'
+      commands.each do |cmd|
+        $stdout.printf "    %-#{length_of_longest_command}s      %s\n",
+                       cmd.command_name,
+                       cmd.command_summary
+      end
+    end
+
+    def self.commands
+      return @commands if @commands
+      klasses   = SimpleDeploy::CLI.constants.reject { |c| c == :Shared }
+      @commands = klasses.map { |klass| SimpleDeploy::CLI.const_get(klass).new }
+    end
+
+    def self.length_of_longest_command
+      commands.map { |c| c.command_name.length }.max
+    end
+
   end
 end

data/lib/simple_deploy/exceptions.rb

@@ -0,0 +1,13 @@
+module SimpleDeploy
+  module Exceptions
+
+    class Base < RuntimeError
+      attr_accessor :message
+
+      def initialize(message="")
+        @message = message
+      end
+    end
+
+  end
+end

data/lib/simple_deploy/stack/ssh.rb

@@ -18,6 +18,7 @@ module SimpleDeploy
       end
 
       def execute(args)
+        return false if @instances.nil? || @instances.empty?
         create_execute_task args
         @task.execute
       end
@@ -25,9 +26,6 @@ module SimpleDeploy
       private
 
       def create_execute_task(args)
-        if @instances.nil? || @instances.empty?
-          raise "There are no running instances to execute this command."
-        end
 
         @task = Capistrano::Configuration.new :output => @logger
         @task.logger.level = 3

data/lib/simple_deploy/stack.rb

@@ -87,13 +87,17 @@ module SimpleDeploy
             info['ipAddress']
           end
         end
-      end.flatten
+      end.flatten.compact
     end
 
     def status
       stack.status
     end
 
+    def wait_for_stable
+      stack.wait_for_stable
+    end
+
     def exists?
       stack.status
       true
@@ -112,13 +116,12 @@ module SimpleDeploy
     def template
       JSON.parse stack.template
     end
-    
+
     private
 
     def stack
       stackster_config = @config.environment @environment
-      @stack ||= Stackster::Stack.new :environment => @environment,
-                                      :name        => @name,
+      @stack ||= Stackster::Stack.new :name        => @name,
                                       :config      => stackster_config,
                                       :logger      => @logger
     end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/simple_deploy.rb

@@ -1,4 +1,5 @@
 require 'simple_deploy/env'
+require 'simple_deploy/exceptions'
 require 'simple_deploy/config'
 require 'simple_deploy/artifact'
 require 'simple_deploy/stack'

data/simple_deploy.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.11.0"
 
   s.add_runtime_dependency "capistrano", "= 2.13.5"
-  s.add_runtime_dependency "stackster", '= 0.4.0'
+  s.add_runtime_dependency "stackster", '= 0.4.1'
   s.add_runtime_dependency "tinder", "= 1.9.1"
   s.add_runtime_dependency "trollop", "= 2.0"
 end

data/spec/cli/attributes_spec.rb

@@ -26,12 +26,12 @@ describe SimpleDeploy::CLI::Attributes do
     end
 
     it 'should output the attributes' do
-      SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                with(:provided => @options,
-                                     :required => [:environment, :name])
+      subject.should_receive(:valid_options?).
+              with(:provided => @options,
+                   :required => [:environment, :name])
       Trollop.stub(:options).and_return(@options)
-      subject.should_receive(:puts).with("foo=bar")
-      subject.should_receive(:puts).with("baz=blah")
+      subject.should_receive(:puts).with('foo: bar')
+      subject.should_receive(:puts).with('baz: blah')
       subject.show
     end
 
@@ -39,9 +39,9 @@ describe SimpleDeploy::CLI::Attributes do
       before do
         @options[:as_command_args] = true
         Trollop.stub(:options).and_return(@options)
-        SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                  with(:provided => @options,
-                                       :required => [:environment, :name])
+        subject.should_receive(:valid_options?).
+                with(:provided => @options,
+                     :required => [:environment, :name])
       end
 
       it 'should output the attributes as command arguments' do

data/spec/cli/clone_spec.rb

@@ -159,9 +159,9 @@ describe SimpleDeploy::CLI::Clone do
       end
       
       it 'should create the new stack using the filtered, merged and added attributes' do
-        SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                 with(:provided => @options,
-                                      :required => [:environment, :source_name, :new_name])
+        subject.should_receive(:valid_options?).
+                with(:provided => @options,
+                     :required => [:environment, :source_name, :new_name])
         Trollop.stub(:options).and_return(@options)
 
         @new_stack.should_receive(:create) do |options|
@@ -181,9 +181,9 @@ describe SimpleDeploy::CLI::Clone do
       it 'should create the new stack using a new template' do
         @options[:template] = 'brand_new_template.json'
 
-        SimpleDeploy::CLI::Shared.should_receive(:valid_options?).
-                                 with(:provided => @options,
-                                      :required => [:environment, :source_name, :new_name])
+        subject.should_receive(:valid_options?).
+                with(:provided => @options,
+                      :required => [:environment, :source_name, :new_name])
         Trollop.stub(:options).and_return(@options)
 
         @new_stack.should_receive(:create) do |options|