ey_cloud_awareness 0.1.14 → 0.2.0

data/README.rdoc

@@ -2,13 +2,13 @@
 
 This gem makes it a little easier to live on the EngineYard cloud:
 
-* automatically run cap tasks on all your instances
+* allow your instances to get information about the app_master, db_master, utility workers, etc. in its EngineYard environment
+* automatically map cap tasks to all your instances
 * automatically update your ssh aliases
-* allow your app to get information about the cluster (aka "environment") it's running in
 
 We use it over at http://brighterplanet.com.
 
-== Don't read this
+== /etc/chef/dna.json must be readable
 
 This gem depends on
 
@@ -16,42 +16,41 @@ This gem depends on
 
 being READABLE and containing certain attributes as named by EngineYard. You might have to add:
 
-  `sudo chmod a+r /etc/chef/dna.json`
+  sudo 'chmod a+r /etc/chef/dna.json'
 
-to your before_migrate.rb script.
+to your before_restart.rb hook.
 
-== Quick start
+== Using the commandline tool directly
 
-Put this in <tt>config/environment.rb</tt>:
+Running this command only works from EngineYard AppCloud Amazon EC2 instances.
 
-  config.gem 'ey_cloud_awareness', :version => '[WHATEVER THE CURRENT GEM VERSION IS]', :lib => false, :source => 'http://gemcutter.org'
+* SSH into one of your EngineYard AppCloud Amazon EC2 instances.
+* Run <tt>sudo gem install ey_cloud_awareness --no-rdoc --no-ri</tt> to make sure the gem binary is installed somewhere in your path.
+* Run <tt>sudo chmod a+r /etc/chef/dna.json</tt> to make sure everybody can read the EngineYard DNA information.
+* Run <tt>ey_cloud_awareness</tt> and you should get back a JSON-encoded hash of instance, environment, app, and other metadata.
 
-Put this in your <tt>config/deploy.rb</tt> (or whereever your Capfile is):
+It returns a cleaned-up combination of Amazon EC2 and EngineYard metadata.
+
+== Capistrano
+
+Put this in your <tt>config/deploy.rb</tt> (or your Capfile):
 
   # don't miss this line just because it's at the top
-  load "#{Gem.searcher.find('ey_cloud_awareness').full_gem_path}/lib/tasks/capistrano_tasks.rb"
+  load "#{Gem.searcher.find('ey_cloud_awareness').full_gem_path}/lib/ey_cloud_awareness/capistrano_tasks.rb"
 
   task :my_production do
-    role :app_master, 'my_app.com'          # or you can use its Elastic IP
-    set :rails_env, 'production'            # required
-    set :deploy_to, '/data/my_app'          # required
-    find_and_execute_task 'eyc_setup'       # required
+    role :app_master, 'my_app.com'
+    find_and_execute_task 'eyc_setup'       # gets a fresh list of your environment's instances and sets roles
   end
 
   task :my_staging do
-    role :app_master, 'staging.my_app.com'  # or you can use its Elastic IP
-    set :rails_env, 'production'            # required
-    set :deploy_to, '/data/my_app'          # required
-    find_and_execute_task 'eyc_setup'       # required
+    role :app_master, 'staging.my_app.com'
+    find_and_execute_task 'eyc_setup'       # gets a fresh list of your environment's instances and sets roles
   end
   
   # add more tasks if you have more cloud environments
 
-That should be all.
-
-== Running capistrano tasks on your instances
-
-Commands like these will work:
+If you want to use EngineYard tasks like
 
   cap my_production monit:status
   cap my_production deploy:web:disable
@@ -59,100 +58,74 @@ Commands like these will work:
   cap my_production passenger:restart
   cap my_production nginx:restart
 
-Every time you use them, a special <tt>eyc_setup</tt> task is run that gets a fresh list of your environment's instances and sets roles like <tt>:app</tt>, <tt>:web</tt>, and <tt>:db</tt>.
+then you should make sure the tasks look like
 
+  [...]
+  require 'eycap/recipes'
+  ssh_options[:compression] = false
+  set :user, 'deploy'
+  set :runner, 'deploy'
+  [...]
+  
+  task :my_production do
+    role :app_master, 'my_app.com'
+    find_and_execute_task 'eyc_setup'
+    set :rails_env, 'production'          # required for eycap
+    set :deploy_to, '/data/my_app'        # required for eycap too
+  end
+  
+  task :my_staging do
+    role :app_master, 'staging.my_app.com'
+    find_and_execute_task 'eyc_setup'
+    set :rails_env, 'production'          # required for eycap
+    set :deploy_to, '/data/my_app'        # required for eycap too
+  end
+  
 == SSH into your instances
 
-Let's say you want to ssh into...
+You can easily create SSH aliases like...
 
   ssh my_production-app_master
 
-Well, you need to keep your <tt>~/.ssh/config</tt> up-to-date. Easy!
+using the following task:
 
   cap my_production eyc:ssh
-
-That will magically add or update a block like
-
-  # START StringReplacer my_production -- DO NOT MODIFY
-
-    # db_master
-    Host my_production-db_master
-      Hostname ec2-222-222-222-59.compute-1.amazonaws.com
-      User my_user
-      StrictHostKeyChecking no
-
-    # utility (1)
-    Host my_production-utility1
-      Hostname ec2-222-222-53-222.compute-1.amazonaws.com
-      User my_user
-      StrictHostKeyChecking no
-
-    # app_master
-    Host my_production-app_master
-      Hostname ec2-222-222-23-222.compute-1.amazonaws.com
-      User my_user
-      StrictHostKeyChecking no
-
-  # END StringReplacer my_production -- DO NOT MODIFY
-
-Run that again as
-
   cap my_staging eyc:ssh
 
