engineyard 0.3.2 → 0.3.3

data/lib/engineyard.rb

@@ -1,13 +1,14 @@
 module EY
   require 'engineyard/ruby_ext'
 
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 
-  autoload :API,     'engineyard/api'
-  autoload :Config,  'engineyard/config'
-  autoload :Error,   'engineyard/error'
-  autoload :Model,   'engineyard/model'
-  autoload :Repo,    'engineyard/repo'
+  autoload :API,        'engineyard/api'
+  autoload :Collection, 'engineyard/collection'
+  autoload :Config,     'engineyard/config'
+  autoload :Error,      'engineyard/error'
+  autoload :Model,      'engineyard/model'
+  autoload :Repo,       'engineyard/repo'
 
   class UI
     # stub debug outside of the CLI

data/lib/engineyard/api.rb

@@ -30,10 +30,6 @@ module EY
       @apps ||= EY::Model::App.from_array(request('/apps')["apps"], :api => self)
     end
 
-    def environment_named(name, envs = self.environments)
-      envs.find{|e| e.name == name }
-    end
-
     def app_for_repo(repo)
       apps.find{|a| repo.urls.include?(a.repository_uri) }
     end
@@ -72,14 +68,17 @@ module EY
       rescue OpenSSL::SSL::SSLError
         raise RequestFailed, "SSL is misconfigured on your cloud"
       end
-      raise RequestFailed, "Response body was empty" if resp.body.empty?
 
-      begin
-        data = JSON.parse(resp.body)
-        EY.ui.debug("Response", data)
-      rescue JSON::ParserError
-        EY.ui.debug("Raw response", resp.body)
-        raise RequestFailed, "Response was not valid JSON."
+      if resp.code == 204
+        data = nil
+      else
+        begin
+          data = JSON.parse(resp.body)
+          EY.ui.debug("Response", data)
+        rescue JSON::ParserError
+          EY.ui.debug("Raw response", resp.body)
+          raise RequestFailed, "Response was not valid JSON."
+        end
       end
 
       data

data/lib/engineyard/cli.rb

@@ -1,12 +1,12 @@
-require 'thor'
 require 'engineyard'
 require 'engineyard/error'
-require 'engineyard/cli/thor_fixes'
+require 'engineyard/thor'
 
 module EY
-  class CLI < Thor
-    autoload :API, 'engineyard/cli/api'
-    autoload :UI,  'engineyard/cli/ui'
+  class CLI < EY::Thor
+    autoload :API,     'engineyard/cli/api'
+    autoload :UI,      'engineyard/cli/ui'
+    autoload :Recipes, 'engineyard/cli/recipes'
 
     include Thor::Actions
 
@@ -28,54 +28,36 @@ module EY
       EY::CLI::Action::Deploy.call(env_name, branch, options)
     end
 
-
     desc "environments [--all]", "List cloud environments for this app, or all environments"
     method_option :all, :type => :boolean, :aliases => %(-a)
     def environments
-      app, envs = app_and_envs(options[:all])
-      if app
-        EY.ui.say %|Cloud environments for #{app.name}:|
-          EY.ui.print_envs(envs, EY.config.default_environment)
-      elsif envs
-        EY.ui.say %|Cloud environments:|
-          EY.ui.print_envs(envs, EY.config.default_environment)
-      else
-        EY.ui.say %|You do not have any cloud environments.|
-      end
+      apps = get_apps(options[:all])
+      EY.ui.warn(NoAppError.new(repo).message) unless apps.any? || options[:all]
+      EY.ui.print_envs(apps, EY.config.default_environment)
     end
     map "envs" => :environments
 
     desc "rebuild [ENV]", "Rebuild environment (ensure configuration is up-to-date)"
     def rebuild(name = nil)
-      env = if name
-              env = api.environment_named(name) or raise NoEnvironmentError.new(name)
-            end
-
-      unless env
-        repo = Repo.new
-        app = api.app_for_repo(repo) or raise NoAppError.new(repo)
-        env = app.one_and_only_environment or raise EnvironmentError, "Unable to determine a single environment for the current application (found #{app.environments.size} environments)"
-      end
-
+      env = fetch_environment(name)
       EY.ui.debug("Rebuilding #{env.name}")
       env.rebuild
     end
 
