prm 0.1.6 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8570a8d55325f10e5bd5b48aaa602685b5a102e9
+  data.tar.gz: 22d467345ed0d8300f04bc8ca5bdfb27824bb7e3
+SHA512:
+  metadata.gz: 71b0f3f455d0080baa0d3abcd9818c2d381b8c22c378abe5e033db040f2c8b3d86cb4cdcc4e8a3c153955ceb964a6adba3fb904eb20450176488fbbe6a4c558d
+  data.tar.gz: 382a4ba24c436de76eb29960f57ca07de363a98f8d33897d16aa6ac4f05c793f2265d0955457235ab055e9eea3d3b83cf187f2c8a4caa934222735c60c508767

data/bin/prm

@@ -13,14 +13,14 @@ end
 class Main < Clamp::Command
   option ["-t", "--type"], "TYPE", "Type of repo to create", :required => true
   option ["-p", "--path"], "PATH", "Path to repo location", :required => true
-  option ["-c", "--component"], "COMPONENT", "Component to create", :required => true
   option ["-r", "--release"], "RELEASE", "OS version to create", :required => true
   option ["-a", "--arch"], "ARCH", "Architecture of repo contents", :required => true
+  option ["-c", "--component"], "COMPONENT", "Component to create [DEB ONLY]"
   option ["--accesskey"], "ACCESS KEY", "DHO/S3 Access Key", :default => false
   option ["--secretkey"], "SECRET KEY", "DHO/S3 Secret Key", :default => false
   option ["-d", "--directory"], "DIRECTORY", "Move packages from directory to target", :default => false
   option ["-s", "--snapshot"], "COMPONENT", "Creates a snapshot of a component", :default => false
-  option ["-e", "--recent"], :flag, "Snapshot the most recent unique packages"
+  option ["-e", "--recent"], :flag, "Snapshot the most recent unique packages", :default => false
   option ["-k", "--gpg"], :flag,  "Sign release files with users GPG key", :default => false
   option ["-g", "--generate"], :flag , "Generate new repository"
 
@@ -28,8 +28,12 @@ class Main < Clamp::Command
 	if recent? && !snapshot
 		raise "--snapshot is required for --recent\n"
 	end
+
+	if type == "deb" && !component
+		raise "--deb option required the --component option!"
+	end
+
     r = PRM::Repo.new
-    r.component = component
     r.release = release
     r.arch = arch
     r.type = type
@@ -46,6 +50,9 @@ class Main < Clamp::Command
     unless snapshot.nil?
       r.snapshot = snapshot
     end
+	unless component.nil?
+	  r.component = component
+	end
 	if recent?
 	  r.recent = recent?
 	end

data/lib/prm/repo.rb

@@ -9,501 +9,362 @@ require 'thread'
 require 'peach' 
 require 'aws/s3'
 require 'arr-pm'
+require_relative "rpm"
 
