fission 0.4.0 → 0.5.0.beta.1

data/spec/fission/command/snapshot_list_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper.rb', __FILE__)
+require 'spec_helper'
 
 describe Fission::Command::SnapshotList do
   include_context 'command_setup'
@@ -12,6 +12,12 @@ describe Fission::Command::SnapshotList do
     @vm_mock.stub(:name).and_return(@target_vm.first)
   end
 
+  describe 'command_name' do
+    it 'should return the pretty command name' do
+      Fission::Command::SnapshotList.new.command_name.should == 'snapshot list'
+    end
+  end
+
   describe 'execute' do
     before do
       @vm_mock.stub(:snapshots).and_return(@snap_list_response_mock)
@@ -19,7 +25,9 @@ describe Fission::Command::SnapshotList do
 
     subject { Fission::Command::SnapshotList }
 
-    it_should_not_accept_arguments_of [], 'snapshot list'
+    [ [], ['--bar'] ].each do |args|
+      it_should_not_accept_arguments_of args, 'snapshot list'
+    end
 
     it 'should output the list of snapshots if any exist' do
       @snap_list_response_mock.stub_as_successful ['snap 1', 'snap 2', 'snap 3']
@@ -54,7 +62,7 @@ describe Fission::Command::SnapshotList do
     it 'should output info for this command' do
       output = Fission::Command::SnapshotList.help
 
-      output.should match /snapshot list vm_name/
+      output.should match /fission snapshot list TARGET_VM/
     end
   end
 end

data/spec/fission/command/snapshot_revert_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper.rb', __FILE__)
+require 'spec_helper'
 
 describe Fission::Command::SnapshotRevert do
   include_context 'command_setup'
@@ -12,10 +12,18 @@ describe Fission::Command::SnapshotRevert do
     @vm_mock.stub(:name).and_return(@target_vm.first)
   end
 
+  describe 'command_name' do
+    it 'should return the pretty command name' do
+      Fission::Command::SnapshotRevert.new.command_name.should == 'snapshot revert'
+    end
+  end
+
   describe 'execute' do
     subject { Fission::Command::SnapshotRevert }
 
-    it_should_not_accept_arguments_of [], 'snapshot revert'
+    [ [], ['foo'], ['--bar'] ].each do |args|
+      it_should_not_accept_arguments_of args, 'snapshot revert'
+    end
 
     it "should output an error and the help when no snapshot name is passed in" do
       Fission::Command::SnapshotRevert.should_receive(:help)
@@ -58,7 +66,7 @@ describe Fission::Command::SnapshotRevert do
     it 'should output info for this command' do
       output = Fission::Command::SnapshotRevert.help
 
-      output.should match /snapshot revert vm_name snapshot_1/
+      output.should match /fission snapshot revert TARGET_VM TARGET_SNAPSHOT/
     end
   end
 end

data/spec/fission/command/start_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper.rb', __FILE__)
+require 'spec_helper'
 
 describe Fission::Command::Start do
   include_context 'command_setup'
@@ -12,10 +12,18 @@ describe Fission::Command::Start do
     @vm_mock.stub(:name).and_return(@target_vm.first)
   end
 
+  describe 'command_name' do
+    it 'should return the pretty command name' do
+      Fission::Command::Start.new.command_name.should == 'start'
+    end
+  end
+
   describe 'execute' do
     subject { Fission::Command::Start }
 
-    it_should_not_accept_arguments_of [], 'start'
+    [ [], ['--bar'] ].each do |args|
+      it_should_not_accept_arguments_of args, 'start'
+    end
 
     it 'should output an error and exit if there was an error starting the vm' do
       @start_response_mock.stub_as_unsuccessful
@@ -49,7 +57,7 @@ describe Fission::Command::Start do
     it 'should output info for this command' do
       output = Fission::Command::Start.help
 
-      output.should match /start vm_name \[options\]/
+      output.should match /fission start TARGET_VM \[OPTIONS\]/
       output.should match /--headless/
     end
   end

data/spec/fission/command/status_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper.rb', __FILE__)
+require 'spec_helper'
 
 describe Fission::Command::Status do
   include_context 'command_setup'
