whenever-elasticbeanstalk 1.0.0 → 1.1.0

data/README.md

@@ -4,8 +4,6 @@ Whenever-elasticbeanstalk is an extension gem to [Whenever](https://github.com/j
 
 ## Installation
 
-**Whenever-elasticbeanstalk is still under development and not packaged as a gem yet**
-
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -30,7 +28,7 @@ $ cd /apps/my-great-project
 $ wheneverize-eb .
 ```
 
-This will create an initial `config/schedule.rb` file for you with the `ensure_leader` job set to run every minute. It will also create a `.ebextensions/cron.config` file that will automatically choose a leader on environment initialization, and start up Whenever with the correct `leader` role.
+This will create an initial `config/schedule.rb` file for you with the `ensure_leader` job set to run every minute. It will also create a `.ebextensions/cron.config` file that will automatically choose a leader on environment initialization, and start up Whenever with the correct `leader` role. Lastly, it creates the `config/whenever-elasticbeanstalk.yml` file that will contain your AWS credentials for retrieving your environment information.
 
 ### Manually updating schedule
 
@@ -75,6 +73,11 @@ staging:
 	secret_access_key: 'your secret access key'
 ```
 
+Make sure to add the `RAILS_ENV` environment variable to your environment if you haven't already done so. This variable is not created automatically by AWS. You can add the following line to your `.elasticbeanstalk/optionsettings.appname-env` file:
+```yaml
+RAILS_ENV=staging
+```
+
 ## Usage
 
 For `config/schedule.rb` usage, please see the documentation for the [Whenever gem](https://github.com/javan/whenever).

data/bin/create_cron_leader

@@ -26,14 +26,20 @@ end
 
 optparse.parse!
 
-this_instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
-environment = ENV["RAILS_ENV"]
+ENVIRONMENT_NAME_FILE = "/var/app/support/env_name"
+AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[ENV["RAILS_ENV"]]
 
-AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[environment]
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 
-environment_name = ec2.instances[this_instance_id].tags["elasticbeanstalk:environment-name"]
+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
+end
 
 leader_instances = ec2.instances.inject([]) do |m, i|
 	m << i.id if i.tags["elasticbeanstalk:environment-name"] == environment_name &&

data/bin/ensure_one_cron_leader

@@ -1,17 +1,23 @@
 #!/usr/bin/ruby
+
 require 'rubygems'
 gem 'aws-sdk'
-
 require 'aws-sdk'
 
-this_instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
-environment = ENV["RAILS_ENV"]
+ENVIRONMENT_NAME_FILE = "/var/app/support/env_name"
+AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[ENV["RAILS_ENV"]]
 
-AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[environment]
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 
-environment_name = ec2.instances[this_instance_id].tags["elasticbeanstalk:environment-name"]
+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
+end
 
 leader_instances = ec2.instances.inject([]) do |m, i|
 	m << i.id if i.tags["elasticbeanstalk:environment-name"] == environment_name &&
@@ -22,6 +28,6 @@ end
 
 if leader_instances.count < 1
 	`bundle exec create_cron_leader`
-elsif leader_instances.count > 1 && leader_instances.includes? this_instance_id
+elsif leader_instances.count > 1 && leader_instances.include?(this_instance_id)
 	`bundle exec remove_cron_leader`
 end

data/bin/remove_cron_leader

@@ -4,14 +4,20 @@ gem 'aws-sdk'
 
 require 'aws-sdk'
 
-this_instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
-environment = ENV["RAILS_ENV"]
+ENVIRONMENT_NAME_FILE = "/var/app/support/env_name"
+AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[ENV["RAILS_ENV"]]
 
-AWS_CREDENTIALS = YAML.load_file("config/whenever-elasticbeanstalk.yml")[environment]
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 
-environment_name = ec2.instances[this_instance_id].tags["elasticbeanstalk:environment-name"]
+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
+end
 
 leader_instances = ec2.instances.inject([]) do |m, i|
 	m << i.id if i.tags["elasticbeanstalk:environment-name"] == environment_name &&
@@ -20,7 +26,7 @@ leader_instances = ec2.instances.inject([]) do |m, i|
 	m
 end
 
-if leader_instances.count > 1 && leader_instances.includes? this_instance_id
+if leader_instances.count > 1 && leader_instances.include?(this_instance_id)
 	ec2.instances[this_instance_id].tags["leader"] = "false"
 end
 

data/bin/setup_cron

@@ -4,14 +4,14 @@ gem 'aws-sdk'
 
 require 'aws-sdk'
 
-this_instance_id = `/opt/aws/bin/ec2-metadata -i | awk '{print $2}'`.strip
+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")[environment]
 AWS.config(AWS_CREDENTIALS)
 ec2 = AWS::EC2.new
 
-if ec2.instances[this_instance_id].tags["leader"] == "true"
+if ec2.instances[instance_id].tags["leader"] == "true"
 	`bundle exec whenever --roles leader --set 'environment=#{environment}&path=/var/app/current' --update-crontab`
 else
 	`bundle exec whenever --set 'environment=#{environment}&path=/var/app/current' --update-crontab`

data/lib/whenever-elasticbeanstalk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whenever-elasticbeanstalk
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: whenever