vmc 0.5.0.beta.5 → 0.5.0.beta.6

data/lib/vmc/cli.rb

@@ -38,6 +38,9 @@ module VMC
     option :force, :desc => "Skip interaction when possible", :alias => "-f",
       :type => :boolean, :default => proc { input[:script] }
 
+    option :debug, :desc => "Print full stack trace (instead of crash log)",
+           :type => :boolean, :default => false
+
     option :quiet, :desc => "Simplify output format", :alias => "-q",
       :type => :boolean, :default => proc { input[:script] }
 
@@ -137,6 +140,7 @@ module VMC
       msg << ": #{e}" unless e.to_s.empty?
       msg << "\nFor more information, see #{VMC::CRASH_FILE}"
       err msg
+      raise if debug?
     end
 
     def log_error(e)
@@ -173,6 +177,10 @@ module VMC
       input[:force]
     end
 
+    def debug?
+      !!input[:debug]
+    end
+
     def color_enabled?
       input[:color]
     end

data/lib/vmc/cli/start/register.rb

@@ -18,12 +18,21 @@ module VMC::Start
         fail "Passwords do not match."
       end
 
-      with_progress("Creating user") do
-        client.register(email, password)
-      end
+      pw_strength = client.base.uaa.password_score(password)
+      msg = "Your password strength is: #{pw_strength}"
+
+      if pw_strength == :weak
+        fail msg
+      else
+        line msg
+
+        with_progress("Creating user") do
+          client.register(email, password)
+        end
 
-      if input[:login]
-        invoke :login, :username => email, :password => password
+        if input[:login]
+          invoke :login, :username => email, :password => password
+        end
       end
     end
 

data/lib/vmc/cli/user/passwd.rb

@@ -23,15 +23,24 @@ module VMC::User
       verify = input[:verify]
 
       if new_password != verify
-        fail "Passwords don't match."
+        fail "Passwords do not match."
       end
 
-      with_progress("Changing password") do
-        if v2?
-          user.change_password!(new_password, password)
-        else
-          user.password = new_password
-          user.update!
+      pw_strength = client.base.uaa.password_score(new_password)
+      msg = "Your password strength is: #{pw_strength}"
+
+      if pw_strength == :weak
+        fail msg
+      else
+        line msg
+
+        with_progress("Changing password") do
+          if v2?
+            user.change_password!(new_password, password)
+          else
+            user.password = new_password
+            user.update!
+          end
         end
       end
     end

data/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.5.0.beta.5".freeze
+  VERSION = "0.5.0.beta.6".freeze
 end

data/spec/features/new_user_flow_spec.rb

@@ -6,7 +6,7 @@ if ENV['VMC_TEST_USER'] && ENV['VMC_TEST_PASSWORD'] && ENV['VMC_TEST_TARGET']
     let(:username) { ENV['VMC_TEST_USER'] }
     let(:password) { ENV['VMC_TEST_PASSWORD'] }
     let(:output) { StringIO.new }
