bosh_cli 1.2862.0 → 1.2865.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6632e97dece90f263f31c48a3dc26c0d8a78418
-  data.tar.gz: a90267167a7b9fcccae9e230f9f04fb6d73b74db
+  metadata.gz: 7bd312c4c998f31d9f79fd35a586deb701246207
+  data.tar.gz: 4f052201dbc90e01f5d1759919863aecd43b86d8
 SHA512:
-  metadata.gz: 74f44fc32b7474ccf75efbb535df69e1c4cdb0adab9889db57f17c7c272c7c6459abf80e79304a8b77df84469418aa22af54e615a9e0d3323ca360d803967d5c
-  data.tar.gz: 397d67a70fa1f2ebeeeee8f768d640801882ef5a16331d8e7a0ec092480f72969b85085e43656ab69b7327442175a958a55bb703c3cff156e750668604913896
+  metadata.gz: 236e568970014d4abab3d2ace8a42f6743cf1ee1abed16574ee8eab88fcf76c15f412fb05d3afb017cf65a2fccede4451bba88dbde25f0ca1ded9f28c3a94048
+  data.tar.gz: 63c9739f69ca88620c607c46f20123cc20475fb1d6c4ad339412475b990b121bdc8528e1b89edd8c202aa026971d7b4b7eefada5fb6da96feb7bdeb23ff86428

data/lib/cli/client/director.rb

@@ -64,6 +64,12 @@ module Bosh
           end
         end
 
+        def login(username, password)
+          self.user = username
+          self.password = password
+          authenticated?
+        end
+
         def authenticated?
           status = get_status
           # Backward compatibility: older directors return 200

data/lib/cli/commands/login.rb

@@ -0,0 +1,35 @@
+require 'cli/terminal'
+require 'cli/login_service'
+
+module Bosh::Cli::Command
+  class Login < Base
+    # bosh login
+    usage "login"
+    desc  "Log in to currently targeted director. " +
+          "The username and password can also be " +
+          "set in the BOSH_USER and BOSH_PASSWORD " +
+          "environment variables."
+    def login(username = nil, password = nil)
+      target_required
+
+      terminal = Bosh::Cli::Terminal.new(HighLine.new)
+      Bosh::Cli::LoginService.new(terminal, director, config, interactive?).login(target, username.to_s, password.to_s)
+    end
+
+    # bosh logout
+    usage "logout"
+    desc  "Forget saved credentials for targeted director"
+    def logout
+      target_required
+      config.set_credentials(target, nil, nil)
+      config.save
+      say("You are no longer logged in to `#{target}'".make_yellow)
+    end
+
+    private
+
+    def get_director_status
+      Bosh::Cli::Client::Director.new(target).get_status
+    end
+  end
+end

data/lib/cli/commands/misc.rb

@@ -62,63 +62,6 @@ module Bosh::Cli::Command
       end
     end
 
-    # bosh login
-    usage "login"
-    desc  "Log in to currently targeted director. " +
-          "The username and password can also be " +
-          "set in the BOSH_USER and BOSH_PASSWORD " +
-          "environment variables."
-    def login(username = nil, password = nil)
-      target_required
-
-      if interactive?
-        username = ask("Your username: ").to_s if username.blank?
-
-        password_retries = 0
-        while password.blank? && password_retries < 3
-          password = ask("Enter password: ") { |q| q.echo = "*" }.to_s
-          password_retries += 1
-        end
-      end
-
-      if username.blank? || password.blank?
-        err("Please provide username and password")
-      end
-      logged_in = false
-
-      #Converts HighLine::String to String
-      username = username.to_s
-      password = password.to_s
-
-      director.user = username
-      director.password = password
-
-      if director.authenticated?
-        say("Logged in as `#{username}'".make_green)
-        logged_in = true
-      elsif non_interactive?
-        err("Cannot log in as `#{username}'".make_red)
-      else
-        say("Cannot log in as `#{username}', please try again".make_red)
-        login(username)
-      end
-
-      if logged_in
-        config.set_credentials(target, username, password)
-        config.save
-      end
-    end
-
-    # bosh logout
-    usage "logout"
-    desc  "Forget saved credentials for targeted director"
-    def logout
-      target_required
-      config.set_credentials(target, nil, nil)
-      config.save
-      say("You are no longer logged in to `#{target}'".make_yellow)
-    end
-
     # bosh target
     usage "target"
     desc  "Choose director to talk to (optionally creating an alias). " +

