aerosol 1.5.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e44c2af5b56fc29327f30ec3f2c7c79bdbbde1a6
-  data.tar.gz: cdaa27889a78ca44b8dd90bb07ab07b590227fa7
+SHA256:
+  metadata.gz: 8800e253ba3945d047a0186145a0aa58bc2d1ea2374ca6cc3e8f9e102a8ad510
+  data.tar.gz: 9748857dd6d759985cf7e1071364474dbb013b2eff7eae3c86616e0eebcc1879
 SHA512:
-  metadata.gz: a92b079896a367f90f0fd26d76fcba367fa0287e5b9a2e755cc44ecb8705f273e20dffd078aeecc8e7687d0a7e06c4de926ac89fa9934c65fd84a5f4ddcd9455
-  data.tar.gz: 8d7da73ca62a28df467a723f578ae0c1ecfe38deb42c2753fc4b36b13b021e02a3c07bedd466d09c862071c97e6cba77644c7ee2ddabb7ce6e6cb40822e82d4b
+  metadata.gz: 143084a0ffcd6ed83e36bea8a106e88776cc146adacc7d55b3976f52fd0ce80d6e0c7543311c5d82110900ce927cca5ca29bb4a06903131497d88ae7ed02a7f6
+  data.tar.gz: 4ea6f13e4f3464f04ab05bd33d504f586c5206cbf13bfbdeed63411ad2a2170b812631d8185c18981a8c46dfc55d5f18d189a59826b04129aca4c14d034148a3

data/.travis.yml

@@ -2,10 +2,9 @@ sudo: false
 dist: trusty
 language: ruby
 rvm:
-    - 1.9.3
     - 2.0
     - 2.1
     - 2.2
 cache: bundler
-before_install: gem install bundler
+before_install: gem install bundler -v 1.17.3
 script: CI=true bundle exec rake

data/aerosol.gemspec

@@ -18,14 +18,17 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activerecord', '>= 3.2.0'
   gem.add_dependency 'clamp', '~> 0.6'
   gem.add_dependency 'excon'
-  gem.add_dependency 'aws-sdk', '~> 2.0'
-  gem.add_dependency 'grit'
+  gem.add_dependency 'aws-sdk-core', '~> 3'
+  gem.add_dependency 'aws-sdk-s3', '~> 1'
+  gem.add_dependency 'aws-sdk-ec2', '~> 1'
+  gem.add_dependency 'aws-sdk-autoscaling', '~> 1'
+  gem.add_dependency 'minigit', '~> 0.0.4'
   gem.add_dependency 'net-ssh'
   gem.add_dependency 'net-ssh-gateway'
   gem.add_dependency 'dockly-util', '~> 0.1.0'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'rspec', '< 3.0'
   gem.add_development_dependency 'webmock'
   gem.add_development_dependency 'vcr'

data/lib/aerosol.rb

@@ -1,5 +1,8 @@
 require 'yaml'
-require 'aws-sdk'
+require 'aws-sdk-autoscaling'
+require 'aws-sdk-core'
+require 'aws-sdk-s3'
+require 'aws-sdk-ec2'
 require 'dockly/util'
 require 'base64'
 

data/lib/aerosol/auto_scaling.rb

@@ -5,7 +5,7 @@ class Aerosol::AutoScaling
   logger_prefix '[aerosol auto_scaling]'
   aws_attribute :auto_scaling_group_name, :availability_zones, :min_size, :max_size, :default_cooldown,
                 :desired_capacity, :health_check_grace_period, :health_check_type, :load_balancer_names,
-                :placement_group, :tags, :created_time, :vpc_zone_identifier
+                :placement_group, :tags, :created_time, :vpc_zone_identifier, :target_group_arns
   aws_class_attribute :launch_configuration, Aerosol::LaunchConfiguration
   primary_key :auto_scaling_group_name
 
@@ -138,6 +138,7 @@ class Aerosol::AutoScaling
 "placement_group" => "#{placement_group}", \
 "tags" => #{tags.to_s}, \
 "created_time" => "#{created_time}" \
+"target_group_arns" => "#{target_group_arns}" \
 }}
   end
 
@@ -155,7 +156,8 @@ private
       load_balancer_names: load_balancer_names,
       placement_group: placement_group,
       tags: tags_to_array,
-      vpc_zone_identifier: vpc_zone_identifier
+      vpc_zone_identifier: vpc_zone_identifier,
+      target_group_arns: target_group_arns
     }.reject { |k, v| v.nil? }
   end
 

