simple_deploy 0.2.8 → 0.3.0

data/CHANGELOG

@@ -0,0 +1,30 @@
+## v0.3.0:
+
+* Updating to new ~/.simpledeploy.yml format.
+
+    artifacts: 
+      chef_repo:
+        bucket_prefix: prefix_to_bucket
+        domain: name_of_object
+      app:
+        bucket_prefix: prefix_to_bucket
+        domain: name_of_object
+      cookbooks:
+        bucket_prefix: prefix_to_bucket
+
+    environments:
+      preprod_shared_us-west-1:
+        access_key: XXX
+        secret_key: YYY
+        region: us-west-1
+      infrastructure_us-west-1:
+        access_key: XXX
+        secret_key: YYY
+        region: us-west-1
+      infrastructure_us-east-1:
+        access_key: XXX
+        secret_key: YYY
+        region: us-east-1
+
+* Adding locking to deployment.
+* Added limit to number of events coming out with -l flag.

data/lib/simple_deploy/artifact.rb

@@ -7,6 +7,7 @@ module SimpleDeploy
       @id = args[:id]
       @name = args[:name]
       @region = args[:region]
+      @domain = @config.artifact_domain @name
 
       @bucket = "#{@bucket_prefix}-#{@region}"
       @key = "#{@id}.tar.gz"
@@ -23,15 +24,15 @@ module SimpleDeploy
     private
 
     def s3_url
-      "s3://#{@bucket}/#{@name}/#{@key}"
+      "s3://#{@bucket}/#{@domain}/#{@key}"
     end
 
     def http_url
-      "http://#{s3_endpoints[@region]}/#{@bucket}/#{@name}/#{@key}"
+      "http://#{s3_endpoints[@region]}/#{@bucket}/#{@domain}/#{@key}"
     end
 
     def https_url
-      "https://#{s3_endpoints[@region]}/#{@bucket}/#{@name}/#{@key}"
+      "https://#{s3_endpoints[@region]}/#{@bucket}/#{@domain}/#{@key}"
     end
 
     def s3_endpoints

data/lib/simple_deploy/cli/variables.rb

@@ -5,7 +5,7 @@ module SimpleDeploy
       read_attributes.each do |attribs|
         key = attribs.split('=').first.gsub(/\s+/, "")
         value = attribs.gsub(/^.+?=/, '')
-        @logger.info "Read #{key} : #{value}"
+        @logger.info "Read #{key}=#{value}"
         attrs << { key => value }
       end
       attrs

data/lib/simple_deploy/cli.rb

@@ -28,11 +28,47 @@ Attributes are specified as '=' seperated key value pairs.  Multiple can be spec
 
 simple_deploy create -t ~/my-template.json -e my-env -n test-stack -a arg1=val1 -a arg2=vol2
 
+You must setup a simple_deploy.yaml file in your home directory.  Format as follows:
+
+  artifacts:
+    chef_repo:
+      domain: app_specific_domain
+      bucket_prefix: chef-bucket-prefix
+    app:
+      domain: app_specific_app
+      bucket_prefix: app-bucket-prefix
+    cookbooks:
+      domain: app_specific_cookbooks
+      bucket_prefix: cookbooks-bucket-prefix
+
+  environments:
+    preprod_shared_us_west_1:
+      access_key: XXXXXXXXXXXXXXXXXXX
+      secret_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      region: us-west-1
+    infrastructure_us_west_1:
+      access_key: XXXXXXXXXXXXXXXXXXX
+      secret_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      region: us-west-1
+    infrastructure_us_west_2:
+      access_key: XXXXXXXXXXXXXXXXXXX
+      secret_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      region: us-west-2
+
+Bucket prefixes will append -us-west-1 (or appropriate region) when deploying based on the environment.
+
+For example app-bucket-prefix will be tranlated to app-bucket-prefix-us-west-1.
+
+The domain is the specific domain that is set when the artifact is created by heirloom.
+
 EOS
         opt :help, "Display Help"
         opt :attributes, "= seperated attribute and it's value", :type  => :string,
                                                                  :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 :name, "Stack name to manage", :type => :string
         opt :template, "Path to the template file", :type => :string
       end
