whenever-elasticbeanstalk 1.1.0 → 1.1.1

data/bin/create_cron_leader

@@ -29,13 +29,21 @@ optparse.parse!
 ENVIRONMENT_NAME_FILE = "/var/app/support/env_name"
 AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[ENV["RAILS_ENV"]]
 
+instance_id = if File.exists?("/var/app/support/instance_id")
+	File.read("/var/app/support/instance_id")
+else
+	if id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
+		File.open("/var/app/support/instance_id", 'w') {|f| f.write(id) }
+		id
+	end
+end
+
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 
 environment_name = if File.exists?(ENVIRONMENT_NAME_FILE)
   File.read(ENVIRONMENT_NAME_FILE)
 else
-	instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
 	env_name = ec2.instances[instance_id].tags["elasticbeanstalk:environment-name"]
 	File.open(ENVIRONMENT_NAME_FILE, 'w') {|f| f.write(env_name) }
 	env_name
@@ -49,7 +57,8 @@ leader_instances = ec2.instances.inject([]) do |m, i|
 end
 
 if leader_instances.count < 1
-	ec2.instances[this_instance_id].tags["leader"] = "true"
+	instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
+	ec2.instances[instance_id].tags["leader"] = "true"
 end
 
 unless options[:no_update]

data/bin/ensure_one_cron_leader

@@ -7,13 +7,21 @@ require 'aws-sdk'
 ENVIRONMENT_NAME_FILE = "/var/app/support/env_name"
 AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[ENV["RAILS_ENV"]]
 
+instance_id = if File.exists?("/var/app/support/instance_id")
+	File.read("/var/app/support/instance_id")
+else
+	if id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
+		File.open("/var/app/support/instance_id", 'w') {|f| f.write(id) }
+		id
+	end
+end
+
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 
 environment_name = if File.exists?(ENVIRONMENT_NAME_FILE)
   File.read(ENVIRONMENT_NAME_FILE)
 else
-	instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
 	env_name = ec2.instances[instance_id].tags["elasticbeanstalk:environment-name"]
 	File.open(ENVIRONMENT_NAME_FILE, 'w') {|f| f.write(env_name) }
 	env_name
@@ -28,6 +36,6 @@ end
 
 if leader_instances.count < 1
 	`bundle exec create_cron_leader`
-elsif leader_instances.count > 1 && leader_instances.include?(this_instance_id)
+elsif leader_instances.count > 1 && leader_instances.include?(instance_id)
 	`bundle exec remove_cron_leader`
 end

data/bin/remove_cron_leader

@@ -7,13 +7,21 @@ require 'aws-sdk'
 ENVIRONMENT_NAME_FILE = "/var/app/support/env_name"
 AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[ENV["RAILS_ENV"]]
 
+instance_id = if File.exists?("/var/app/support/instance_id")
+	File.read("/var/app/support/instance_id")
+else
+	if id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
+		File.open("/var/app/support/instance_id", 'w') {|f| f.write(id) }
+		id
+	end
+end
+
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 
 environment_name = if File.exists?(ENVIRONMENT_NAME_FILE)
   File.read(ENVIRONMENT_NAME_FILE)
 else
-	instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
 	env_name = ec2.instances[instance_id].tags["elasticbeanstalk:environment-name"]
 	File.open(ENVIRONMENT_NAME_FILE, 'w') {|f| f.write(env_name) }
 	env_name
@@ -26,8 +34,8 @@ leader_instances = ec2.instances.inject([]) do |m, i|
 	m
 end
 
-if leader_instances.count > 1 && leader_instances.include?(this_instance_id)
-	ec2.instances[this_instance_id].tags["leader"] = "false"
+if leader_instances.count > 1 && leader_instances.include?(instance_id)
+	ec2.instances[instance_id].tags["leader"] = "false"
 end
 
 `bundle exec setup_cron`

data/bin/setup_cron

@@ -4,10 +4,17 @@ gem 'aws-sdk'
 
 require 'aws-sdk'
 
-instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
-environment = ENV["RAILS_ENV"]
+AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[ENV["RAILS_ENV"]]
+
+instance_id = if File.exists?("/var/app/support/instance_id")
+  File.read("/var/app/support/instance_id")
+else
+  if id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
+    File.open("/var/app/support/instance_id", 'w') {|f| f.write(id) }
+    id
+  end
+end
 
-AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[environment]
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 

data/lib/whenever-elasticbeanstalk/version.rb

@@ -1,5 +1,5 @@
 module Whenever
   module Elasticbeanstalk
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenever-elasticbeanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: whenever
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Allows you to run cron jobs easily on one or all AWS Elastic Beanstalk instances.