engineyard 1.4.20 → 1.4.21

data/lib/engineyard/cli.rb

@@ -357,5 +357,21 @@ module EY
       EY.ui.say "#{user.name} (#{user.email})"
     end
 
+    desc "login", "Log in and verify access to EY Cloud."
+    def login
+      whoami
+    end
+
+    desc "logout", "Remove the current API key from ~/.eyrc or env $EYRC"
+    def logout
+      eyrc = EYRC.load
+      if eyrc.delete_api_token
+        EY.ui.say "API token removed: #{eyrc.path}"
+        EY.ui.say "Run any other command to login again."
+      else
+        EY.ui.say "Already logged out. Run any other command to login again."
+      end
+    end
+
   end # CLI
 end # EY

data/lib/engineyard/eyrc.rb

@@ -16,6 +16,10 @@ module EY
       path.exist?
     end
 
+    def delete_api_token
+      delete('api_token')
+    end
+
     def api_token
       self['api_token']
     end
@@ -35,17 +39,24 @@ module EY
     end
 
     def []=(key,val)
-      merge_and_write(key.to_s => val)
+      new_data = read_data.merge(key.to_s => val)
+      write_data new_data
       val
     end
 
+    def delete(key)
+      data = read_data.dup
+      res = data.delete(key)
+      write_data data
+      res
+    end
+
     def read_data
       exist? && YAML.load(path.read) || {}
     end
 
-    def merge_and_write(new_data)
-      to_write = read_data.merge(new_data)
-      path.open("w") {|f| YAML.dump(to_write, f) }
+    def write_data(new_data)
+      path.open("w") {|f| YAML.dump(new_data, f) }
     end
 
   end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.4.20'
+  VERSION = '1.4.21'
 end

data/spec/engineyard/eyrc_spec.rb

@@ -41,6 +41,11 @@ describe EY::EYRC do
       EY::EYRC.load.api_token.should == 'abcd'
     end
 
+    it "deletes the api_token" do
+      EY::EYRC.load.delete_api_token
+      EY::EYRC.load.api_token.should be_nil
+    end
+
     it "writes the api_token to api_token: .eyrc" do
       read_yaml(ENV['EYRC']).should == {"api_token" => "abcd"}
     end
@@ -57,6 +62,11 @@ describe EY::EYRC do
       EY::EYRC.load.api_token.should == 'abcd'
     end
 
+    it "deletes the api token safely on logout" do
+      EY::EYRC.load.delete_api_token
+      read_yaml(ENV['EYRC']).should == {"http://localhost/" => {"api_token" => "5678"}}
+    end
+
     it "maintains other random info in the file" do
       read_yaml(ENV['EYRC']).should == {"api_token" => "abcd", "http://localhost/" => {"api_token" => "5678"}}
     end

data/spec/ey/login_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "ey login" do
+  context "logged in" do
+    given "integration"
+
+    it "returns the logged in user name" do
+      ey %w[login]
+      @out.should include("User Name (test@test.test)")
+    end
+  end
+
+  context "not logged in" do
+    given "integration without an eyrc file"
+
+    it "prompts for authentication before outputting the logged in user" do
+      ey(%w[login], :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 Name (test@test.test)")
+    end
+  end
+end

data/spec/ey/logout_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe "ey logout" do
+  context "logged in" do
+    given "integration"
+
+    it "logs you out" do
+      ey %w[logout]
+      @out.should include("API token removed: #{ENV['EYRC']}")
+      @out.should include("Run any other command to login again.")
+    end
+  end
+
+  context "not logged in" do
+    given "integration without an eyrc file"
+
+    it "prompts for authentication before outputting the logged in user" do
+      ey %w[logout]
+      @out.should_not include("API token removed:")
+      @out.should include("Already logged out.")
+      @out.should include("Run any other command to login again.")
+    end
+  end
+end

data/spec/ey/whoami_spec.rb

@@ -4,10 +4,6 @@ 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 Name (test@test.test)")
@@ -17,10 +13,6 @@ describe "ey whoami" do
   context "not logged in" do
     given "integration without an eyrc file"
 
-    before(:each) do
-      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")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 1
   - 4
-  - 20
-  version: 1.4.20
+  - 21
+  version: 1.4.21
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +31,12 @@ dependencies:
         - 14
         - 6
         version: 0.14.6
-  requirement: *id001
-  type: :runtime
-  prerelease: false
   name: thor
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +47,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  requirement: *id002
-  type: :runtime
-  prerelease: false
   name: rest-client
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +63,12 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  requirement: *id003
-  type: :runtime
-  prerelease: false
   name: highline
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,12 +77,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  type: :runtime
-  prerelease: false
   name: json_pure
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,12 +93,12 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  requirement: *id005
-  type: :runtime
-  prerelease: false
   name: escape
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -107,12 +109,12 @@ dependencies:
         - 5
         - 25
         version: 1.5.25
-  requirement: *id006
-  type: :runtime
-  prerelease: false
   name: engineyard-serverside-adapter
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -123,12 +125,12 @@ dependencies:
         - 2
         - 1
         version: 2.2.1
-  requirement: *id007
-  type: :runtime
-  prerelease: false
   name: net-ssh
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -139,12 +141,12 @@ dependencies:
         - 0
         - 5
         version: 2.0.5
-  requirement: *id008
-  type: :runtime
-  prerelease: false
   name: launchy
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -154,12 +156,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  requirement: *id009
-  type: :development
-  prerelease: false
   name: rspec
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +170,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
-  type: :development
-  prerelease: false
   name: rake
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,12 +184,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
-  type: :development
-  prerelease: false
   name: rdoc
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,12 +198,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
-  type: :development
-  prerelease: false
   name: fakeweb
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,12 +212,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
-  type: :development
-  prerelease: false
   name: fakeweb-matcher
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -224,12 +226,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id014
-  type: :development
-  prerelease: false
   name: sinatra
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -240,12 +242,12 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
-  requirement: *id015
-  type: :development
-  prerelease: false
   name: realweb
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -256,10 +258,8 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  requirement: *id016
-  type: :development
-  prerelease: false
   name: open4
+  version_requirements: *id016
 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: 
@@ -317,6 +317,8 @@ files:
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
 - spec/ey/list_environments_spec.rb
+- spec/ey/login_spec.rb
+- spec/ey/logout_spec.rb
 - spec/ey/logs_spec.rb
 - spec/ey/rebuild_spec.rb
 - spec/ey/recipes/apply_spec.rb
@@ -379,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Command-line deployment for the Engine Yard cloud
@@ -400,6 +402,8 @@ test_files:
 - spec/ey/deploy_spec.rb
 - spec/ey/ey_spec.rb
 - spec/ey/list_environments_spec.rb
+- spec/ey/login_spec.rb
+- spec/ey/logout_spec.rb
 - spec/ey/logs_spec.rb
 - spec/ey/rebuild_spec.rb
 - spec/ey/recipes/apply_spec.rb