data/lib/cli/config.rb

@@ -158,15 +158,44 @@ module Bosh::Cli
       @config_file["deployment"][target] = deployment_file_path
     end
 
-    [:target, :target_name, :target_version, :release,
-     :target_uuid].each do |attr|
-      define_method attr do
-        read(attr, false)
-      end
+    def target
+      read(:target, false)
+    end
 
-      define_method "#{attr}=" do |value|
-        write_global(attr, value)
-      end
+    def target=(value)
+      write_global(:target, value)
+    end
+
+    def target_name
+      read(:target_name, false)
+    end
+
+    def target_name=(value)
+      write_global(:target_name, value)
+    end
+
+    def target_version
+      read(:target_version, false)
+    end
+
+    def target_version=(value)
+      write_global(:target_version, value)
+    end
+
+    def release
+      read(:release, false)
+    end
+
+    def release=(value)
+      write_global(:release, value)
+    end
+
+    def target_uuid
+      read(:target_uuid, false)
+    end
+
+    def target_uuid=(value)
+      write_global(:target_uuid, value)
     end
 
     # Read the max parallel downloads configuration.

data/lib/cli/login_service.rb

@@ -0,0 +1,40 @@
+require 'highline'
+require 'cli/core_ext'
+require 'cli/errors'
+
+module Bosh
+  module Cli
+    class LoginService
+      def initialize(terminal, director, config, interactive)
+        @terminal = terminal
+        @director = director
+        @config = config
+        @interactive = interactive
+      end
+
+      def login(target, username, password)
+        if @interactive
+          username = @terminal.ask("Your username: ") if username.blank?
+          password = @terminal.ask_password("Enter password: ") if password.blank?
+        end
+
+        if username.blank? || password.blank?
+          raise Bosh::Cli::CliError.new("Please provide username and password")
+        end
+
+        if @director.login(username, password)
+          @terminal.say_green("Logged in as `#{username}'")
+          @config.set_credentials(target, username, password)
+          @config.save
+        else
+          if @interactive
+            @terminal.say_red("Cannot log in as `#{username}', please try again")
+            login(target, username, '')
+          else
+            raise Bosh::Cli::CliError.new("Cannot log in as `#{username}'")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cli/terminal.rb

@@ -0,0 +1,30 @@
+module Bosh
+  module Cli
+    class Terminal
+      extend Forwardable
+
+      def initialize(highline)
+        @highline = highline
+      end
+
+      def ask(prompt)
+        highline.ask(prompt).to_s # make sure we return a String not a HighLine::String
+      end
+
+      def ask_password(prompt)
+        highline.ask(prompt) { |q| q.echo = false }.to_s
+      end
+
+      def say_green(message)
+        highline.say(message.make_green)
+      end
+
+      def say_red(message)
+        highline.say(message.make_red)
+      end
+
+      private
+      attr_reader :highline
+    end
+  end
+end

data/lib/cli/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.2862.0'
+    VERSION = '1.2865.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: 1.2862.0
+  version: 1.2865.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2862.0
+        version: 1.2865.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: 0.5.4
 description: |-
   BOSH CLI
-  c8ad5c
+  14ebaf
 email: support@cloudfoundry.com
 executables:
 - bosh
@@ -231,6 +231,7 @@ files:
 - lib/cli/commands/job_rename.rb
 - lib/cli/commands/locks.rb
 - lib/cli/commands/log_management.rb
+- lib/cli/commands/login.rb
 - lib/cli/commands/maintenance.rb
 - lib/cli/commands/misc.rb
 - lib/cli/commands/package.rb
@@ -266,6 +267,7 @@ files:
 - lib/cli/job_property_validator.rb
 - lib/cli/job_state.rb
 - lib/cli/line_wrap.rb
+- lib/cli/login_service.rb
 - lib/cli/logs_downloader.rb
 - lib/cli/manifest_warnings.rb
 - lib/cli/name_version_pair.rb
@@ -293,6 +295,7 @@ files:
 - lib/cli/task_tracking/task_log_renderer.rb
 - lib/cli/task_tracking/task_tracker.rb
 - lib/cli/task_tracking/total_duration.rb
+- lib/cli/terminal.rb
 - lib/cli/validation.rb
 - lib/cli/version.rb
 - lib/cli/versions/local_artifact_storage.rb