shiprails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8093eda442437b91f2aba6f63e12f4f7e98a5ead
-  data.tar.gz: 5ae7b8820202411d15fdf7be7c57294829e9d467
+  metadata.gz: 48924907329f2d0287023689d913f38e94020b7b
+  data.tar.gz: a2f84d51b8751d5125958fb9d741a4c7cd6ec9ca
 SHA512:
-  metadata.gz: 8daa5f07fc78ba4bc67ac15253620c09e4abc904e73a37525043e16444db397dcca9230bcc56e598fe293e2842fe37b216ca5bd597ca49baf07ffc56de960234
-  data.tar.gz: 3cc82233c2be7a576cfecbb517f35fa7380c8056c863a46f34180f47de82d4d77dd1998c866051958f5a549a60ad8d3b4d46bcf372e763577788c94f8139e1d4
+  metadata.gz: 291e29842b74feaa4c88024249dd0f132d1b8d07e9ebab9e4b4bd9ed8713eae261e125853d34e3ad749be401b3cd50accaecc17341c5afeb163aeeee2dc8f102
+  data.tar.gz: 7b1cee9f15ff1b725bb0bd759f233d624e815899f21c7d419101722ccc01fe94a86ae956283a6cde76baadffa3e3e950cb446b9321854fab3815cef44a5f04cc

data/lib/shiprails/ship/config.rb

@@ -21,12 +21,14 @@ module Shiprails
       end
 
       def update_ecs_tasks
+        environment = args.second
         return unless @version
         say "Updating config version for ECS tasks..."
         configuration[:services].each do |service_name, service|
           service[:regions].each do |region_name, region|
             ecs = Aws::ECS::Client.new(region: region_name.to_s)
             region[:environments].each do |environment_name|
+              next unless environment == environment_name
               cluster_name = "#{project_name}_#{environment_name}"
               task_name = "#{project_name}_#{service_name}_#{environment_name}"
               begin
@@ -56,12 +58,14 @@ module Shiprails
       end
 
       def update_ecs_services
+        environment = args.second
         return unless @version
         say "Updating ECS services..."
         configuration[:services].each do |service_name, service|
           service[:regions].each do |region_name, region|
             ecs = Aws::ECS::Client.new(region: region_name.to_s)
             region[:environments].each do |environment_name|
+              next unless environment == environment_name
               cluster_name = "#{project_name}_#{environment_name}"
               task_name = "#{project_name}_#{service_name}_#{environment_name}"
               begin

data/lib/shiprails/ship/deploy.rb

@@ -16,7 +16,7 @@ module Shiprails
       def check_git_status
         if git.status.added.any? or git.status.changed.any? or git.status.deleted.any?
           say "You have uncommitted changes. Commit and try again.", :red
-          exit
+          # exit # TESTING
         end
       end
 
@@ -29,9 +29,10 @@ module Shiprails
           service[:regions].each do |region_name, region|
             aws_region = region_name.to_s
             region[:environments].each do |environment_name|