@@ -56,11 +92,19 @@ EOS
         end
       end
 
+      @stacks = Stackster::StackLister.new(:config => @config).all
+      @logger = SimpleDeployLogger.new
+
       case @cmd
       when 'create', 'delete', 'deploy', 'destroy', 'instances',
            'status', 'attributes', 'events', 'resources',
            'outputs', 'template', 'update', 'parameters'
-        @logger = SimpleDeployLogger.new
+
+        unless @stacks.include? @opts[:name]
+          @logger.error "Stack '#{@opts[:name]}' does not exist."
+          exit 1
+        end
+
         @stack = Stack.new :environment => @opts[:environment],
                            :name        => @opts[:name],
                            :config      => @config,
@@ -78,7 +122,7 @@ EOS
         @stack.destroy
         @logger.info "#{@opts[:name]} destroyed."
       when 'deploy'
-        @stack.deploy
+        @stack.deploy @opts[:force]
       when 'environments'
         Config.new.environments.keys.each { |e| puts e }
       when 'update'
@@ -87,11 +131,13 @@ EOS
       when 'instances'
         @stack.instances.each { |s| puts s }
       when 'list'
-        puts Stackster::StackLister.new(:config => @config).all
+        puts @stacks
       when 'template'
         jj @stack.template
-      when 'events', 'outputs', 'resources', 'status', 'parameters'
+      when 'outputs', 'resources', 'status', 'parameters'
         puts (@stack.send @cmd.to_sym).to_yaml
+      when 'events'
+        puts (@stack.events @opts[:limit]).to_yaml
       else
         puts "Unknown command.  Use -h for help."
       end

data/lib/simple_deploy/config.rb

@@ -8,17 +8,34 @@ module SimpleDeploy
       self.logger = args[:logger] ||= SimpleDeployLogger.new
     end
 
-    def load_config_file
-      config_file = "#{ENV['HOME']}/.simple_deploy.yml"
-      self.config = YAML::load( File.open( config_file ) )
+    def artifacts
+      ['chef_repo', 'cookbooks', 'app']
     end
 
-    def artifacts
-      config['deploy']['artifacts']
+    def artifact_deploy_variable(artifact)
+      name_to_variable_map = { 'chef_repo' => 'CHEF_REPO_URL',
+                               'app'       => 'APP_URL',
+                               'cookbooks' => 'COOKBOOKS_URL' }
+      name_to_variable_map[artifact]
+    end
+
+    def artifact_cloud_formation_url(artifact)
+      name_to_url_map = { 'chef_repo' => 'ChefRepoURL',
+                          'app'       => 'AppArtifactURL',
+                          'cookbooks' => 'CookbooksURL' }
+      name_to_url_map[artifact]
+    end 
+
+    def artifact_domain(artifact)
+      config['artifacts'][artifact]['domain'] ||= artifact
+    end
+
+    def artifact_bucket_prefix(artifact)
+      config['artifacts'][artifact]['bucket_prefix']
     end
 
     def deploy_script
-      config['deploy']['script']
+      '/opt/intu/admin/bin/configure.sh'
     end
 
     def environments
@@ -33,12 +50,13 @@ module SimpleDeploy
       environment(name)['region']
     end
 
-    def artifact_repository
-      config['artifact_repository']
-    end
-
     private
 
+    def load_config_file
+      config_file = "#{ENV['HOME']}/.simple_deploy.yml"
+      self.config = YAML::load( File.open( config_file ) )
+    end
+
     def env_home
       ENV['HOME']
     end

data/lib/simple_deploy/logger.rb

@@ -17,5 +17,9 @@ module SimpleDeploy
     def info(msg)
       @logger.info msg
     end
+
+    def error(msg)
+      @logger.error msg
+    end
   end
 end

data/lib/simple_deploy/stack/deployment.rb

