engineyard 1.0.2 → 1.1.0

data/lib/engineyard/cli.rb

@@ -9,6 +9,8 @@ module EY
     autoload :Recipes, 'engineyard/cli/recipes'
     autoload :Web,     'engineyard/cli/web'
 
+    check_unknown_options!
+
     include Thor::Actions
 
     def self.start(*)
@@ -151,7 +153,7 @@ module EY
       end
     end
 
-    desc "ssh [COMMAND] [--all] [--environment ENVIRONMENT]", "Open an ssh session, or run a command."
+    desc "ssh [COMMAND] [--all] [--environment ENVIRONMENT]", "Open an ssh session to the master app server, or run a command."
     long_desc <<-DESC
       If a command is supplied, it will be run, otherwise a session will be
       opened. The application master is used for environments with clusters.
@@ -166,30 +168,54 @@ module EY
       :desc => "Environment to ssh into"
     method_option :all, :type => :boolean, :aliases => %(-a),
       :desc => "Run command on all servers"
+    method_option :app_servers, :type => :boolean,
+      :desc => "Run command on all application servers"
+    method_option :db_servers, :type => :boolean,
+      :desc => "Run command on the database servers"
+    method_option :db_master, :type => :boolean,
+      :desc => "Run command on the master database server"
+    method_option :db_slaves, :type => :boolean,
+      :desc => "Run command on the slave database servers"
+    method_option :utilities, :type => :array, :lazy_default => true,
+      :desc => "Run command on the utility servers with the given names. If no names are given, run on all utility servers."
 
     def ssh(cmd=nil)
-      env = fetch_environment(options[:environment])
+      env   = fetch_environment(options[:environment])
+      hosts = ssh_hosts(options, env)
 
-      if options[:all]
-        raise NoCommandError.new unless cmd
+      raise NoCommandError.new if cmd.nil? and hosts.count != 1
 
-        hosts = env.instances.map do |instance|
-          instance.public_hostname
-        end
+      hosts.each do |host|
+        system "ssh #{env.username}@#{host} #{cmd}"
+      end
+    end
 
-        if hosts.empty?
-          raise NoInstancesError.new(env.name)
-        else
-          hosts.each do |host|
-            system "ssh #{env.username}@#{host} #{cmd}"
+    no_tasks do
+      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 ssh_hosts(opts, env)
+        if opts[:utilities] and not opts[:utilities].respond_to?(:include?)
+          includes_everything = []
+          class << includes_everything
+            def include?(*) true end
           end
-        end
-      else
-        if env.app_master
-          system "ssh #{env.username}@#{env.app_master.public_hostname} #{cmd}"
+          filter = ssh_host_filter(opts.merge(:utilities => includes_everything))
         else
-          raise NoAppMasterError.new(env.name)
+          filter = ssh_host_filter(opts)
         end
+
+        instances = env.instances.select {|instance| filter[instance] }
+        raise NoInstancesError.new(env.name) if instances.empty?
+        return instances.map { |instance| instance.public_hostname }
       end
     end
 
