engineyard 1.3.33 → 1.4.0

data/README.rdoc

@@ -16,7 +16,7 @@ The ey.yml file allows options to be saved for each environment to which an appl
         migration_command: rake fancy:migrate
         branch: deploy
 
-This ey.yml file wile turn off default migrations, set the default command to "rake fancy:migrate" and set the default deploy branch to "deploy".
+This ey.yml file will turn off default migrations, set the default command to "rake fancy:migrate" and set the default deploy branch to "deploy".
 
 == Commands
 

data/lib/engineyard/api.rb

@@ -41,6 +41,10 @@ module EY
       apps.find_all {|a| repo.has_remote?(a.repository_uri) }
     end
 
+    def user
+      EY::Model::User.from_hash(request('/current_user')['user'])
+    end
+
     class InvalidCredentials < EY::Error; end
     class RequestFailed < EY::Error; end
 

data/lib/engineyard/cli.rb

@@ -345,5 +345,11 @@ module EY
       environment.launch
     end
 
+    desc "whoami", "Who am I logged in as?"
+    def whoami
+      user = api.user
+      EY.ui.say "#{user.name} (#{user.email})"
+    end
+
   end # CLI
 end # EY

data/lib/engineyard/model.rb

@@ -7,5 +7,6 @@ module EY
     autoload :Environment,   'engineyard/model/environment'
     autoload :Log,           'engineyard/model/log'
     autoload :Instance,      'engineyard/model/instance'
+    autoload :User,          'engineyard/model/user'
   end
 end

data/lib/engineyard/model/user.rb

@@ -0,0 +1,6 @@
+module EY
+  module Model
+    class User < ApiStruct.new(:id, :name, :email)
+    end
+  end
+end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.33'
+  VERSION = '1.4.0'
 end

data/spec/ey/deploy_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'net/ssh'
 
 describe "ey deploy without an eyrc file" do
 

data/spec/ey/whoami_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe "ey whoami" do
+  context "logged in" do
+    given "integration"
+
+    before(:all) do
+      api_scenario "empty"
+    end
+
+    it "outputs the currently logged in user" do
+      ey %w[whoami]
+      @out.should include("User (test@test.test)")
+    end
+  end
+
+  context "not logged in" do
+    given "integration without an eyrc file"
+
+    before(:each) do
+      FileUtils.rm_rf(ENV['EYRC'])
+      api_scenario "empty"
+    end
+
+    it "prompts for authentication before outputting the logged in user" do
+      ey(%w[whoami], :hide_err => true) do |input|
+        input.puts("test@test.test")
+        input.puts("test")
+      end
+
+      @out.should include("We need to fetch your API token; please log in.")
+      @out.should include("Email:")
+      @out.should include("Password:")
+
+      @out.should include("User (test@test.test)")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ EY_ROOT = File.expand_path("../..", __FILE__)
 require 'rubygems'
 require 'bundler/setup'
 require 'escape'
+require 'net/ssh'
 
 # Bundled gems
 require 'fakeweb'

data/spec/support/fake_awsm.ru

@@ -43,6 +43,10 @@ class FakeAwsm < Sinatra::Base
     {"ok" => "true"}.to_json
   end
 
+  get "/api/v2/current_user" do
+    { "user" => { "id" => 1, "name" => "User", "email" => "test@test.test" } }.to_json
+  end
+
   get "/api/v2/apps" do
     raise('No user agent header') unless env['HTTP_USER_AGENT'] =~ %r#^EngineYardCLI/#
     {"apps" => @@cloud_mock.apps}.to_json

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 33
-  version: 1.3.33
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -04:00
+date: 2011-10-07 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
   type: :runtime
-  name: thor
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,9 +35,9 @@ dependencies:
         version: 0.14.6
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: rest-client
   prerelease: false
   type: :runtime
-  name: rest-client
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,9 +51,9 @@ dependencies:
         version: 1.6.0
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
   type: :runtime
-  name: highline
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,9 +67,9 @@ dependencies:
         version: 1.6.1
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: json_pure
   prerelease: false
   type: :runtime
-  name: json_pure
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,9 +81,9 @@ dependencies:
         version: "0"
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: escape
   prerelease: false
   type: :runtime
-  name: escape
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,25 +97,25 @@ dependencies:
         version: 0.0.4
   requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: engineyard-serverside-adapter
   prerelease: false
   type: :runtime
-  name: engineyard-serverside-adapter
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 3
         segments: 
         - 1
-        - 4
-        - 16
-        version: 1.4.16
+        - 5
+        - 0
+        version: 1.5.0
   requirement: *id006
 - !ruby/object:Gem::Dependency 
+  name: net-ssh
   prerelease: false
   type: :runtime
-  name: net-ssh
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,9 +129,9 @@ dependencies:
         version: 2.1.0
   requirement: *id007
 - !ruby/object:Gem::Dependency 
+  name: launchy
   prerelease: false
   type: :runtime
-  name: launchy
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,9 +145,9 @@ dependencies:
         version: 2.0.5
   requirement: *id008
 - !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
   type: :development
-  name: rspec
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -161,9 +161,9 @@ dependencies:
         version: 1.3.0
   requirement: *id009
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
   type: :development
-  name: rake
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -175,9 +175,9 @@ dependencies:
         version: "0"
   requirement: *id010
 - !ruby/object:Gem::Dependency 
+  name: fakeweb
   prerelease: false
   type: :development
-  name: fakeweb
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -189,9 +189,9 @@ dependencies:
         version: "0"
   requirement: *id011
 - !ruby/object:Gem::Dependency 
+  name: fakeweb-matcher
   prerelease: false
   type: :development
-  name: fakeweb-matcher
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -203,9 +203,9 @@ dependencies:
         version: "0"
   requirement: *id012
 - !ruby/object:Gem::Dependency 
+  name: fakefs
   prerelease: false
   type: :development
-  name: fakefs
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -217,9 +217,9 @@ dependencies:
         version: "0"
   requirement: *id013
 - !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
   type: :development
-  name: sinatra
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -231,9 +231,9 @@ dependencies:
         version: "0"
   requirement: *id014
 - !ruby/object:Gem::Dependency 
+  name: realweb
   prerelease: false
   type: :development
-  name: realweb
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -247,9 +247,9 @@ dependencies:
         version: 0.1.6
   requirement: *id015
 - !ruby/object:Gem::Dependency 
+  name: open4
   prerelease: false
   type: :development
-  name: open4
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -291,6 +291,7 @@ files:
 - lib/engineyard/model/environment.rb
 - lib/engineyard/model/instance.rb
 - lib/engineyard/model/log.rb
+- lib/engineyard/model/user.rb
 - lib/engineyard/model.rb
 - lib/engineyard/repo.rb
 - lib/engineyard/resolver.rb
@@ -326,6 +327,7 @@ files:
 - spec/ey/status_spec.rb
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
+- spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru
@@ -377,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud
@@ -407,6 +409,7 @@ test_files:
 - spec/ey/status_spec.rb
 - spec/ey/web/disable_spec.rb
 - spec/ey/web/enable_spec.rb
+- spec/ey/whoami_spec.rb
 - spec/spec_helper.rb
 - spec/support/bundled_ey
 - spec/support/fake_awsm.ru