@@ -0,0 +1,94 @@
+require 'capistrano'
+require 'capistrano/cli'
+
+module SimpleDeploy
+  class Stack
+    class Deployment
+      def initialize(args)
+        @config = args[:config]
+        @logger = @config.logger
+        @instances = args[:instances]
+        @attributes = args[:attributes]
+        @environment = args[:environment]
+        @ssh_gateway = @attributes['ssh_gateway']
+        @ssh_user = args[:ssh_user]
+        @ssh_key = args[:ssh_key]
+
+        @region = @config.region(@environment)
+        @deploy_script = @config.deploy_script
+
+        create_deployment
+        set_deploy_command
+      end
+
+      def execute
+        @logger.info 'Starting deployment.'
+        @deployment.simpledeploy
+        @logger.info 'Deployment complete.'
+      end
+
+      private
+
+      def set_deploy_command
+        cmd = get_artifact_endpoints.any? ? "env " : ""
+        get_artifact_endpoints.each_pair do |k,v|
+          cmd += "#{k}=#{v} "
+        end
+        cmd += @deploy_script
+
+        @logger.info "Executing '#{cmd}.'"
+        @deployment.load :string => "task :simpledeploy do
+        sudo '#{cmd}'
+        end"
+      end
+
+      def get_artifact_endpoints
+        h = {}
+        @config.artifacts.each do |artifact|
+          variable = @config.artifact_deploy_variable artifact
+          bucket_prefix = @config.artifact_bucket_prefix artifact
+
+          artifact = Artifact.new :name          => artifact,
+                                  :id            => @attributes[artifact],
+                                  :region        => @region,
+                                  :config        => @config,
+                                  :bucket_prefix => bucket_prefix
+          h[variable] = artifact.endpoints['s3']
+        end
+        h
+      end
+
+      def ssh_options
+        @logger.info "Setting key to #{@ssh_key}."
+        { 
+          :keys => @ssh_key,
+          :paranoid => false
+        }
+      end
+
+      def create_deployment 
+        @deployment = Capistrano::Configuration.new
+        if @ssh_user
+          @logger.info "Setting user to #{@ssh_user}."
+          @deployment.set :user, @ssh_user
+        end
+
+        if @ssh_gateway
+          @deployment.set :gateway, @ssh_gateway
+          @logger.info "Proxying via gateway #{@ssh_gateway}."
+        else
+          @logger.info "Not using an ssh gateway."
+        end
+
+        @deployment.variables[:ssh_options] = ssh_options
+        
+        @instances.each do |i| 
+          @logger.info "Adding instance #{i}."
+          @deployment.server i, :instances
+        end
+      end
+
+    end
+  end
+end
+

data/lib/simple_deploy/stack/stack_attribute_formater.rb

@@ -2,23 +2,22 @@ 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
+    def updated_attributes(attributes)
       updates = []
-      @attributes.each do |attribute|
+      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
+      attributes + updates
     end
 
     def artifact_names
@@ -30,10 +29,8 @@ module SimpleDeploy
       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']
+      bucket_prefix = @config.artifact_bucket_prefix artifact
+      cloud_formation_url = @config.artifact_cloud_formation_url artifact
 
       artifact = Artifact.new :name          => name,
                               :id            => id,
@@ -41,7 +38,7 @@ module SimpleDeploy
                               :config        => @config,
                               :bucket_prefix => bucket_prefix
 
-      { cloud_formation_url => artifact.endpoints[endpoint] }
+      { cloud_formation_url => artifact.endpoints['s3'] }
     end
 
   end

data/lib/simple_deploy/stack.rb

@@ -1,4 +1,5 @@
 require 'stackster'
+require 'simple_deploy/stack/deployment'
 require 'simple_deploy/stack/stack_reader'
 require 'simple_deploy/stack/stack_lister'
 require 'simple_deploy/stack/stack_attribute_formater'
@@ -10,44 +11,62 @@ module SimpleDeploy
       @environment = args[:environment]
       @name = args[:name]
       @config = Config.new :logger => args[:logger]
-    end
-
-    def self.list(args)
-      StackLister.new(:config => args[:config]).all
+      @logger = @config.logger
     end
 
     def create(args)
