qops 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb7dddedf2cf37abd85e3482860ea0ae77feb8df
-  data.tar.gz: f932e9fbf9cd6bee85570151bb9a216b11947237
+  metadata.gz: 5ce6ec6898479b478e84f3f9b124daaa7f0b55fc
+  data.tar.gz: 5864daf206d6cb82473cd1cc74ce2a885b499108
 SHA512:
-  metadata.gz: 501cc90d1ed27509c1f7402494d609a74482c73ee9f63cba6edd2d31dba2e4c953cab88615d6c629ac7f8367d17e36aab3d7ba08061f5b85d2d675161c422439
-  data.tar.gz: 67fb96840fb03c74e569193e4e11bc0f0031216ce796b8a9a82637f4603226e01aa3039508dc1545bb787e9dd81f0a051e31a9befd0cf4114b0989cb795d27f2
+  metadata.gz: d753d119a25815cc5814b55fb678602e5d16853b8ae399b3b47a04d6251e097ec1eb56520741980b7a7cec72f38d90d896b5e4769a6721bbe644cc67fb768783
+  data.tar.gz: 5ff39709b94f8142fa0e80d6c3497a8fed9f5d9360777f3eb32692de575b2ad32c027b86031c806d5b064eb4ae57709f8f7435d967599ec1f42d5b5927205126

data/lib/qops/deployment/app.rb

@@ -1,8 +1,6 @@
 class Qops::Deploy < Thor
   include Qops::DeployHelpers
 
-  class_option :custom_json, type: :string, aliases: '-j', desc: 'A custom json that will be used during a deployment of the app. ex: \'{ "custom_attrs": "are awesome!"}\''
-
   desc 'app', 'Deploy the latest version of the app'
   def app
     initialize_run
@@ -19,7 +17,7 @@ class Qops::Deploy < Thor
     end
 
     if config.deploy_type == 'staging'
-      puts "Preparing to deploy branch #{default_revision} to instance #{online_instances.first.hostname}"
+      puts "Preparing to deploy branch #{revision_used} to instance #{online_instances.first.hostname}"
     else
       puts "Preparing to deploy default branch to all (online) servers (#{online_instances.map(&:hostname).join(', ')})"
     end
@@ -104,7 +102,7 @@ class Qops::Deploy < Thor
       @_custom_json[:deploy] = {
         application_name => {
           scm: {
-            revision: default_revision
+            revision: revision_used
           }
         }
       }

data/lib/qops/deployment/helpers.rb

@@ -4,6 +4,7 @@ module Qops::DeployHelpers
   include Qops::Helpers
 
   included do
+    class_option :custom_json, type: :string, aliases: '-j', desc: 'A custom json that will be used during a deployment of the app. ex: \'{ "custom_attrs": "are awesome!"}\''
     class_option :branch, type: :string, aliases: '-b', desc: 'The branch to use when deploying to staging type environments'
     class_option :hostname, type: :string, aliases: '-h', desc: 'Fully override the hostname that qops would normally give the instance'
   end
@@ -49,14 +50,32 @@ module Qops::DeployHelpers
 
   def tag_instance(instance)
     print "Tagging instance #{instance.hostname}\n"
+
+    tags = [
+      {
+        key: 'environment',
+        value: config.deploy_type
+      },
+      {
+        key: 'branch',
+        value: revision_used
+      },
+      {
+        key: 'app',
+        value: config.app_name
+      }
+    ]
+
+    if config.deploy_type == 'staging'
+      tags << {
+        key: 'cleanable',
+        value: 'true'
+      }
+    end
+
     config.ec2.create_tags(
       resources: [instance.ec2_instance_id],
-      tags: [
-        {
-          key: 'environment',
-          value: config.deploy_type
-        }
-      ]
+      tags: tags
     )
   end
 
@@ -69,7 +88,7 @@ module Qops::DeployHelpers
     # Alternative flow if user has not overridden the hostname
     else
       if config.deploy_type == 'staging'
-        @requested_hostname = default_revision.parameterize
+        @requested_hostname = revision_used.parameterize
       elsif config.deploy_type == 'production'
         @requested_hostname = config.app_name
         existing_hostnames = retrieve_instances.map(&:hostname)
@@ -84,7 +103,7 @@ module Qops::DeployHelpers
     @requested_hostname
   end
 
-  def default_revision
+  def revision_used
     return 'master' unless config.deploy_type == 'staging'
     if options[:branch].present?
       options[:branch]

data/lib/qops/deployment/instances.rb

@@ -154,6 +154,19 @@ class Qops::Instance < Thor # rubocop:disable Metrics/ClassLength
     retrieve_instances.each do |instance|
       next if instance.hostname == "#{config.hostname_prefix}master"
 
+      ec2instances = config.ec2.describe_instances(instance_ids: [instance.ec2_instance_id])
+      next if ec2instances.reservations.empty?
+
+      # Get various tag values
+      ec2instance = ec2instances.reservations.first.instances.first
+      environment = ec2instance.tags.find { |t| t.key == 'environment' }
+      cleanable = ec2instance.tags.find { |t| t.key == 'cleanable' }
+      branch = ec2instance.tags.find { |t| t.key == 'branch' }
+
+      next if !cleanable || cleanable.value != 'true'
+      next if !environment || environment.value != 'staging'
+      next if !branch || branch.value == 'master'
+
       # Find the latest command since the instance was deployed
       latest_command = Time.parse(instance.created_at)
       config.opsworks.describe_commands(instance_id: instance.instance_id).commands.each do |command|

data/lib/qops/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Qops
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qops
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Matthew Basset
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qthor