-    desc "ssh ENV", "Open an ssh session to the environment's application server"
-    def ssh(name)
-      env = api.environment_named(name)
-      if env && env.app_master
-        Kernel.exec "ssh", "#{env.username}@#{env.app_master.public_hostname}", *ARGV[2..-1]
-      elsif env
-        raise NoAppMaster.new(env.name)
+    desc "ssh [ENV]", "Open an ssh session to the environment's application server"
+    def ssh(name = nil)
+      env = fetch_environment(name)
+
+      if env.app_master
+        Kernel.exec "ssh", "#{env.username}@#{env.app_master.public_hostname}"
       else
-        EY.ui.warn %|Could not find an environment named "#{name}"|
+        raise NoAppMaster.new(env.name)
       end
     end
 
-    desc "logs ENV", "Retrieve the latest logs for an enviornment"
-    def logs(name)
-      env_named(name).logs.each do |log|
+    desc "logs [ENV]", "Retrieve the latest logs for an environment"
+    def logs(name = nil)
+      fetch_environment(name).logs.each do |log|
         EY.ui.info log.instance_name
 
         if log.main
@@ -90,14 +72,8 @@ module EY
       end
     end
 
-    desc "upload_recipes ENV", "Upload custom chef recipes from the current directory to ENV"
-    def upload_recipes(name)
-      if env_named(name).upload_recipes
-        EY.ui.say "Recipes uploaded successfully"
-      else
-        EY.ui.error "Recipes upload failed"
-      end
-    end
+    desc "recipes COMMAND [ARGS]", "Commands related to custom recipes"
+    subcommand "recipes", EY::CLI::Recipes
 
     desc "version", "Print the version of the engineyard gem"
     def version
@@ -105,42 +81,5 @@ module EY
     end
     map ["-v", "--version"] => :version
 
-    private
-    def api
-      @api ||= EY::CLI::API.new
-    end
-
-    def repo
-      @repo ||= EY::Repo.new
-    end
-
-    def env_named(env_name)
-      env = api.environment_named(env_name)
-
-      if env.nil?
-        raise EnvironmentError, "Environment '#{env_name}' can't be found\n" +
-          "You can create it at #{EY.config.endpoint}"
-      end
-
-      env
-    end
-
-    def app_and_envs(all_envs = false)
-      app = api.app_for_repo(repo)
-
-      if all_envs || !app
-        envs = api.environments
-        EY.ui.warn(NoAppError.new(repo).message) unless app || all_envs
-        [nil, envs]
-      else
-        envs = app.environments
-        if envs.empty?
-          EY.ui.warn %|You have no environments set up for the application "#{app.name}"|
-            EY.ui.warn %|You can make one at #{EY.config.endpoint}|
-        end
-        envs.empty? ? [app, nil] : [app, envs]
-      end
-    end
-
   end # CLI
 end # EY

data/lib/engineyard/cli/action/deploy.rb

@@ -8,14 +8,10 @@ module EY
         def self.call(env_name, branch, options)
           env_name ||= EY.config.default_environment
 
-          app = fetch_app
-          env = fetch_environment(env_name, app)
+          app    = fetch_app
+          env    = fetch_environment(env_name, app)
           branch = fetch_branch(env.name, branch, options[:force])
-
-          running = env.app_master && env.app_master.status == "running"
-          raise EnvironmentError, "No running instances for environment #{env.name}\nStart one at #{EY.config.endpoint}" unless running
-
-          master   = env.app_master
+          master = fetch_app_master(env)
 
           EY.ui.info "Connecting to the server..."
           ensure_eysd_present(master, options[:install_eysd])
@@ -32,6 +28,18 @@ module EY
 
         private
 
+        def self.fetch_app_master(env)
+          master = env.app_master
+
+          if !master
+            raise EnvironmentError, "No running instances for environment #{env.name}\nStart one at #{EY.config.endpoint}"
+          elsif master.status != "running"
+            raise EnvironmentError, "Cannot deploy: application master's status is not \"running\" (green); it is \"#{master.status}\"."
+          end
+
+          master
+        end
+
         def self.api
           @api ||= EY::CLI::API.new
         end
@@ -52,13 +60,13 @@ module EY
           raise DeployArgumentError if !env_name && app.environments.size != 1
 
           env = if env_name
-                  api.environment_named(env_name, app.environments)
+                  app.environments.match_one(env_name)
                 else
                   app.environments.first
                 end
 
           # the environment exists, but doesn't have this app
-          if !env && api.environment_named(env_name)
+          if !env && api.environments.named(env_name)
             raise EnvironmentError, "Environment '#{env_name}' doesn't run this application\nYou can add it at #{EY.config.endpoint}"
           end
 

data/lib/engineyard/cli/api.rb

