Merge pull request #135 from walkamongus/master

Fix issue with using force method as pvcreate argument

Author: DavidS

lib/puppet/provider/physical_volume/lvm.rb

@@ -11,11 +11,11 @@ def self.instances
     end
 
     def create
-        pvcreate(force, @resource[:name])
+      create_physical_volume(@resource[:name])
     end
 
     def destroy
-        pvremove(@resource[:name])
+      pvremove(@resource[:name])
     end
 
     def exists?
@@ -71,9 +71,15 @@ def self.get_physical_volume_properties(physical_volumes_line)
       physical_volumes_properties
     end
 
-    def force
-      return '--force' if @resource[:force] == :true
-      nil
+    private
+
+    def create_physical_volume(path)
+      args = []
+      if @resource[:force] == :true
+        args.push('--force')
+      end
+      args << path
+        pvcreate(*args)
     end
 
 end

spec/unit/puppet/provider/physical_volume/lvm_spec.rb

@@ -27,10 +27,9 @@
   end
 
   describe 'when creating' do
-    it "should execute the 'pvcreate'" do
+    it "should execute the 'create_physical_volume'" do
       @resource.expects(:[]).with(:name).returns('/dev/hdx')
-      @resource.expects(:[]).with(:force)
-      @provider.expects(:pvcreate).with(nil, '/dev/hdx')
+      @provider.expects(:create_physical_volume).with('/dev/hdx')
       @provider.create
     end
   end