-... and it adds
-
-  # START StringReplacer my_staging -- DO NOT MODIFY
-
-    # app_master
-    Host my_staging-app_master
-      Hostname ec2-222-222-7-210.compute-1.amazonaws.com
-      User my_user
-      StrictHostKeyChecking no
-
-    # db_master
-    Host my_staging-db_master
-      Hostname ec2-222-222-52-8.compute-1.amazonaws.com
-      User my_user
-      StrictHostKeyChecking no
-
-  # END StringReplacer my_staging -- DO NOT MODIFY
-
-This leaves you with lots of useful aliases:
+That will magically update <tt>~/.ssh/config</tt> with aliases like
 
   ssh my_production-db_master
   ssh my_production-app_master
-  ssh my_production-utility1
+  ssh my_production-app0
+  ssh my_production-app1
+  ssh my_production-app2
+  ssh my_production-util0
+  ssh my_production-util1
+  
   ssh my_staging-app_master
   ssh my_staging-db_master
 
-Note that the numbers after app [slaves], db [slaves], and utility [slaves] may change every time you run the task.
-
-== Just dumping information about your instances
+Unfortunately, the counters are arbitrary and so the assignment of util0 versus util1, etc. may change every time you update your <tt>.ssh/config</tt> file with this task.
 
 Once you've done the quickstart, try:
 
-  cap my_production eyc:app         # gets a list of your app instances, including app_master
-  cap my_production eyc:utility     # ditto for utility instances
-  cap my_production eyc:db          # ditto for db instances
+  cap my_production eyc:app_servers # gets a list of your app instances, including app_master
+  cap my_production eyc:utilities   # ditto for utility instances
+  cap my_production eyc:db_servers  # ditto for db instances
   cap my_production eyc:all         # gets a list of all your instances
 
-== Using the EngineYardCloudInstance class inside Rails
+== Making your instances aware of each other
 
-I run a memcached server on every app instance, so I have this in <tt>config/environment.rb</tt>:
+You can use EngineYardCloudInstance to pull up information on other instances in an environment:
 
-  Rails::Initializer.run do |config|
-    [...]
-    config.cache_store = :mem_cache_store, EngineYardCloudInstance.app.map { |i| "#{i.private_dns_name}:11211" }
-    [...]
-  end
+  >> db_master = EngineYardCloudInstance.db_master
+  => #<EngineYardCloudInstance:0xb5e12f70 @instance_id="i-50cf5838">
+  >> db_master.dns_name
+  => "ec2-67-201-47-30.compute-1.amazonaws.com"
 
-Or whatever you want:
+You can also inspect the whole set of metadata itself. This may change over time:
 