@@ -23,8 +23,8 @@ module EY
         @token = self.class.fetch_token
       end
 
-      def environment_named(env_name, envs = self.environments)
-        super || find_environment_by_unambiguous_substring(env_name, envs)
+      def fetch_app_for_repo(repo)
+        app_for_repo(repo) || raise(NoAppError.new(repo))
       end
 
       def self.fetch_token
@@ -41,15 +41,6 @@ module EY
         end
       end
 
-      private
-      def find_environment_by_unambiguous_substring(env_name, envs)
-        candidates = envs.find_all{|e| e.name[env_name] }
-        if candidates.size > 1
-          raise AmbiguousEnvironmentName.new(env_name, candidates.map {|e| e.name})
-        end
-        candidates.first
-      end
-
     end
   end
 end

data/lib/engineyard/cli/recipes.rb

@@ -0,0 +1,14 @@
+module EY
+  class CLI
+    class Recipes < EY::Thor
+      desc "recipes upload [ENV]", "Upload custom chef recipes from the current directory to ENV"
+      def upload(name = nil)
+        if fetch_environment(name).upload_recipes
+          EY.ui.say "Recipes uploaded successfully"
+        else
+          EY.ui.error "Recipes upload failed"
+        end
+      end
+    end
+  end
+end

data/lib/engineyard/cli/thor_fixes.rb

@@ -5,7 +5,7 @@
 # The fix is
 # http://github.com/smerritt/thor/commit/421b2e97684e67ee393a13b3873e1a784bb83f68
 
-class Thor
+class ::Thor
   class Arguments
     private
 

data/lib/engineyard/cli/ui.rb

@@ -59,17 +59,26 @@ module EY
         end
       end
 
-      def print_envs(envs, default_env = nil)
-        printable_envs = envs.map do |e|
-          icount = e.instances_count
-          iname = (icount == 1) ? "instance" : "instances"
+      def print_envs(apps, default_env_name = nil)
+        apps.each do |app|
+          puts app.name
+          if app.environments.any?
+            app.environments.each do |env|
+              short_name = env.shorten_name_for(app)
 
-          e.name << " (default)" if e.name == default_env
-          env = [e.name]
-          env << "#{icount} #{iname}"
-          env << e.apps.map{|a| a.name }.join(", ")
+              icount = env.instances_count
+              iname = (icount == 1) ? "instance" : "instances"
+
+              default_text = env.name == default_env_name ? " [default]" : ""
+
+              puts "  #{short_name}#{default_text} (#{icount} #{iname})"
+            end
+          else
+            puts "  (This application is not in any environments; you can make one at #{EY.config.endpoint})"
+          end
+
+          puts ""
         end
-        print_table(printable_envs, :ident => 2)
       end
 
       def print_exception(e)

data/lib/engineyard/collection.rb

@@ -0,0 +1,5 @@
+module EY
+  module Collection
+    autoload :Environments, 'engineyard/collection/environments'
+  end
+end

data/lib/engineyard/collection/environments.rb

@@ -0,0 +1,36 @@
+require 'engineyard/error'
+
+module EY
+  module Collection
+    class Environments < Array
+
+      def named(name)
+        find {|e| e.name == name}
+      end
+
+      def named!(name)
+        named(name) or raise EnvironmentError,
+        "Environment '#{name}' can't be found\nYou can create it at #{EY.config.endpoint}"
+      end
+
+      def match_one(name_part)
+        named(name_part) || find_by_unambiguous_substring(name_part)
+      end
+
+      def match_one!(name_part)
+        match_one(name_part) or raise EnvironmentError,
+        "Environment containing '#{name_part}' can't be found\nYou can create it at #{EY.config.endpoint}"
+      end
+
+    private
+      def find_by_unambiguous_substring(name_part)
+        candidates = find_all{|e| e.name[name_part] }
+        if candidates.size > 1
+          raise AmbiguousEnvironmentName.new(name_part, candidates.map {|e| e.name})
+        end
+        candidates.first
+      end
+
+    end
+  end
+end

data/lib/engineyard/error.rb

@@ -44,6 +44,16 @@ module EY
     end
   end
 
+  class NoSingleEnvironmentError < EY::Error
+    def initialize(app)
+      @envs = app.environments
+    end
+
+    def message
+      "Unable to determine a single environment for the current application (found #{@envs.size} environments)"
+    end
+  end
+
   class NoEnvironmentError < EY::Error
     def initialize(env_name=nil)
       @env_name = env_name

data/lib/engineyard/model/app.rb

@@ -8,12 +8,16 @@ module EY
         end
       end
 