-module Redhat
-  def build_rpm_repo(path,arch,release,gpg,silent)
-    release.each { |r|
-      arch.each { |a|
-        orgpath = path
-        path = path + "/repodata/"
-        FileUtils.mkpath(path)
-        timestamp = Time.now.to_i
-        package_hash = Hash.new
+module Debian
+    def build_apt_repo(path, component, arch, release, gpg, silent)
+        release.each { |r|
+            component.each { |c|
+                arch.each { |a|
+                    fpath = path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/"
+                    pfpath = fpath + "Packages"
+                    rfpath = fpath + "Release"
+
+                    unless silent == true
+                        puts "Building Path: #{fpath}"
+                    end
 
-        template_dir = File.join(File.dirname(__FILE__), "..", "..", "templates")
+                    FileUtils.mkpath(fpath)
+                    FileUtils.touch(pfpath)
+                    FileUtils.touch(rfpath)
+                    generate_packages_gz(fpath,pfpath,path,rfpath,r,c,a, silent)
+                }
+            }
+            generate_release(path,r,component,arch)
 
-        erb_files = %w{
-          filelists
-          other
-          primary
+            if gpg == true
+                generate_release_gpg(path,r)
+            end
         }
+    end
 
-        Dir.glob("#{orgpath}/*.rpm").peach do |rpm|
-          sha256sum = ''
-          sha256_path = "#{orgpath}/sha256_results"
-          unless File.directory?(sha256_path)
-            FileUtils.mkdir(sha256_path)
-          end
-          trpm = rpm.split('/').last
-          if File.exists?("#{sha256_path}/#{trpm}")
-            file = File.open("#{sha256_path}/#{trpm}", 'r')
-            sha256sum = file.read
-            file.close
-          else
-            sha256sum = Digest::SHA256.file(rpm).hexdigest
-            File.open("#{sha256_path}/#{trpm}", 'w') { |file| file.write(sha256sum) }
-          end
-
-          nrpm = RPM::File.new(rpm)
-          sheader = nrpm.lead.length + nrpm.signature.length
-          eheader = sheader + nrpm.header.length
-          
-          info = Hash[*nrpm.header.tags.collect { |t| [t.tag, t.value] }.inject([]) { |m,v| m + v }]
-          package_hash[trpm] = {
-              "sha256"       => sha256sum,
-              "name"         => info[:name],
-              "arch"         => info[:arch],
-              "version"      => info[:version],
-              "release"      => info[:release],
-              "start_header" => sheader,
-              "end_header"   => eheader,
-              "files"        => nrpm.files,
-              "license"      => info[:license],
-              "vendor"       => info[:vendor],
-              "buildtime"    => info[:buildtime],
-              "buildhost"    => info[:buildhost],
-              "requires"     => nrpm.requires,
-              "conflicts"    => nrpm.conflicts,
-              "provides"     => nrpm.provides,
-              "epoch"        => info[:epochnum],
-              "sourcerpm"    => info[:sourcerpm],
-              "buildtime"    => info[:buildtime],
-              "installtime"  => info[:installtime],
-              "url"          => info[:url],
-              "summary"      => info[:summary],
-              "description"  => info[:description],
-              "packager"     => info[:packager],
-              "size"         => info[:size],
-              "longsize"     => info[:longsize],
-              "filesizes"    => info[:filesizes]
-          }
-          
+    def move_packages(path,component,arch,release,directory)
+        unless File.exists?(directory)
+            puts "ERROR: #{directory} doesn't exist... not doing anything\n"
+            return false
         end
 
-        xml_hash = Hash.new()
-        xml_hash = {
-          "filelists" => {
-            "xml"   => "",
-            "gz"    => "",
-            "size"  => "",
-            "osize" => "",
-          },
-          "other"     => {
-            "xml"   => "",
-            "gz"    => "",
-            "size"  => "",
-            "osize" => "",
-          },
-          "primary"   => {
-            "xml"   => "",
-            "gz"    => "",
-            "size"  => "",
-            "osize" => "",
-          }
+        files_moved = Array.new
+        release.each { |r|
+            component.each { |c|
+                arch.each { |a|
+                    puts a
+                    Dir.glob(directory + "/*.deb") do |file|
+                        if file =~ /^.*#{a}.*\.deb$/i || file =~ /^.*all.*\.deb$/i || file =~ /^.*any.*\.deb$/i
+                            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)
+                            else
+                                FileUtils.cp(file, "#{path}/dists/#{r}/#{c}/binary-#{a}/")
+                                files_moved << file
+                            end
+                        end
+                    end
+                }
+            }
         }
 
-        erb_files.each { |f|
-          erb = ERB.new(File.open("#{template_dir}/#{f}.xml.erb") { |file|
-            file.read
-          }).result(binding)
+        files_moved.each do |f|
+            if File.exists?(f)
+                FileUtils.rm(f)
+            end
+        end
+        # Regex?
+        #/^.*#{arch}.*\.deb$/i
+    end
 
-          release_file = File.new("#{path}/#{f}.xml.tmp","wb")
-          release_file.puts erb
-          release_file.close 
+    def generate_packages_gz(fpath,pfpath,path,rfpath,r,c,a,silent)
+        unless silent == true
+            puts "Generating Packages: #{r} : #{c} : binary-#{a}"
+        end
 
-          Zlib::GzipWriter.open("#{path}/#{f}.xml.tmp.gz") do |gz|
-            ff = File.new("#{path}/#{f}.xml.tmp", "r")
-            ff.each do |line|
-              gz.write(line)
-            end
-          end
-        }
+        npath = "dists/" + r + "/" + c + "/" + "binary-" + a + "/"
+        packages_text = []
 
-        erb_files.each { |f|  
-          xml_hash[f]["gz"] = Digest::SHA256.file("#{path}/#{f}.xml.tmp.gz").hexdigest
-          xml_hash[f]["xml"] = Digest::SHA256.file("#{path}/#{f}.xml.tmp").hexdigest
-          xml_hash[f]["size"] = File.size?("#{path}/#{f}.xml.tmp.gz")
-          xml_hash[f]["osize"] = File.size?("#{path}/#{f}.xml.tmp")
-        }
+        d = File.open(pfpath, "w+")	
+        write_mutex = Mutex.new
 
-        erb_two = ERB.new(File.open("#{template_dir}/repomd.xml.erb") { |file|
-          file.read
-        }).result(binding)
+        Dir.glob("#{fpath}*.deb").peach do |deb|
+            md5sum = ''
+            tdeb = deb.split('/').last
+            md5sum_path = path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/" + tdeb
+
+            FileUtils.mkdir_p "tmp/#{tdeb}/"
+            FileUtils.mkdir_p path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/"
+            `ar p #{deb} control.tar.gz | tar zx -C tmp/#{tdeb}/`
 
-        r_file = File.new("#{path}/repomd.xml.tmp","wb")
-        r_file.puts erb_two
-        r_file.close
+            init_size = `wc -c < #{deb}`
 
-        Dir.glob("#{path}/*.gz") do |f|
-          if f =~ /gz$/
-            unless f =~ /tmp\.gz$/
-              FileUtils.rm(f)
+            if File.exists? md5sum_path
+                file = File.open(md5sum_path, 'r')
+                md5sum = file.read
+                file.close
+            else
+                md5sum = Digest::MD5.file(deb)
+                File.open(md5sum_path, 'w') { |file| file.write(md5sum) }
+            end
+
+            package_info = [
+                "Filename: #{npath}#{tdeb}",
+                "MD5sum: #{md5sum}",
+                "Size: #{init_size}"
+            ]
+
+            write_mutex.synchronize do
+                # Copy the control file data into the Packages list
+                d.write(File.read("tmp/#{tdeb}/control"))
+                d.write(package_info.join("\n"))
+                d.write("\n") # blank line between package info in the Packages file
             end
-          end
         end
 
-        erb_files.each { |f| 
-          FileUtils.move("#{path}/#{f}.xml.tmp.gz", "#{path}/" + xml_hash[f]["gz"] + "-#{f}.xml.gz")
-          FileUtils.rm("#{path}/#{f}.xml.tmp")
-        }
-        FileUtils.move("#{path}/repomd.xml.tmp", "#{path}/repomd.xml")
-      }
-    }
-  end
-end
+        FileUtils.rmtree 'tmp/'
 
-module Debian
-  def build_apt_repo(path, component, arch, release, gpg, silent)
-    release.each { |r|
-      component.each { |c|
-        arch.each { |a|
-          fpath = path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/"
-          pfpath = fpath + "Packages"
-          rfpath = fpath + "Release"
-
-          unless silent == true
-            puts "Building Path: #{fpath}"
-          end
-
-          FileUtils.mkpath(fpath)
-          FileUtils.touch(pfpath)
-          FileUtils.touch(rfpath)
-          generate_packages_gz(fpath,pfpath,path,rfpath,r,c,a, silent)
-        }
-      }
-      generate_release(path,r,component,arch)
-
-      if gpg == true
-        generate_release_gpg(path,r)
-      end
-    }
-  end
-
-  def move_packages(path,component,arch,release,directory)
-    unless File.exists?(directory)
-      puts "ERROR: #{directory} doesn't exist... not doing anything\n"
-      return false
+        d.close
+
+        Zlib::GzipWriter.open(pfpath + ".gz") do |gz|
+            f = File.new(pfpath, "r")
+            f.each do |line|
+                gz.write(line)
+            end
+        end
     end
 
-    files_moved = Array.new
-    release.each { |r|
-      component.each { |c|
-        arch.each { |a|
-            puts a
-          Dir.glob(directory + "/*.deb") do |file|
-            if file =~ /^.*#{a}.*\.deb$/i || file =~ /^.*all.*\.deb$/i || file =~ /^.*any.*\.deb$/i
-              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)
-              else
-                FileUtils.cp(file, "#{path}/dists/#{r}/#{c}/binary-#{a}/")
-                files_moved << file
-              end
+    def generate_release(path,release,component,arch)
+        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|
+            f.slice!(path + "/dists/" + release + "/")
+            unless f == "Release" or f == "Release.gpg"
+                component_ar << f
             end
-          end
         }
-      }
-    }
 