-  >> all_app_instances = EngineYardCloudInstance.app      
-  => [#<EngineYardCloudInstance:0xb5e12f70 @instance_id="i-50cf5838">, #<EngineYardCloudInstance:0xb5e12f5c @instance_id="i-dc9207b4">, #<EngineYardCloudInstance:0xb5e12f34 @instance_id="i-b2d84fda">]
-  >> all_app_instances.first.dns_name
-  => "ec2-67-201-47-30.compute-1.amazonaws.com"
-  >> pp all_app_instances.first.to_hash
+  >> pp db_master.data
   => {:block_device_mapping=>
         [{:ebs=>
            {:status=>"attached",
@@ -193,19 +166,19 @@ Or whatever you want:
         :dns_name=>"ec2-67-201-47-30.compute-1.amazonaws.com",
         :ip_address=>"199.99.99.99",
         :architecture=>"i386",
-        :instance_role=>"solo",
+        :role=>"db_master",
         :monitoring=>{:state=>"disabled"}}
 
 == A note on caching and network needs
 
 I tried to be smart about caching the results of network calls.
 
-Stuff like the current instance id, which is pulled from an EC2 metadata server, is stored in
+Stuff like the present instance id, which is pulled from an EC2 metadata server, is stored in
 
-  CURRENT_INSTANCE_ID_CACHE_PATH = File.expand_path '~/.ey_cloud_awareness/engine_yard_cloud_instance_id'
+  ~/.ey_cloud_awareness/engine_yard_cloud_instance_id
 
 Please let me know if this causes problems.
 
 == Copyright
 
-Copyright (c) 2009 Seamus Abshere. See LICENSE for details.
+Copyright (c) 2009, 2010 Seamus Abshere. See LICENSE for details.

data/Rakefile

@@ -10,11 +10,11 @@ begin
     gem.email = "seamus@abshere.net"
     gem.homepage = "http://github.com/seamusabshere/ey_cloud_awareness"
     gem.authors = ["Seamus Abshere"]
-    # gem.rubyforge_project = "ey_cloud_awareness"
-    gem.add_dependency 'json', '>=1.2.3'
+    gem.executables = 'ey_cloud_awareness'
+    gem.add_dependency 'string_replacer', '>=0.0.1'
     gem.add_dependency 'activesupport', '>=2.3.4'
-    gem.add_dependency 'amazon-ec2', '>=0.9.10'
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_dependency 'amazon-ec2', '>=0.9.15'
+    # gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -25,21 +25,22 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
+# sabshere 9/21/10 disable until we actually have tests
+# require 'spec/rake/spectask'
+# Spec::Rake::SpecTask.new(:spec) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.spec_files = FileList['spec/**/*_spec.rb']
+# end
+# 
+# Spec::Rake::SpecTask.new(:rcov) do |spec|
+#   spec.libs << 'lib' << 'spec'
+#   spec.pattern = 'spec/**/*_spec.rb'
+#   spec.rcov = true
+# end
+# 
+# task :spec => :check_dependencies
+# 
+# task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.2.0

data/bin/ey_cloud_awareness

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'ey_cloud_awareness'
+
+EngineYardCloudInstance.clear
+puts EngineYardCloudInstance.to_json

data/ey_cloud_awareness.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ey_cloud_awareness}
-  s.version = "0.1.14"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-09-22}
+  s.default_executable = %q{ey_cloud_awareness}
   s.description = %q{Pull metadata from EC2 and EngineYard so that your EngineYard Cloud instances know about each other.}
   s.email = %q{seamus@abshere.net}
+  s.executables = ["ey_cloud_awareness"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -23,11 +25,12 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/ey_cloud_awareness",
      "ey_cloud_awareness.gemspec",
-     "lib/engine_yard_cloud_instance.rb",
      "lib/ey_cloud_awareness.rb",
-     "lib/tasks/capistrano_tasks.rb",
-     "lib/tasks/ey_cloud_awareness.rake",
+     "lib/ey_cloud_awareness/capistrano_tasks.rb",
+     "lib/ey_cloud_awareness/engine_yard_cloud_instance.rb",
+     "lib/ey_cloud_awareness/hash_ext.rb",
      "spec/ey_cloud_awareness_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -35,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/seamusabshere/ey_cloud_awareness}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Make your EngineYard cloud instances aware of each other.}
   s.test_files = [
     "spec/ey_cloud_awareness_spec.rb",
@@ -46,22 +49,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 1.2.3"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<string_replacer>, [">= 0.0.1"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<amazon-ec2>, [">= 0.9.10"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<amazon-ec2>, [">= 0.9.15"])
     else
-      s.add_dependency(%q<json>, [">= 1.2.3"])
+      s.add_dependency(%q<string_replacer>, [">= 0.0.1"])
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<amazon-ec2>, [">= 0.9.10"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<amazon-ec2>, [">= 0.9.15"])
     end
   else
-    s.add_dependency(%q<json>, [">= 1.2.3"])
+    s.add_dependency(%q<string_replacer>, [">= 0.0.1"])
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<amazon-ec2>, [">= 0.9.10"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<amazon-ec2>, [">= 0.9.15"])
   end
 end
 

data/lib/ey_cloud_awareness.rb

@@ -1,15 +1,14 @@
 require 'open-uri'
 require 'set'
 require 'fileutils'
-require 'json'
-require 'yaml'
 require 'AWS' # aka amazon-ec2
 require 'etc'
 require 'active_support'
 require 'active_support/version'
 %w{
+  active_support/json
   active_support/core_ext/string
-  active_support/core_ext/class/inheritable_attributes
+  active_support/core_ext/class/attribute_accessors
   active_support/inflector/inflections
   active_support/core_ext/string/inflections
   active_support/core_ext/hash/keys
@@ -18,57 +17,8 @@ require 'active_support/version'
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
     
-require 'engine_yard_cloud_instance'
+require 'ey_cloud_awareness/engine_yard_cloud_instance'
+require 'ey_cloud_awareness/hash_ext'
 
-class Hash
-  # http://pragmatig.wordpress.com/2009/04/14/recursive-symbolize_keys/
-  def recursive_symbolize_keys!
-    symbolize_keys!
-    values.select { |v| v.is_a?(Hash) }.each do |hsh|
-      hsh.recursive_symbolize_keys!
-    end
-    # burst thru at least one level of arrays
-    values.select { |v| v.is_a?(Array) }.each do |ary|
-      ary.each do |v|
-        v.recursive_symbolize_keys! if v.is_a?(Hash)
-      end
-    end
-    self
-  end
-  
-  XML_ITEM_KEYS = [ :item, 'item' ]
-  
-  # :sam => { :item => [{ :foo => :bar }] }
-  # into
-  # :sam => [{:foo => :bar}]
-  def kill_xml_item_keys!
-    if keys.length == 1 and XML_ITEM_KEYS.include?(keys.first)
-      raise ArgumentError, "You need to call kill_xml_item_keys! on { :foo => { :items => [...] } } not on { :items => [...] }"
-    end
-    keys.each do |key|
-      if self[key].is_a?(Hash) and self[key].keys.length == 1 and XML_ITEM_KEYS.include?(self[key].keys.first)
-        # self[:sam] = self[:sam]["item"] (using values.first because we don't know if it's :item or "item")
-        self[key] = delete(key).values.first
-      end
-    end
-    self
-  end
-  
-  def recursive_kill_xml_item_keys!
-    kill_xml_item_keys!
-    values.select { |v| v.is_a?(Hash) }.each do |hsh|
-      hsh.recursive_kill_xml_item_keys!
-    end
-    # burst thru at least one level of arrays
-    values.select { |v| v.is_a?(Array) }.each do |ary|
-      ary.each do |v|
-        v.recursive_kill_xml_item_keys! if v.is_a?(Hash)
-      end
-    end
-    self
-  end
-  
-  def deep_copy
-    Marshal.load Marshal.dump(self)
-  end
+module EyCloudAwareness
 end

data/lib/ey_cloud_awareness/capistrano_tasks.rb

@@ -0,0 +1,80 @@
+require 'ey_cloud_awareness'
+
+task :eyc_setup, :roles => :app_master do
+  # pull JSON-encoded metadata
+  output = capture('ey_cloud_awareness').gsub /\s+/, ' '
+  if /(\{.*\})/.match(output)
+    json_str = $1
+    begin
+      set :eyc_proxy, EngineYardCloudInstance.from_json(json_str)
+    rescue
+      $stderr.puts "[EY CLOUD AWARENESS GEM] Couldn't parse JSON, so just dumping what we got"
+      $stderr.puts json_str
+      raise $!
+    end
+  else
+    $stderr.puts "[EY CLOUD AWARENESS GEM] Didn't get JSON we recognized back, just dumping what we got"
+    $stderr.puts output
+    raise
+  end
+  
+  # now set up roles
+  # role :app_master is already set
+  role :db_master, eyc_proxy.db_master.dns_name
+  eyc_proxy.app_servers.each do |i|
+    role :app, i.dns_name
+    role :web, i.dns_name
+  end
+  eyc_proxy.db_servers.each do |i|
+    role :db, i.dns_name
+  end
+  eyc_proxy.utilities.each do |i|
+    role :util, i.dns_name
+  end
+end
+
+namespace :eyc do
+  %w{ app_servers db_servers utilities all }.each do |name|
+    task name, :roles => :app_master do
+      require 'pp'
+      pp eyc_proxy.send(name).map(&:to_hash)
+    end
+  end
+
+  task :ssh, :roles => :app_master do
+    require 'string_replacer'
+    replacement = []
+    counters = Hash.new(0)
+    eyc_proxy.with_roles.each do |instance|
+      case instance.role
+      when 'db_master'
+        explanation = ''
+        shorthand = 'db_master'
+      when 'app_master'
+        explanation = ''
+        shorthand = 'app_master'
+      when 'solo'
+        explanation = ''
+        shorthand = 'solo'
+      else
+        explanation = " (#{counters[instance.role]})"
+        shorthand = "#{instance.role}#{counters[instance.role]}"
+        counters[instance.role] += 1
+      end
+      replacement << %{
+  # #{instance.role}#{explanation}
+  Host #{eyc_proxy.environment['name']}-#{shorthand}
+    Hostname #{instance.dns_name}
+    User #{instance.user['username']}
+    StrictHostKeyChecking no
+}
+    end
+    string = replacement.join
+    ssh_config_path = File.expand_path("~/.ssh/config")
+    r = StringReplacer.new ssh_config_path
+    r.replace! string, eyc_proxy.environment['name'], nil
+    
+    $stderr.puts "[EY CLOUD AWARENESS GEM] Added this to #{ssh_config_path}"
+    $stderr.puts string
+  end
+end

data/lib/ey_cloud_awareness/engine_yard_cloud_instance.rb

@@ -0,0 +1,233 @@
+class EngineYardCloudInstance
+  HOMEDIR = File.expand_path "~#{Etc.getpwuid.name}"
+  PRESENT_INSTANCE_ID_CACHE_PATH = "#{HOMEDIR}/.ey_cloud_awareness/engine_yard_cloud_instance_id"
+  PRESENT_SECURITY_GROUP_CACHE_PATH = "#{HOMEDIR}/.ey_cloud_awareness/engine_yard_cloud_security_group"
+  INSTANCES_CACHE_PATH = "#{HOMEDIR}/.ey_cloud_awareness/engine_yard_cloud_ec2_instances.json"
+  DNA_PATH = '/etc/chef/dna.json'
+  
+  attr_reader :instance_id
+  def initialize(instance_id)
+    @instance_id = instance_id.to_s
+  end
+  
+  def clear
+    self.class.clear
+  end
+  
+  def to_hash
+    data.merge 'environment' => environment,
+               'apps' => apps,
+               'users' => users
+  end
+  
+  def app
+    raise "[EY CLOUD AWARENESS GEM] There is more than one app on this instance, so you can't use the #app method. Use #users.first (etc.) instead." if apps.length > 1
+    apps.first
+  end
+  
+  def user
+    raise "[EY CLOUD AWARENESS GEM] There is more than one user on this instance, so you can't use the #user method. Use #users.first (etc.) instead." if users.length > 1
+    users.first
+  end
+
+  def as_json(*)
+    to_hash
+  end
+  
+  def data
+    self.class.data['instances'][instance_id]
+  end
+  
+  def method_missing(name, *args, &block)
+    if data and data.has_key?(name.to_s)
+      data[name.to_s]
+    elsif self.class.data and self.class.data.has_key?(name.to_s)
+      self.class.data[name.to_s]
+    else
+      super
+    end
+  end
+  
+  def ==(other)
+    self.instance_id == other.instance_id
+  end
+  
+  cattr_accessor :proxy
+  cattr_accessor :data_cache
+  cattr_accessor :dna_cache
+  
+  class << self
+    # sabshere 9/21/10 from engineyard gem cli.rb
+    # def ssh_host_filter(opts)
+    #   return lambda {|instance| true }                                                if opts[:all]
+    #   return lambda {|instance| %w(solo app app_master    ).include?(instance.role) } if opts[:app_servers]
+    #   return lambda {|instance| %w(solo db_master db_slave).include?(instance.role) } if opts[:db_servers ]
+    #   return lambda {|instance| %w(solo db_master         ).include?(instance.role) } if opts[:db_master  ]
+    #   return lambda {|instance| %w(db_slave               ).include?(instance.role) } if opts[:db_slaves  ]
+    #   return lambda {|instance| %w(util                   ).include?(instance.role) &&
+    #                                        opts[:utilities].include?(instance.name) } if opts[:utilities  ]
+    #   return lambda {|instance| %w(solo app_master        ).include?(instance.role) }
+    # end
+    
+    def all
+      data['instances'].map { |instance_id, _| new instance_id }
+    end
+    
+    def app_servers
+      find_all_by_instance_roles 'app', 'app_master', 'solo'
+    end
+    
+    def db_servers
+      find_all_by_instance_roles 'db_master', 'db_slave', 'solo'
+    end
+
+    def db_master
+      find_all_by_instance_roles('db_master').first || find_all_by_instance_roles('solo').first
+    end
+    
+    def db_slaves
+      find_all_by_instance_roles 'db_slave'
+    end
+    
+    def utilities
+      find_all_by_instance_roles 'util'
+    end
+    
+    def app_master
+      find_all_by_instance_roles('app_master').first || find_all_by_instance_roles('solo').first
+    end
+    
+    def with_roles
+      all.select { |i| i.role.present? }
+    end
+    
+    def present
+      new present_instance_id
+    end
+    
+    def find_by_instance_id(instance_id)
+      new instance_id
+    end
+    
+    def find_all_by_instance_roles(*args)
+      data['instances'].select { |_, instance| Array.wrap(args).map(&:to_s).include? instance['role'] }.map { |instance_id, _| new instance_id }
+    end
+    
+    def clear
+      raise "[EY CLOUD AWARENESS GEM] Can't clear if we used from_hash" if proxy?
+      self.data_cache = nil
+      self.dna_cache = nil
+      ec2_instances true
+      present_security_group true
+      present_instance_id true
+    end
+    
+    def data
+      return data_cache if data_cache.is_a? Hash
+      raise "[EY CLOUD AWARENESS GEM] Can't calculate data if we used from_hash" if proxy?
+      self.data_cache = Hash.new
+      data_cache['instances'] = mixed_instances
+      data_cache['environment'] = dna['engineyard']['environment'].except('instances', 'apps')
+      data_cache['apps'] = dna['engineyard']['environment']['apps']
+      data_cache['users'] = dna['users']
+      data_cache['group_id'] = present_security_group
+      data_cache
+    end
+    
+    def proxy?
+      !!proxy
+    end
+    
+    def to_hash
+      data
+    end
+    
+    def as_json(*)
+      to_hash
+    end
+    
+    def from_json(str)
+      from_hash ActiveSupport::JSON.decode(str)
+    end
+    
+    def from_hash(hash)
+      self.proxy = true
+      self.data_cache = hash
+      self
+    end
+    
+    def method_missing(name, *args, &block)
+      if data and data.has_key?(name.to_s)
+        data[name.to_s]
+      else
+        super
+      end
+    end
+    
+    def mixed_instances
+      ec2_instances.inject(Hash.new) do |memo, ec2_instance|
+        instance_id = ec2_instance['instance_id']
+        mixed_instance = dna_instances.detect { |dna_instance| dna_instance['id'] == instance_id }.merge ec2_instance
+        memo[instance_id] = mixed_instance
+        memo
+      end
+    end
+    
+    def dna_instances
+      dna['engineyard']['environment']['instances']
+    end
+    
+    def dna
+      raise "[EY CLOUD AWARENESS GEM] Can't see DNA if we used from_hash" if proxy?
+      raise "[EY CLOUD AWARENESS GEM] Can't read DNA from #{DNA_PATH}! You should put 'sudo chmod a+r /etc/chef/dna.json' your your before_migrate.rb!" unless File.readable?(DNA_PATH)
+      self.dna_cache ||= ActiveSupport::JSON.decode(IO.read(DNA_PATH))
+    end
+    
+    def present_instance_id(refresh = false)
+      raise "[EY CLOUD AWARENESS GEM] Can't call present_instance_id if we used from_hash" if proxy?
+      if refresh or !File.readable?(PRESENT_INSTANCE_ID_CACHE_PATH)
+        @_present_instance_id = open("http://169.254.169.254/latest/meta-data/instance-id").gets
+        begin
+          FileUtils.mkdir_p File.dirname(PRESENT_INSTANCE_ID_CACHE_PATH)
+          File.open(PRESENT_INSTANCE_ID_CACHE_PATH, 'w') { |f| f.write @_present_instance_id }
+        rescue Errno::EACCES
+          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching present instance because #{PRESENT_INSTANCE_ID_CACHE_PATH} can't be written to"
+        end
+      end
+      @_present_instance_id ||= IO.read(PRESENT_INSTANCE_ID_CACHE_PATH)
+    end
+
+    def present_security_group(refresh = false)
+      raise "[EY CLOUD AWARENESS GEM] Can't call present_security_group if we used from_hash" if proxy?
+      if refresh or !File.readable?(PRESENT_SECURITY_GROUP_CACHE_PATH)
+        @_present_security_group = open('http://169.254.169.254/latest/meta-data/security-groups').gets
+        raise "[EY CLOUD AWARENESS GEM] Don't know how to deal with (possibly) multiple security group: #{@_present_security_group}" if @_present_security_group =~ /,;/
+        begin
+          FileUtils.mkdir_p File.dirname(PRESENT_SECURITY_GROUP_CACHE_PATH)
+          File.open(PRESENT_SECURITY_GROUP_CACHE_PATH, 'w') { |f| f.write @_present_security_group }
+        rescue Errno::EACCES
+          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching present security group because #{PRESENT_SECURITY_GROUP_CACHE_PATH} can't be written to"
+        end
+      end
+      @_present_security_group ||= IO.read(PRESENT_SECURITY_GROUP_CACHE_PATH)
+    end
+    
+    def ec2_instances(refresh = false)
+      raise "[EY CLOUD AWARENESS GEM] Can't call ec2_instances if we used from_hash" if proxy?
+      if refresh or !File.readable?(INSTANCES_CACHE_PATH)
+        ec2 = AWS::EC2::Base.new :access_key_id => dna['aws_secret_id'], :secret_access_key => dna['aws_secret_key']
+        @_ec2_instances = ec2.describe_instances
+        @_ec2_instances.recursive_kill_xml_item_keys!
+        @_ec2_instances = @_ec2_instances['reservationSet'].select { |hash| present_security_group.include? hash['groupSet'].first['groupId'] }
+        @_ec2_instances.map! { |hash| hash['instancesSet'].first.recursive_underscore_keys! }
+        begin
+          FileUtils.mkdir_p File.dirname(INSTANCES_CACHE_PATH)
+          File.open(INSTANCES_CACHE_PATH, 'w') { |f| f.write @_ec2_instances.to_json }
+        rescue Errno::EACCES
+          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching instance data because #{INSTANCES_CACHE_PATH} can't be written to"
+        end
+      end
+      @_ec2_instances ||= ActiveSupport::JSON.decode(IO.read(INSTANCES_CACHE_PATH))
+    end
+  end
+end

data/lib/ey_cloud_awareness/hash_ext.rb

@@ -0,0 +1,60 @@
+module EyCloudAwareness
+  module HashExt
+    # http://as.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html
+    def underscore_keys!
+      keys.each do |key|
+        self[key.to_s.underscore] = delete(key)
+      end
+      self
+    end
+    
+    # http://pragmatig.wordpress.com/2009/04/14/recursive-symbolize_keys/
+    def recursive_underscore_keys!
+      underscore_keys!
+      values.select { |v| v.is_a?(Hash) }.each do |hsh|
+        hsh.recursive_underscore_keys!
+      end
+      # burst thru at least one level of arrays
+      values.select { |v| v.is_a?(Array) }.each do |ary|
+        ary.each do |v|
+          v.recursive_underscore_keys! if v.is_a?(Hash)
+        end
+      end
+      self
+    end
+  
+    XML_ITEM_KEYS = [ :item, 'item' ]
+  
+    # :sam => { :item => [{ :foo => :bar }] }
+    # into
+    # :sam => [{:foo => :bar}]
+    def kill_xml_item_keys!
+      if keys.length == 1 and XML_ITEM_KEYS.include?(keys.first)
+        raise ArgumentError, "You need to call kill_xml_item_keys! on { :foo => { :items => [...] } } not on { :items => [...] }"
+      end
+      keys.each do |key|
+        if self[key].is_a?(Hash) and self[key].keys.length == 1 and XML_ITEM_KEYS.include?(self[key].keys.first)
+          # self[:sam] = self[:sam]["item"] (using values.first because we don't know if it's :item or "item")
+          self[key] = delete(key).values.first
+        end
+      end
+      self
+    end
+  
+    def recursive_kill_xml_item_keys!
+      kill_xml_item_keys!
+      values.select { |v| v.is_a?(Hash) }.each do |hsh|
+        hsh.recursive_kill_xml_item_keys!
+      end
+      # burst thru at least one level of arrays
+      values.select { |v| v.is_a?(Array) }.each do |ary|
+        ary.each do |v|
+          v.recursive_kill_xml_item_keys! if v.is_a?(Hash)
+        end
+      end
+      self
+    end
+  end
+end
+
+Hash.send :include, EyCloudAwareness::HashExt

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey_cloud_awareness
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 14
-  version: 0.1.14
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -04:00
-default_executable: 
+date: 2010-09-22 00:00:00 -05:00
+default_executable: ey_cloud_awareness
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: string_replacer
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
+        - 0
+        - 0
         - 1
-        - 2
-        - 3
-        version: 1.2.3
+        version: 0.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -49,34 +54,22 @@ dependencies:
   name: amazon-ec2
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 37
         segments: 
         - 0
         - 9
-        - 10
-        version: 0.9.10
+        - 15
+        version: 0.9.15
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id004
 description: Pull metadata from EC2 and EngineYard so that your EngineYard Cloud instances know about each other.
 email: seamus@abshere.net
-executables: []
-
+executables: 
+- ey_cloud_awareness
 extensions: []
 
 extra_rdoc_files: 
@@ -89,11 +82,12 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/ey_cloud_awareness
 - ey_cloud_awareness.gemspec
-- lib/engine_yard_cloud_instance.rb
 - lib/ey_cloud_awareness.rb
-- lib/tasks/capistrano_tasks.rb
-- lib/tasks/ey_cloud_awareness.rake
+- lib/ey_cloud_awareness/capistrano_tasks.rb
+- lib/ey_cloud_awareness/engine_yard_cloud_instance.rb
+- lib/ey_cloud_awareness/hash_ext.rb
 - spec/ey_cloud_awareness_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -107,23 +101,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Make your EngineYard cloud instances aware of each other.

data/lib/engine_yard_cloud_instance.rb

@@ -1,207 +0,0 @@
-class EngineYardCloudInstance
-  homedir = File.expand_path "~#{Etc.getpwuid.name}"
-  CURRENT_INSTANCE_ID_CACHE_PATH = "#{homedir}/.ey_cloud_awareness/engine_yard_cloud_instance_id"
-  CURRENT_SECURITY_GROUP_CACHE_PATH = "#{homedir}/.ey_cloud_awareness/engine_yard_cloud_security_group"
-  INSTANCE_DESCRIPTIONS_CACHE_PATH = "#{homedir}/.ey_cloud_awareness/engine_yard_cloud_ec2_instance_descriptions.yml"
-  DNA_PATH = '/etc/chef/dna.json'
-  
-  attr_reader :instance_id
-  def initialize(instance_id)
-    @instance_id = instance_id.to_s
-  end
-  
-  def valid?
-    data.present?
-  end
-  
-  def clear
-    self.class.clear
-  end
-  
-  def to_hash
-    data.deep_copy
-  end
-  
-  def data
-    self.class.data[instance_id.to_sym]
-  end
-  
-  def method_missing(name, *args, &block)
-    name = name.to_sym
-    if data and data.has_key?(name)
-      data[name]
-    else
-      super
-    end
-  end
-  
-  def ==(other)
-    self.instance_id == other.instance_id
-  end
-  
-  class_inheritable_accessor :proxy
-  
-  class << self
-    def to_hash
-      clear
-      data.deep_copy
-    end
-    
-    def from_hash(hash)
-      self.proxy = true
-      @_data = hash.recursive_symbolize_keys!
-      self
-    end
-    
-    def environment
-      @_environment ||= first.environment
-    end
-    
-    def app_master
-      find_all_by_instance_roles(:app_master).first || find_all_by_instance_roles(:solo).first
-    end
-    
-    def db_master
-      find_all_by_instance_roles(:db_master).first || find_all_by_instance_roles(:solo).first
-    end
-    
-    def app
-      find_all_by_instance_roles :app, :app_master, :solo
-    end
-    
-    def db
-      find_all_by_instance_roles :db_master, :db_slave, :solo
-    end
-    
-    def utility
-      find_all_by_instance_roles :utility
-    end
-    
-    def all
-      data.map { |k, _| new k }
-    end
-    
-    def with_roles
-      all.reject { |i| i.instance_role == 'unknown' }
-    end
-    
-    def current
-      new cached_current_instance_id
-    end
-    
-    def first
-      new data.to_a.first.first
-    end
-    
-    def find_by_instance_id(instance_id)
-      new instance_id
-    end
-    
-    def find_all_by_instance_roles(*args)
-      data.select { |_, v| Array.wrap(args).map(&:to_s).include? v[:instance_role] }.map { |k, _| new k }
-    end
-    
-    def clear
-      raise "[EY CLOUD AWARENESS GEM] Can't clear if we used from_hash" if self.proxy
-      @_data = nil
-      @_dna = nil
-      cached_ec2_instance_descriptions true
-      cached_current_security_group true
-      cached_current_instance_id true
-    end
-    
-    def data
-      return @_data if @_data
-      raise "[EY CLOUD AWARENESS GEM] Can't calculate data if we used from_hash" if self.proxy
-      @_data = Hash.new
-      cached_ec2_instance_descriptions.each do |ec2_instance_description|
-        @_data[ec2_instance_description['instanceId']] ||= Hash.new
-        member = @_data[ec2_instance_description['instanceId']]
-        # using instance as a pointer
-        if dna[:instance_role] == 'solo'
-          member[:instance_role] = 'solo'
-        elsif dna[:db_host] == ec2_instance_description['dnsName'] or dna[:db_host] == ec2_instance_description['privateDnsName']
-          member[:instance_role] = 'db_master'
-        elsif Array.wrap(dna[:db_slaves]).include? ec2_instance_description['privateDnsName']
-          member[:instance_role] = 'db_slave'
-        elsif Array.wrap(dna[:utility_instances]).include? ec2_instance_description['privateDnsName']
-          member[:instance_role] = 'utility'
-        elsif dna[:master_app_server][:private_dns_name] == ec2_instance_description['privateDnsName']
-          member[:instance_role] = 'app_master'
-        elsif ec2_instance_description['instanceState']['name'] == 'running'
-          member[:instance_role] = 'app'
-        else
-          member[:instance_role] = 'unknown'
-        end
-        member[:group_id] = cached_current_security_group
-        member[:users] = dna[:users]
-        member[:environment] = dna[:environment]
-        @_environment ||= dna[:environment]
-
-        ec2_instance_description.each do |raw_k, raw_v|
-          k = raw_k.underscore.to_sym
-          next if member.keys.include? k
-          member[k] = raw_v
-        end
-      end
-      @_data.recursive_symbolize_keys!
-      @_data
-    end
-    
-    def dna
-      raise "[EY CLOUD AWARENESS GEM] Can't see DNA if we used from_hash" if self.proxy
-      raise "[EY CLOUD AWARENESS GEM] Can't read DNA from #{DNA_PATH}! You should put 'sudo chmod a+r /etc/chef/dna.json' your your before_migrate.rb!" unless File.readable?(DNA_PATH)
-      @_dna ||= JSON.load(IO.read(DNA_PATH)).recursive_symbolize_keys!
-    end
-    
-    private
-    
-    def cached_current_instance_id(refresh = false)
-      raise "[EY CLOUD AWARENESS GEM] Can't call current_instance_id if we used from_hash" if self.proxy
-      if refresh or !File.readable?(CURRENT_INSTANCE_ID_CACHE_PATH)
-        @_cached_current_instance_id = open("http://169.254.169.254/latest/meta-data/instance-id").gets
-        begin
-          FileUtils.mkdir_p File.dirname(CURRENT_INSTANCE_ID_CACHE_PATH)
-          File.open(CURRENT_INSTANCE_ID_CACHE_PATH, 'w') { |f| f.write @_cached_current_instance_id }
-        rescue Errno::EACCES
-          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching current instance because #{CURRENT_INSTANCE_ID_CACHE_PATH} can't be written to"
-        end
-      end
-      @_cached_current_instance_id ||= IO.read(CURRENT_INSTANCE_ID_CACHE_PATH)
-    end
-  
-
-    def cached_current_security_group(refresh = false)
-      raise "[EY CLOUD AWARENESS GEM] Can't call current_security_group if we used from_hash" if self.proxy
-      if refresh or !File.readable?(CURRENT_SECURITY_GROUP_CACHE_PATH)
-        @_cached_current_security_group = open('http://169.254.169.254/latest/meta-data/security-groups').gets
-        raise "[EY CLOUD AWARENESS GEM] Don't know how to deal with (possibly) multiple security group: #{@_cached_current_security_group}" if @_cached_current_security_group =~ /,;/
-        begin
-          FileUtils.mkdir_p File.dirname(CURRENT_SECURITY_GROUP_CACHE_PATH)
-          File.open(CURRENT_SECURITY_GROUP_CACHE_PATH, 'w') { |f| f.write @_cached_current_security_group }
-        rescue Errno::EACCES
-          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching current security group because #{CURRENT_SECURITY_GROUP_CACHE_PATH} can't be written to"
-        end
-      end
-      @_cached_current_security_group ||= IO.read(CURRENT_SECURITY_GROUP_CACHE_PATH)
-    end
-    
-    def cached_ec2_instance_descriptions(refresh = false)
-      raise "[EY CLOUD AWARENESS GEM] Can't call cached_ec2_instance_descriptions if we used from_hash" if self.proxy
-      if refresh or !File.readable?(INSTANCE_DESCRIPTIONS_CACHE_PATH)
-        ec2 = AWS::EC2::Base.new :access_key_id => dna[:aws_secret_id], :secret_access_key => dna[:aws_secret_key]
-        @_cached_ec2_instance_descriptions = ec2.describe_instances
-        @_cached_ec2_instance_descriptions.recursive_kill_xml_item_keys!
-        @_cached_ec2_instance_descriptions = @_cached_ec2_instance_descriptions['reservationSet'].select { |hash| cached_current_security_group.include? hash['groupSet'].first['groupId'] }
-        @_cached_ec2_instance_descriptions.map! { |hash| hash['instancesSet'].first }
-        begin
-          FileUtils.mkdir_p File.dirname(INSTANCE_DESCRIPTIONS_CACHE_PATH)
-          File.open(INSTANCE_DESCRIPTIONS_CACHE_PATH, 'w') { |f| f.write @_cached_ec2_instance_descriptions.to_yaml }
-        rescue Errno::EACCES
-          $stderr.puts "[EY CLOUD AWARENESS GEM] Not caching instance data because #{INSTANCE_DESCRIPTIONS_CACHE_PATH} can't be written to"
-        end
-      end
-      @_cached_ec2_instance_descriptions ||= YAML.load(IO.read(INSTANCE_DESCRIPTIONS_CACHE_PATH))
-    end
-  end
-end

data/lib/tasks/capistrano_tasks.rb

@@ -1,111 +0,0 @@
-require 'ey_cloud_awareness'
-require 'pp'
-
-task :eyc_setup, :roles => :app_master do
-  version = Gem.searcher.find('ey_cloud_awareness').version.to_s
-  begin
-    run "gem list ey_cloud_awareness --installed --version #{version}"
-  rescue
-    $stderr.puts "[EY CLOUD AWARENESS GEM] app_master doesn't have ey_cloud_awareness --version #{version} installed. You need to have the exact same version installed."
-    raise $!
-  end
-
-  upload File.expand_path(File.join(File.dirname(__FILE__), 'ey_cloud_awareness.rake')), "#{deploy_to}/current/lib/tasks/ey_cloud_awareness.rake"
-  
-  output = capture("cd #{deploy_to}/current && rake --silent eyc:to_json RAILS_ENV=#{rails_env}").gsub(/\s+/, ' ')
-  if /(\{.*\})/.match(output)
-    begin
-      set :eyc_proxy, EngineYardCloudInstance.from_hash(ActiveSupport::JSON.decode($1))
-    rescue
-      $stderr.puts "[EY CLOUD AWARENESS GEM] Couldn't parse JSON, so just dumping what we got"
-      $stderr.puts $1
-      raise $!
-    end
-  else
-    $stderr.puts "[EY CLOUD AWARENESS GEM] Didn't get JSON we recognized back, just dumping what we got"
-    $stderr.puts output
-    raise
-  end
-  role :db_master, eyc_proxy.db_master.dns_name
-  eyc_proxy.app.each do |i|
-    role :app, i.dns_name
-    role :web, i.dns_name # assuming that you've got nginx on all of your instances
-  end
-  eyc_proxy.db.each { |i| role :db, i.dns_name }
-end
-
-namespace :eyc do
-  %w{ app db utility all first }.each do |name|
-    task name, :roles => :app_master do
-      pp eyc_proxy.send(name).map(&:to_hash)
-    end
-  end
-end
-
-# Used by the eyc:ssh cap task to insert host information into ~/.ssh/config
-class StringReplacer
-  NEWLINE = "AijQA6tD1wkWqgvLzXD"
-  START_MARKER = '# START StringReplacer %s -- DO NOT MODIFY'
-  END_MARKER = "# END StringReplacer %s -- DO NOT MODIFY#{NEWLINE}"
-  
-  attr_accessor :path
-  def initialize(path)
-    @path = path
-  end
-  
-  def replace!(replacement, id = 1)
-    new_path = "#{path}.new"
-    backup_path = "#{path}.bak"
-    current_start_marker = START_MARKER % id.to_s
-    current_end_marker = END_MARKER % id.to_s
-    replacement_with_markers = current_start_marker + NEWLINE + replacement + NEWLINE + current_end_marker
-    text = IO.read(path).gsub("\n", NEWLINE)
-    if text.include? current_start_marker
-      text.gsub! /#{Regexp.escape current_start_marker}.*#{Regexp.escape current_end_marker}/, replacement_with_markers
-    else
-      text << NEWLINE << replacement_with_markers
-    end
-    text.gsub! NEWLINE, "\n"
-    File.open(new_path, 'w') { |f| f.write text }
-    FileUtils.mv path, backup_path
-    FileUtils.mv new_path, path
-  end
-end
-
-namespace :eyc do
-  task :ssh, :roles => :app_master do
-    replacement = []
-    counter = 0
-    eyc_proxy.with_roles.each do |instance|
-      case instance.instance_role
-      when 'db_master'
-        explanation = ''
-        shorthand = 'db_master'
-      when 'app_master'
-        explanation = ''
-        shorthand = 'app_master'
-      when 'solo'
-        explanation = ''
-        shorthand = 'solo'
-      else
-        explanation = " (#{counter})"
-        shorthand = "#{instance.instance_role}#{counter}"
-        counter += 1
-      end
-      replacement << %{
-  # #{instance.instance_role}#{explanation}
-  Host #{eyc_proxy.environment[:name]}-#{shorthand}
-    Hostname #{instance.dns_name}
-    User #{instance.users.first[:username]}
-    StrictHostKeyChecking no
-}
-      end
-    replacement = replacement.join
-    ssh_config_path = File.expand_path("~/.ssh/config")
-    r = StringReplacer.new ssh_config_path
-    r.replace! replacement, eyc_proxy.environment[:name]
-    
-    $stderr.puts "[EY CLOUD AWARENESS GEM] Added this to #{ssh_config_path}"
-    $stderr.puts replacement
-  end
-end

data/lib/tasks/ey_cloud_awareness.rake

@@ -1,7 +0,0 @@
-require 'ey_cloud_awareness'
-
-namespace :eyc do
-  task :to_json do
-    puts EngineYardCloudInstance.to_hash.to_json
-  end
-end