-      def one_and_only_environment
+      def sole_environment
         if environments.size == 1
           environments.first
         end
       end
 
+      def sole_environment!
+        sole_environment or raise NoSingleEnvironmentError.new(self)
+      end
+
     end
   end
 end

data/lib/engineyard/model/environment.rb

@@ -9,6 +9,10 @@ module EY
         end
       end
 
+      def self.from_array(array, extras={})
+        Collection::Environments[*super]
+      end
+
       def logs
         Log.from_array(api_get("/environments/#{id}/logs")["logs"])
       end
@@ -48,6 +52,10 @@ module EY
         EY.config.environments[self.name]
       end
       alias_method :config, :configuration
+
+      def shorten_name_for(app)
+        name.gsub(/^#{Regexp.quote(app.name)}_/, '')
+      end
     end
   end
 end

data/lib/engineyard/model/instance.rb

@@ -3,7 +3,7 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :status, :amazon_id, :public_hostname, :environment)
-      EYSD_VERSION = "~>0.3.2"
+      EYSD_VERSION = "~>0.3.3"
       CHECK_SCRIPT = <<-SCRIPT
 require "rubygems"
 requirement = Gem::Requirement.new("#{EYSD_VERSION}")

data/lib/engineyard/thor.rb

@@ -0,0 +1,47 @@
+require 'thor'
+require 'engineyard/cli/thor_fixes'
+
+module EY
+  class Thor < ::Thor
+    def self.start(original_args=ARGV, config={})
+      @@original_args = original_args
+      super
+    end
+
+    no_tasks do
+      def subcommand_args
+        @@original_args[1..-1]
+      end
+
+      def self.subcommand(subcommand, subcommand_class)
+        define_method(subcommand) { |*_| subcommand_class.start(subcommand_args) }
+      end
+    end
+
+    protected
+
+    def api
+      @api ||= EY::CLI::API.new
+    end
+
+    def repo
+      @repo ||= EY::Repo.new
+    end
+
+    def fetch_environment(env_name)
+      if env_name.nil?
+        api.fetch_app_for_repo(repo).sole_environment!
+      else
+        api.environments.match_one!(env_name)
+      end
+    end
+
+    def get_apps(all_apps = false)
+      if all_apps
+        api.apps
+      else
+        [api.app_for_repo(repo)].compact
+      end
+    end
+  end
+end

data/spec/engineyard/collection/environments.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe EY::Collection::Environments do
+  before(:each) do
+    @envs = described_class.new([
+      EY::Model::Environment.from_hash("id" => 1234, "name" => "app_production"),
+      EY::Model::Environment.from_hash("id" => 4321, "name" => "app_staging"),
+      EY::Model::Environment.from_hash("id" => 8765, "name" => "bigapp_staging"),
+    ])
+  end
+
+  describe "#match_one" do
+    it "works when given an unambiguous substring" do
+      @envs.match_one("prod").name.should == "app_production"
+    end
+
+    it "raises an error when given an ambiguous substring" do
+      lambda {
+        @envs.match_one("staging")
+      }.should raise_error(EY::AmbiguousEnvironmentName)
+    end
+
+    it "returns an exact match if one exists" do
+      @envs.match_one("app_staging").name.should == "app_staging"
+    end
+
+    it "returns nil when it can't find anything" do
+      @envs.match_one("dev-and-production").should be_nil
+    end
+  end
+
+  describe "#match_one!" do
+    it "works when given an unambiguous substring" do
+      @envs.match_one!("prod").name.should == "app_production"
+    end
+
+    it "raises an error when given an ambiguous substring" do
+      lambda {
+        @envs.match_one!("staging")
+      }.should raise_error(EY::AmbiguousEnvironmentName)
+    end
+
+    it "returns an exact match if one exists" do
+      @envs.match_one!("app_staging").name.should == "app_staging"
+    end
+
+    it "raises an error when it can't find anything" do
+      lambda {
+        @envs.match_one!("dev-and-production")
+      }.should raise_error(EY::EnvironmentError)
+    end
+  end
+
+  describe "#named" do
+    it "finds the environment with the matching name" do
+      @envs.named("app_staging").id.should == 4321
+    end
+
+    it "returns nil when no name matches" do
+      @envs.named("something else").should be_nil
+    end
+  end
+
+  describe "#named!" do
+    it "finds the environment with the matching name" do
+      @envs.named!("app_staging").id.should == 4321
+    end
+
+    it "raises an error when no name matches" do
+      lambda {
+        @envs.named!("something else")
+      }.should raise_error(EY::EnvironmentError)
+    end
+  end
+end