+              next unless args.empty? or args.include?(environment_name)
               result = `S3_CONFIG_BUCKET=#{s3_config_bucket} bundle exec config list #{environment_name}`
               s3_config_revision = result.match(/#{environment_name} \(v([0-9]+)\)/)[1] rescue 0
-              commands << "docker build -t #{image_name} --build-arg AWS_ACCESS_KEY_ID='#{aws_access_key_id}' --build-arg AWS_SECRET_ACCESS_KEY='#{aws_access_key_secret}' --build-arg AWS_REGION='#{aws_region}' --build-arg S3_CONFIG_BUCKET='#{s3_config_bucket}' --build-arg S3_CONFIG_REVISION='#{s3_config_revision}' -f Dockerfile.production ."
+              commands << "docker build -t #{image_name}_#{environment_name} --build-arg AWS_ACCESS_KEY_ID='#{aws_access_key_id}' --build-arg AWS_SECRET_ACCESS_KEY='#{aws_access_key_secret}' --build-arg AWS_REGION='#{aws_region}' --build-arg S3_CONFIG_BUCKET='#{s3_config_bucket}' --build-arg S3_CONFIG_REVISION='#{s3_config_revision}' -f Dockerfile.production ."
             end
           end
         end
@@ -47,7 +48,10 @@ module Shiprails
           image_name = "#{compose_project_name}_#{service[:image]}"
           service[:regions].each do |region_name, region|
             repository_url = region[:repository_url]
-            commands << "docker tag #{image_name} #{repository_url}:#{git_sha}"
+            region[:environments].each do |environment_name|
+              next unless args.empty? or args.include?(environment_name)
+              commands << "docker tag #{image_name}_#{environment_name} #{repository_url}:#{git_sha}"
+            end
           end
         end
         commands.uniq!
@@ -77,6 +81,7 @@ module Shiprails
           service[:regions].each do |region_name, region|
             ecs = Aws::ECS::Client.new(region: region_name.to_s)
             region[:environments].each do |environment_name|
+              next unless args.empty? or args.include?(environment_name)
               cluster_name = "#{project_name}_#{environment_name}"
               task_name = "#{project_name}_#{service_name}_#{environment_name}"
               image_name = "#{region[:repository_url]}:#{git_sha}"
@@ -120,6 +125,7 @@ module Shiprails
           service[:regions].each do |region_name, region|
             ecs = Aws::ECS::Client.new(region: region_name.to_s)
             region[:environments].each do |environment_name|
+              next unless args.empty? or args.include?(environment_name)
               cluster_name = "#{project_name}_#{environment_name}"
               task_name = "#{project_name}_#{service_name}_#{environment_name}"
               begin

data/lib/shiprails/ship/exec.rb

@@ -20,7 +20,7 @@ module Shiprails
         default: "app",
         desc: "Specify the service name"
       class_option "private-key",
-        default: "~/.ssh/aws.pem",
+        default: "shiprails.pem",
         desc: "Specify the AWS SSH private key path"
 
       def run_command
@@ -74,13 +74,6 @@ module Shiprails
         # get its current security groups to restory later
         security_group_ids = ec2_instance.security_groups.map(&:group_id)
 
-        # create new public ip
-        elastic_ip = ec2.allocate_address({ domain: "vpc" })
-        # link ip to ec2 instance
-        associate_address_response = ec2.associate_address({
-          allocation_id: elastic_ip.allocation_id,
-          instance_id: ec2_instance_id
-        })
         # create security group for us
         security_group_response = ec2.create_security_group({
           group_name: "shiprails-exec-#{cluster}-#{Time.now.to_i}",
@@ -114,9 +107,9 @@ module Shiprails
 
         say "Waiting for AWS to setup networking..."
         sleep 5 # AWS just needs a little bit to setup networking
-        say "Connecting #{ssh_user}@#{elastic_ip.public_ip}..."
+        say "Connecting #{ssh_user}@#{ec2_instance.public_ip_address}..."
         say "Executing: $ #{command_string}"
-        system "ssh -o ConnectTimeout=15 -o 'StrictHostKeyChecking no' -t -i #{ssh_private_key_path} #{ssh_user}@#{elastic_ip.public_ip} '#{command_string}'"
+        system "ssh -o ConnectTimeout=15 -o 'StrictHostKeyChecking no' -t -i #{ssh_private_key_path} #{ssh_user}@#{ec2_instance.public_ip_address} '#{command_string}'"
       rescue => e
         say "Error: #{e.message}", :red
       ensure
@@ -128,10 +121,6 @@ module Shiprails
         }) rescue nil
         # remove our access security group
         ec2.delete_security_group({ group_id: security_group_response.group_id }) rescue nil
-        # unlink ec2 instance from public ip
-        ec2.disassociate_address({ association_id: associate_address_response.association_id }) rescue nil
-        # release public ip address
-        ec2.release_address({ allocation_id: elastic_ip.allocation_id }) rescue nil
         say "Done.", :green
       end
 

data/lib/shiprails/ship/install/shiprails.yml.erb

@@ -1,4 +1,5 @@
 config_s3_bucket: '<%= config_s3_bucket %>'
+private_key_path: '<%= ec2_ssh_private_key_path %>'
 project_name: '<%= project_name %>'
 services:
 <%- services.each do |service| -%>

data/lib/shiprails/ship/install.rb

@@ -47,6 +47,10 @@ module Shiprails
         @bucket_name = bucket_name
       end
 
+      def ec2_ssh_private_key_path
+        @ec2_ssh_private_key_path ||= ask "Where is your AWS EC2 SSH private key?", default: 'shiprails.pem'
+      end
+
       def environments
         environments = Dir.entries("#{Dir.getwd}/config/environments").grep(/\.rb$/).map { |fname| fname.chomp!(".rb") }.select{ |e| !['development', 'test'].include? e } rescue ['production']
         environments ||= ['production']
@@ -122,6 +126,7 @@ module Shiprails
 
 # Ignore Docker ENV
 /.env
+/shiprails.pem
 EOF
         end
       end

data/lib/shiprails/ship/setup.rb

@@ -22,7 +22,10 @@ module Shiprails
             region[:environments].each do |environment_name|
               cluster_name = "#{project_name}_#{environment_name}"
               unless created_groups.include? cluster_name
-                client.create_log_group({ log_group_name: cluster_name })
+                begin
+                  client.create_log_group({ log_group_name: cluster_name })
+                rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => err
+                end
                 say "Created #{cluster_name} log group."
                 created_groups << cluster_name
               end
@@ -53,7 +56,7 @@ module Shiprails
                 task_definition = {
                   container_definitions: [
                     {
-                      command: service[:command],
+                      command: [service[:command]],
                       cpu: service[:resources][:cpu_units],
                       essential: true,
                       environment: [
@@ -66,9 +69,9 @@ module Shiprails
                       log_configuration: {
                         log_driver: "awslogs",
                         options: {
-                          "awslog-group" => cluster_name,
+                          "awslogs-group" => cluster_name,
                           "awslogs-region" => region_name.to_s,
-                          "awslogs-stream-prefix" => ""
+                          "awslogs-stream-prefix" => service_name
                         }
                       },
                       memory: service[:resources][:memory_units],
@@ -149,7 +152,7 @@ module Shiprails
                 task_definition: task_definition_response.task_definition.task_definition_arn
               }
               (service[:ports] || []).each do |port|
-                if yes? "Should port #{port} for #{image_name} be load balanced?"
+                if yes? "Should port #{port} for #{image_name} be load balanced in #{environment_name}?"
                   ecs_service[:role] = "ecsServiceRole"
                   load_balancers = elb.describe_load_balancers.to_h
                   say "EC2 Load Balancers"

data/lib/shiprails/ship.rb

@@ -23,9 +23,9 @@ module Shiprails
     end
 
     desc "deploy", "Deploy services"
-    def deploy
+    def deploy(*command_args)
       require "shiprails/ship/deploy"
-      Deploy.start
+      Deploy.start command_args
     end
 
     desc "logs", "Fetch logs"

data/lib/shiprails/version.rb

@@ -1,3 +1,3 @@
 module Shiprails
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiprails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Zane Shannon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport