appfog-vmc-plugin 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGVhOWJhZTE0YTg0NzI4MTQxYTNmYjM3MDVkMjhlMGVmMWQ5MGJmMg==
+    MTczYWIxZmFjYWY0NjBkYjU3MGJhODc0MGY3OWU3NjE3NmY1ZjFkMQ==
   data.tar.gz: !binary |-
-    NWI0Y2EzZjVkYTEzNzQ1MzY3NzBlZmY1OGUxNjEwNTM3MjY3Y2VkYQ==
+    NjAxZTA3N2Q2MTg3NWU1N2U5YTdjMTdiODM4ZWU4OTNjYTgzMGNkMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzBmMjEyNGRmZTk2MjEyYWZkMTQ0ZDQ3MzYxMjUyMzMyYzQwNzM3YzE5MWNi
-    YWYzNTMwOWJhZWRlZGZkMWEwM2U2Mzg5MDg4MDAyYTJiNWNlNjg1NjFhMDZj
-    MjY4YTQyYzA4MmI0YzRmYmU0Y2JkZmVkYTliOWIyNzllZDUzZjE=
+    YjI3YzEzY2E0NzljODFkZjEwYWMzNzg4NDVhMjM1ZDM0ODQ2ZmQ3MWM5M2Yz
+    Nzg5OWQ4ZTg3YzZmZjc5NzRhYjkzMTdjNmM3Y2NmYzY1MmJlOWI1Mzg1MWQz
+    N2Q3Njc3Y2MxMzQzZmEzOGYxNTRlMzQ4ZGZmZGRjYjA1NGNiY2Q=
   data.tar.gz: !binary |-
-    MzgzYTdkZTU5OGM0YjRkN2RiY2IxYWE3MWVhN2NmZmMyMDQwMGMwMzUyY2Iw
-    M2VlZmJhZmM3ODIxNGE3MTJlNzdmZTFlZTU3ZDNlYWU1NDY3YjVhYTJjMGEx
-    YmUxM2MzNDU0ZmJlMWQzZmNhZWVlZjc1ODg4MDE3ZDdlMDY5NWI=
+    Mjc4OWYwMjQwMzE2NWQwNzMyMmNiMzI2ZTliNmQzNTY4N2VjZDQ5OTU4OTll
+    ZjJhMTkwYzdiM2NhYzZlNDFjYmZjMzVlOGYxYTE0MDRmYTk0OTZiOTRkZDEz
+    YWU1ODY1OTkxYjhkMjViMWY3MjkwNjBjZmIzMDk4MTg0NzU1MDI=

data/lib/appfog-vmc-plugin/non_uaa.rb

@@ -23,23 +23,15 @@ module CFoundry
 
   module LoginHelpers
     def login_prompts
-      if @base.uaa
-        @base.uaa.prompts
-      else
-        {
-          :username => %w[text Email],
-          :password => %w[password Password]
-        }
-      end
+      {
+        :username => %w[text Email],
+        :password => %w[password Password]
+      }
     end
 
     def login(username, password)
       token =
-        if @base.uaa
-          AuthToken.from_uaa_token_info(@base.uaa.authorize(username, password))
-        else
-          AuthToken.from_cc_token(@base.create_token({:password => password}, username)[:token])
-        end
+        AuthToken.from_cc_token(@base.create_token({:password => password}, username)[:token])
 
       @base.token = token
     end

data/lib/appfog-vmc-plugin/version.rb

@@ -1,3 +1,3 @@
 module VMCAppfog
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 end

data/lib/appfog-vmc-plugin/vmc/start/login.rb

@@ -0,0 +1,94 @@
+require "vmc/cli/start/base"
+require "vmc/cli/start/target_interactions"
+
+module VMC::Start
+  class Login < Base
+    desc "Authenticate with the target"
+    group :start
+    input :username, :value => :email, :desc => "Account email",
+          :alias => "--email", :argument => :optional
+    input :password, :desc => "Account password"
+    input :organization, :desc => "Organization" , :aliases => %w{--org -o},
+          :from_given => by_name(:organization)
+    input :space, :desc => "Space", :alias => "-s",
+          :from_given => by_name(:space)
+    interactions TargetInteractions
+    def login
+      show_context
+
+      credentials =
+        { :username => input[:username],
+          :password => input[:password]
+        }
+
+      prompts = client.login_prompts
+
+      # ask username first
+      if prompts.key? :username
+        type, label = prompts.delete :username
+        credentials[:username] ||= ask_prompt(type, label)
+      end
+
+      info = target_info
+
+      auth_token = nil
+      authenticated = false
+      failed = false
+      remaining_attempts = 3
+      until authenticated || remaining_attempts <= 0
+        remaining_attempts -= 1
+        unless force?
+          ask_prompts(credentials, prompts)
+        end
+
+        with_progress("Authenticating") do |s|
+          begin
+            auth_token = client.login(credentials[:username], credentials[:password])
+            authenticated = true
+          rescue CFoundry::Denied, CFoundry::Forbidden
+            return if force?
+
+            s.fail do
+              failed = true
+              credentials.delete(:password)
+            end
+          end
+        end
+      end
+
+      if authenticated
+        info.merge!(auth_token.to_hash)
+        save_target_info(info)
+        invalidate_client
+
+        if v2?
+          line if input.interactive?(:organization) || input.interactive?(:space)
+          select_org_and_space(input, info)
+        end
+
+        save_target_info(info)
+      end
+    ensure
+      exit_status 1 if not authenticated
+    end
+
+    private
+
+    def ask_prompts(credentials, prompts)
+      prompts.each do |name, meta|
+        type, label = meta
+        credentials[name] ||= ask_prompt(type, label)
+      end
+    end
+
+    def ask_prompt(type, label)
+      if type == "password"
+        options = { :echo => "*", :forget => true }
+      else
+        options = {}
+      end
+
+      ask(label, options)
+    end
+  end
+end

data/lib/appfog-vmc-plugin/vmc/user/base.rb

@@ -0,0 +1,16 @@
+module VMC
+  module User
+    class Base < CLI
+      def precondition
+        check_logged_in
+      end
+
+      private
+
+      def validate_password!(password)
+        validate_password_verified!(password)
+        # validate_password_strength!(password)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appfog-vmc-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Tim Santeford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 description: ! "\n    AppFog specific plugins for the AF CLI\n  "
 email:
 - support@appfog.com
@@ -62,6 +62,8 @@ files:
 - lib/appfog-vmc-plugin/version.rb
 - lib/appfog-vmc-plugin/vmc/app/apps.rb
 - lib/appfog-vmc-plugin/vmc/app/instances.rb
+- lib/appfog-vmc-plugin/vmc/start/login.rb
+- lib/appfog-vmc-plugin/vmc/user/base.rb
 - lib/appfog-vmc-plugin/vmc.rb
 homepage: http://www.appfog.com/
 licenses: []