fission 0.4.0.beta.1 → 0.4.0.beta.2

data/CHANGELOG.md

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

data/lib/fission/config.rb

@@ -18,17 +18,16 @@ module Fission
     # Returns a new Config instance.
     def initialize
       @attributes = {}
-      load_from_file
-
-      if @attributes['vm_dir'].blank?
-        @attributes['vm_dir'] = File.expand_path('~/Documents/Virtual Machines.localized/')
-      end
 
+      @attributes['vm_dir'] = File.expand_path('~/Documents/Virtual Machines.localized/')
       @attributes['lease_file'] = '/var/db/vmware/vmnet-dhcpd-vmnet8.leases'
       @attributes['vmrun_bin'] = '/Library/Application Support/VMware Fusion/vmrun'
-      @attributes['vmrun_cmd'] = "#{@attributes['vmrun_bin'].gsub(' ', '\ ')} -T fusion"
       @attributes['plist_file'] = File.expand_path('~/Library/Preferences/com.vmware.fusion.plist')
       @attributes['gui_bin'] = File.expand_path('/Applications/VMware Fusion.app/Contents/MacOS/vmware')
+
+      load_from_file
+
+      @attributes['vmrun_cmd'] = "#{@attributes['vmrun_bin'].gsub(' ', '\ ')} -T fusion"
     end
 
     # Public: Helper method to access config atributes.  This is a shortcut for

data/lib/fission/version.rb

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

data/spec/fission/config_spec.rb

@@ -2,18 +2,23 @@ require File.expand_path('../../spec_helper.rb', __FILE__)
 
 describe Fission::Config do
   describe "init" do
+    before do
+      FakeFS.activate!
+    end
+
+    after do
+      FakeFS.deactivate!
+      FakeFS::FileSystem.clear
+    end
+
     it "should use the fusion default dir for vm_dir" do
-      FakeFS do
-        @config = Fission::Config.new
-        @config.attributes['vm_dir'].should == File.expand_path('~/Documents/Virtual Machines.localized/')
-      end
+      @config = Fission::Config.new
+      @config.attributes['vm_dir'].should == File.expand_path('~/Documents/Virtual Machines.localized/')
     end
 
     it 'should use the fusion default for vmrun_bin' do
-      FakeFS do
-        @config = Fission::Config.new
-        @config.attributes['vmrun_bin'].should == '/Library/Application Support/VMware Fusion/vmrun'
-      end
+      @config = Fission::Config.new
+      @config.attributes['vmrun_bin'].should == '/Library/Application Support/VMware Fusion/vmrun'
     end
 
     it 'should use the fusion default for plist_file' do
@@ -27,19 +32,33 @@ describe Fission::Config do
     end
 
     it "should use the user specified dir in ~/.fissionrc" do
-      FakeFS do
-        File.open('~/.fissionrc', 'w') { |f| f.puts YAML.dump({ 'vm_dir' => '/var/tmp/foo' })}
+      File.open('~/.fissionrc', 'w') { |f| f.puts YAML.dump({ 'vm_dir' => '/var/tmp/foo' })}
 
-        @config = Fission::Config.new
-        @config.attributes['vm_dir'].should == '/var/tmp/foo'
+      @config = Fission::Config.new
+      @config.attributes['vm_dir'].should == '/var/tmp/foo'
+    end
+
+    it 'should use the user specified vmrun bin in ~/.fissionrc' do
+      File.open('~/.fissionrc', 'w') do |f|
+        f.puts YAML.dump({ 'vmrun_bin' => '/var/tmp/vmrun_bin' })
       end
+
+      @config = Fission::Config.new
+      @config.attributes['vmrun_bin'].should == '/var/tmp/vmrun_bin'
     end
 
     it 'should set vmrun_cmd' do
-      FakeFS do
-        @config = Fission::Config.new
-        @config.attributes['vmrun_cmd'].should == '/Library/Application\ Support/VMware\ Fusion/vmrun -T fusion'
+      @config = Fission::Config.new
+      @config.attributes['vmrun_cmd'].should == '/Library/Application\ Support/VMware\ Fusion/vmrun -T fusion'
+    end
+
+    it 'should set the vmrun_cmd correctly if there is a user specified vmrun bin' do
+      File.open('~/.fissionrc', 'w') do |f|
+        f.puts YAML.dump({ 'vmrun_bin' => '/var/tmp/vmrun_bin' })
       end
+
+      @config = Fission::Config.new
+      @config.attributes['vmrun_cmd'].should == '/var/tmp/vmrun_bin -T fusion'
     end
 
     it 'should use the fusion default lease file' do

metadata

@@ -2,7 +2,7 @@
 name: fission
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.4.0.beta.1
+  version: 0.4.0.beta.2
 platform: ruby
 authors: 
 - Tommy Bishop
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-23 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: CFPropertyList