-    files_moved.each do |f|
-        if File.exists?(f)
-            FileUtils.rm(f)
-        end
-    end
-    # Regex?
-    #/^.*#{arch}.*\.deb$/i
-  end
+        component_ar.each do |c| 
+            arch.each do |ar|
+                unreasonable_array.each do |unr|
+                    tmp_path = "#{path}/dists/#{release}/#{c}/binary-#{ar}"
+                    tmp_hash = Hash.new
+                    filename = "#{c}/binary-#{ar}/#{unr}".chomp
 
-  def generate_packages_gz(fpath,pfpath,path,rfpath,r,c,a,silent)
-    unless silent == true
-      puts "Generating Packages: #{r} : #{c} : binary-#{a}"
-    end
+                    byte_size = File.size("#{tmp_path}/#{unr}").to_s
+                    md5sum = Digest::MD5.file("#{tmp_path}/#{unr}").to_s
 
-    npath = "dists/" + r + "/" + c + "/" + "binary-" + a + "/"
-    packages_text = []
-
-    d = File.open(pfpath, "w+")	
-    write_mutex = Mutex.new
-
-    Dir.glob("#{fpath}*.deb").peach do |deb|
-      md5sum = ''
-      tdeb = deb.split('/').last
-      md5sum_path = path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/" + tdeb
-
-      FileUtils.mkdir_p "tmp/#{tdeb}/"
-      FileUtils.mkdir_p path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/"
-      `ar p #{deb} control.tar.gz | tar zx -C tmp/#{tdeb}/`
-
-      init_size = `wc -c < #{deb}`
-
-      if File.exists? md5sum_path
-        file = File.open(md5sum_path, 'r')
-        md5sum = file.read
-        file.close
-      else
-        md5sum = Digest::MD5.file(deb)
-        File.open(md5sum_path, 'w') { |file| file.write(md5sum) }
-      end
-
-      package_info = [
-        "Filename: #{npath}#{tdeb}",
-        "MD5sum: #{md5sum}",
-        "Size: #{init_size}"
-      ]
-
-      write_mutex.synchronize do
-        # Copy the control file data into the Packages list
-        d.write(File.read("tmp/#{tdeb}/control"))
-        d.write(package_info.join("\n"))
-        d.write("\n") # blank line between package info in the Packages file
-      end
-    end
+                    tmp_hash['size'] = byte_size
+                    tmp_hash['md5sum'] = md5sum
+                    release_info[filename] = tmp_hash
+                end
+            end
+        end
 
