beanstalk_deploy 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc78ddd0b4c7402e0d24c874190bc81b4a18ff8
-  data.tar.gz: f94ae7f881dc3dea1a82ad5dcf90a1800cbf2bf9
+  metadata.gz: 5257886b242aa673988f08bb0c207666dcf4d40b
+  data.tar.gz: aef91f014e24a88b4442396ff236270f2023034b
 SHA512:
-  metadata.gz: 73f62965741ccc49b44470456794b29c62603e6df08913b95a8d93b5848db1a27501617457c3bcecab420f187dba106108b23cb83e69b9438c330e3481086368
-  data.tar.gz: b5dcabe72f05bd01bae4c2028ac229f065ce7b5919c5ff76f6b7b5f36a11dc0748c71a0610a70f0d086f9a72d84cd0805e6cd9f6d80376f8453efc74daf00a5a
+  metadata.gz: 9249e09aa5f2e6655ab928a50f536196230815dee7101326b75195ce9436167a0b025cdc575c58834f3f202889d683871e8a5a066a29111b230834e9f4f0768e
+  data.tar.gz: 8d76aaeaddbc7e46f7a7da62e79c50bd597ccf6088a8f096f95960f843c96c80ad34f28f172d70dcb4ac1729d7d972e963c4812be30e8a8da17cef5f50727af8

data/lib/beanstalk.rb

@@ -9,6 +9,7 @@ module Beanstalk
     option :source_dir, :aliases => "-s", :default => './src'
     option :profile, :aliases => "-p", :default => 'web-services'
     option :region, :aliases => "-r", :default => 'eu-west-1'
+    option :tags, :aliases => "-t", :type => :hash
 
     def deploy
 
@@ -17,53 +18,120 @@ module Beanstalk
       source_dir = options[:source_dir]
       profile_name = options[:profile]
       region = options[:region]
+      tags = options[:tags]
+
+      # Authenticates the user & sets up a new ElasticBeanstalk client
+      authenticate_user(profile_name, region)
+
+      # Checks if the application exists & creates a new one if it doest
+      app = check_applications(app_name)
+
+      # Check if the environment exists then creates or deploys application as appropriate
+      deploy_environment(app_name, env_name, source_dir, tags)
+
+    end
+
+    no_commands {
+      # Authenticates the user & sets up a new ElasticBeanstalk client.
+      #
+      # ==== Parameters
+      # profile_name<String>:: Name of the profile to use for authentication
+      # region<String>:: Name of the AWS region to authenticate against
+      def authenticate_user(profile_name, region)
+
+        if !ENV['AWS_ACCESS_KEY_ID'].nil? || !ENV['AWS_SECRET_ACCESS_KEY'].nil?
+          puts 'Using environment variables for authentication '
+          creds = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'], session_token = nil)
+        else
+          puts 'Using profile for authentication'
+          creds = Aws::SharedCredentials.new(profile_name: profile_name)
+        end
+
+        puts 'Setting up ElasticBeanstalk client'
+        @eb = Aws::ElasticBeanstalk::Client.new(region: region, credentials: creds)
+        puts 'ElasticBeanstalk client setup complete'
 
-      if !ENV['AWS_ACCESS_KEY_ID'].nil? || !ENV['AWS_SECRET_ACCESS_KEY'].nil?
-        puts 'Using environment variables for authentication '
-        creds = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'], session_token = nil)
-      else
-        puts 'Using profile for authentication'
-        creds = Aws::SharedCredentials.new(profile_name: profile_name)
       end
+    }
 
-      puts 'Setting up ElasticBeanstalk client'
-      eb = Aws::ElasticBeanstalk::Client.new(region: region, credentials: creds)
-      puts 'ElasticBeanstalk client setup complete'
+    no_commands {
+      # Checks if the application exists & creates a new one if it doest.
+      #
+      # ==== Parameters
+      # app_name<String>:: Name of the application to be used
+      def check_applications(app_name)
+        puts 'Checking applications'
+        apps = @eb.describe_applications({
+                                             application_names: ["#{app_name}"]
+                                         })
 
-      puts 'Checking applications'
-      apps = eb.describe_applications({
-                                          application_names: ["#{app_name}"]
+        if apps.applications.empty?
+          puts "Application does not exist, creating #{app_name}."
+          app =@eb.create_application({
+                                          application_name: "#{app_name}",
+                                          description: "#{app_name}"
                                       })
+          puts 'Application creating completed'
+        end
 
-      if apps.applications.empty?
-        puts "Application does not exist, creating #{app_name}."
-        app = eb.create_application({
-                                        application_name: "#{app_name}",
-                                        description: "#{app_name}"
-                                    })
-        puts 'Application creating completed'
       end
+    }
 
-      puts 'Describing environments '
-      envs = eb.describe_environments({
-                                          environment_names: ["#{env_name}"]
-                                      })
+    no_commands {
+      # Check if the environment exists then creates or deploys application as appropriate.
+      #
+      # ==== Parameters
+      # eb<Class>:: ElasticBeanstalk client
+      # app_name<String>:: Name of the application to be used
+      # env_name<String>:: Name of the environment to be used
+      # source_dir<String>:: Name of the environment to be used
+      # tags<Hash>:: Hash of tags to be added to environment
+      def deploy_environment(app_name, env_name, source_dir, tags)
+        puts 'Describing environments '
+        envs = @eb.describe_environments({
+                                             environment_names: ["#{env_name}"]
+                                         })
 
-      environment_available = false
-      envs.environments.each do |environemt|
-        if environemt.status != 'Terminated'
-          environment_available = true
+        environment_available = false
+        envs.environments.each do |environemt|
+          if environemt.status != 'Terminated'
+            environment_available = true
+          end
         end
+
+        if (envs.environments.empty?) or (!environment_available)
+          puts "CreateEnvironment is starting for #{env_name}."
+          system ("cd #{source_dir} && eb create #{env_name} --timeout 60") or raise "Something went wrong, check your source directory is correct."
+          # Tag the environment
+          unless tags.nil?
+            tag_environment(app_name, env_name, tags)
+          end
+        else
+          puts "Updating #{env_name}."
+          system ("cd #{source_dir} && eb deploy #{env_name}") or raise "Something went wrong, check your source directory is correct."
+        end
+
       end
+    }
+
+    no_commands {
+      # Check if the environment exists then creates or deploys application as appropriate.
+      # Only called if the environment is being created.
+      #
+      # ==== Parameters
+      # app_name<String>:: Name of the application to be used
+      # env_name<String>:: Name of the environment to be used
+      # tags<Hash>:: Hash of tags to be added to environment
+      def tag_environment(app_name, env_name, tags)
+
+        puts "Tagging #{env_name}."
+        tags.each do |key, value|
+          puts "Adding #{key.to_s}=#{value.to_s}"
+          system "eb tags #{app_name}-#{env_name}  -a #{key.to_s}=#{value.to_s}"
+        end
 
-      if (envs.environments.empty?) or (!environment_available)
-        puts "CreateEnvironment is starting for #{env_name}."
-        system "cd #{source_dir} && eb create #{env_name} --timeout 60"
-      else
-        puts "Updating #{env_name}."
-        system "cd #{source_dir} && eb deploy #{env_name}"
       end
+    }
 
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalk_deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - StoneWaves