simple_deploy 0.2.1 → 0.2.2

data/README.md

@@ -13,32 +13,27 @@ Create a file **~/.simple_deploy.yml** and include within it:
 
 ```
 deploy:
-  keys: PATH_TO_PRIVATE_KEY
-  user: ec2-user
+  gateway: GATEWAY_TO_YOUR_VPC
   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: artifacts
-      endpoint: http
+      bucket_prefix: intu-artifacts
       variable: COOKBOOKS_URL
-  script: /opt/admin/bin/deploy.sh
+      cloud_formation_url: CookbooksURL
+  script: /opt/intu/admin/bin/configure.sh
 
 environments:
-  preprod_us_west_1:
+  preprod_shared_us_west_1:
     access_key: XXX
-    secret_key: XXX
+    secret_key: yyy
     region: us-west-1
-  prod_us_west_1:
-    access_key: YYY
-    secret_key: YYY
-    region: us-west-1
-  preprod_us_east_1:
-    access_key: XXX
-    secret_key: XXX
-    region: us-east-1
-  prod_us_east_1:
-    access_key: YYY
-    secret_key: YYY
-    region: us-east-1
 ```
 
 Commands

data/lib/simple_deploy/cli/variables.rb

@@ -2,9 +2,12 @@ module SimpleDeploy
   module CLI
     def self.attributes
       attrs = []
+      puts "Read the following attributes:"
       read_attributes.each do |attribs|
-        a = attribs.split('=')
-        attrs << { a.first.gsub(/\s+/, "") => a.last }
+        key = attribs.split('=').first.gsub(/\s+/, "")
+        value = attribs.gsub(/^.+?=/, '')
+        puts "#{key} : #{value}"
+        attrs << { key => value }
       end
       attrs
     end

data/lib/simple_deploy/config.rb

@@ -1,7 +1,7 @@
 module SimpleDeploy
   class Config
 
-    attr_accessor :config
+    attr_accessor :config, :logger
 
     def initialize
       load_config_file
@@ -17,11 +17,15 @@ module SimpleDeploy
     end
 
     def keys
-      config['deploy']['keys']
+      config['deploy']['keys'] ||= "#{env_home}/.ssh/id_rsa"
+    end
+
+    def gateway
+      config['deploy']['gateway']
     end
 
     def user
-      config['deploy']['user']
+      config['deploy']['user'] ||= "#{env_user}"
     end
 
     def deploy_script
@@ -44,5 +48,15 @@ module SimpleDeploy
       config['artifact_repository']
     end
 
+    private
+
+    def env_home
+      ENV['HOME']
+    end
+
+    def env_user
+      ENV['USER']
+    end
+
   end
 end

data/lib/simple_deploy/deployment.rb

@@ -8,6 +8,7 @@ module SimpleDeploy
       @instances = args[:instances]
       @environment = args[:environment]
       @attributes = args[:attributes]
+      @logger = @config.logger
 
       @region = @config.region(@environment)
       @deploy_script = @config.deploy_script
@@ -17,6 +18,7 @@ module SimpleDeploy
     end
 
     def execute
+      @logger.info 'Starting Deployment.'
       @deployment.simpledeploy
     end
 
@@ -29,6 +31,7 @@ module SimpleDeploy
       end
       cmd += @deploy_script
 
+      @logger.info "Executing '#{cmd}.'"
       @deployment.load :string => "task :simpledeploy do
       sudo '#{cmd}'
       end"
@@ -38,7 +41,7 @@ module SimpleDeploy
       h = {}
       @config.artifacts.each do |a|
         name = a['name']
-        endpoint = a['endpoint']
+        endpoint = a['endpoint'] ||= 's3'
         variable = a['variable']
         bucket_prefix = a['bucket_prefix']
 
@@ -53,6 +56,7 @@ module SimpleDeploy
     end
 
     def ssh_options
