engineyard 0.4.0 → 0.5.0

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ require 'engineyard'
 
 # Spec stuff
 require 'spec/autorun'
+require 'tmpdir'
 require 'yaml'
 require 'pp'
 support = Dir[File.join(EY_ROOT,'/spec/support/*.rb')]
@@ -30,6 +31,7 @@ support.each{|helper| require helper }
 Spec::Runner.configure do |config|
   config.include Spec::Helpers
   config.extend Spec::GitRepo
+  config.extend Spec::Helpers::SemanticNames
 
   config.before(:all) do
     FakeWeb.allow_net_connect = false
@@ -65,7 +67,7 @@ EY.define_git_repo("default") do |git_dir|
   system("git commit -m 'initial commit' >/dev/null 2>&1")
 end
 
-shared_examples_for "an integration test without an eyrc file" do
+shared_examples_for "integration without an eyrc file" do
   use_git_repo('default')
 
   before(:all) do
@@ -84,8 +86,8 @@ shared_examples_for "an integration test without an eyrc file" do
 end
 
 # Use this in conjunction with the 'ey' helper method
-shared_examples_for "an integration test" do
-  it_should_behave_like "an integration test without an eyrc file"
+shared_examples_for "integration" do
+  given "integration without an eyrc file"
 
   before(:all) do
     token = { ENV['CLOUD_URL'] => {
@@ -99,3 +101,5 @@ shared_examples_for "it has an api" do
     @api = EY::API.new('asdf')
   end
 end
+
+

data/spec/support/fake_awsm.ru

@@ -54,6 +54,24 @@ class FakeAwsm < Sinatra::Base
     {"logs" => @@scenario.logs(params[:env_id])}.to_json
   end
 
+  get "/api/v2/environments/:env_id/recipes" do
+    redirect '/fakes3/recipe'
+  end
+
+  get "/fakes3/recipe" do
+    content_type "binary/octet-stream"
+    status(200)
+
+    tempdir = File.join(Dir.tmpdir, "ey_test_cmds_#{Time.now.tv_sec}#{Time.now.tv_usec}_#{$$}")
+    Dir.mkdir(tempdir)
+    Dir.mkdir("#{tempdir}/cookbooks")
+    File.open("#{tempdir}/cookbooks/README", 'w') do |f|
+      f.write "Remove this file to clone an upstream git repository of cookbooks\n"
+    end
+
+    Dir.chdir(tempdir) { `tar czf - cookbooks` }
+  end
+
   post "/api/v2/environments/:env_id/recipes" do
     if params[:file][:tempfile]
       files = `tar --list -z -f "#{params[:file][:tempfile].path}"`.split(/\n/)

data/spec/support/helpers.rb

@@ -108,6 +108,19 @@ module Spec
       end
       retval
     end
+
+  end
+end
+
+module Spec
+  module Helpers
+    module SemanticNames
+
+      def given(name)
+        it_should_behave_like name
+      end
+
+    end
   end
 end
 

data/spec/support/shared_behavior.rb

@@ -0,0 +1,132 @@
+module Spec
+  module Helpers
+    module SharedIntegrationTestUtils
+
+      def run_ey(command_options, ey_options)
+        if respond_to?(:extra_ey_options)   # needed for ssh tests
+          ey_options.merge!(extra_ey_options)
+        end
+
+        ey(command_to_run(command_options), ey_options)
+      end
+
+      def make_scenario(hash)
+        # since nil will silently turn to empty string when interpolated,
+        # and there's a lot of string matching involved in integration
+        # testing, it would be nice to have early notification of typos.
+        scenario = Hash.new { |h,k| raise "Tried to get key #{k.inspect}, but it's missing!" }
+        scenario.merge!(hash)
+      end
+
+    end
+  end
+end
+
+
+shared_examples_for "it takes an environment name" do
+  include Spec::Helpers::SharedIntegrationTestUtils
+
+  it "operates on the current environment by default" do
+    api_scenario "one app, one environment"
+    run_ey({:env => nil}, {:debug => true})
+    verify_ran(make_scenario({
+          :environment  => 'giblets',
+          :application  => 'rails232app',
+          :master_ip    => '174.129.198.124',
+          :ssh_username => 'turkey',
+        }))
+  end
+
+  it "complains when you specify a nonexistent environment" do
+    api_scenario "one app, one environment"
+    run_ey({:env => 'typo-happens-here'}, {:expect_failure => true})
+    @err.should match(/no environment named 'typo-happens-here'/i)
+  end
+
+  context "given a piece of the environment name" do
+    before(:all) do
+      api_scenario "one app, many similarly-named environments"
+    end
+
+    it "complains when the substring is ambiguous" do
+      run_ey({:env => 'staging'}, {:expect_failure => true})
+      @err.should match(/'staging' is ambiguous/)
+    end
+
+    it "works when the substring is unambiguous" do
+      api_scenario "one app, many similarly-named environments"
+      run_ey({:env => 'prod'}, {:debug => true})
+      verify_ran(make_scenario({
+            :environment  => 'railsapp_production',
+            :application  => 'rails232app',
+            :master_ip    => '174.129.198.124',
+            :ssh_username => 'turkey',
+          }))
+    end
+  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"
+    run_ey({:env => nil}, {:expect_failure => true})
+    @err.should =~ /single environment/i
+  end
+end
+
+shared_examples_for "it invokes eysd" do
+  include Spec::Helpers::SharedIntegrationTestUtils
+
+  context "eysd install" do
+    before(:all) do
+      api_scenario "one app, one environment"
+    end
+
+    before(:each) do
+      ENV.delete "NO_SSH"
+    end
+
+    after(:each) do
+      ENV['NO_SSH'] = "true"
+    end
+
+    def exiting_ssh(exit_code)
+      "#!/usr/bin/env ruby\n exit!(#{exit_code}) if ARGV.to_s =~ /Base64.decode64/"
+    end
+
+    it "raises an error if SSH fails" do
+      run_ey({:env => 'giblets'},
+        {:prepend_to_path => {'ssh' => exiting_ssh(255)}, :expect_failure => true})
+      @err.should =~ /SSH connection to \S+ failed/
+    end
+
+    it "installs ey-deploy if it's missing" do
+      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(104)}})
+
+      gem_install_command = @ssh_commands.find do |command|
+        command =~ /gem install ey-deploy/
+      end
+      gem_install_command.should_not be_nil
+      gem_install_command.should =~ %r{/usr/local/ey_resin/ruby/bin/gem install.*ey-deploy}
+    end
+
+    it "upgrades ey-deploy if it's too old" do
+      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(70)}})
+      @ssh_commands.should have_command_like(/gem uninstall -a -x ey-deploy/)
+      @ssh_commands.should have_command_like(/gem install ey-deploy/)
+    end
+
+    it "raises an error if ey-deploy is too new" do
+      run_ey({:env => 'giblets'},
+        {:prepend_to_path => {'ssh' => exiting_ssh(17)}, :expect_failure => true})
+      @ssh_commands.should_not have_command_like(/gem install ey-deploy/)
+      @ssh_commands.should_not have_command_like(/eysd deploy/)
+      @err.should match(/too new/i)
+    end
+
+    it "does not change ey-deploy if its version is satisfactory" do
+      run_ey({:env => 'giblets'}, {:prepend_to_path => {'ssh' => exiting_ssh(0)}})
+      @ssh_commands.should_not have_command_like(/gem install ey-deploy/)
+      @ssh_commands.should_not have_command_like(/gem uninstall.* ey-deploy/)
+      @ssh_commands.should have_command_like(/eysd deploy/)
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -07:00
+date: 2010-06-16 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - lib/engineyard/cli/recipes.rb
 - lib/engineyard/cli/thor_fixes.rb
 - lib/engineyard/cli/ui.rb
+- lib/engineyard/cli/web.rb
 - lib/engineyard/cli.rb
 - lib/engineyard/collection/environments.rb
 - lib/engineyard/collection.rb
@@ -177,12 +178,16 @@ test_files:
 - spec/ey/logs_spec.rb
 - spec/ey/rebuild_spec.rb
 - spec/ey/recipes/apply_spec.rb
+- spec/ey/recipes/download_spec.rb
 - spec/ey/recipes/upload_spec.rb
 - spec/ey/rollback_spec.rb
 - spec/ey/ssh_spec.rb
+- spec/ey/web/disable_spec.rb
+- spec/ey/web/enable_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru
 - spec/support/git_repo.rb
 - spec/support/helpers.rb
 - spec/support/ruby_ext.rb
+- spec/support/shared_behavior.rb