engineyard 0.3.1 → 0.3.2

data/spec/ey/logs_spec.rb

@@ -11,3 +11,21 @@ describe "ey logs" do
     @err.should be_empty
   end
 end
+
+describe "ey logs ENV" do
+  it_should_behave_like "an integration test"
+
+  before(:all) do
+    api_scenario "one app, many similarly-named environments"
+  end
+
+  it "works when given an unambiguous substring" do
+    ey "logs prod"
+    @out.should match(/MAIN LOG OUTPUT/)
+  end
+
+  it "complains when given an ambiguous substring" do
+    ey "logs staging", :hide_err => true, :expect_failure => true
+    @err.should match(/'staging' is ambiguous/)
+  end
+end

data/spec/ey/rebuild_spec.rb

@@ -3,23 +3,40 @@ require 'spec_helper'
 describe "ey rebuild" do
   it_should_behave_like "an integration test"
 
-  before(:each) do
+  before(:all) do
     api_scenario "one app, one environment"
   end
 
   it "works when the environment name is valid" do
-    ey "rebuild giblets"
+    ey "rebuild giblets", :debug => true
     @out.should =~ /Rebuilding giblets/i
   end
 
   it "rebuilds the current environment by default" do
-    ey "rebuild"
+    ey "rebuild", :debug => true
     @out.should =~ /Rebuilding giblets/i
   end
 
   it "fails when the environment name is bogus" do
-    ey "rebuild typo", :hide_err => true, :expect_failure => true
+    ey "rebuild typo", :expect_failure => true
     @err.should match(/No environment named 'typo'/)
   end
 end
 
+describe "ey rebuild ENV" do
+  it_should_behave_like "an integration test"
+
+  before(:all) do
+    api_scenario "one app, many similarly-named environments"
+  end
+
+  it "works when given an unambiguous substring" do
+    ey "rebuild prod", :debug => true
+    @out.should =~ /Rebuilding railsapp_production/
+  end
+
+  it "complains when given an ambiguous substring" do
+    ey "rebuild staging", :hide_err => true, :expect_failure => true
+    @err.should =~ /'staging' is ambiguous/
+  end
+end

data/spec/ey/ssh_spec.rb

@@ -4,21 +4,46 @@ describe "ey ssh" do
   it_should_behave_like "an integration test"
 
   before(:all) do
-    api_scenario "one app, one environment"
+    api_scenario "one app, two environments"
   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}
-    @ssh_commands.should == ["ssh turkey@174.129.198.124"]
+    @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
+  end
+
+  it "complains if it has no app master" do
+    ey "ssh bakon", :expect_failure => true
+    @err.should =~ /'bakon' does not have a master instance/
   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
-    @ssh_commands.should be_empty
+    @raw_ssh_commands.should be_empty
     @out.should =~ /could not find.*bogusenv/i
   end
 end
+
+describe "ey ssh ENV" do
+  it_should_behave_like "an integration test"
+
+  before(:all) do
+    api_scenario "one app, many similarly-named environments"
+  end
+
+  it "works when given an unambiguous substring" do
+    print_my_args = "#!/bin/sh\necho ssh $*"
+
+    ey "ssh prod", :prepend_to_path => {'ssh' => print_my_args}
+    @raw_ssh_commands.should == ["ssh turkey@174.129.198.124"]
+  end
+
+  it "complains when given an ambiguous substring" do
+    ey "ssh staging", :hide_err => true, :expect_failure => true
+    @err.should match(/'staging' is ambiguous/)
+  end
+end

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ end
 require 'fakeweb'
 require 'fakeweb_matcher'
 require 'fakefs/safe'
+require 'json'
 
 # Engineyard gem
 $LOAD_PATH.unshift(File.join(EY_ROOT, "lib"))
@@ -22,11 +23,10 @@ require 'engineyard'
 # Spec stuff
 require 'spec/autorun'
 require 'yaml'