+      @logger.info "Setting key to #{@config.keys}." if @config.keys
       { 
         :keys => @config.keys,
         :paranoid => false
@@ -61,9 +65,18 @@ module SimpleDeploy
 
     def create_deployment 
       @deployment = Capistrano::Configuration.new
-      @deployment.set :user, @config.user
+      if @config.user
+        @logger.info "Setting user to #{@config.user}."
+        @deployment.set :user, @config.user
+      end
+      @deployment.set :gateway, @config.gateway if @config.gateway
       @deployment.variables[:ssh_options] = ssh_options
-      @instances.each { |i| @deployment.server i, :instances }
+      @logger.info "Proxying via gateway #{@config.gateway}."
+      
+      @instances.each do |i| 
+        @logger.info "Adding instance #{i}."
+        @deployment.server i, :instances
+      end
     end
   end
 end

data/lib/simple_deploy/logger.rb

@@ -0,0 +1,21 @@
+module SimpleDeploy
+  class SimpleDeployLogger
+    
+    def initialize(args = {})
+      @logger = args[:logger] ||= Logger.new(STDOUT)
+
+      unless args[:logger]
+        @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+        @logger.formatter = proc do |severity, datetime, progname, msg|
+            "#{datetime}: #{msg}\n"
+        end
+      end
+
+      @logger
+    end
+
+    def info(msg)
+      @logger.info msg
+    end
+  end
+end

data/lib/simple_deploy/stack/stack_attribute_formater.rb

@@ -0,0 +1,48 @@
+module SimpleDeploy
+  class StackAttributeFormater
+
+    def initialize(args)
+      @attributes = args[:attributes]
+      @config = args[:config]
+      @environment = args[:environment]
+      @region = @config.region @environment
+      @logger = @config.logger
+    end
+
+    def updated_attributes
+      updates = []
+      @attributes.each do |attribute|
+        key = attribute.keys.first
+        if artifact_names.include? key
+          updates << cloud_formation_url(attribute)
+          @logger.info "Adding artifact attribute: #{cloud_formation_url(attribute)}"
+        end
+      end
+      @attributes + updates
+    end
+
+    def artifact_names
+      @config.artifacts.map {|i| i['name']}
+    end
+    
+    def cloud_formation_url attribute
+      name = attribute.keys.first
+      id = attribute[name]
+      a = @config.artifacts.select { |a| a['name'] == name }.first
+
+      endpoint = a['endpoint'] ||= 's3'
+      variable = a['variable']
+      bucket_prefix = a['bucket_prefix']
+      cloud_formation_url = a['cloud_formation_url']
+
+      artifact = Artifact.new :name          => name,
+                              :id            => id,
+                              :region        => @region,
+                              :config        => @config,
+                              :bucket_prefix => bucket_prefix
+
+      { cloud_formation_url => artifact.endpoints[endpoint] }
+    end
+
+  end
+end

data/lib/simple_deploy/stack.rb

@@ -1,6 +1,7 @@
 require 'stackster'
 require 'simple_deploy/stack/stack_reader'
 require 'simple_deploy/stack/stack_lister'
+require 'simple_deploy/stack/stack_attribute_formater'
 
 module SimpleDeploy
   class Stack
@@ -9,6 +10,7 @@ module SimpleDeploy
       @environment = args[:environment]
       @name = args[:name]
       @config = Config.new
+      @config.logger = SimpleDeployLogger.new
     end
 
     def self.list(args)
@@ -16,12 +18,18 @@ module SimpleDeploy
     end
 
     def create(args)
-      stack.create :attributes => args[:attributes],
+      saf = StackAttributeFormater.new(:attributes  => args[:attributes],
+                                       :config      => @config,
+                                       :environment => @environment)
+      stack.create :attributes => saf.updated_attributes,
                    :template => args[:template]
     end
 
     def update(args)
-      stack.update :attributes => args[:attributes]
+      saf = StackAttributeFormater.new(:attributes  => args[:attributes],
+                                       :config      => @config,
+                                       :environment => @environment)
+      stack.update :attributes => saf.updated_attributes
     end
 
     def deploy
@@ -49,7 +57,7 @@ module SimpleDeploy
     end
 
     def instances
-      stack.instances_public_ip_addresses
+      stack.instances_private_ip_addresses
     end
 
     def status

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/simple_deploy.rb

@@ -2,4 +2,5 @@ require 'simple_deploy/config'
 require 'simple_deploy/artifact'
 require 'simple_deploy/stack'
 require 'simple_deploy/deployment'
+require 'simple_deploy/logger'
 require 'simple_deploy/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70224683751920 !ruby/object:Gem::Requirement
+  requirement: &70197676003120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70224683751920
+  version_requirements: *70197676003120
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70224683751260 !ruby/object:Gem::Requirement
+  requirement: &70197676002640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224683751260
+  version_requirements: *70197676002640
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70224683750140 !ruby/object:Gem::Requirement
+  requirement: &70197676002080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70224683750140
+  version_requirements: *70197676002080
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70224683749380 !ruby/object:Gem::Requirement
+  requirement: &70197676001540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70224683749380
+  version_requirements: *70197676001540
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -76,7 +76,9 @@ files:
 - lib/simple_deploy/cli/variables.rb
 - lib/simple_deploy/config.rb
 - lib/simple_deploy/deployment.rb
+- lib/simple_deploy/logger.rb
 - lib/simple_deploy/stack.rb
+- lib/simple_deploy/stack/stack_attribute_formater.rb
 - lib/simple_deploy/stack/stack_lister.rb
 - lib/simple_deploy/stack/stack_reader.rb
 - lib/simple_deploy/version.rb
@@ -98,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3725953430508665187
+      hash: 3779767158902072775
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3725953430508665187
+      hash: 3779767158902072775
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16