@@ -246,10 +272,12 @@ module EY
           list.find{|task| task[0] =~ /^#{base} #{name}/ }
         end
         list -= deploy_cmds
+
         EY.ui.print_help(deploy_cmds)
         EY.ui.say
 
-        EY::Thor.subcommands.each do |name, klass|
+        self.class.subcommands.each do |name|
+          klass = self.class.subcommand_class_for(name)
           list.reject!{|cmd| cmd[0] =~ /^#{base} #{name}/}
           EY.ui.say "#{name.capitalize} commands:"
           tasks = klass.printable_tasks.reject{|t| t[0] =~ /help$/ }
@@ -266,7 +294,7 @@ module EY
 
         self.class.send(:class_options_help, shell)
         EY.ui.say "See '#{base} help COMMAND' for more information on a specific command."
-      elsif klass = EY::Thor.subcommands[cmds.first]
+      elsif klass = self.class.subcommand_class_for(cmds.first)
         klass.new.help(*cmds[1..-1])
       else
         super

data/lib/engineyard/error.rb

@@ -49,7 +49,7 @@ module EY
 
   class NoInstancesError < EY::Error
     def initialize(env_name)
-      super "The environment '#{env_name}' does not have any instances."
+      super "The environment '#{env_name}' does not have any matching instances."
     end
   end
 

data/lib/engineyard/model/instance.rb

@@ -3,7 +3,7 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      EYDEPLOY_VERSION = ENV["EY_DEPLOY_VERSION"] || "1.0.2"
+      EYDEPLOY_VERSION = ENV["EY_DEPLOY_VERSION"] || "1.1.0"
       EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "ey-deploy version checker exited with unknown status code #{k}" }
       EXIT_STATUS.merge!({
         255 => :ssh_failed,

data/lib/engineyard/thor.rb

@@ -82,14 +82,32 @@ module EY
       end
 
       def self.banner(task, task_help = false, subcommand = false)
-        scmd = EY::Thor.subcommands.invert[self]
+        subcommand_banner = to_s.split(/::/).map{|s| s.downcase}[2..-1]
+        subcommand_banner = if subcommand_banner.size > 0
+                              subcommand_banner.join(' ')
+                            else
+                              nil
+                            end
+
         task = (task_help ? task.formatted_usage(self, false, subcommand) : task.name)
-        [banner_base, scmd, task].compact.join(" ")
+        [banner_base, subcommand_banner, task].compact.join(" ")
       end
 
       def self.handle_no_task_error(task)
         raise UndefinedTaskError, "Could not find command #{task.inspect}."
       end
+
+      def self.subcommand(name, klass)
+        @@subcommand_class_for ||= {}
+        @@subcommand_class_for[name] = klass
+        super
+      end
+
+      def self.subcommand_class_for(name)
+        @@subcommand_class_for ||= {}
+        @@subcommand_class_for[name]
+      end
+
     end
 
     protected

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/spec/engineyard/cli_spec.rb

@@ -11,6 +11,24 @@ describe EY::CLI do
     EY.ui.should be_an(EY::CLI::UI)
   end
 
+  it "provides help" do
+    out = capture_stdout do
+      EY::CLI.start(["help"])
+    end
+
+    out.should include("ey deploy")
+    out.should include("ey ssh")
+    out.should include("ey web enable")
+  end
+
+  it "delegates help" do
+    out = capture_stdout do
+      EY::CLI.start(%w[help web enable])
+    end
+
+    out.should match(/remove the maintenance page/i)
+  end
+
   it "provides error classes" do
     EY::EnvironmentError.should be
     EY::BranchMismatchError.should be

data/spec/ey/ey_spec.rb

@@ -13,4 +13,11 @@ describe "ey" do
       @err.should include("Could not find command")
     end
   end
+
+  context "run a command and a bad flag" do
+    it "tells the user that is not a valid flag" do
+      ey "help --expect-failure", :expect_failure => true
+      @err.should include("Unknown switches")
+    end
+  end
 end

data/spec/ey/ssh_spec.rb

@@ -11,6 +11,47 @@ shared_examples_for "running ey ssh" do
   end
 end
 
+shared_examples_for "running ey ssh for select role" do
+  given "integration"
+  include Spec::Helpers::SharedIntegrationTestUtils
+
+  def extra_ey_options
+    {:prepend_to_path => {'ssh' => "#!/bin/sh\necho ssh $*"}}
+  end
+
+  def command_to_run(opts)
+    cmd = "ssh #{opts[:ssh_command]}"
+    cmd << " #{@ssh_flag}"
+    cmd << " --environment #{opts[:env]}" if opts[:env]
+    cmd
+  end
+
+  it "runs the command on the right servers" do
+    api_scenario "one app, one environment"
+    run_ey(:ssh_command => "ls", :env => 'giblets', :verbose => true)
+    @hosts.each do |host|
+      @raw_ssh_commands.select do |command|
+        command =~ /^ssh turkey@#{host}.+ ls$/
+      end.should_not be_empty
+    end
+    @raw_ssh_commands.select do |command|
+      command =~ /^ssh turkey.+ ls$/
+    end.count.should == @hosts.count
+  end
+
+  it "raises an error when there are no matching hosts" do
+    api_scenario "one app, one environment, no instances"
+    run_ey({:ssh_command => "ls", :env => 'giblets', :verbose => true}, :expect_failure => true)
+  end
+
+  it "responds correctly when there is no command" do
+    if @hosts.count != 1
+      api_scenario "one app, one environment"
+      run_ey({:env => 'giblets', :verbose => true}, :expect_failure => true)
+    end
+  end
+end
+
 describe "ey ssh" do
   it_should_behave_like "running ey ssh"
 
@@ -20,7 +61,7 @@ describe "ey ssh" do
 
   it "complains if it has no app master" do
     ey "ssh -e bakon", :expect_failure => true
-    @err.should =~ /'bakon' does not have a master instance/
+    @err.should =~ /'bakon' does not have any matching instances/
   end
 
 end
@@ -59,56 +100,89 @@ describe "ey ssh with a command" do
   it_should_behave_like "it takes an environment name"
 end
 
+describe "ey ssh --all" do
+  before do
+    @ssh_flag = "--all"
+    @hosts = %w(app_hostname 
+                app_master_hostname 
+                util_fluffy_hostname 
+                util_rocky_hostname 
+                db_master_hostname 
+                db_slave_1_hostname 
+                db_slave_2_hostname)
+  end
 
-describe "ey ssh --all with a command" do
   it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
+end
 
-  def command_to_run(opts)
-    cmd = "ssh ls"
-    cmd << " --all"
-    cmd << " --environment #{opts[:env]}" if opts[:env]
-    cmd
+describe "ey ssh --app-servers" do
+  before do
+    @ssh_flag = "--app-servers"
+    @hosts = %w(app_hostname app_master_hostname)
   end
 
-  it "runs the command on all servers" do
-    api_scenario "one app, one environment"
-    run_ey(:env => 'giblets', :verbose => true)
-    @raw_ssh_commands.count do |command|
-      command =~ /^ssh turkey@.+ ls$/
-    end.should == 4
-  end
+  it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
 end
 
-describe "ey ssh --all without a command" do
+describe "ey ssh --db-master" do
+  before do
+    @ssh_flag = "--db-master"
+    @hosts = %w(db_master_hostname)
+  end
+
   it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
+end
 
-  def command_to_run(opts)
-    cmd = "ssh"
-    cmd << " --all"
-    cmd << " --environment #{opts[:env]}" if opts[:env]
-    cmd
+describe "ey ssh --db-slaves" do
+  before do
+    @ssh_flag = "--db-slaves"
+    @hosts = %w(db_slave_1_hostname db_slave_2_hostname)
   end
 
-  it "raises an error" do
-    api_scenario "one app, one environment"
-    run_ey({:env => 'giblets', :verbose => true}, :expect_failure => true)
-    @err.grep(/NoCommandError/)
+  it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
+end
+
+describe "ey ssh --db-servers" do
+  before do
+    @ssh_flag = "--db-servers"
+    @hosts = %w(db_master_hostname db_slave_1_hostname db_slave_2_hostname)
   end
+
+  it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
 end
 
-describe "ey ssh --all without servers" do
+describe "ey ssh --utilities" do
+  before do
+    @ssh_flag = "--utilities"
+    @hosts = %w(util_fluffy_hostname util_rocky_hostname)
+  end
+
   it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
+end
 
-  def command_to_run(opts)
-    cmd = "ssh ls"
-    cmd << " --all"
-    cmd << " --environment #{opts[:env]}" if opts[:env]
-    cmd
+describe "ey ssh --utilities fluffy" do
+  before do
+    @ssh_flag = "--utilities fluffy"
+    @hosts = %w(util_fluffy_hostname)
   end
 
-  it "raises an error" do
-    api_scenario "one app, one environment, no instances"
-    run_ey({:env => 'giblets', :verbose => true}, :expect_failure => true)
-    @err.grep(/NoInstancesError/)
+  it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
+end
+
+describe "ey ssh --utilities fluffy rocky" do
+  before do
+    @ssh_flag = "--utilities fluffy rocky"
+    @hosts = %w(util_fluffy_hostname util_rocky_hostname)
   end
+
+  it_should_behave_like "running ey ssh"
+  it_should_behave_like "running ey ssh for select role"
 end
+

data/spec/support/fake_awsm.ru

@@ -151,7 +151,7 @@ private
                 "id" => 27220,
                 "amazon_id" => 'i-ddbbdd92',
                 "role" => "solo",
-                "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}],
+                "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
             "name" => "giblets",
             "apps" => [],
             "instances_count" => 1,
@@ -163,7 +163,7 @@ private
               "id" => 27220,
               "amazon_id" => 'i-ddbbdd92',
               "role" => "solo",
-              "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}}]
+              "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}}]
       end
     end # UnlinkedApp
 
@@ -175,28 +175,49 @@ private
             "name" => nil,
             "status" => "running",
             "amazon_id" => 'i-ddbbdd92',
-            "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com",
+            "public_hostname" => "app_master_hostname.compute-1.amazonaws.com",
           }, {
             "id" => 22721,
             "name" => nil,
             "role" => "db_master",
             "status" => "running",
             "amazon_id" => "i-d4cdddbf",
-            "public_hostname" => "ec2-174-129-142-53.compute-1.amazonaws.com",
+            "public_hostname" => "db_master_hostname.compute-1.amazonaws.com",
+          }, {
+            "id" => 22724,
+            "name" => nil,
+            "role" => "db_slave",
+            "status" => "running",
+            "amazon_id" => "i-asdfasdfaj",
+            "public_hostname" => "db_slave_1_hostname.compute-1.amazonaws.com",
+          }, {
+            "id" => 22725,
+            "name" => nil,
+            "role" => "db_slave",
+            "status" => "running",
+            "amazon_id" => "i-asdfasdfaj",
+            "public_hostname" => "db_slave_2_hostname.compute-1.amazonaws.com",
           }, {
             "id" => 22722,
             "role" => "app",
             "name" => nil,
             "status" => "building",
             "amazon_id" => "i-d2e3f1b9",
-            "public_hostname" => "ec2-72-44-46-66.compute-1.amazonaws.com",
+            "public_hostname" => "app_hostname.compute-1.amazonaws.com",
           }, {
             "id" => 22723,
             "role" => "util",
             "name" => "fluffy",
             "status" => "running",
             "amazon_id" => "i-80e3f1eb",
-            "public_hostname" => "ec2-184-73-116-228.compute-1.amazonaws.com",
+            "public_hostname" => "util_fluffy_hostname.compute-1.amazonaws.com",
+          }, {
+            "id" => 22727,
+            "role" => "util",
+            "name" => "rocky",
+            "status" => "running",
+            "amazon_id" => "i-80etf1eb",
+            "public_hostname" => "util_rocky_hostname.compute-1.amazonaws.com",
           }]
       end
       private :_instances
@@ -308,7 +329,7 @@ private
                     "id" => 27220,
                     "amazon_id" => 'i-ddbbdd92',
                     "role" => "solo",
-                    "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}],
+                    "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
                 "name" => "giblets",
                 "apps" => apps,
                 "instances_count" => 1,
@@ -320,7 +341,7 @@ private
                   "id" => 27220,
                   "amazon_id" => 'i-ddbbdd92',
                   "role" => "solo",
-                  "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}
+                  "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}
               }, {
                 "ssh_username" => "ham",
                 "instances" => [],
@@ -342,7 +363,7 @@ private
                 "id" => 27220,
                 "amazon_id" => 'i-ddbbdd92',
                 "role" => "solo",
-                "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}],
+                "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
             "name" => "giblets",
             "apps" => [{
                 "name" => "rails232app",
@@ -356,7 +377,7 @@ private
               "id" => 27220,
               "amazon_id" => 'i-ddbbdd92',
               "role" => "solo",
-              "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}
+              "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}
           }, {
             "ssh_username" => "ham",
             "instances" => [],
@@ -399,7 +420,7 @@ private
           "status" => "running",
           "name" => nil,
           "role" => "solo",
-          "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com",
+          "public_hostname" => "app_master_hostname.compute-1.amazonaws.com",
           "id" => 75428,
           "amazon_id" => "i-051195b9",
         }
@@ -489,7 +510,7 @@ private
                     "id" => 27220,
                     "amazon_id" => 'i-ddbbdd92',
                     "role" => "solo",
-                    "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}],
+                    "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
                 "name" => "railsapp_production",
                 "apps" => apps,
                 "instances_count" => 1,
@@ -501,7 +522,7 @@ private
                   "id" => 27220,
                   "amazon_id" => 'i-ddbbdd92',
                   "role" => "solo",
-                  "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com",
+                  "public_hostname" => "app_master_hostname.compute-1.amazonaws.com",
                 },
               }, {
                 "ssh_username" => "ham",
@@ -529,7 +550,7 @@ private
                     "status" => "running",
                     "id" => 59395,
                     "role" => "solo",
-                    "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com",
+                    "public_hostname" => "app_master_hostname.compute-1.amazonaws.com",
                   }],
                 "name" => "railsapp_staging_2",
                 "apps" => apps,