+require 'pp'
 support = Dir[File.join(EY_ROOT,'/spec/support/*.rb')]
 support.each{|helper| require helper }
 
-EY.start_fake_awsm
-
 Spec::Runner.configure do |config|
   config.include Spec::Helpers
 
@@ -43,29 +43,54 @@ Spec::Runner.configure do |config|
   end
 end
 
-# Use this in conjunction with the 'ey' helper method
-shared_examples_for "an integration test" do
+Spec::Matchers.define :have_command_like do |regex|
+  match do |command_list|
+    @found = command_list.find{|c| c =~ regex }
+    !!@found
+  end
+
+  failure_message_for_should do |command_list|
+    "Didn't find a command matching #{regex} in commands:\n\n" + command_list.join("\n\n")
+  end
+
+  failure_message_for_should_not do |command_list|
+    "Found unwanted command:\n\n#{@found}\n\n(matches regex #{regex})"
+  end
+end
+
+shared_examples_for "an integration test without an eyrc file" do
   before(:all) do
     FakeFS.deactivate!
     ENV['EYRC'] = "/tmp/eyrc"
-    ENV['CLOUD_URL'] = EY.fake_awsm
     FakeWeb.allow_net_connect = true
+    ENV['CLOUD_URL'] = EY.fake_awsm
+  end
 
-    token = { ENV['CLOUD_URL'] => {
-        "api_token" => "f81a1706ddaeb148cfb6235ddecfc1cf"} }
-    File.open(ENV['EYRC'], "w"){|f| YAML.dump(token, f) }
+  before(:each) do
+    api_git_remote nil
   end
 
   after(:all) do
-    ENV['CLOUD_URL'] = nil
+    ENV.delete('CLOUD_URL')
+    ENV.delete('EYRC')
     FakeFS.activate!
     FakeWeb.allow_net_connect = false
   end
 end
 
-shared_examples_for "it has an account" do
+# 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"
+
+  before(:all) do
+    token = { ENV['CLOUD_URL'] => {
+        "api_token" => "f81a1706ddaeb148cfb6235ddecfc1cf"} }
+    File.open(ENV['EYRC'], "w"){|f| YAML.dump(token, f) }
+  end
+end
+
+shared_examples_for "it has an api" do
   before(:all) do
-    write_yaml({"api_token" => "asdf"}, "~/.eyrc")
-    @account = EY::Account.new(EY::API.new)
+    @api = EY::API.new('asdf')
   end
 end

data/spec/support/fake_awsm.ru

@@ -30,6 +30,8 @@ class FakeAwsm < Sinatra::Base
                      Scenario::LinkedApp
                    when "one app, two environments"
                      Scenario::OneAppTwoEnvs
+                   when "one app, many similarly-named environments"
+                     Scenario::OneAppManySimilarlyNamedEnvs
                    end
     if new_scenario
       @@scenario = new_scenario
@@ -119,7 +121,7 @@ private
       def self.environments
         []
       end
-    end
+    end # Empty
 
     class UnlinkedApp
       extend FindableGitRemote
@@ -148,7 +150,7 @@ private
               "status" => "running",
               "id" => 27220}}]
       end
-    end
+    end # UnlinkedApp
 
     class LinkedApp
       extend FindableGitRemote
@@ -199,7 +201,7 @@ private
           "custom" => "CUSTOM LOG OUTPUT"
         }]
       end
-    end
+    end # LinkedApp
 
     class OneAppTwoEnvs
       extend FindableGitRemote
@@ -268,7 +270,140 @@ private
             "app_master" => nil,
           }]
       end