data/spec/engineyard/model/environment_spec.rb

@@ -19,6 +19,19 @@ describe "EY::Model::Environment#rebuild" do
   end
 end
 
+describe "EY::Model::Environment.from_array" do
+  it "returns a smart collection, not just a dumb array" do
+    api_data = [
+      {"id" => 32340, "name" => 'iceberg'},
+      {"id" => 9433, "name" => 'zoidberg'},
+    ]
+
+    collection = EY::Model::Environment.from_array(api_data)
+    collection.should be_kind_of(Array)
+    collection.should respond_to(:match_one)
+  end
+end
+
 describe "EY::Model::Environment#instances" do
   it_should_behave_like "it has an api"
 
@@ -43,3 +56,27 @@ describe "EY::Model::Environment#instances" do
     env.instances.first.should == EY::Model::Instance.from_hash(instance_data.merge(:environment => env))
   end
 end
+
+describe "EY::Model::Environment#shorten_name_for(app)" do
+  def short(environment_name, app_name)
+    env = EY::Model::Environment.from_hash({:name => environment_name})
+    app = EY::Model::App.from_hash({:name => app_name})
+    env.shorten_name_for(app)
+  end
+
+  it "turns myapp+myapp_production to production" do
+    short('myapp_production', 'myapp').should == 'production'
+  end
+
+  it "turns product+production to product (leaves it alone)" do
+    short('production', 'product').should == 'production'
+  end
+
+  it "leaves the environment name alone when the app name appears in the middle" do
+    short('hattery', 'ate').should == 'hattery'
+  end
+
+  it "does not produce an empty string when the names are the same" do
+    short('dev', 'dev').should == 'dev'
+  end
+end

data/spec/ey/deploy_spec.rb

@@ -49,6 +49,13 @@ describe "ey deploy" do
       ey "deploy", :expect_failure => true
       @err.should match(/was called incorrectly/i)
     end
+
+    it "complains when the app master is in a non-running state" do
+      api_scenario "one app, one environment, app master red"
+      ey "deploy giblets master", :expect_failure => true
+      @err.should_not match(/No running instances/i)
+      @err.should match(/running.*\(green\)/)
+    end
   end
 
   it "runs when environment is known" do
@@ -88,12 +95,7 @@ describe "ey deploy" do
 
   context "choosing something to deploy" do
     before(:all) do
-      api_scenario "one app, one environment"
-      api_git_remote("user@git.host/path/to/repo.git")
-    end
-
-    after(:all) do
-      api_git_remote(nil)
+      api_scenario "one app, one environment", "user@git.host/path/to/repo.git"
     end
 
     before(:all) do

data/spec/ey/list_environments_spec.rb

@@ -15,7 +15,6 @@ describe "ey environments" do
   end
 
   it "reports failure to find a git repo when not in one" do
-    api_git_remote('dontcare')
     Dir.chdir("/tmp") do
       ey "environments", :expect_failure => true
       @err.should =~ /fatal: No git remotes found in .*\/tmp/

data/spec/ey/logs_spec.rb

@@ -10,6 +10,20 @@ describe "ey logs" do
     @out.should match(/CUSTOM LOG OUTPUT/)
     @err.should be_empty
   end
+
+  it "can infer the environment" do
+    api_scenario "one app, one environment"
+    ey "logs"
+    @out.should match(/MAIN LOG OUTPUT/)
+    @out.should match(/CUSTOM LOG OUTPUT/)
+    @err.should be_empty
+  end
+
+  it "complains when it can't infer the environment" do
+    api_scenario "one app, two environments"
+    ey "logs", :expect_failure => true
+    @err.should =~ /single environment/
+  end
 end
 
 describe "ey logs ENV" do

data/spec/ey/rebuild_spec.rb

@@ -19,7 +19,7 @@ describe "ey rebuild" do
 
   it "fails when the environment name is bogus" do
     ey "rebuild typo", :expect_failure => true
-    @err.should match(/No environment named 'typo'/)
+    @err.should match(/'typo'/)
   end
 end
 

data/spec/ey/ssh_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+print_my_args_ssh = "#!/bin/sh\necho ssh $*"
+
 describe "ey ssh" do
   it_should_behave_like "an integration test"
 
@@ -8,9 +10,7 @@ describe "ey ssh" do
   end
 
   it "SSH-es into the right environment" do
