engineyard 0.5.2 → 0.5.3

data/lib/engineyard.rb

@@ -1,7 +1,6 @@
 module EY
   require 'engineyard/ruby_ext'
-
-  VERSION = "0.5.2"
+  require 'engineyard/version'
 
   autoload :API,        'engineyard/api'
   autoload :Collection, 'engineyard/collection'

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)
-      EYSD_VERSION = "~>0.5.0"
+      EYSD_VERSION = "~>0.6.0"
       CHECK_SCRIPT = <<-SCRIPT
 require "rubygems"
 requirement = Gem::Requirement.new("#{EYSD_VERSION}")
@@ -31,7 +31,11 @@ exit(17) # required_version < current_version
 
 
       def deploy(app, ref, migration_command=nil, extra_configuration=nil)
-        deploy_args = ['--app', app.name, '--branch', ref]
+        deploy_args = [
+          '--app', app.name,
+          '--repo', app.repository_uri,
+          '--branch', ref,
+        ]
 
         if extra_configuration
           deploy_args << '--config' << extra_configuration.to_json

data/lib/engineyard/version.rb

@@ -0,0 +1,3 @@
+module EY
+  VERSION = '0.5.3'
+end

data/spec/ey/deploy_spec.rb

@@ -34,6 +34,7 @@ describe "ey deploy" do
 
   def verify_ran(scenario)
     @out.should match(/Running deploy for '#{scenario[:environment]}'/)
+    @ssh_commands.should have_command_like(/eysd deploy/)
   end
 
   # common behavior
@@ -201,7 +202,8 @@ describe "ey deploy" do
 
     it "allows you to specify an app when not in a directory" do
       ey "deploy --app rails232app --ref master"
-      @ssh_commands.last.should match(/deploy --app rails232app --branch master --migrate 'rake db:migrate'/)
+      @ssh_commands.last.should match(/--app rails232app/)
+      @ssh_commands.last.should match(/--branch master/)
     end
 
     it "requires that you specify a ref when specifying the application" do
@@ -209,4 +211,11 @@ describe "ey deploy" do
       @err.should match(/you must also specify the ref to deploy/)
     end
   end
+
+  it "passes along the repository URL to eysd" do
+    api_scenario "one app, one environment", "user@git.host:path/to/repo.git"
+    ey "deploy"
+    @ssh_commands.last.should =~ /--repo user@git.host:path\/to\/repo.git/
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -07:00
+date: 2010-06-18 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,6 +128,7 @@ files:
 - lib/engineyard/repo.rb
 - lib/engineyard/ruby_ext.rb
 - lib/engineyard/thor.rb
+- lib/engineyard/version.rb
 - lib/engineyard.rb
 - LICENSE
 - README.rdoc