-    end
+    end # OneAppTwoEnvs
+
+    class OneAppManySimilarlyNamedEnvs
+      extend FindableGitRemote
+
+      def self.apps
+        apps = [{
+            "name" => "rails232app",
+            "repository_uri" => git_remote
+          }]
+
+        [{"name" => "rails232app",
+            "environments" => [{
+                "ssh_username" => "turkey",
+                "instances" => [{
+                    "public_hostname" => "174.129.198.124",
+                    "status" => "running",
+                    "id" => 27220}],
+                "name" => "railsapp_production",
+                "apps" => apps,
+                "instances_count" => 1,
+                "stack_name" => "nginx_mongrel",
+                "id" => 200,
+                "app_master" => {
+                  "public_hostname" => "174.129.198.124",
+                  "status" => "running",
+                  "id" => 27220,
+                },
+              }, {
+                "ssh_username" => "ham",
+                "instances" => [{
+                    "public_hostname" => '127.3.2.1',
+                    "status" => "running",
+                    "id" => 63066,
+                  }],
+                "name" => "railsapp_staging",
+                "apps" => apps,
+                "instances_count" => 1,
+                "stack_name" => "nginx_passenger",
+                "id" => 8371,
+                "app_master" => {
+                  "public_hostname" => '127.3.2.1',
+                  "status" => "running",
+                  "id" => 63066,
+                },
+              }, {
+                "ssh_username" => "ham",
+                "instances" => [{
+                    "public_hostname" => '127.44.55.66',
+                    "status" => "running",
+                    "id" => 59395,
+                  }],
+                "name" => "railsapp_staging_2",
+                "apps" => apps,
+                "instances_count" => 1,
+                "stack_name" => "nginx_passenger",
+                "id" => 8371,
+                "app_master" => {
+                  "public_hostname" => '127.44.55.66',
+                  "status" => "running",
+                  "id" => 59395,
+                },
+              }],
+            "repository_uri" => git_remote}]
+      end
+
+      def self.environments
+        [{
+            "ssh_username" => "turkey",
+            "instances" => [{
+                "public_hostname" => "174.129.198.124",
+                "status" => "running",
+                "id" => 27220}],
+            "name" => "railsapp_production",
+            "apps" => [{
+                "name" => "rails232app",
+                "repository_uri" => git_remote}],
+            "instances_count" => 1,
+            "stack_name" => "nginx_mongrel",
+            "id" => 200,
+            "app_master" => {
+              "public_hostname" => "174.129.198.124",
+              "status" => "running",
+              "id" => 27220}
+          }, {
+            "ssh_username" => "ham",
+            "instances" => [{
+                "public_hostname" => '127.3.2.1',
+                "status" => "running",
+                "id" => 63066,
+              }],
+            "name" => "railsapp_staging",
+            "apps" => [{
+                "name" => "rails232app",
+                "repository_uri" => git_remote}],
+            "instances_count" => 1,
+            "stack_name" => "nginx_passenger",
+            "id" => 8371,
+            "app_master" => {
+              "public_hostname" => '127.3.2.1',
+              "status" => "running",
+              "id" => 63066,
+            },
+          }, {
+            "ssh_username" => "chicken",
+            "instances" => [{
+                "public_hostname" => '127.44.55.66',
+                "status" => "running",
+                "id" => 59395,
+              }],
+            "name" => "railsapp_staging_2",
+            "apps" => [{
+                "name" => "rails232app",
+                "repository_uri" => git_remote}],
+            "instances_count" => 1,
+            "stack_name" => "nginx_passenger",
+            "id" => 8371,
+            "app_master" => {
+              "public_hostname" => '127.44.55.66',
+              "status" => "running",
+              "id" => 59395,
+            },
+          }]
+      end
+
+      def self.logs(env_id)
+        [{
+            "id" => env_id,
+            "role" => "app_master",
+            "main" => "MAIN LOG OUTPUT",
+            "custom" => "CUSTOM LOG OUTPUT"
+          }]
+      end
+    end  # OneAppManySimilarlyNamedEnvs
   end
 end
 

data/spec/support/helpers.rb

@@ -18,12 +18,11 @@ module Spec
 
     def ey(cmd = nil, options = {}, &block)
       require "open3"