-      saf = StackAttributeFormater.new(:attributes  => args[:attributes],
-                                       :config      => @config,
-                                       :environment => @environment)
-      stack.create :attributes => saf.updated_attributes,
+      stack.create :attributes => stack_attribute_formater.updated_attributes(args[:attributes]),
                    :template => args[:template]
     end
 
     def update(args)
-      saf = StackAttributeFormater.new(:attributes  => args[:attributes],
-                                       :config      => @config,
-                                       :environment => @environment)
-      stack.update :attributes => saf.updated_attributes
-    end
-
-    def deploy
-      deployment = Deployment.new :config      => @config,
-                                  :environment => @environment,
-                                  :instances   => instances,
-                                  :attributes  => attributes,
-                                  :ssh_gateway => stack.attributes['ssh_gateway'],
-                                  :ssh_user    => ENV['SIMPLE_DEPLOY_SSH_USER'],
-                                  :ssh_key     => ENV['SIMPLE_DEPLOY_SSH_KEY']
+      stack.update :attributes => stack_attribute_formater.updated_attributes(args[:attributes])
+    end
+
+    # To Do: Abstract deployment into it's own class
+    # Pass in required stack objects for attribut mgmt
+    def deploy(force = false)
+      @logger.info "Checking deployment status."
+      if deployment_in_progress?
+        @logger.info "Deployment in progress."
+        @logger.info "Started by #{attributes['deployment_user']}@#{attributes['deployment_datetime']}."
+        if force
+          clear_deployment_status
+        else
+          @logger.error "Exiting due to existing deployment."
+          @logger.error "Use -f to override."
+          exit 1
+        end
+      else
+        @logger.info "No other deployments in progress."
+      end
+      set_deployment_in_progress
       deployment.execute
+      clear_deployment_status
+    end
+
+    def deployment_in_progress?
+      attributes['deployment_in_progress'] == 'true'
+    end
+
+    def set_deployment_in_progress
+      @logger.info "Setting deployment in progress by #{ssh_user}."
+      stack.update :attributes => [ { 'deployment_in_progress' => 'true',
+                                      'deployment_user'        => ssh_user,
+                                      'deployment_datetime'    => Time.now.to_s } ]
+    end
+
+    def clear_deployment_status
+      @logger.info "Clearing deployment status."
+      stack.update :attributes => [ { 'deployment_in_progress' => '' } ]
     end
 
     def destroy
       stack.destroy
     end
 
-    def events
-      stack.events
+    def events(limit)
+      stack.events limit
     end
 
     def outputs
@@ -88,7 +107,29 @@ module SimpleDeploy
       @stack ||= Stackster::Stack.new :environment => @environment,
                                       :name        => @name,
                                       :config      => @config.environment(@environment),
-                                      :logger      => @config.logger
+                                      :logger      => @logger
+    end
+    
+    def stack_attribute_formater
+      @saf ||= StackAttributeFormater.new :config      => @config,
+                                          :environment => @environment
+    end
+
+    def deployment
+      @deployment ||= Stack::Deployment.new :config      => @config,
+                                            :environment => @environment,
+                                            :instances   => instances,
+                                            :attributes  => attributes,
+                                            :ssh_user    => ssh_user,
+                                            :ssh_key     => ssh_key
+    end
+
+    def ssh_key
+      ENV['SIMPLE_DEPLOY_SSH_KEY'] ||= "#{ENV['HOME']}/.ssh/id_rsa"
+    end
+
+    def ssh_user
+      ENV['SIMPLE_DEPLOY_SSH_USER'] ||= ENV['USER']
     end
 
   end

data/lib/simple_deploy/version.rb

@@ -1,3 +1,3 @@
 module SimpleDeploy
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/lib/simple_deploy.rb

@@ -1,6 +1,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'

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.1'
+  s.add_runtime_dependency "stackster", '= 0.2.2'
   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.8
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70275358954600 !ruby/object:Gem::Requirement
+  requirement: &70101555575840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70275358954600
+  version_requirements: *70101555575840
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70275358954100 !ruby/object:Gem::Requirement
+  requirement: &70101555575240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275358954100
+  version_requirements: *70101555575240
 - !ruby/object:Gem::Dependency
   name: stackster