-    let(:out) { output.string.gsub(/\.  \x08([\x08\. ]+)/, "... ") } # trim animated dots
+    let(:out) { output.string.strip_progress_dots }
 
     let(:app) {
       fuzz =

data/spec/spec_helper.rb

@@ -19,6 +19,10 @@ class String
     indent = min ? min.size : 0
     gsub(/^[ \t]{#{indent}}/, '')
   end
+
+  def strip_progress_dots
+    gsub(/\.  \x08([\x08\. ]+)/, "... ")
+  end
 end
 
 def with_output_to(output = StringIO.new)

data/spec/support/common_input_examples.rb

@@ -0,0 +1,14 @@
+shared_examples_for 'inputs must have descriptions' do
+  describe 'inputs' do
+    subject { command.inputs }
+
+    it "is not missing any descriptions" do
+      subject.each do |_, attrs|
+        next if attrs[:hidden]
+
+        expect(attrs[:description]).to be
+        expect(attrs[:description].strip).to_not be_empty
+      end
+    end
+  end
+end

data/spec/support/feature_helpers.rb

@@ -1,7 +1,7 @@
 def vmc_ok(argv)
   with_output_to do |out|
     code = VMC::CLI.start(argv + ["--no-script"])
-    yield strip_progress_dots(out.string) if block_given?
+    yield out.string.strip_progress_dots if block_given?
     expect(code).to eq 0
   end
 end
@@ -9,11 +9,7 @@ end
 def vmc_fail(argv)
   with_output_to do |out|
     code = VMC::CLI.start(argv + ["--no-script"])
-    yield strip_progress_dots(out.string) if block_given?
+    yield out.string.strip_progress_dots if block_given?
     expect(code).to eq 1
   end
 end
-
-def strip_progress_dots(str)
-  str.gsub(/\.  \x08([\x08\. ]+)/, "... ")
-end

data/spec/vmc/cli/app/delete_spec.rb

@@ -27,18 +27,7 @@ describe VMC::App::Delete do
       it { expect(Mothership::Help.group(:apps, :manage)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |input, attrs|
-          next if attrs[:hidden]
-
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/app/push_spec.rb

@@ -25,16 +25,7 @@ describe VMC::App::Push do
       it { expect(Mothership::Help.group(:apps, :manage)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |input, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/app/rename_spec.rb

@@ -27,16 +27,7 @@ describe VMC::App::Rename do
       it { expect(Mothership::Help.group(:apps, :manage)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |input, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/organization/orgs_spec.rb

@@ -34,16 +34,7 @@ describe VMC::Organization::Orgs do
       it { expect(Mothership::Help.group(:organizations)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |_, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/route/delete_route_spec.rb

@@ -25,6 +25,8 @@ describe VMC::Route::Delete do
       it { expect(Mothership::Help.group(:routes)).to include(subject) }
     end
 
+    include_examples 'inputs must have descriptions'
+
     describe 'inputs' do
       subject { command.inputs }
       it { expect(subject[:route][:description]).to eq "Route to delete" }

data/spec/vmc/cli/service/bind_spec.rb

@@ -10,16 +10,7 @@ describe VMC::Service::Bind do
       it { expect(Mothership::Help.group(:services, :manage)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |_, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/service/delete_spec.rb

@@ -10,17 +10,7 @@ describe VMC::Service::Delete do
       it { expect(Mothership::Help.group(:services, :manage)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |_, attrs|
-          next if attrs[:hidden]
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/service/rename_spec.rb

@@ -27,16 +27,7 @@ describe VMC::Service::Rename do
       it { expect(Mothership::Help.group(:services, :manage)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |input, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/service/service_spec.rb

@@ -10,16 +10,7 @@ describe VMC::Service::Service do
       it { expect(Mothership::Help.group(:services)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |_, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/service/unbind_spec.rb

@@ -10,16 +10,7 @@ describe VMC::Service::Unbind do
       it { expect(Mothership::Help.group(:services, :manage)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |input, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/space/rename_spec.rb

@@ -28,16 +28,7 @@ describe VMC::Space::Rename do
       it { expect(Mothership::Help.group(:spaces)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |input, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/space/spaces_spec.rb

@@ -35,16 +35,7 @@ describe VMC::Space::Spaces do
       it { expect(Mothership::Help.group(:spaces)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |_, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'arguments' do
       subject { command.arguments }

data/spec/vmc/cli/start/info_spec.rb

@@ -10,16 +10,7 @@ describe VMC::Start::Info do
       it { expect(Mothership::Help.group(:start)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |_, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'flags' do
       subject { command.flags }

data/spec/vmc/cli/start/login_spec.rb

@@ -10,16 +10,7 @@ describe VMC::Start::Login do
       it { expect(Mothership::Help.group(:start)).to include(subject) }
     end
 
-    describe 'inputs' do
-      subject { command.inputs }
-
-      it "is not missing any descriptions" do
-        subject.each do |_, attrs|
-          expect(attrs[:description]).to be
-          expect(attrs[:description].strip).to_not be_empty
-        end
-      end
-    end
+    include_examples 'inputs must have descriptions'
 
     describe 'flags' do
       subject { command.flags }

data/spec/vmc/cli/start/register_spec.rb

@@ -0,0 +1,144 @@
+require 'spec_helper'
+
+describe VMC::Start::Register do
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:register] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Create a user and log in" }
+      it { expect(Mothership::Help.group(:start)).to include(subject) }
+    end
+
+    include_examples 'inputs must have descriptions'
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'have the correct commands' do
+        should eq [
+          {:type => :optional, :value => nil, :name => :email}
+        ]
+      end
+    end
+  end
+
+  describe '#register' do
+    let(:client) { FactoryGirl.build(:client) }
+    let(:output) { StringIO.new }
+    let(:out) { output.string }
+    let(:email) { "a@b.com" }
+    let(:password) { "password" }
+    let(:verify_password) { password }
+    let(:force) { false }
+    let(:login) { false }
+    let(:score) { :strong }
+
+    before do
+      stub(VMC::CLI).exit { |code| code }
+      any_instance_of(VMC::CLI) do |cli|
+        stub(cli).client { client }
+        stub(cli).precondition { nil }
+      end
+      stub(client).register
+      stub(client).base.stub!.uaa.stub!.password_score(password) { score }
+    end
+
+    subject do
+      with_output_to output do
+        VMC::CLI.start %W(register --email #{email} --password #{password} --verify #{verify_password} #{login ? '--login' : '--no-login'} #{force ? '--force' : '--no-force'} --debug)
+      end
+    end
+
+    context 'when the passwords dont match' do
+      let(:verify_password) { "other_password" }
+
+      it { should eq 1 }
+
+      it 'fails' do
+        subject
+        expect(out).to include "Passwords do not match."
+      end
+
+      it "doesn't print out the score" do
+        subject
+        expect(out).not_to include "strength"
+      end
+
+      it "doesn't log in or register" do
+        dont_allow(client).register
+        any_instance_of VMC::Start::Register do |register|
+          dont_allow(register).invoke
+        end
+        subject
+      end
+
+      context 'and the force flag is passed' do
+        let(:force) { true }
+
+        it "doesn't verify the password" do
+          mock(client).register(email, password)
+          subject
+          expect(out).not_to include "Passwords do not match."
+        end
+      end
+    end
+
+    context 'when the password is good or strong' do
+      it { should eq 0 }
+
+      it 'prints out the password score' do
+        subject
+        expect(out).to include "Your password strength is: strong"
+      end
+
+      it 'registers the user' do
+        mock(client).register(email, password)
+        subject
+      end
+
+      context 'and the login flag is true' do
+        let(:login) { true }
+
+        it 'logs in' do
+          any_instance_of VMC::Start::Register do |register|
+            mock(register).invoke(:login, :username => email, :password => password)
+          end
+          subject
+        end
+      end
+
+      context 'and the login flag is false' do
+        it "doesn't log in" do
+          any_instance_of VMC::Start::Register do |register|
+            dont_allow(register).invoke(:login, :username => email, :password => password)
+          end
+          subject
+        end
+      end
+    end
+
+    context 'when the password is weak' do
+      let(:score) { :weak }
+      let(:login) { true }
+
+      it { should eq 1 }
+
+      it 'prints out the password score' do
+        subject
+        expect(out).to include "Your password strength is: weak"
+      end
+
+      it "doesn't register" do
+        dont_allow(client).register(email, password)
+        subject
+      end
+
+      it "doesn't log in" do
+        any_instance_of VMC::Start::Register do |register|
+          dont_allow(register).invoke(:login, :username => email, :password => password)
+        end
+        subject
+      end
+    end
+  end
+end

data/spec/vmc/cli/user/passwd_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe VMC::User::Passwd do
+  describe 'metadata' do
+    let(:command) { Mothership.commands[:passwd] }
+
+    describe 'command' do
+      subject { command }
+      its(:description) { should eq "Update a user's password" }
+      it { expect(Mothership::Help.group(:admin, :user)).to include(subject) }
+    end
+
+    include_examples 'inputs must have descriptions'
+
+    describe 'arguments' do
+      subject { command.arguments }
+      it 'have the correct commands (with inconsistent user instead of email)' do
+        should eq [{:type => :optional, :value => nil, :name => :user}]
+      end
+    end
+  end
+
+  describe '#passwd' do
+    let(:client) { FactoryGirl.build(:client) }
+    let(:output) { StringIO.new }
+    let(:out) { output.string }
+    let(:old_password) { "old" }
+    let(:new_password) { "password" }
+    let(:verify_password) { new_password }
+    let(:score) { :strong }
+    let(:user) { FactoryGirl.build(:user) }
+
+    before do
+      stub(VMC::CLI).exit { |code| code }
+      any_instance_of(VMC::CLI) do |cli|
+        stub(cli).client { client }
+        stub(cli).precondition { nil }
+      end
+      stub(client).current_user { user }
+      stub(client).register
+      stub(client).base.stub!.uaa.stub!.password_score(new_password) { score }
+    end
+
+    subject do
+      with_output_to output do
+        VMC::CLI.start %W(passwd --password #{old_password} --new-password #{new_password} --verify #{verify_password} --force --debug)
+      end
+    end
+
+    context 'when the passwords dont match' do
+      let(:verify_password) { "other_password" }
+
+      it { should eq 1 }
+
+      it 'fails' do
+        subject
+        expect(out).to include "Passwords do not match."
+      end
+
+      it "doesn't print out the score" do
+        subject
+        expect(out).not_to include "strength"
+      end
+
+      it "doesn't log in or register" do
+        dont_allow(user).change_password!
+        subject
+      end
+    end
+
+    context 'when the password is good or strong' do
+      before do
+        stub(user).change_password!
+      end
+
+      it { should eq 0 }
+
+      it 'prints out the password score' do
+        subject
+        expect(out).to include "Your password strength is: strong"
+      end
+
+      it 'changes the password' do
+        mock(user).change_password!(new_password, old_password)
+        subject
+      end
+    end
+
+    context 'when the password is weak' do
+      let(:score) { :weak }
+
+      it { should eq 1 }
+
+      it 'prints out the password score' do
+        subject
+        expect(out).to include "Your password strength is: weak"
+      end
+
+      it "doesn't change the password" do
+        dont_allow(user).change_password!
+        subject
+      end
+    end
+  end
+end

data/spec/vmc/cli_spec.rb

@@ -4,9 +4,13 @@ describe VMC::CLI do
   let(:cmd) { Class.new(VMC::CLI).new }
 
   describe '#execute' do
+    let(:inputs) { {} }
+
     subject do
-      stub(cmd).input { {} }
-      cmd.execute(nil, [])
+      with_output_to do
+        stub(cmd).input { inputs }
+        cmd.execute(nil, [])
+      end
     end
 
     it 'wraps Timeout::Error with a more friendly message' do
@@ -15,6 +19,24 @@ describe VMC::CLI do
       mock(cmd).err "GET /foo timed out"
       subject
     end
+
+    context "when the debug flag is on" do
+      let(:inputs) { {:debug => true} }
+
+      it 'reraises' do
+        stub(cmd).precondition { raise StandardError.new }
+        expect { subject }.to raise_error(StandardError)
+      end
+    end
+
+    context "when the debug flag is off" do
+      it 'outputs the crash log message' do
+        stub(cmd).precondition { raise StandardError.new }
+        mock(cmd).err "StandardError: StandardError\nFor more information, see /Users/pivotal/workspace/vmc/vmc/spec/tmp/.vmc/crash"
+
+        expect { subject }.not_to raise_error(StandardError)
+      end
+    end
   end
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 244434823
+  hash: -504813842
   prerelease: 6
   segments: 
   - 0
   - 5
   - 0
   - beta
-  - 5
-  version: 0.5.0.beta.5
+  - 6
+  version: 0.5.0.beta.6
 platform: ruby
 authors: 
 - Alex Suraci
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-17 00:00:00 Z
+date: 2012-12-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -73,12 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 47
         segments: 
         - 0
         - 4
-        - 15
-        version: 0.4.15
+        - 16
+        version: 0.4.16
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -314,6 +314,7 @@ files:
 - spec/assets/hello-sinatra/main.rb
 - spec/features/new_user_flow_spec.rb
 - spec/spec_helper.rb
+- spec/support/common_input_examples.rb
 - spec/support/feature_helpers.rb
 - spec/support/interact_helpers.rb
 - spec/vmc/cli/app/delete_spec.rb
@@ -332,6 +333,8 @@ files:
 - spec/vmc/cli/space/spaces_spec.rb
 - spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/start/login_spec.rb
+- spec/vmc/cli/start/register_spec.rb
+- spec/vmc/cli/user/passwd_spec.rb
 - spec/vmc/cli_spec.rb
 - spec/vmc/detect_spec.rb
 - bin/vmc
@@ -375,6 +378,7 @@ test_files:
 - spec/assets/hello-sinatra/main.rb
 - spec/features/new_user_flow_spec.rb
 - spec/spec_helper.rb
+- spec/support/common_input_examples.rb
 - spec/support/feature_helpers.rb
 - spec/support/interact_helpers.rb
 - spec/vmc/cli/app/delete_spec.rb
@@ -393,5 +397,7 @@ test_files:
 - spec/vmc/cli/space/spaces_spec.rb
 - spec/vmc/cli/start/info_spec.rb
 - spec/vmc/cli/start/login_spec.rb
+- spec/vmc/cli/start/register_spec.rb
+- spec/vmc/cli/user/passwd_spec.rb
 - spec/vmc/cli_spec.rb
 - spec/vmc/detect_spec.rb