-    FileUtils.rmtree 'tmp/'
 
-    d.close
+        template_dir = File.join(File.dirname(__FILE__), "..", "..", "templates")
+        erb = ERB.new(File.open("#{template_dir}/deb_release.erb") { |file|
+            file.read
+        }).result(binding)
+
+        release_file = File.new("#{path}/dists/#{release}/Release.tmp","wb")
+        release_file.puts erb
+        release_file.close
 
-    Zlib::GzipWriter.open(pfpath + ".gz") do |gz|
-      f = File.new(pfpath, "r")
-      f.each do |line|
-        gz.write(line)
-      end
+        FileUtils.move("#{path}/dists/#{release}/Release.tmp", "#{path}/dists/#{release}/Release")
     end
-  end
-
-  def generate_release(path,release,component,arch)
-    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|
-      f.slice!(path + "/dists/" + release + "/")
-      unless f == "Release" or f == "Release.gpg"
-        component_ar << f
-      end
-    }
-
-    component_ar.each do |c| 
-      arch.each do |ar|
-        unreasonable_array.each do |unr|
-          tmp_path = "#{path}/dists/#{release}/#{c}/binary-#{ar}"
-          tmp_hash = Hash.new
-          filename = "#{c}/binary-#{ar}/#{unr}".chomp
-
-          byte_size = File.size("#{tmp_path}/#{unr}").to_s
-          md5sum = Digest::MD5.file("#{tmp_path}/#{unr}").to_s
-
-          tmp_hash['size'] = byte_size
-          tmp_hash['md5sum'] = md5sum
-          release_info[filename] = tmp_hash
+
+    # We expect that GPG is installed and a key has already been made
+    def generate_release_gpg(path,release)
+        Dir.chdir("#{path}/dists/#{release}") do
+            system "gpg --yes --output Release.gpg -b Release"
         end