-  requirement: &70275358953320 !ruby/object:Gem::Requirement
+  requirement: &70101555573540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70275358953320
+  version_requirements: *70101555573540
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70275358952600 !ruby/object:Gem::Requirement
+  requirement: &70101555572840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275358952600
+  version_requirements: *70101555572840
 description: I am designed to deploy artifacts uploaded by Heirloom
 email:
 - brett@weav.net
@@ -65,6 +65,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.md
@@ -75,9 +76,9 @@ files:
 - lib/simple_deploy/cli.rb
 - 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/deployment.rb
 - lib/simple_deploy/stack/stack_attribute_formater.rb
 - lib/simple_deploy/stack/stack_lister.rb
 - lib/simple_deploy/stack/stack_reader.rb
@@ -100,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4139540952746826326
+      hash: 3973264013160818853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4139540952746826326
+      hash: 3973264013160818853
 requirements: []
 rubyforge_project: simple_deploy
 rubygems_version: 1.8.16

data/lib/simple_deploy/deployment.rb

@@ -1,104 +0,0 @@
-require 'capistrano'
-require 'capistrano/cli'
-
-module SimpleDeploy
-  class Deployment
-    def initialize(args)
-      @config = args[:config]
-      @instances = args[:instances]
-      @ssh_gateway = args[:ssh_gateway]
-      @ssh_user = args[:ssh_user] ||= "#{env_user}"
-      @ssh_key = args[:ssh_key] ||= "#{env_home}/.ssh/id_rsa"
-      @environment = args[:environment]
-      @attributes = args[:attributes]
-      @logger = @config.logger
-
-      @region = @config.region(@environment)
-      @deploy_script = @config.deploy_script
-
-      create_deployment
-      set_deploy_command
-    end
-
-    def execute
-      @logger.info 'Starting deployment.'
-      @deployment.simpledeploy
-      @logger.info 'Deployment complete.'
-    end
-
-    private
-
-    def set_deploy_command
-      cmd = get_artifact_endpoints.any? ? "env " : ""
-      get_artifact_endpoints.each_pair do |k,v|
-        cmd += "#{k}=#{v} "
-      end
-      cmd += @deploy_script
-
-      @logger.info "Executing '#{cmd}.'"
-      @deployment.load :string => "task :simpledeploy do
-      sudo '#{cmd}'
-      end"
-    end
-
-    def get_artifact_endpoints
-      h = {}
-      @config.artifacts.each do |a|
-        name = a['name']
-        endpoint = a['endpoint'] ||= 's3'
-        variable = a['variable']
-        bucket_prefix = a['bucket_prefix']
-
-        artifact = Artifact.new :name          => name,
-                                :id            => @attributes[name],
-                                :region        => @region,
-                                :config        => @config,
-                                :bucket_prefix => bucket_prefix
-        h[variable] = artifact.endpoints[endpoint]
-      end
-      h
-    end
-
-    def ssh_options
-      @logger.info "Setting key to #{@ssh_key}."
-      { 
-        :keys => @ssh_key,
-        :paranoid => false
-      }
-    end
-
-    def create_deployment 
-      @deployment = Capistrano::Configuration.new
-      if @ssh_user
-        @logger.info "Setting user to #{@ssh_user}."
-        @deployment.set :user, @ssh_user
-      end
-
-      if @ssh_gateway
-        @deployment.set :gateway, @ssh_gateway
-        @logger.info "Proxying via gateway #{@ssh_gateway}."
-      else
-        @logger.info "Not using an ssh gateway."
-      end
-
-      @deployment.variables[:ssh_options] = ssh_options
-      
-      @instances.each do |i| 
-        @logger.info "Adding instance #{i}."
-        @deployment.server i, :instances
-      end
-    end
-
-    private
-
-    def env_home
-      ENV['HOME']
-    end
-
-    def env_user
-      ENV['USER']
-    end
-
-  end
-end
-