simple_deploy 0.3.5 → 0.3.6

data/CHANGELOG

@@ -1,3 +1,9 @@
+## v0.3.6:
+
+* Added -l to set log level
+* Change -l to -c to limit results
+* Updated output of ssh command
+
 ## v0.3.5:
 
 * Added ssh command

data/lib/simple_deploy/cli.rb

@@ -69,8 +69,10 @@ EOS
                                                                  :multi => true
         opt :environment, "Set the target environment", :type => :string
         opt :force, "Force a deployment to proceed"
-        opt :limit, "Add limit to results returned by events.", :type    => :integer,
-                                                                :default => 3
+        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
@@ -102,7 +104,18 @@ EOS
       end
 
       @stacks = Stackster::StackLister.new(:config => @config).all.sort
-      @logger = SimpleDeployLogger.new
+
+
+      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',
@@ -127,6 +140,7 @@ EOS
         @stack.destroy
         @logger.info "#{@opts[:name]} destroyed."
       when 'deploy'
+        @stack.update :attributes => attributes
         @stack.deploy @opts[:force]
       when 'environments'
         Config.new.environments.keys.each { |e| puts e }
@@ -144,7 +158,7 @@ EOS
       when 'ssh'
         puts @stack.send @cmd.to_sym
       when 'events'
-        puts (@stack.events @opts[:limit]).to_yaml
+        puts (@stack.events @opts[:count]).to_yaml
       else
         puts "Unknown command.  Use -h for help."
       end

data/lib/simple_deploy/logger.rb

@@ -3,6 +3,7 @@ module SimpleDeploy
     
     def initialize(args = {})
       @logger = args[:logger] ||= Logger.new(STDOUT)
+      @log_level = args[:log_level] ||= 'info'
 
       unless args[:logger]
         @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
@@ -11,6 +12,16 @@ module SimpleDeploy
         end
       end
 
+      case @log_level.downcase
+      when 'info'
+        @logger.level = Logger::INFO
+      when 'debug'
+        @logger.level = Logger::DEBUG
+      when 'warn'
+        @logger.level = Logger::WARN
+      when 'error'
+        @logger.level = Logger::ERROR
+      end
       @logger
     end
 

data/lib/simple_deploy/stack/deployment.rb

@@ -29,7 +29,7 @@ module SimpleDeploy
 
       def ssh
         @instances.map do |i|
-          "\n-----\nssh -i #{@ssh_key} -l #{@ssh_user} -L 9998:#{i}:22 -N #{@ssh_gateway} &\nssh -p 9998 localhost\n-----\n"
+          "\nssh -i #{@ssh_key} -l #{@ssh_user} -L 9998:#{i}:22 -N #{@ssh_gateway} &\nssh -p 9998 localhost"
         end
       end
 

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 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.4'
+  s.add_runtime_dependency "stackster", '= 0.2.5'
   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.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70195385732420 !ruby/object:Gem::Requirement
+  requirement: &70196623215560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195385732420
+  version_requirements: *70196623215560
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70195385732000 !ruby/object:Gem::Requirement
+  requirement: &70196623214760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195385732000
+  version_requirements: *70196623214760
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70195385731460 !ruby/object:Gem::Requirement
+  requirement: &70196623213700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70195385731460
+  version_requirements: *70196623213700
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70195385730980 !ruby/object:Gem::Requirement
+  requirement: &70196623213200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195385730980
+  version_requirements: *70196623213200
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2027487143120214063
+      hash: 424800808715961970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2027487143120214063
+      hash: 424800808715961970
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16