-      end
     end
+end
 
+module SNAP
+    def snapshot_to(path,component,release,snapname,type,recent)
+        if type != "deb"
+            puts "Only deb supported"
+            return
+        end
 
-    template_dir = File.join(File.dirname(__FILE__), "..", "..", "templates")
-    erb = ERB.new(File.open("#{template_dir}/deb_release.erb") { |file|
-      file.read
-    }).result(binding)
+        release.each do |r| 
+            time = Time.new
+            now = time.strftime("%Y-%m-%d-%H-%M")
+            new_snap = "#{snapname}-#{now}"
 
-    release_file = File.new("#{path}/dists/#{release}/Release.tmp","wb")
-    release_file.puts erb
-    release_file.close
 
-    FileUtils.move("#{path}/dists/#{release}/Release.tmp", "#{path}/dists/#{release}/Release")
-  end
+            component.each do |c|
+                if !File.exists?("#{path}/dists/#{r}/#{c}")
+                    puts "Component doesn't exist! To snapshot you need to have an existing component\n"
+                    return
+                end
+            end
 
-  # We expect that GPG is installed and a key has already been made
-  def generate_release_gpg(path,release)
-    Dir.chdir("#{path}/dists/#{release}") do
-      system "gpg --yes --output Release.gpg -b Release"
-    end
-  end
-end
+            if File.exists?("#{path}/dists/#{r}/#{snapname}") && !File.symlink?("#{path}/dists/#{r}/#{snapname}") 
+                puts "Snapshot target is a filesystem, remove it or rename your snap target"
+                return
+            end
 
-module SNAP
-  def snapshot_to(path,component,release,snapname,type,recent)
-    if type != "deb"
-      puts "Only deb supported"
-      return
-    end
+            unless File.exists?("#{path}/dists/#{r}/#{new_snap}/")
+                Dir.mkdir("#{path}/dists/#{r}/#{new_snap}")
+            end
 