-    print_my_args = "#!/bin/sh\necho ssh $*"
-
-    ey "ssh giblets", :prepend_to_path => {'ssh' => print_my_args}
+    ey "ssh giblets", :prepend_to_path => {'ssh' => print_my_args_ssh}
     @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
   end
 
@@ -20,11 +20,27 @@ describe "ey ssh" do
   end
 
   it "complains if you give it a bogus environment" do
-    print_my_args = "#!/bin/sh\necho ssh $*"
-
-    ey "ssh bogusenv", :prepend_to_path => {'ssh' => print_my_args}, :hide_err => true
+    ey "ssh bogusenv", :prepend_to_path => {'ssh' => print_my_args_ssh}, :expect_failure => true
     @raw_ssh_commands.should be_empty
-    @out.should =~ /could not find.*bogusenv/i
+    @err.should =~ /bogusenv/
+  end
+end
+
+describe "ey ssh" do
+  it_should_behave_like "an integration test"
+
+  it "guesses the environment from the current application" do
+    api_scenario "one app, one environment"
+
+    ey "ssh", :prepend_to_path => {'ssh' => print_my_args_ssh}
+    @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
+  end
+
+  it "complains when it can't guess the environment and its name isn't specified" do
+    api_scenario "one app, one environment, not linked"
+
+    ey "ssh", :prepend_to_path => {'ssh' => print_my_args_ssh}, :expect_failure => true
+    @err.should =~ /single environment/i
   end
 end
 

data/spec/ey/upload_recipes_spec.rb

@@ -1,21 +1,54 @@
 require 'spec_helper'
 
-describe "ey upload_recipes" do
+describe "ey recipes upload" do
   it_should_behave_like "an integration test"
 
-  it "posts the recipes to the correct url" do
-    api_scenario "one app, one environment"
-    dir = Pathname.new("/tmp/#{$$}")
-    dir.mkdir
-    Dir.chdir(dir) do
-      dir.join("cookbooks").mkdir
-      File.open(dir.join("cookbooks/file"), "w"){|f| f << "boo" }
+  before(:all) do
+    @recipe_dir = Pathname.new("/tmp/#{$$}")
+    @recipe_dir.mkdir
+    Dir.chdir(@recipe_dir) do
+      @recipe_dir.join("cookbooks").mkdir
+      File.open(@recipe_dir.join("cookbooks/file"), "w"){|f| f << "boo" }
       `git init`
       `git add .`
       `git commit -m "OMG"`
-      ey "upload_recipes giblets", :debug => true
+      `git remote add testremote user@host.tld:path/to/repo.git`
+    end
+  end
+
+  it "posts the recipes to the correct url" do
+    api_scenario "one app, one environment"
+    Dir.chdir(@recipe_dir) do
+      ey "recipes upload giblets", :debug => true
+    end
+
+    @out.should =~ /recipes uploaded successfully/i
+  end
+
+  it "errors correctly on bogus env name" do
+    api_scenario "one app, one environment"
+    ey "recipes upload bogusenv", :expect_failure => true
+
+    @err.should =~ /can't be found/i
+  end
+
+  it "can infer the environment from the current application" do
+    api_scenario "one app, one environment", "user@host.tld:path/to/repo.git"
+
+    Dir.chdir(@recipe_dir) do
+      ey "recipes upload", :debug => true
     end
 
     @out.should =~ /recipes uploaded successfully/i
   end
+
+  it "complains when it can't infer the environment from the current application" do
+    api_scenario "one app, one environment, not linked", "user@host.tld:path/to/repo.git"
+
+    Dir.chdir(@recipe_dir) do
+      ey "recipes upload", :debug => true, :expect_failure => true
+    end
+
+    @err.should =~ /single environment/i
+  end
 end

data/spec/spec_helper.rb

@@ -66,10 +66,6 @@ shared_examples_for "an integration test without an eyrc file" do
     ENV['CLOUD_URL'] = EY.fake_awsm
   end
 
-  before(:each) do
-    api_git_remote nil
-  end
-
   after(:all) do
     ENV.delete('CLOUD_URL')
     ENV.delete('EYRC')

data/spec/support/fake_awsm.ru

@@ -28,26 +28,18 @@ class FakeAwsm < Sinatra::Base
                      Scenario::UnlinkedApp
                    when "one app, one environment"
                      Scenario::LinkedApp
+                   when "one app, one environment, app master red"
+                     Scenario::LinkedAppRedMaster
                    when "one app, two environments"
                      Scenario::OneAppTwoEnvs
                    when "one app, many similarly-named environments"
                      Scenario::OneAppManySimilarlyNamedEnvs