@@ -10,15 +10,24 @@ describe Fission::Command::Status do
     @all_status_response_mock = mock('response')
   end
 
+  describe 'command_name' do
+    it 'should return the pretty command name' do
+      Fission::Command::Status.new.command_name.should == 'status'
+    end
+  end
+
   describe 'execute' do
-    before do
-      Fission::VM.should_receive(:all_with_status).
-                  and_return(@all_status_response_mock)
+    subject { Fission::Command::Status }
+
+    [ ['--bar'] ].each do |args|
+      it_should_not_accept_arguments_of args, 'status'
     end
 
     describe 'when successful' do
       before do
         @all_status_response_mock.stub_as_successful @vms_status
+        Fission::VM.should_receive(:all_with_status).
+                    and_return(@all_status_response_mock)
       end
 
       it 'should output the VMs and their status' do
@@ -34,6 +43,8 @@ describe Fission::Command::Status do
     describe 'when unsuccessful' do
       before do
         @all_status_response_mock.stub_as_unsuccessful
+        Fission::VM.should_receive(:all_with_status).
+                    and_return(@all_status_response_mock)
       end
 
       it 'should output an error and exit if there was an error getting the list of running VMs' do
@@ -49,7 +60,7 @@ describe Fission::Command::Status do
     it 'should output info for this command' do
       output = Fission::Command::Status.help
 
-      output.should match /status/
+      output.should match /fission status/
     end
   end
 end

data/spec/fission/command/stop_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper.rb', __FILE__)
+require 'spec_helper'
 
 describe Fission::Command::Stop do
   include_context 'command_setup'
@@ -12,10 +12,18 @@ describe Fission::Command::Stop do
     @vm_mock.stub(:name).and_return(@target_vm.first)
   end
 
+  describe 'command_name' do
+    it 'should return the pretty command name' do
+      Fission::Command::Stop.new.command_name.should == 'stop'
+    end
+  end
+
   describe 'execute' do
     subject { Fission::Command::Stop }
 
-    it_should_not_accept_arguments_of [], 'stop'
+    [ [], ['--bar'] ].each do |args|
+      it_should_not_accept_arguments_of args, 'stop'
+    end
 
     it 'should stop the vm' do
       @stop_response_mock.should_receive(:successful?).and_return(true)
@@ -45,7 +53,7 @@ describe Fission::Command::Stop do
     it 'should output info for this command' do
       output = Fission::Command::Stop.help
 
-      output.should match /stop vm_name/
+      output.should match /fission stop TARGET_VM/
     end
   end
 end

data/spec/fission/command/suspend_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper.rb', __FILE__)
+require 'spec_helper'
 
 describe Fission::Command::Suspend do
   include_context 'command_setup'
@@ -12,10 +12,18 @@ describe Fission::Command::Suspend do
     @vm_mock.stub(:name).and_return(@target_vm.first)
   end
 
+  describe 'command_name' do
+    it 'should return the pretty command name' do
+      Fission::Command::Suspend.new.command_name.should == 'suspend'
+    end
+  end
+
   describe 'execute' do
     subject { Fission::Command::Suspend }
 
-    it_should_not_accept_arguments_of [], 'suspend'
+    [ [], ['--bar'] ].each do |args|
+      it_should_not_accept_arguments_of args, 'suspend'
+    end
 
     it 'should suspend the vm' do
       @suspend_response_mock.stub_as_successful
@@ -91,7 +99,7 @@ describe Fission::Command::Suspend do
     it 'should output info for this command' do
       output = Fission::Command::Suspend.help
 
-      output.should match /suspend \[vm_name \| --all\]/
+      output.should match /fission suspend \[TARGET_VM \| --all\]/
     end
   end
 end

data/spec/fission/command_helpers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper.rb', __FILE__)
+require 'spec_helper'
 
 describe Fission::CommandHelpers do
   include_context 'command_setup'
@@ -6,24 +6,46 @@ describe Fission::CommandHelpers do
   before do
     @object = Object.new
     @object.extend Fission::CommandHelpers