-    release.each do |r| 
-      time = Time.new
-      now = time.strftime("%Y-%m-%d-%H-%M")
-      new_snap = "#{snapname}-#{now}"
-
-
-      component.each do |c|
-          if !File.exists?("#{path}/dists/#{r}/#{c}")
-              puts "Component doesn't exist! To snapshot you need to have an existing component\n"
-              return
-          end
-      end
-
-      if File.exists?("#{path}/dists/#{r}/#{snapname}") && !File.symlink?("#{path}/dists/#{r}/#{snapname}") 
-        puts "Snapshot target is a filesystem, remove it or rename your snap target"
-        return
-      end
-
-      unless File.exists?("#{path}/dists/#{r}/#{new_snap}/")
-        Dir.mkdir("#{path}/dists/#{r}/#{new_snap}")
-      end
-
-      if recent
-        component.each do |c|
-          arch_ar = arch.split(",")
-          arch_ar.each do |a|
-                source_dir = "#{path}/dists/#{r}/#{c}/binary-#{a}"
-                target_dir = "#{path}/dists/#{r}/#{new_snap}/binary-#{a}"
-                pfiles = Dir.glob("#{source_dir}/*").sort_by { |f| File.mtime(f) }
-
-                package_hash = Hash.new
-                pfiles.each do |p|
-                    file = p.split(/[_]/)
-                    mtime = File.mtime(p)
-                    date_in_mil = mtime.to_f
-                    if File.directory?(p)
-                      next
-                    elsif !package_hash.has_key?(file[0])
-                        package_hash[file[0]] = { "name" => p, "time" => date_in_mil }
-                    else
-                        if date_in_mil > package_hash[file[0]]["time"]
-                            package_hash[file[0]] = { "name" => p, "time" => date_in_mil }
+            if recent
+                component.each do |c|
+                    arch_ar = arch.split(",")
+                    arch_ar.each do |a|
+                        source_dir = "#{path}/dists/#{r}/#{c}/binary-#{a}"
+                        target_dir = "#{path}/dists/#{r}/#{new_snap}/binary-#{a}"
+                        pfiles = Dir.glob("#{source_dir}/*").sort_by { |f| File.mtime(f) }
+
+                        package_hash = Hash.new
+                        pfiles.each do |p|
+                            file = p.split(/[_]/)
+                            mtime = File.mtime(p)
+                            date_in_mil = mtime.to_f
+                            if File.directory?(p)
+                                next
+                            elsif !package_hash.has_key?(file[0])
+                                package_hash[file[0]] = { "name" => p, "time" => date_in_mil }
+                            else
+                                if date_in_mil > package_hash[file[0]]["time"]
+                                    package_hash[file[0]] = { "name" => p, "time" => date_in_mil }
+                                end
+                            end
                         end
-                    end
-                end
 
-                if !File.exists?(target_dir)
-                    FileUtils.mkdir_p(target_dir)
-                end
+                        if !File.exists?(target_dir)
+                            FileUtils.mkdir_p(target_dir)
+                        end
+
+                        package_hash.each do |key,value|
+                            value["name"].each do |k|
+                                target_file = k.split("/").last
+                                FileUtils.cp(k, "#{target_dir}/#{target_file}")
+                            end
+                        end
 
-                package_hash.each do |key,value|
-                    value["name"].each do |k|
-                        target_file = k.split("/").last
-                        FileUtils.cp(k, "#{target_dir}/#{target_file}")
                     end
                 end
-
+            else
+                FileUtils.cp_r(Dir["#{path}/dists/#{r}/#{component}/*"], "#{path}/dists/#{r}/#{new_snap}")
             end
-        end
-      else
-      	FileUtils.cp_r(Dir["#{path}/dists/#{r}/#{component}/*"], "#{path}/dists/#{r}/#{new_snap}")
-      end
 
