prm 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea98fb0933daf9f0d73a8c65793b6025b020a40
-  data.tar.gz: 5b3e6c2871743f2dc3df830c4e51406821dd0d0c
+  metadata.gz: 6c59c77246e92858fa026b811a193724c105bcdb
+  data.tar.gz: e7c006d04276746730d96438d58f5970c209f392
 SHA512:
-  metadata.gz: e5fcb4e237c4ef749379300976b8a061050485b6040e46b0803bcffc853148513561da7493bac1ed4d1885579e3977d9adcd46813c04b4556ec4cb90bd1f6ad6
-  data.tar.gz: 45eca0717f4d4da7010f6ce3261d9ff1fe43514defa95f56ab343b8298ae46e8842aad8af8d36d3996b401b1d6fe5382013a8c31a74923fd68588b17b1dce913
+  metadata.gz: b164948c21d5d6510a10839f2035cf6c3b3fc4d2fb2e2459cdd07ce4eec7ed46c064e657c0bcf29d6f520407a1d311b4c9b97679906f7805575d6e3bd2227a95
+  data.tar.gz: 7ac1d09b3b204e4d2e368a07db8a6ac4f6f9e2194d3e32a06880b35797e7523309abf0d305fae4273bd314b1df3c61879a8911c3df85e3c4072fce52af3c37c0

data/bin/prm

@@ -34,12 +34,12 @@ class Main < Clamp::Command
 
   def execute
 	if version?
-		puts "PRM version: 0.2.13\n"
+		puts "PRM version: 0.2.14\n"
 		exit
 	end
 
 	unless type && path && release && arch
-		puts "Type, Path, Release and Arch are required arguements"
+		puts "Type, Path, Release and Arch are required arguments"
 		exit
 	end
 

data/lib/prm/repo.rb

@@ -38,7 +38,7 @@ module Debian
         }
     end
 
-    def move_packages(path,component,arch,release,directory)
+    def move_apt_packages(path,component,arch,release,directory)
         unless File.exists?(directory)
             puts "ERROR: #{directory} doesn't exist... not doing anything\n"
             return false
@@ -54,7 +54,7 @@ module Debian
                             if file =~ /^.*#{r}.*\.deb$/i
                                 # Lets do this here to help mitigate packages like "asdf-123+wheezy.deb"
                                 FileUtils.cp(file, "#{path}/dists/#{r}/#{c}/binary-#{a}/")
-                            FileUtils.rm(file)
+                                FileUtils.rm(file)
                             else
                                 FileUtils.cp(file, "#{path}/dists/#{r}/#{c}/binary-#{a}/")
                                 files_moved << file
@@ -152,7 +152,6 @@ module Debian
         date = Time.now.utc
 
         release_info = Hash.new()
-        unreasonable_array = Array.new
         unreasonable_array = ["Packages", "Packages.gz", "Release"]
         component_ar = Array.new
         Dir.glob(path + "/dists/" + release + "/*").select { |f|
@@ -371,7 +370,7 @@ module PRM
                 if directory
                     silent = true
                     build_apt_repo(path,pcomponent,parch,prelease,label,origin,gpg,silent,nocache)
-                    if move_packages(path,pcomponent,parch,prelease,directory) == false
+                    if move_apt_packages(path,pcomponent,parch,prelease,directory) == false
                         return
                     end
                 end
@@ -384,6 +383,13 @@ module PRM
             elsif "#{@type}" == "rpm"
                 component = nil
                 parch,pcomponent,prelease = _parse_vars(arch,component,release)
+                if directory
+                    silent = true
+                    build_rpm_repo(path,parch,prelease,gpg,silent)
+                    if move_rpm_packages(path,parch,prelease,directory) == false
+                        return
+                    end
+                end
                 silent = false
                 build_rpm_repo(path,parch,prelease,gpg,silent)
             end

data/lib/prm/rpm.rb

@@ -127,6 +127,40 @@ module Redhat
         end
     end
 
+    def move_rpm_packages(path,arch,release,directory)
+        unless File.exists?(directory)
+            puts "ERROR: #{directory} doesn't exist... not doing anything\n"
+            return false
+        end
+
+        files_moved = Array.new
+        release.each { |r|
+            arch.each { |a|
+                puts a
+                Dir.glob(directory + "/*.rpm") do |file|
+                    if file =~ /^.*#{a}.*\.rpm$/i || file =~ /^.*all.*\.rpm$/i || file =~ /^.*any.*\.rpm$/i
+                        target_dir = "#{path}/#{r}/#{a}/"
+                        FileUtils.mkpath(target_dir)
+                        if file =~ /^.*#{r}.*\.rpm$/i
+                            # Lets do this here to help mitigate packages like "asdf-123+rhel7.rpm"
+                            FileUtils.cp(file, target_dir)
+                            FileUtils.rm(file)
+                        else
+                            FileUtils.cp(file, target_dir)
+                            files_moved << file
+                        end
+                    end
+                end
+            }
+        }
+
+        files_moved.each do |f|
+            if File.exists?(f)
+                FileUtils.rm(f)
+            end
+        end
+    end
+
     def create_repomd_xml(xml_data_hash,timestamp)
         repomd_meta = String.new
         xml_data_hash.each_pair do |k,v|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prm
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Brett Gailey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peach