+    @object.class.stub(:help).and_return('foo help')
   end
 
   describe 'incorrect_arguments' do
     before do
-      @object.class.should_receive(:help).and_return('foo help')
+      @object.stub(:command_name)
       @object.stub(:output)
       @object.stub(:output_and_exit)
     end
 
     it "should output the command's help text" do
-      @object.should_receive(:output).with("foo help\n")
-      @object.incorrect_arguments 'delete'
+      @object.stub(:command_name)
+      @object.should_receive(:output).with(/foo help/)
+      @object.incorrect_arguments
     end
 
     it 'should output that the argumets are incorrect and exit' do
+      @object.stub(:command_name).and_return('delete')
       @object.should_receive(:output_and_exit).
               with('Incorrect arguments for delete command', 1)
-      @object.incorrect_arguments 'delete'
+      @object.incorrect_arguments
+    end
+  end
+
+  describe 'parse arguments' do
+    before do
+      @object.stub(:option_parser).and_return(@object)
+    end
+
+    it 'should parse the arguments' do
+      @object.stub :parse!
+      @object.parse_arguments
+    end
+
+    it 'should output the error with help' do
+      error = OptionParser::InvalidOption.new 'bar is invalid'
+      @object.should_receive(:output).with(error)
+      @object.should_receive(:output_and_exit).with(/foo help/, 1)
+      @object.stub(:parse!).and_raise(error)
+      @object.parse_arguments
     end
   end
 

data/spec/fission/command_line_parser_spec.rb