+                   else
+                     status(400)
+                     return {"ok" => "false", "message" => "wtf is the #{params[:scenario]} scenario?"}.to_json
                    end
-    if new_scenario
-      @@scenario = new_scenario
-      {"ok" => "true"}.to_json
-    else
-      status(400)
-      {"ok" => "false", "message" => "wtf is the #{params[:scenario]} scenario?"}.to_json
-    end
-  end
-
-  put "/git_remote" do
-    FindableGitRemote.remote = if (!params[:remote] || params[:remote].empty?)
-                                 nil
-                               else
-                                 params[:remote]
-                               end
+    @@scenario = new_scenario.new(params[:remote])
+    {"ok" => "true"}.to_json
   end
 
   get "/api/v2/apps" do
@@ -67,7 +59,8 @@ class FakeAwsm < Sinatra::Base
   end
 
   put "/api/v2/environments/:env_id/rebuild" do
-    {}.to_json
+    status(204)
+    ""
   end
 
   post "/api/v2/authenticate" do
@@ -86,54 +79,32 @@ private
       params[:password] == "test"
   end
 
-  module FindableGitRemote
-    class << self
-      attr_accessor :remote
-    end
-
-    def git_remote
-      FindableGitRemote.remote || local_git_remote
-    end
+  module Scenario
+    class Empty
+      attr_reader :git_remote
 
-    # Since we have to find something in `git remote -v` that
-    # corresponds to an app in cloud.ey in order to do anything, we
-    # simulate this by faking out the API to have whatever git
-    # remote we'll find anyway.
-    def local_git_remote
-      remotes = []
-      `git remote -v`.each_line do |line|
-        parts = line.split(/\t/)
-        # the remote will look like
-        # "git@github.com:engineyard/engineyard.git (fetch)\n"
-        # so we need to chop it up a bit
-        remotes << parts[1].gsub(/\s.*$/, "") if parts[1]
+      def initialize(git_remote)
+        @git_remote = git_remote
       end
-      remotes.first
-    end
-  end
 
-  module Scenario
-    class Empty
-      def self.apps
+      def apps
         []
       end
 
-      def self.environments
+      def environments
         []
       end
     end # Empty
 
-    class UnlinkedApp
-      extend FindableGitRemote
-
-      def self.apps
+    class UnlinkedApp < Empty
+      def apps
         [{
             "name" => "rails232app",
             "environments" => [],
             "repository_uri" => git_remote}]
       end
 