-      if File.exists?("#{path}/dists/#{r}/#{snapname}")
-          FileUtils.rm("#{path}/dists/#{r}/#{snapname}")
-      end
+            if File.exists?("#{path}/dists/#{r}/#{snapname}")
+                FileUtils.rm("#{path}/dists/#{r}/#{snapname}")
+            end
 
-      FileUtils.ln_s "#{new_snap}", "#{path}/dists/#{r}/#{snapname}", :force => true
-      puts "Created #{snapname} snapshot of #{component}\n"
+            FileUtils.ln_s "#{new_snap}", "#{path}/dists/#{r}/#{snapname}", :force => true
+            puts "Created #{snapname} snapshot of #{component}\n"
+        end
     end
-  end
 end
 
 module DHO
-  def sync_to_dho(path, accesskey, secretkey,pcomponent,prelease)
-    component = pcomponent.join
-    release = prelease.join
-    AWS::S3::Base.establish_connection!(
-      :server             => 'objects.dreamhost.com',
-      :use_ssl            => true,
-      :access_key_id      => accesskey,
-      :secret_access_key  => secretkey
-    )
-
-    AWS::S3::Service.buckets.each do |bucket|
-      unless bucket == path
-        AWS::S3::Bucket.create(path)
-      end
-    end
-
-    new_content = Array.new
-    Find.find(path + "/") do |object|
-      object.slice!(path + "/")
-      if (object =~ /deb$/) || (object =~ /Release$/) || (object =~ /Packages.gz$/) || (object =~ /Packages$/) || (object =~ /gpg$/)
-        f = path + "/" + object
-        new_content << object
-        AWS::S3::S3Object.store(
-          object,
-          open(f),
-          path
+    def sync_to_dho(path, accesskey, secretkey,pcomponent,prelease)
+        component = pcomponent.join
+        release = prelease.join
+        AWS::S3::Base.establish_connection!(
+            :server             => 'objects.dreamhost.com',
+            :use_ssl            => true,
+            :access_key_id      => accesskey,
+            :secret_access_key  => secretkey
         )
 
-        policy = AWS::S3::S3Object.acl(object, path)
-        policy.grants = [ AWS::S3::ACL::Grant.grant(:public_read) ]
-        AWS::S3::S3Object.acl(object,path,policy)
-      end
-    end
+        AWS::S3::Service.buckets.each do |bucket|
+            unless bucket == path
+                AWS::S3::Bucket.create(path)
+            end
+        end
 
-    bucket_info = AWS::S3::Bucket.find(path)
-    bucket_info.each do |obj|
-      o = obj.key
-      if (o =~ /deb$/) || (o =~ /Release$/) || (o =~ /Packages.gz$/) || (o =~ /Packages$/) || (o =~ /gpg$/)
-        unless new_content.include?(o)
-          AWS::S3::S3Object.delete(o,path)
+        new_content = Array.new
+        Find.find(path + "/") do |object|
+            object.slice!(path + "/")
+            if (object =~ /deb$/) || (object =~ /Release$/) || (object =~ /Packages.gz$/) || (object =~ /Packages$/) || (object =~ /gpg$/)
+                f = path + "/" + object
+                new_content << object
+                AWS::S3::S3Object.store(
+                    object,
+                    open(f),
+                    path
+                )
+
+                policy = AWS::S3::S3Object.acl(object, path)
+                policy.grants = [ AWS::S3::ACL::Grant.grant(:public_read) ]
+                AWS::S3::S3Object.acl(object,path,policy)
+            end
         end
-      end
+
+        bucket_info = AWS::S3::Bucket.find(path)
+        bucket_info.each do |obj|
+            o = obj.key
+            if (o =~ /deb$/) || (o =~ /Release$/) || (o =~ /Packages.gz$/) || (o =~ /Packages$/) || (o =~ /gpg$/)
+                unless new_content.include?(o)
+                    AWS::S3::S3Object.delete(o,path)
+                end
+            end
+        end
+        puts "Your apt repository is located at http://objects.dreamhost.com/#{path}/"
+        puts "Add the following to your apt sources.list"
+        puts "deb http://objects.dreamhost.com/#{path}/ #{release} #{component}"
     end
-    puts "Your apt repository is located at http://objects.dreamhost.com/#{path}/"
-    puts "Add the following to your apt sources.list"
-    puts "deb http://objects.dreamhost.com/#{path}/ #{release} #{component}"
-  end
 end
 
 module PRM
-  class PRM::Repo
-    include Debian
-    include DHO
-    include SNAP
-    include Redhat
-
-    attr_accessor :path
-    attr_accessor :type
-    attr_accessor :component
-    attr_accessor :arch
-    attr_accessor :release
-    attr_accessor :gpg
-    attr_accessor :secretkey
-    attr_accessor :accesskey
-    attr_accessor :snapshot
-    attr_accessor :directory
-    attr_accessor :recent
-
-    def create
-      if "#{@type}" == "deb"
-        parch,pcomponent,prelease = _parse_vars(arch,component,release)
-        if snapshot
-          snapshot_to(path,pcomponent,prelease,snapshot,type,recent)
-	  pcomponent = snapshot
-	end
-        if directory
-          silent = true
-          build_apt_repo(path,pcomponent,parch,prelease,gpg,silent)
-          if move_packages(path,pcomponent,parch,prelease,directory) == false
-            return
-          end
+    class PRM::Repo
+        include Debian
+        include DHO
+        include SNAP
+        include Redhat
+
+        attr_accessor :path
+        attr_accessor :type
+        attr_accessor :component
+        attr_accessor :arch
+        attr_accessor :release
+        attr_accessor :gpg
+        attr_accessor :secretkey
+        attr_accessor :accesskey
+        attr_accessor :snapshot
+        attr_accessor :directory
+        attr_accessor :recent
+
+        def create
+            if "#{@type}" == "deb"
+                parch,pcomponent,prelease = _parse_vars(arch,component,release)
+                if snapshot
+                    snapshot_to(path,pcomponent,prelease,snapshot,type,recent)
+                    pcomponent = snapshot
+                end
+                if directory
+                    silent = true
+                    build_apt_repo(path,pcomponent,parch,prelease,gpg,silent)
+                    if move_packages(path,pcomponent,parch,prelease,directory) == false
+                        return
+                    end
+                end
+                silent = false
+                build_apt_repo(path,pcomponent,parch,prelease,gpg,silent)
+            elsif "#{@type}" == "sync"
+                sync_to_dho(path, accesskey, secretkey,pcomponent,prelease)
+            elsif "#{@type}" == "rpm"
+                component = nil
+                parch,pcomponent,prelease = _parse_vars(arch,component,release)
+                silent = false
+                build_rpm_repo(path,parch,prelease,gpg,silent)
+            end
         end
-        silent = false
-        build_apt_repo(path,pcomponent,parch,prelease,gpg,silent)
-      elsif "#{@type}" == "sync"
-        sync_to_dho(path, accesskey, secretkey,pcomponent,prelease)
-      elsif "#{@type}" == "rpm"
-        component = "test"
-        parch,prelease = _parse_vars(arch,component,release)
-        silent = false
-        build_rpm_repo(path,parch,prelease,gpg,silent)
-      end
-    end
 
-    def _parse_vars(arch_ar,component_ar,release_ar)
-      arch_ar = arch.split(",")
-      component_ar = component.split(",")
-      release_ar = release.split(",")
-      return [arch_ar,component_ar,release_ar]
+        def _parse_vars(arch_ar,component_ar,release_ar)
+            arch_ar = arch.split(",")
+            if !component.nil?
+                component_ar = component.split(",")
+            end
+            release_ar = release.split(",")
+            return [arch_ar,component_ar,release_ar]
+        end
     end
-  end
 end