@@ -0,0 +1,267 @@
+require 'spec_helper'
+
+describe Fission::CommandLineParser do
+  before do
+    @string_io = StringIO.new
+    Fission::CommandLineParser.any_instance.
+                               stub(:ui).
+                               and_return(Fission::UI.new(@string_io))
+  end
+
+  describe 'initialize' do
+    it 'should set command to nil' do
+      Fission::CommandLineParser.new.command.should be_nil
+    end
+  end
+
+  describe 'parse' do
+    context 'with no initial arguments' do
+      it 'should output the usage info' do
+        lambda {
+          Fission::CommandLineParser.new([]).parse
+        }.should raise_error SystemExit
+        @string_io.string.should match /Usage/
+      end
+    end
+
+    context 'with -v or --version initial arguments' do
+      ['-v', '--version'].each do |arg|
+        it "should output the version with #{arg}" do
+          lambda {
+            Fission::CommandLineParser.new([arg]).parse
+          }.should raise_error SystemExit
+
+          @string_io.string.should match /#{Fission::VERSION}/
+        end
+      end
+    end
+
+    context 'with -h or --help initial arguments' do
+      ['-h', '--help'].each do |arg|
+        it "should output the usage info with #{arg}" do
+          lambda {
+            Fission::CommandLineParser.new([arg]).parse
+          }.should raise_error SystemExit
+
+          @string_io.string.should match /Usage/
+        end
+      end
+    end
+
+    context 'with an invalid sub command' do
+      it 'should display the help' do
+        lambda {
+          Fission::CommandLineParser.new(['foo', 'bar']).parse
+        }.should raise_error SystemExit
+
+        @string_io.string.should match /Usage/
+      end
+    end
+
+    context 'with a valid sub command' do
+      before do
+        @cmd_mock = mock 'command', :summary => ''
+      end
+
+      [ ['clone'],
+        ['delete'],
+        ['snapshot', 'create'],
+        ['snapshot', 'delete'],
+        ['snapshot', 'list'],
+        ['snapshot', 'revert'],
+        ['start'],
+        ['status'],
+        ['stop'],
+        ['suspend']
+      ].each do |command|
+        it "should accept #{command}" do
+          Fission::CommandLineParser.new(command).parse
+        end
+
+        it "should populate @command with an instance of the '#{command.join(' ')}' class" do
+          klass = command.map { |c| c.capitalize }.join('')
+          parser = Fission::CommandLineParser.new(command).parse
+          parser.command.should be_an_instance_of Fission::Command.const_get klass
+        end
+      end
+
+      context 'clone' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('clone')
+          Fission::Command::Clone.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::Clone.should_receive(:new).
+                                  with(['foo', 'bar'])
+          Fission::CommandLineParser.new(['clone', 'foo', 'bar']).parse
+        end
+
+        context 'with --start' do
+          it 'should create the command with the start option' do
+            Fission::Command::Clone.should_receive(:new).
+                                    with(['foo', 'bar', '--start'])
+            Fission::CommandLineParser.new(['clone', 'foo', 'bar', '--start']).parse
+          end
+        end
+
+      end
+
+      context 'delete' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('delete')
+          Fission::Command::Delete.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::Delete.should_receive(:new).
+                                   with(['foo'])
+          Fission::CommandLineParser.new(['delete', 'foo']).parse
+        end
+
+        context 'with --force' do
+          it 'should create the command with the force option' do
+            Fission::Command::Delete.should_receive(:new).
+                                     with(['foo', '--force'])
+            Fission::CommandLineParser.new(['delete', 'foo', '--force']).parse
+          end
+        end
+
+      end
+
+      context 'snapshot create' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('snapshot create')
+          Fission::Command::SnapshotCreate.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::SnapshotCreate.should_receive(:new).
+                                           with(['foo', 'bar'])
+          Fission::CommandLineParser.new(['snapshot', 'create', 'foo', 'bar']).parse
+        end
+      end
+
+      context 'snapshot delete' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('snapshot delete')
+          Fission::Command::SnapshotDelete.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::SnapshotDelete.should_receive(:new).
+                                           with(['foo', 'bar'])
+          Fission::CommandLineParser.new(['snapshot', 'delete', 'foo', 'bar']).parse
+        end
+      end
+
+      context 'snapshot list' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('snapshot list')
+          Fission::Command::SnapshotList.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::SnapshotList.should_receive(:new).
+                                           with(['foo'])
+          Fission::CommandLineParser.new(['snapshot', 'list', 'foo']).parse
+        end
+      end
+
+      context 'snapshot revert' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('snapshot revert')
+          Fission::Command::SnapshotRevert.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::SnapshotRevert.should_receive(:new).
+                                           with(['foo', 'bar'])
+          Fission::CommandLineParser.new(['snapshot', 'revert', 'foo', 'bar']).parse
+        end
+      end
+
+      context 'start' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('start')
+          Fission::Command::Start.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::Start.should_receive(:new).
+                                  with(['foo'])
+          Fission::CommandLineParser.new(['start', 'foo']).parse
+        end
+
+        context 'with --headless' do
+          it 'should create the command with the force option' do
+            Fission::Command::Start.should_receive(:new).
+                                     with(['foo', '--headless'])
+            Fission::CommandLineParser.new(['start', 'foo', '--headless']).parse
+          end
+        end
+
+      end
+
+      context 'status' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('status')
+          Fission::Command::Status.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::Status.should_receive(:new).
+                                   with([])
+          Fission::CommandLineParser.new(['status']).parse
+        end
+      end
+
+      context 'stop' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('stop')
+          Fission::Command::Stop.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::Stop.should_receive(:new).
+                                 with(['foo'])
+          Fission::CommandLineParser.new(['stop', 'foo']).parse
+        end
+
+        context 'with --force' do
+          it 'should create the command with the force option' do
+            Fission::Command::Stop.should_receive(:new).
+                                    with(['foo', '--force'])
+            Fission::CommandLineParser.new(['stop', 'foo', '--force']).parse
+          end
+        end
+
+      end
+
+      context 'suspend' do
+        before do
+          @cmd_mock.stub(:command_name).and_return('suspend')
+          Fission::Command::Suspend.should_receive(:new).and_return(@cmd_mock)
+        end
+
+        it 'should create the command' do
+          Fission::Command::Suspend.should_receive(:new).
+                                    with(['foo'])
+          Fission::CommandLineParser.new(['suspend', 'foo']).parse
+        end
+
+        context 'with --all' do
+          it 'should create the command with the all option' do
+            Fission::Command::Suspend.should_receive(:new).
+                                      with(['--all'])
+            Fission::CommandLineParser.new(['suspend', '--all']).parse
+          end
+        end
+
+      end
+
+    end
+
+  end
+
+end