@@ -555,7 +576,7 @@ private
                 "id" => 27220,
                 "amazon_id" => 'i-ddbbdd92',
                 "role" => "solo",
-                "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}],
+                "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
             "name" => "railsapp_production",
             "apps" => [{
                 "name" => "rails232app",
@@ -565,7 +586,7 @@ private
             "id" => 200,
             "framework_env" => "production",
             "app_master" => {
-              "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com",
+              "public_hostname" => "app_master_hostname.compute-1.amazonaws.com",
               "status" => "running",
               "id" => 27220,
               "amazon_id" => 'i-ddbbdd92',

data/spec/support/shared_behavior.rb

@@ -32,7 +32,7 @@ shared_examples_for "it takes an environment name" do
     verify_ran(make_scenario({
           :environment      => 'giblets',
           :application      => 'rails232app',
-          :master_hostname  => 'ec2-174-129-198-124.compute-1.amazonaws.com',
+          :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
           :ssh_username     => 'turkey',
         }))
   end
@@ -59,7 +59,7 @@ shared_examples_for "it takes an environment name" do
       verify_ran(make_scenario({
             :environment      => 'railsapp_production',
             :application      => 'rails232app',
-            :master_hostname  => 'ec2-174-129-198-124.compute-1.amazonaws.com',
+            :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
             :ssh_username     => 'turkey',
           }))
     end
@@ -82,7 +82,7 @@ shared_examples_for "it takes an app name" do
       verify_ran(make_scenario({
             :environment      => 'giblets',
             :application      => 'rails232app',
-            :master_hostname  => 'ec2-174-129-198-124.compute-1.amazonaws.com',
+            :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
             :ssh_username     => 'turkey',
           }))
     end
@@ -95,7 +95,7 @@ shared_examples_for "it takes an app name" do
       verify_ran(make_scenario({
             :environment      => 'giblets',
             :application      => 'rails232app',
-            :master_hostname  => 'ec2-174-129-198-124.compute-1.amazonaws.com',
+            :master_hostname  => 'app_master_hostname.compute-1.amazonaws.com',
             :ssh_username     => 'turkey',
           }))
     end
@@ -125,12 +125,12 @@ shared_examples_for "it invokes ey-deploy" do
 
     it "passes along instance information to ey-deploy" do
       instance_args = [
-        Regexp.quote("ec2-174-129-198-124.compute-1.amazonaws.com,app_master"),
-        Regexp.quote("ec2-72-44-46-66.compute-1.amazonaws.com,app"),
-        Regexp.quote("ec2-184-73-116-228.compute-1.amazonaws.com,util,fluffy"),
+        Regexp.quote("app_master_hostname.compute-1.amazonaws.com,app_master"),
+        Regexp.quote("app_hostname.compute-1.amazonaws.com,app"),
+        Regexp.quote("util_fluffy_hostname.compute-1.amazonaws.com,util,fluffy"),
       ]
 
-      db_instance = Regexp.quote("ec2-174-129-142-53.compute-1.amazonaws.com,db_master")
+      db_instance = Regexp.quote("db_master_hostname.compute-1.amazonaws.com,db_master")
 
       # apps + utilities are all mentioned
       instance_args.each do |i|

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,23 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -07:00
+date: 2010-08-04 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 3
         segments: 
         - 0
-        - 13
-        - 8
-        version: 0.13.8
+        version: "0"
   requirement: *id001
-  name: thor
+  name: termios
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -43,10 +41,11 @@ dependencies:
         hash: 7
         segments: 
         - 1
-        - 4
-        version: "1.4"
+        - 5
+        - 2
+        version: 1.5.2
   requirement: *id002
-  name: rest-client
+  name: highline
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -55,28 +54,30 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 39
         segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
+        - 0
+        - 14
+        - 0
+        version: 0.14.0
   requirement: *id003
-  name: highline
+  name: thor
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 4
+        version: 0.0.4
   requirement: *id004
-  name: termios
+  name: escape
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -101,14 +102,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 7
         segments: 
-        - 0
-        - 0
+        - 1
         - 4
-        version: 0.0.4
+        version: "1.4"
   requirement: *id006
-  name: escape
+  name: rest-client
   prerelease: false
   type: :runtime
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.