-      hide_err = options.delete(:hide_err)
-      path_prepends = options.delete(:prepend_to_path)
+      hide_err = options.has_key?(:hide_err) ? options[:hide_err] : options[:expect_failure]
+      path_prepends = options[:prepend_to_path]
 
-      ey_env = {
-        'DEBUG' => options[:debug].to_s
-      }
+      ey_env = {}
+      ey_env['DEBUG'] = options[:debug].to_s if options[:debug]
 
       if path_prepends
         tempdir = File.join(Dir.tmpdir, "ey_test_cmds_#{Time.now.tv_sec}#{Time.now.tv_usec}_#{$$}")
@@ -54,10 +53,22 @@ module Spec
         end
       end
 
-      @ssh_commands = @out.split(/\n/).find_all do |line|
+      @raw_ssh_commands = @out.split(/\n/).find_all do |line|
         line =~ /^ssh/
-      end.map do |line|
-        line.sub(/^.*?\"/, '').sub(/\"$/, '')
+      end
+
+      @ssh_commands = @raw_ssh_commands.map do |cmd|
+        # Strip off everything up to and including user@host, leaving
+        # just the command that the remote system would run
+        ssh_prefix_removed = cmd.gsub(/^.*?\w+@\S*\s*/, '')
+
+        # Its arguments have been double-escaped: one layer is to get
+        # them through our local shell and into ssh, and the other
+        # layer is to get them through the remote system's shell.
+        #
+        # Strip off one layer by running it through the shell.
+        just_the_remote_command = ssh_prefix_removed.gsub(/>\s*\/dev\/null.*$/, '')
+        `echo #{just_the_remote_command}`.strip
       end
 
       puts @err unless @err.empty? || hide_err

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -07:00
+date: 2010-05-26 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,16 +59,16 @@ dependencies:
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
+  name: escape
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 4
         - 0
-        version: 1.4.0
+        - 0
+        - 4
+        version: 0.0.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,20 @@ dependencies:
         version: "1.4"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  version_requirements: *id006
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
 executables: 
@@ -94,23 +108,20 @@ extra_rdoc_files: []
 
 files: 
 - bin/ey
-- lib/engineyard/account/api_struct.rb
-- lib/engineyard/account/app.rb
-- lib/engineyard/account/app_master.rb
-- lib/engineyard/account/environment.rb
-- lib/engineyard/account/instance.rb
-- lib/engineyard/account/log.rb
-- lib/engineyard/account.rb
-- lib/engineyard/action/deploy.rb
-- lib/engineyard/action/rebuild.rb
-- lib/engineyard/action/util.rb
 - lib/engineyard/api.rb
+- lib/engineyard/cli/action/deploy.rb
 - lib/engineyard/cli/api.rb
 - lib/engineyard/cli/thor_fixes.rb
 - lib/engineyard/cli/ui.rb
 - lib/engineyard/cli.rb
 - lib/engineyard/config.rb
 - lib/engineyard/error.rb
+- lib/engineyard/model/api_struct.rb
+- lib/engineyard/model/app.rb
+- lib/engineyard/model/environment.rb
+- lib/engineyard/model/instance.rb
+- lib/engineyard/model/log.rb
+- lib/engineyard/model.rb
 - lib/engineyard/repo.rb
 - lib/engineyard/ruby_ext.rb
 - lib/engineyard.rb
@@ -147,13 +158,13 @@ signing_key:
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud
 test_files: 
-- spec/engineyard/account/api_struct_spec.rb
-- spec/engineyard/account/environment_spec.rb
-- spec/engineyard/account_spec.rb
 - spec/engineyard/api_spec.rb
 - spec/engineyard/cli/api_spec.rb
 - spec/engineyard/cli_spec.rb
 - spec/engineyard/config_spec.rb
+- spec/engineyard/model/api_struct_spec.rb
+- spec/engineyard/model/environment_spec.rb
+- spec/engineyard/model/instance_spec.rb
 - spec/engineyard/repo_spec.rb
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb