updates after comments

Author: buzzdeee

lib/puppet/provider/package/openbsd.rb

@@ -15,8 +15,8 @@
     These options should be specified as an array where each element is either a
      string or a hash."
 
-  commands :pkgadd => "pkg_add",
-           :pkginfo => "pkg_info",
+  commands :pkginfo => "pkg_info",
+           :pkgadd => "pkg_add",
            :pkgdelete => "pkg_delete"
 
   defaultfor 'os.name' => :openbsd
@@ -38,7 +38,7 @@ def self.instances
 
         # now turn each returned line into a package object
         process.each_line { |line|
-          match = regex.match(line.split("\n")[0])
+          match = regex.match(line.split[0])
           if match
             fields.zip(match.captures) { |field, value|
               hash[field] = value
@@ -88,9 +88,9 @@ def install
 
   def get_full_name
     # In case of a real update (i.e., the package already exists) then
-    # pkg_add(8) can handle the flavors. However, if we're actually
+    # pkg_add(1) can handle the flavors. However, if we're actually
     # installing with 'latest', we do need to handle the flavors. This is
-    # done so we can feed pkg_add(8) the full package name to install to
+    # done so we can feed pkg_add(1) the full package name to install to
     # prevent ambiguity.
 
     name_branch_regex = /^(\S*)(%\w*)$/

spec/fixtures/unit/provider/package/openbsd/pkginfo.list

@@ -2,5 +2,5 @@ autoconf--%2.13
 autoconf--%2.56
 bash--
 postfix--ldap%stable
-puppet--%8
+openvox--%8
 zstd--

spec/unit/provider/package/openbsd_spec.rb

@@ -38,7 +38,7 @@
       fixture = File.read(my_fixture('pkginfo.list'))
       expect(described_class).to receive(:execpipe).with(%w{/bin/pkg_info -a -z}).and_yield(fixture)
       expect(described_class.instances.map(&:name).sort).to eq(
-        %w{autoconf%2.13 autoconf%2.56 bash postfix%stable puppet%8 zstd}.sort
+        %w{autoconf%2.13 autoconf%2.56 bash postfix%stable openvox%8 zstd}.sort
       )
     end
 
@@ -52,7 +52,7 @@
       expect(instances[1]).to eq({:name => 'autoconf%2.56', :flavor => :absent, :branch => '%2.56'})
       expect(instances[2]).to eq({:name => 'bash', :flavor => :absent, :branch => :absent})
       expect(instances[3]).to eq({:name => 'postfix%stable', :flavor => 'ldap', :branch => '%stable'})
-      expect(instances[4]).to eq({:name => 'puppet%8', :flavor => :absent, :branch => '%8'})
+      expect(instances[4]).to eq({:name => 'openvox%8', :flavor => :absent, :branch => '%8'})
       expect(instances[5]).to eq({:name => 'zstd', :flavor => :absent, :branch => :absent})
     end
   end
@@ -78,8 +78,8 @@
     end
 
     it "should return the full unversioned package name when installing without a flavor" do
-        provider.resource[:name] = 'puppet'
-        expect(provider.get_full_name).to eq('puppet--')
+        provider.resource[:name] = 'openvox'
+        expect(provider.get_full_name).to eq('openvox--')
     end
 
     it "should return unversioned package name when installing without flavor or branch" do