simple_deploy 0.2.3 → 0.2.4

data/README.md

@@ -14,6 +14,8 @@ Create a file **~/.simple_deploy.yml** and include within it:
 ```
 deploy:
   gateway: ADMIN_IP_TO_YOUR_VPC
+  user: SSH_USER_TO_GATEWAY_AND_INSTANCES
+  key: PRIVATE_SSH_KEYFILE_FOR_USER
   artifacts: 
     - name: live_community_chef_repo
       bucket_prefix: intu-lc
@@ -36,6 +38,13 @@ environments:
     region: us-west-1
 ```
 
+Configuration File
+------------------
+
+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).
+
+Deploy can have a ssh **user** and **key** set.  These will be used to connect to both the gateway and tunnel through to instances.
+
 Commands
 --------
 
@@ -55,6 +64,10 @@ 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 arg2=vol2
 ```
 
 For more information, run simple_deploy -h.

data/lib/simple_deploy/cli/variables.rb

@@ -13,7 +13,7 @@ module SimpleDeploy
     end
 
     def self.read_attributes
-      @opts[:attributes].nil? ? [] :  @opts[:attributes].split(',')
+      @opts[:attributes].nil? ? [] : @opts[:attributes]
     end                                         
 
     def self.environment_provided?

data/lib/simple_deploy/cli.rb

@@ -22,10 +22,15 @@ 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 arg2=vol2
 
 EOS
         opt :help, "Display Help"
-        opt :attributes, "CSV list of updates attributes", :type => :string
+        opt :attributes, "CSV list of updates attributes", :type => :strings
         opt :environment, "Set the target environment", :type => :string
         opt :name, "Stack name to manage", :type => :string
         opt :template, "Path to the template file", :type => :string
@@ -34,7 +39,7 @@ EOS
       @cmd = ARGV.shift
 
       unless @cmd
-        puts "Please specify a command."
+        puts "\nPlease specify a command.\n"
         exit 1
       end
 
@@ -44,7 +49,7 @@ EOS
         @config = Config.new.environment @opts[:environment]
 
         unless environment_provided?
-          puts "Please specify an environment."
+          puts "\nPlease specify an environment.\n\n"
           Config.new.environments.keys.each { |e| puts e }
           exit 1
         end
@@ -53,7 +58,7 @@ EOS
       case @cmd
       when 'create', 'delete', 'deploy', 'destroy', 'instances',
            'status', 'attributes', 'events', 'resources',
-           'outputs', 'template', 'update'
+           'outputs', 'template', 'update', 'parameters'
         @stack = Stack.new :environment => @opts[:environment],
                            :name        => @opts[:name],
                            :config      => @config
@@ -80,10 +85,10 @@ EOS
       when 'instances'
         @stack.instances.each { |s| puts s }
       when 'list'
-        puts Stack.list(:config => @config)
+        puts Stackster::StackLister.new.all
       when 'template'
         jj @stack.template
-      when 'events', 'outputs', 'resources', 'status'
+      when 'events', 'outputs', 'resources', 'status', 'parameters'
         puts (@stack.send @cmd.to_sym).to_yaml
       else
         puts "Unknown command.  Use -h for help."

data/lib/simple_deploy/config.rb

@@ -16,8 +16,8 @@ module SimpleDeploy
       config['deploy']['artifacts']
     end
 
-    def keys
-      config['deploy']['keys'] ||= "#{env_home}/.ssh/id_rsa"
+    def key
+      config['deploy']['key'] ||= "#{env_home}/.ssh/id_rsa"
     end
 
     def gateway

data/lib/simple_deploy/deployment.rb

@@ -56,9 +56,9 @@ module SimpleDeploy
     end
 
     def ssh_options
-      @logger.info "Setting key to #{@config.keys}." if @config.keys
+      @logger.info "Setting key to #{@config.key}." if @config.key
       { 
-        :keys => @config.keys,
+        :keys => @config.key,
         :paranoid => false
       }
     end

data/lib/simple_deploy/stack.rb

@@ -57,7 +57,11 @@ module SimpleDeploy
     end
 
     def instances
-      stack.instances_private_ip_addresses
+      stack.instances.map do |i| 
+        if i['instancesSet'].first['privateIpAddress']
+          i['instancesSet'].first['privateIpAddress']
+        end
+      end
     end
 
     def status
@@ -68,6 +72,10 @@ module SimpleDeploy
       stack.attributes 
     end
 
+    def parameters
+      stack.parameters 
+    end
+
     def template
       JSON.parse stack.template
     end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 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.1.3'
+  s.add_runtime_dependency "stackster", '= 0.2.0'
   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.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70196170628520 !ruby/object:Gem::Requirement
+  requirement: &70176717046820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196170628520
+  version_requirements: *70176717046820
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70196170627740 !ruby/object:Gem::Requirement
+  requirement: &70176717046380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196170627740
+  version_requirements: *70176717046380
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70196170625960 !ruby/object:Gem::Requirement
+  requirement: &70176717045720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70196170625960
+  version_requirements: *70176717045720
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70196170625080 !ruby/object:Gem::Requirement
+  requirement: &70176717045240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196170625080
+  version_requirements: *70176717045240
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2723572142042949466
+      hash: -2471766336351240427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2723572142042949466
+      hash: -2471766336351240427
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16