vanagon 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6191c02ed1d220d7d947a37b906e82e60b5bba38
-  data.tar.gz: a64bae317e40b8ac61dc189d062c86b52a26c2a3
+  metadata.gz: 755316cb7aea9e8938ce656195e60c0beef28034
+  data.tar.gz: f96398616823b0fe9eb36180d57d24f1410959c6
 SHA512:
-  metadata.gz: cd1df71b5c97763d2316fc244ab0972ba5187a412cbe6c44cc77af95d82ebb102fa74327f1f1bbdc7ee0c3e66a5f63b581fe2a797d3acf9fc27e31195e101958
-  data.tar.gz: c03ff705b67c8688fe4dbfdc0d303600614030c2710d576aa4d9142f005002ba1e3ce33afc95b42d6ec55c43cc535af00c605380b42db4b933f0264a9fc0a356
+  metadata.gz: 3404fbcefa191a182489b9e5465eb12c2c1dfb98267f2704958a6e5d9c5ea5035c30d97d3845da9cb778ff16616decd1579b74a8cf70f3990fed59d3f219f27c
+  data.tar.gz: df9fea809a77f2bb1ae83c3d7a64c65984010702d5ca49b8c0a111f888103323d0de6ac3d7a6424da57d94119f942a25e852988fcf82da6f2a8d9131617339a2

data/lib/vanagon/platform.rb

@@ -319,14 +319,14 @@ class Vanagon
     # @return [true, false] true if it is a redhat variety or uses rpm
     # under the hood, false otherwise
     def is_rpm?
-      return !!@name.match(/^(aix|cisco-wrlinux|el|eos|fedora|sles)-.*$/)
+      return !!@name.match(/^(aix|cisco-wrlinux|el|eos|fedora|sles|redhat)-.*$/)
     end
 
     # Utility matcher to determine is the platform is an enterprise linux variety
     #
     # @return [true, false] true if it is a enterprise linux variety, false otherwise
     def is_el?
-      return !!@name.match(/^el-.*$/)
+      return !!@name.match(/^(el|redhat)-.*$/)
     end
 
     # Utility matcher to determine is the platform is a sles variety

data/spec/lib/vanagon/platform_spec.rb

@@ -14,6 +14,8 @@ describe "Vanagon::Platform" do
         :source_output_dir              => "deb/lucid/",
         :source_output_dir_with_target  => "deb/lucid/thing",
         :source_output_dir_empty_string => "deb/lucid/",
+        :is_rpm                         => false,
+        :is_el                          => false,
         :block                          => %Q[
           platform "debian-6-i386" do |plat|
             plat.codename "lucid"
@@ -30,8 +32,25 @@ describe "Vanagon::Platform" do
         :source_output_dir              => "el/5/products/SRPMS",
         :source_output_dir_with_target  => "el/5/thing/SRPMS",
         :source_output_dir_empty_string => "el/5/SRPMS",
+        :is_rpm                         => true,
+        :is_el                          => true,
         :block                          => %Q[ platform "el-5-i386" do |plat| end ],
       },
+      {
+        :name                           => "redhat-7-x86_64",
+        :os_name                        => "redhat",
+        :os_version                     => "7",
+        :architecture                   => "x86_64",
+        :output_dir                     => "redhat/7/products/x86_64",
+        :output_dir_with_target         => "redhat/7/thing/x86_64",
+        :output_dir_empty_string        => "redhat/7/x86_64",
+        :source_output_dir              => "redhat/7/products/SRPMS",
+        :source_output_dir_with_target  => "redhat/7/thing/SRPMS",
+        :source_output_dir_empty_string => "redhat/7/SRPMS",
+        :is_rpm                         => true,
+        :is_el                          => true,
+        :block                          => %Q[ platform "redhat-7-x86_64" do |plat| end ],
+      },
       {
         :name                           => "debian-6-i386",
         :os_name                        => "debian",
@@ -44,6 +63,8 @@ describe "Vanagon::Platform" do
         :source_output_dir              => "updated/sources",
         :source_output_dir_with_target  => "updated/sources",
         :source_output_dir_empty_string => "updated/sources",
+        :is_rpm                         => false,
+        :is_el                          => false,
         :block                          => %Q[
           platform "debian-6-i386" do |plat|
             plat.codename "lucid"
@@ -133,4 +154,22 @@ describe "Vanagon::Platform" do
       end
     end
   end
+
+  describe "#is_rpm?" do
+    it "returns true if this is an rpm platform" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform.new(plat[:name])
+        expect(cur_plat.is_rpm?).to eq(plat[:is_rpm])
+      end
+    end
+  end
+
+  describe "#is_el?" do
+    it "returns true if this is an el platform" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform.new(plat[:name])
+        expect(cur_plat.is_el?).to eq(plat[:is_el])
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git