-      def self.environments
+      def environments
         [{
             "ssh_username" => "turkey",
             "instances" => [{
@@ -152,10 +123,8 @@ private
       end
     end # UnlinkedApp
 
-    class LinkedApp
-      extend FindableGitRemote
-
-      def self.apps
+    class LinkedApp < Empty
+      def apps
         [{"name" => "rails232app",
             "environments" => [{"ssh_username" => "turkey",
                 "instances" => [{"public_hostname" => "174.129.198.124",
@@ -173,7 +142,7 @@ private
             "repository_uri" => git_remote}]
       end
 
-      def self.environments
+      def environments
         [{
             "ssh_username" => "turkey",
             "instances" => [{
@@ -193,7 +162,7 @@ private
               "id" => 27220}}]
       end
 
-      def self.logs(env_id)
+      def logs(env_id)
         [{
           "id" => env_id,
           "role" => "app_master",
@@ -203,10 +172,24 @@ private
       end
     end # LinkedApp
 
-    class OneAppTwoEnvs
-      extend FindableGitRemote
+    class LinkedAppRedMaster < LinkedApp
+      def apps
+        apps = super
+        apps[0]["environments"][0]["instances"][0]["status"] = "error"
+        apps[0]["environments"][0]["app_master"]["status"] = "error"
+        apps
+      end
 
-      def self.apps
+      def environments
+        envs = super
+        envs[0]["instances"][0]["status"] = "error"
+        envs[0]["app_master"]["status"] = "error"
+        envs
+      end
+    end
+
+    class OneAppTwoEnvs < Empty
+      def apps
         apps = [{
             "name" => "rails232app",
             "repository_uri" => git_remote
@@ -239,7 +222,7 @@ private
             "repository_uri" => git_remote}]
       end
 
-      def self.environments
+      def environments
         [{
             "ssh_username" => "turkey",
             "instances" => [{
@@ -272,10 +255,8 @@ private
       end
     end # OneAppTwoEnvs
 
-    class OneAppManySimilarlyNamedEnvs
-      extend FindableGitRemote
-
-      def self.apps
+    class OneAppManySimilarlyNamedEnvs < Empty
+      def apps
         apps = [{
             "name" => "rails232app",
             "repository_uri" => git_remote
@@ -336,7 +317,7 @@ private
             "repository_uri" => git_remote}]
       end
 
-      def self.environments
+      def environments
         [{
             "ssh_username" => "turkey",
             "instances" => [{
@@ -395,7 +376,7 @@ private
           }]
       end
 
-      def self.logs(env_id)
+      def logs(env_id)
         [{
             "id" => env_id,
             "role" => "app_master",

data/spec/support/helpers.rb

@@ -1,4 +1,4 @@
-require 'ey_merkin'
+require 'realweb'
 require "rest_client"
 require 'open4'
 
@@ -42,8 +42,8 @@ module Spec
       with_env(ey_env) do
         exit_status = Open4::open4("#{eybin} #{cmd}") do |pid, stdin, stdout, stderr|
           block.call(stdin) if block
-          @err = stderr.read_available_bytes
-          @out = stdout.read_available_bytes
+          @err = stderr.read
+          @out = stdout.read
         end
 
         if !exit_status.success? && !options[:expect_failure]
@@ -75,14 +75,21 @@ module Spec
       @out
     end
 
-    def api_scenario(scenario)
-      response = ::RestClient.put(EY.fake_awsm + '/scenario', {"scenario" => scenario}, {})
+    def api_scenario(scenario, remote = local_git_remote)
+      response = ::RestClient.put(EY.fake_awsm + '/scenario', {"scenario" => scenario, "remote" => remote}, {})
       raise "Setting scenario failed: #{response.inspect}" unless response.code == 200
     end
 
-    def api_git_remote(remote)
-      response = ::RestClient.put(EY.fake_awsm + '/git_remote', {"remote" => remote}, {})
-      raise "Setting git remote failed: #{response.inspect}" unless response.code == 200
+    def local_git_remote
+      remotes = []
+      `git remote -v`.each_line do |line|
+        parts = line.split(/\t/)
+        # the remote will look like
+        # "git@github.com:engineyard/engineyard.git (fetch)\n"
+        # so we need to chop it up a bit
+        remotes << parts[1].gsub(/\s.*$/, "") if parts[1]
+      end
+      remotes.first
     end
 
     def read_yaml(file="ey.yml")
@@ -125,7 +132,7 @@ module EY
           raise SyntaxError, "There is a syntax error in fake_awsm.ru! fix it!"
         end
         config_ru = File.join(EY_ROOT, "spec/support/fake_awsm.ru")
-        @server = EY::Merkin.start_server(config_ru)
+        @server = RealWeb.start_server_in_fork(config_ru)
         "http://localhost:#{@server.port}"
       end
     end

data/spec/support/ruby_ext.rb

@@ -11,19 +11,3 @@ module Kernel
   end
   alias capture_stdout capture_stdio
 end
-
-class IO
-  def read_available_bytes(chunk_size = 1024, select_timeout = 5)
-    buffer = []
-
-    while self.class.select([self], nil, nil, select_timeout)
-      begin
-        buffer << self.readpartial(chunk_size)
-      rescue(EOFError)
-        break
-      end
-    end
-
-    return buffer.join
-  end
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -07:00
+date: 2010-06-03 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,9 +111,12 @@ files:
 - lib/engineyard/api.rb
 - lib/engineyard/cli/action/deploy.rb
 - lib/engineyard/cli/api.rb
+- lib/engineyard/cli/recipes.rb
 - lib/engineyard/cli/thor_fixes.rb
 - lib/engineyard/cli/ui.rb
 - lib/engineyard/cli.rb
+- lib/engineyard/collection/environments.rb
+- lib/engineyard/collection.rb
 - lib/engineyard/config.rb
 - lib/engineyard/error.rb
 - lib/engineyard/model/api_struct.rb
@@ -124,6 +127,7 @@ files:
 - lib/engineyard/model.rb
 - lib/engineyard/repo.rb
 - lib/engineyard/ruby_ext.rb
+- lib/engineyard/thor.rb
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc
@@ -161,6 +165,7 @@ test_files:
 - spec/engineyard/api_spec.rb
 - spec/engineyard/cli/api_spec.rb
 - spec/engineyard/cli_spec.rb
+- spec/engineyard/collection/environments.rb
 - spec/engineyard/config_spec.rb
 - spec/engineyard/model/api_struct_spec.rb
 - spec/engineyard/model/environment_spec.rb