data/lib/aerosol/cli.rb

@@ -14,6 +14,20 @@ class Aerosol::AbstractCommand < Clamp::Command
   end
 end
 
+class Aerosol::DeployCommand < Aerosol::AbstractCommand
+  parameter 'DEPLOY', 'the deploy to run (can also be an environment name) for', :attribute_name => :deploy_name
+
+  def execute
+    super
+
+    if Aerosol.deploy(deploy_name.to_sym)
+      Rake::Task["aerosol:#{deploy_name}:all"].invoke
+    elsif Aerosol.env(deploy_name.to_sym)
+      Rake::Task["aerosol:env:#{deploy_name}"].invoke
+    end
+  end
+end
+
 class Aerosol::SshCommand < Aerosol::AbstractCommand
   option ['-r', '--run'], :flag, 'run first ssh command', :attribute_name => :run_first
   parameter 'DEPLOY', 'the deploy to list commands for', :attribute_name => :deploy_name
@@ -37,5 +51,6 @@ end
 
 class Aerosol::Cli < Aerosol::AbstractCommand
   subcommand ['ssh', 's'], 'Print ssh commands for latest running instances', Aerosol::SshCommand
+  subcommand ['deploy', 'd'], 'Run a deploy', Aerosol::DeployCommand
 end
 

data/lib/aerosol/launch_configuration.rb

@@ -5,7 +5,7 @@ class Aerosol::LaunchConfiguration
   logger_prefix '[aerosol launch_configuration]'
   aws_attribute :launch_configuration_name, :image_id, :instance_type, :security_groups, :user_data,
                 :iam_instance_profile, :kernel_id, :key_name, :spot_price, :created_time,
-                :associate_public_ip_address, :block_device_mappings
+                :associate_public_ip_address, :block_device_mappings, :ebs_optimized
   dsl_attribute :meta_data
 
   primary_key :launch_configuration_name
@@ -89,7 +89,8 @@ class Aerosol::LaunchConfiguration
 "key_name" => "#{key_name}", \
 "spot_price" => "#{spot_price}", \
 "created_time" => "#{created_time}", \
-"block_device_mappings" => #{block_device_mappings}" \
+"block_device_mappings" => #{block_device_mappings}", \
+"ebs_optimized" => #{ebs_optimized} \
 }}
   end
 
@@ -109,7 +110,8 @@ private
       spot_price: spot_price,
       user_data: corrected_user_data,
       associate_public_ip_address: associate_public_ip_address,
-      block_device_mappings: block_device_mappings
+      block_device_mappings: block_device_mappings,
+      ebs_optimized: ebs_optimized
     }.reject { |k, v| v.nil? }
   end
 

data/lib/aerosol/rake_task.rb

@@ -1,8 +1,6 @@
 require 'rake'
 require 'aerosol'
 
-$rake_task_logger = Dockly::Util::Logger.new('[aerosol rake_task]', STDOUT, false)
-
 class Rake::AutoScalingTask < Rake::Task
   def needed?
     !auto_scaling.exists?

data/lib/aerosol/runner.rb

@@ -1,6 +1,5 @@
 require 'socket'
 require 'active_record'
-require 'grit'
 require 'timeout'
 
 class Aerosol::Runner

data/lib/aerosol/util.rb

@@ -1,4 +1,4 @@
-require 'grit'
+require 'minigit'
 
 module Aerosol::Util
   extend self
@@ -32,10 +32,10 @@ module Aerosol::Util
   end
 
   def git_repo
-    @git_repo ||= Grit::Repo.new('.')
+    @git_repo ||= MiniGit.new('.')
   end
 
   def git_sha
-    @git_sha ||= git_repo.git.show.lines.first.chomp.match(/^commit ([a-f0-9]+)$/)[1][0..6] rescue 'unknown'
+    @git_sha ||= git_repo.capturing.rev_parse('HEAD').chomp[0..6] rescue 'unknown'
   end
 end

data/lib/aerosol/version.rb

@@ -1,5 +1,5 @@
 # Copyright Swipely, Inc.  All rights reserved.
 
 module Aerosol
-  VERSION = '1.5.1'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerosol
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Swipely, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,33 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-autoscaling
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: minigit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +196,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +301,7 @@ homepage: https://github.com/swipely/aerosol
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,9 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Instance-based deploys made easy
 test_files: