fission 0.4.0.beta.2 → 0.4.0.beta.3

data/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ## 0.4.0
 * major internal refactoring for usage as a lib
-* add fix for loading a custom vmrun_bin in ~/.fissionrc
+* add fix for loading a custom vmrun_bin in ~/.fissionrc (issue #8 )
 
 ## 0.3.0 (09/16/2011)
 * add ability to suspend all running VMs ('--all')

data/lib/fission/command/status.rb

@@ -3,34 +3,16 @@ module Fission
     class Status < Command
 
       def execute
-        response = VM.all
-        if response.successful?
-          all_vms = response.data
+        response = VM.all_with_status
+        unless response.successful?
+          output_and_exit "There was an error getting the status of the VMs.  The error was:\n#{response.message}", response.code
         end
 
-        response = VM.all_running
-        if response.successful?
-          all_running_vm_names = response.data.collect { |v| v.name }
-        else
-          output_and_exit "There was an error getting the list of running VMs.  The error was:\n#{response.message}", response.code
-        end
-
-        vm_names = all_vms.collect { |v| v.name }
-
-        longest_vm_name = vm_names.max { |a,b| a.length <=> b.length }
-
-        all_vms.each do |vm|
-          if all_running_vm_names.include? vm.name
-            status = '[running]'
-          else
-            if vm.suspend_file_exists?
-              status = '[suspended]'
-            else
-              status = '[not running]'
-            end
-          end
+        vms_status = response.data
+        longest_vm_name = vms_status.keys.max { |a,b| a.length <=> b.length }
 
-          output_printf "%-#{longest_vm_name.length}s   %s\n", vm.name, status
+        vms_status.each_pair do |vm_name, status|
+          output_printf "%-#{longest_vm_name.length}s   [%s]\n", vm_name, status
         end
       end
 

data/lib/fission/version.rb

@@ -1,3 +1,3 @@
 module Fission
-  VERSION = "0.4.0.beta.2"
+  VERSION = "0.4.0.beta.3"
 end

data/lib/fission/vm.rb

@@ -564,6 +564,48 @@ module Fission
       response
     end
 
+    # Public: Provides a list of all of the VMs and their associated status
+    #
+    # Examples
+    #
+    #   Fission::VM.all_with_status.data
+    #   # => { 'vm1' => 'running', 'vm2' => 'suspended', 'vm3' => 'not running'}
+    #
+    # Returns a Response with the result.
+    # If successful, the Response's data attribute will be a Hash of with the VM
+    # names as keys and their status as the values.
+    # If there is an error, an unsuccessful Repsonse will be returned.
+    def self.all_with_status
+      all_response = all
+      return all_response unless all_response.successful?
+
+      all_vms = all_response.data
+
+      running_response = all_running
+      return running_response unless running_response.successful?
+
+      response = Response.new :code => 0
+
+      all_running_vm_names = running_response.data.collect { |v| v.name }
+
+      response.data = all_vms.inject({}) do |result, vm|
+        if all_running_vm_names.include? vm.name
+          status = 'running'
+        else
+          if vm.suspend_file_exists?
+            status = 'suspended'
+          else
+            status = 'not running'
+          end
+        end
+
+        result[vm.name] = status
+        result
+      end
+
+      response
+    end
+
     # Public: Creates a new VM which is a clone of an existing VM.  As Fusion
     # doesn't provide a native cloning mechanism, this is a best effort.  This
     # essentially is a directory copy with updates to relevant files.  It's

data/spec/fission/command/status_spec.rb

@@ -4,61 +4,43 @@ describe Fission::Command::Status do
   include_context 'command_setup'
 
   before do
-    @all_response_mock = mock('response')
-    @vm_1 = Fission::VM.new 'foo'
-    @vm_2 = Fission::VM.new 'bar'
-    @vm_3 = Fission::VM.new 'baz'
-    @vm_4 = Fission::VM.new 'blah'
+    @vms_status = { 'foo' => 'running',
+                    'bar' => 'suspended',
+                    'baz' => 'not running' }
+    @all_status_response_mock = mock('response')
   end
 
   describe 'execute' do
     before do
-      @all_response_mock.stub_as_successful [@vm_1, @vm_2, @vm_3, @vm_4]
-
-      Fission::VM.should_receive(:all).and_return(@all_response_mock)
-      Fission::VM.stub(:all_running).and_return(@all_running_response_mock)
+      Fission::VM.should_receive(:all_with_status).
+                  and_return(@all_status_response_mock)
     end
 
     describe 'when successful' do
       before do
-        @all_running_response_mock.stub_as_successful [@vm_1, @vm_3]
+        @all_status_response_mock.stub_as_successful @vms_status
       end
 
-      it 'should output the VMs which are running' do
+      it 'should output the VMs and their status' do
         command = Fission::Command::Status.new
         command.execute
 
         @string_io.string.should match /foo.+\[running\]/
-        @string_io.string.should match /baz.+\[running\]/
-      end
-
-      it 'should output the VMs which are not running' do
-        command = Fission::Command::Status.new
-        command.execute
-
-        @string_io.string.should match /bar.+\[not running\]/
+        @string_io.string.should match /bar.+\[suspended\]/
+        @string_io.string.should match /baz.+\[not running\]/
       end
-
-      it 'should output the VMs which are suspended' do
-        @vm_4.stub(:suspend_file_exists?).and_return(true)
-        command = Fission::Command::Status.new
-        command.execute
-
-        @string_io.string.should match /blah.+\[suspended\]/
-      end
-
     end
 
     describe 'when unsuccessful' do
       before do
-        @all_running_response_mock.stub_as_unsuccessful
+        @all_status_response_mock.stub_as_unsuccessful
       end
 
       it 'should output an error and exit if there was an error getting the list of running VMs' do
         command = Fission::Command::Status.new
         lambda { command.execute }.should raise_error SystemExit
 
-        @string_io.string.should match /There was an error getting the list of running VMs.+it blew up/m
+        @string_io.string.should match /There was an error getting the status of the VMs.+it blew up/m
       end
     end
   end

data/spec/fission/vm_spec.rb

@@ -1078,6 +1078,44 @@ ethernet1.generatedAddressenable = "TRUE"'
 
   end
 
+  describe 'self.all_with_status' do
+    before do
+      @vm_1 = Fission::VM.new 'foo'
+      @vm_2 = Fission::VM.new 'bar'
+      @vm_2.stub(:suspend_file_exists?).and_return('true')
+      @vm_3 = Fission::VM.new 'baz'
+
+      @all_vms_response_mock = mock('all_vms_mock')
+      @all_vms_response_mock.stub_as_successful [@vm_1, @vm_2, @vm_3]
+
+      @all_running_response_mock = mock('all_running_mock')
+      @all_running_response_mock.stub_as_successful [@vm_1]
+
+      Fission::VM.stub(:all).and_return(@all_vms_response_mock)
+      Fission::VM.stub(:all_running).and_return(@all_running_response_mock)
+    end
+
+    it 'should return a sucessful response with the VMs and their status' do
+      response = Fission::VM.all_with_status
+      response.should be_a_successful_response
+      response.data.should == { 'foo' => 'running',
+                                'bar' => 'suspended',
+                                'baz' => 'not running' }
+
+    end
+
+    it 'should return an unsuccessful response if unable to get all of the VMs' do
+      @all_vms_response_mock.stub_as_unsuccessful
+      Fission::VM.all_with_status.should be_an_unsuccessful_response
+    end
+
+    it 'should return an unsuccessful repsonse if unable to get the running VMs' do
+      @all_running_response_mock.stub_as_unsuccessful
+      Fission::VM.all_with_status.should be_an_unsuccessful_response
+    end
+
+  end
+
   describe 'delete' do
     before do
       @running_response_mock = mock('running?')

metadata

@@ -1,60 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fission
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.0.beta.3
   prerelease: 6
-  version: 0.4.0.beta.2
 platform: ruby
-authors: 
+authors:
 - Tommy Bishop
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: CFPropertyList
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70357096609200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.17
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70357096609200
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70357096608700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70357096608700
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70357096608240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70357096608240
 description: A simple utility to manage VMware Fusion VMs from the command line
-email: 
+email:
 - bishop.thomas@gmail.com
-executables: 
+executables:
 - fission
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -117,32 +114,29 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/thbishop/fission
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: fission
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Command line tool to manage VMware Fusion VMs
-test_files: 
+test_files:
 - spec/contexts/command.rb
 - spec/fission/cli_spec.rb
 - spec/fission/command/clone_spec.rb