prm 0.2.3 → 0.2.5

data/bin/prm

@@ -16,13 +16,17 @@ class Main < Clamp::Command
   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 ["--nocache"], :flag, "Don't cache md5 sums [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", :default => false
   option ["-k", "--gpg"], :flag,  "Sign release files with users GPG key", :default => false
-  option ["-g", "--generate"], :flag , "Generate new repository"
+  option ["-g", "--generate"], :flag , "[DEPRECATED 0.2.4]" do
+	  warn "WARNING: Generate option (--generate) is deprecated\n" +
+	  "This option will be removed in next stable release (0.3.0)\n"
+  end
 
   def execute
 	if recent? && !snapshot
@@ -59,6 +63,9 @@ class Main < Clamp::Command
     unless directory.nil?
       r.directory = directory
     end
+	if nocache?
+		r.nocache = nocache?
+	end
 
     r.create
   end

data/lib/prm/repo.rb

@@ -12,7 +12,7 @@ require 'arr-pm'
 require File.join(File.dirname(__FILE__), 'rpm.rb')
 
 module Debian
-    def build_apt_repo(path, component, arch, release, gpg, silent)
+    def build_apt_repo(path, component, arch, release, gpg, silent, nocache)
         release.each { |r|
             component.each { |c|
                 arch.each { |a|
@@ -90,18 +90,36 @@ module Debian
             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/"
+            if not nocache
+                FileUtils.mkdir_p path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/"
+            end
             `ar p #{deb} control.tar.gz | tar zx -C tmp/#{tdeb}/`
 
             init_size = `wc -c < #{deb}`
 
-            if File.exists? md5sum_path
+            if deb.split("/").last.to_s == md5sum_path.split("/").last.to_s
+
+            end
+            
+            if File.exists?("#{md5sum_path}") && nocache.nil? 
                 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) }
+                if nocache.nil?
+                    File.open(md5sum_path, 'w') { |file| file.write(md5sum) }
+                end
+            end
+
+            if File.exists?("#{md5sum_path}") && nocache
+                file = File.open(md5sum_path, 'r')
+                temp_md5sum = file.read
+                file.close
+                
+                if md5sum != temp_md5sum
+                    puts "WARN: md5sum mismatch on #{deb}\n"
+                end
             end
 
             package_info = [
@@ -330,6 +348,7 @@ module PRM
         attr_accessor :snapshot
         attr_accessor :directory
         attr_accessor :recent
+        attr_accessor :nocache
 
         def create
             if "#{@type}" == "deb"
@@ -340,13 +359,13 @@ module PRM
                 end
                 if directory
                     silent = true
-                    build_apt_repo(path,pcomponent,parch,prelease,gpg,silent)
+                    build_apt_repo(path,pcomponent,parch,prelease,gpg,silent,nocache)
                     if move_packages(path,pcomponent,parch,prelease,directory) == false
                         return
                     end
                 end
                 silent = false
-                build_apt_repo(path,pcomponent,parch,prelease,gpg,silent)
+                build_apt_repo(path,pcomponent,parch,prelease,gpg,silent,nocache)
             elsif "#{@type}" == "sync"
                 sync_to_dho(path, accesskey, secretkey,pcomponent,prelease)
             elsif "#{@type}" == "rpm"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: prm
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Brett Gailey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-18 00:00:00 -07:00
+date: 2013-09-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency