engineyard 0.2.11 → 0.2.12

data/spec/support/fake_awsm.ru

@@ -40,6 +40,14 @@ class FakeAwsm < Sinatra::Base
     end
   end
 
+  put "/git_remote" do
+    FindableGitRemote.remote = if (!params[:remote] || params[:remote].empty?)
+                                 nil
+                               else
+                                 params[:remote]
+                               end
+  end
+
   get "/api/v2/apps" do
     {"apps" => @@scenario.apps}.to_json
   end
@@ -52,6 +60,14 @@ class FakeAwsm < Sinatra::Base
     {"logs" => @@scenario.logs(params[:env_id])}.to_json
   end
 
+  post "/api/v2/environments/:env_id/recipes" do
+    {}.to_json
+  end
+
+  put "/api/v2/environments/:env_id/rebuild" do
+    {}.to_json
+  end
+
   post "/api/v2/authenticate" do
     if valid_user?
       {"api_token" => "deadbeef", "ok" => true}.to_json
@@ -69,11 +85,19 @@ private
   end
 
   module FindableGitRemote
+    class << self
+      attr_accessor :remote
+    end
+
+    def git_remote
+      FindableGitRemote.remote || local_git_remote
+    end
+
     # 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 git_remote
+    def local_git_remote
       remotes = []
       `git remote -v`.each_line do |line|
         parts = line.split(/\t/)

data/spec/support/helpers.rb

@@ -1,21 +1,59 @@
 require 'ey_merkin'
 require "rest_client"
+require 'open4'
 
 module Spec
   module Helpers
-    def ey(cmd = nil, options = {})
+    class UnexpectedExit < StandardError
+      def initialize(stdout, stderr)
+        @stdout, @stderr = stdout, stderr
+      end
+
+      def message
+        "Exited with an unexpected exit code\n---STDOUT---\n#{@stdout}\n---STDERR---\n#{@stderr}\n"
+      end
+    end
+    NonzeroExitStatus = Class.new(UnexpectedExit)
+    ZeroExitStatus = Class.new(UnexpectedExit)
+
+    def ey(cmd = nil, options = {}, &block)
       require "open3"
       hide_err = options.delete(:hide_err)
-      ENV['DEBUG'] = options.delete(:debug)
+      path_prepends = options.delete(:prepend_to_path)
+
+      ey_env = {
+        'DEBUG' => options[:debug].to_s
+      }
+
+      if path_prepends
+        tempdir = File.join(Dir.tmpdir, "ey_test_cmds_#{Time.now.tv_sec}#{Time.now.tv_usec}_#{$$}")
+        Dir.mkdir(tempdir)
+        path_prepends.each do |name, contents|
+          File.open(File.join(tempdir, name), 'w') do |f|
+            f.write(contents)
+            f.chmod(0755)
+          end
+        end
+
+        ey_env['PATH'] = tempdir + ':' + ENV['PATH']
+      end
 
-      args = options.map { |k,v| "--#{k} #{v}"}.join(" ")
       eybin = File.expand_path('../bundled_ey', __FILE__)
 
-      @in, @out, @err = Open3.popen3("#{eybin} #{cmd} #{args}")
+      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
+        end
+
+        if !exit_status.success? && !options[:expect_failure]
+          raise NonzeroExitStatus.new(@out, @err)
+        elsif exit_status.success? && options[:expect_failure]
+          raise ZeroExitStatus.new(@out, @err)
+        end
+      end
 
-      yield @in if block_given?
-      @err = @err.read_available_bytes
-      @out = @out.read_available_bytes
       @ssh_commands = @out.split(/\n/).find_all do |line|
         line =~ /^ssh/
       end.map do |line|
@@ -31,6 +69,11 @@ module Spec
       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
+    end
+
     def read_yaml(file="ey.yml")
       YAML.load_file(File.expand_path(file))
     end
@@ -38,6 +81,28 @@ module Spec
     def write_yaml(data, file = "ey.yml")
       File.open(file, "w"){|f| YAML.dump(data, f) }
     end
