vmc 0.4.0.beta.46 → 0.4.0.beta.47

data/vmc-ng/lib/vmc/cli/user.rb

@@ -61,28 +61,30 @@ module VMC
 
     desc "Update a user's password"
     group :admin, :user, :hidden => true
-    input(:email, :argument => true, :desc => "User to update") {
-      ask("Email")
+    input(:user, :argument => :optional, :desc => "User to update") {
+      client.current_user
     }
     input(:password, :desc => "New password") {
-      ask("Password", :echo => "*", :forget => true)
+      ask("Current Password", :echo => "*", :forget => true)
+    }
+    input(:new_password, :desc => "New password") {
+      ask("New Password", :echo => "*", :forget => true)
     }
     input(:verify, :desc => "Repeat new password") {
       ask("Verify Password", :echo => "*", :forget => true)
     }
     def passwd
-      email = input[:email]
+      user = input[:user]
       password = input[:password]
+      new_password = input[:new_password]
       verify = input[:verify]
 
-      if password != verify
+      if new_password != verify
         fail "Passwords don't match."
       end
 
       with_progress("Changing password") do
-        user = client.user(email)
-        user.password = password
-        user.update!
+        user.change_password!(new_password, password)
       end
     end
 

data/vmc-ng/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.46"
+  VERSION = "0.4.0.beta.47"
 end

data/vmc/lib/cli/frameworks.rb

@@ -86,7 +86,7 @@ module VMC::Cli
               next if matched_file
               File.open(fname, 'r') do |f|
                 str = f.read # This might want to be limited
-                matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra['"(\/base['"])]/))
+                matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra(\/base)?['"]/))
               end
             end
             if matched_file

data/vmc/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.20'
+    VERSION = '0.3.21'
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1875048273
+  hash: 3780277393
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 46
-  version: 0.4.0.beta.46
+  - 47
+  version: 0.4.0.beta.47
 platform: ruby
 authors: 
 - VMware