+
+    def with_env(new_env_vars)
+      raise ArgumentError, "with_env takes a block" unless block_given?
+      old_env_vars = {}
+      new_env_vars.each do |k, v|
+        if ENV.has_key?(k)
+          old_env_vars[k] = ENV[k]
+        end
+        ENV[k] = v
+      end
+
+      retval = yield
+
+      new_env_vars.keys.each do |k|
+        if old_env_vars.has_key?(k)
+          ENV[k] = old_env_vars[k]
+        else
+          ENV.delete(k)
+        end
+      end
+      retval
+    end
   end
 end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,80 +14,70 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -07:00
+date: 2010-05-07 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: termios
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: termios
-  requirement: *id001
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: highline
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: highline
-  requirement: *id002
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: thor
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: thor
-  requirement: *id003
-  prerelease: false
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: json
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  name: json
-  requirement: *id004
-  prerelease: false
   type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  name: rest-client
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
         version: "1.4"
-  name: rest-client
-  requirement: *id005
-  prerelease: false
   type: :runtime
+  version_requirements: *id005
 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: 
@@ -99,36 +88,33 @@ extra_rdoc_files: []
 
 files: 
 - bin/ey
+- lib/engineyard/#repo.rb#
+- 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/list_environments.rb
+- lib/engineyard/action/rebuild.rb
+- lib/engineyard/action/show_logs.rb
+- lib/engineyard/action/ssh.rb
+- lib/engineyard/action/upload_recipes.rb
+- lib/engineyard/action/util.rb
 - lib/engineyard/api.rb
 - lib/engineyard/cli/api.rb
-- lib/engineyard/cli/error.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/repo.rb
+- lib/engineyard/ruby_ext.rb
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc
-- spec/engineyard/api_spec.rb
-- spec/engineyard/cli/api_spec.rb
-- spec/engineyard/cli_spec.rb
-- spec/engineyard/config_spec.rb
-- spec/engineyard/repo_spec.rb
-- spec/engineyard_spec.rb
-- spec/ey/deploy_spec.rb
-- spec/ey/ey_spec.rb
-- spec/ey/logs_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/bundled_ey
-- spec/support/fake_awsm.ru
-- spec/support/helpers.rb
-- spec/support/ruby_ext.rb
 has_rdoc: true
 homepage: http://engineyard.com
 licenses: []
@@ -139,31 +125,30 @@ 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.7.pre.1
+rubygems_version: 1.3.6
 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
@@ -172,8 +157,11 @@ test_files:
 - spec/engineyard_spec.rb
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
+- spec/ey/list_environments_spec.rb
 - spec/ey/logs_spec.rb
-- spec/spec.opts
+- spec/ey/rebuild_spec.rb
+- spec/ey/ssh_spec.rb
+- spec/ey/upload_recipes_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru

data/lib/engineyard/cli/error.rb

@@ -1,44 +0,0 @@
-module EY
-  class CLI < Thor
-    class NoAppError < EY::Error
-      def initialize(repo)
-        @repo = repo
-      end
-
-      def message
-        error = [%|There is no application configured for any of the following remotes:|]
-        @repo.urls.each{|url| error << %|\t#{url}| }
-        error << %|You can add this application at #{EY.config.endpoint}|
-        error.join("\n")
-      end
-    end
-
-    class EnvironmentError < EY::Error
-    end
-
-    class NoEnvironmentError < EnvironmentError
-      def message
-        "No environment named '#{env_name}'\nYou can create one at #{EY.config.endpoint}"
-      end
-    end
-
-    class BranchMismatch < EY::Error
-      def initialize(default_branch, branch)
-        super(nil)
-        @default_branch, @branch = default_branch, branch
-      end
-
-      def message
-        %|Your deploy branch is set to "#{@default_branch}".\n| +
-          %|If you want to deploy branch "#{@branch}", use --force.|
-      end
-    end
-
-    class DeployArgumentError < EY::Error
-      def message
-        %|"deploy" was called incorrectly. Call as "deploy [ENVIRONMENT] [BRANCH]"\n| +
-          %|You can set default environments and branches in ey.yml|
-      end
-    end
-  end
-end

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format specdoc