prm 0.2.9 → 0.2.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c087bcdb19f4bf6f49ed7d42da7362b89ab578e1
+  data.tar.gz: f41c8d28b05461271389139c5d0a24740a780131
+SHA512:
+  metadata.gz: 35ac22da34aba114bdd281e33188a011021e6f6197e9b02e7855480c2b27c4a68a7d565946371f15a5ff4ba54632c3d48add6f43c98ab503cbfbcabb13a8e2c6
+  data.tar.gz: 4e1671cebb3980d553e7cb0e812c8f1e8e6ddfa50650632253bb3569626eb10d7fa63a7fadede73385681e7a56e8e317413340b26a493ab1aae5602016ba6da8

data/bin/prm

@@ -16,6 +16,8 @@ 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 ["-l", "--label"], "LABEL", "Label for generated repository [DEB ONLY]"
+  option ["-o", "--origin"], "ORIGIN", "Origin for generated repository [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
@@ -42,6 +44,8 @@ class Main < Clamp::Command
     r.arch = arch
     r.type = type
     r.path = path
+    r.label = label
+    r.origin = origin
     unless gpg.nil?
       r.gpg = gpg
     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, nocache)
+    def build_apt_repo(path, component, arch, release, label, origin, gpg, silent, nocache)
         release.each { |r|
             component.each { |c|
                 arch.each { |a|
@@ -30,7 +30,7 @@ module Debian
                     generate_packages_gz(fpath,pfpath,path,rfpath,r,c,a, silent)
                 }
             }
-            generate_release(path,r,component,arch)
+            generate_release(path,r,component,arch,label,origin)
 
             unless gpg == false
                 generate_release_gpg(path,r, gpg)
@@ -123,7 +123,7 @@ module Debian
             end
 
             package_info = [
-                "Filename: #{npath}#{tdeb}",
+                "Filename: #{npath}#{s3_compatible_encode(tdeb)}",
                 "MD5sum: #{md5sum}",
                 "Size: #{init_size}"
             ]
@@ -148,7 +148,7 @@ module Debian
         end
     end
 
-    def generate_release(path,release,component,arch)
+    def generate_release(path,release,component,arch,label,origin)
         date = Time.now.utc
 
         release_info = Hash.new()
@@ -181,9 +181,7 @@ module Debian
 
 
         template_dir = File.join(File.dirname(__FILE__), "..", "..", "templates")
-        erb = ERB.new(File.open("#{template_dir}/deb_release.erb") { |file|
-            file.read
-        }).result(binding)
+        erb = ERB.new(File.read("#{template_dir}/deb_release.erb"), nil, "-").result(binding)
 
         release_file = File.new("#{path}/dists/#{release}/Release.tmp","wb")
         release_file.puts erb
@@ -203,6 +201,10 @@ module Debian
             system sign_cmd
         end
     end
+
+    def s3_compatible_encode(str)
+        str.gsub(/[#\$&'\(\)\*\+,\/:;=\?@\[\]]/) { |x| x.each_byte.map { |b| '%' + b.to_s(16) }.join }
+    end
 end
 
 module SNAP
@@ -347,6 +349,8 @@ module PRM
         attr_accessor :component
         attr_accessor :arch
         attr_accessor :release
+        attr_accessor :label
+        attr_accessor :origin
         attr_accessor :gpg
         attr_accessor :secretkey
         attr_accessor :accesskey
@@ -364,13 +368,13 @@ module PRM
                 end
                 if directory
                     silent = true
-                    build_apt_repo(path,pcomponent,parch,prelease,gpg,silent,nocache)
+                    build_apt_repo(path,pcomponent,parch,prelease,label,origin,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,nocache)
+                build_apt_repo(path,pcomponent,parch,prelease,label,origin,gpg,silent,nocache)
             elsif "#{@type}" == "sync"
                 parch,pcomponent,prelease = _parse_vars(arch,component,release)
                 sync_to_dho(path, accesskey, secretkey,pcomponent,prelease)

data/lib/prm/rpm.rb

@@ -58,9 +58,7 @@ module Redhat
                 template_dir = File.join(File.dirname(__FILE__), "..", "..", "templates")
 
                 erb_files.each { |f|
-                    erb = ERB.new(File.open("#{template_dir}/#{f}.xml.erb") { |file|
-                        file.read
-                    }).result(binding)
+                    erb = ERB.new(File.read("#{template_dir}/#{f}.xml.erb"), nil, "-").result(binding)
 
                     release_file = File.new("#{repo_path}/#{f}.xml","wb")
                     release_file.puts erb
@@ -115,7 +113,7 @@ module Redhat
                 timestamp = Time.now.to_i
 
                 repomd_xml << create_repomd_xml(xml_data_hash,timestamp)
-                erb_two = ERB.new(File.open("#{template_dir}/repomd.xml.erb") { |file|
+                erb_two = ERB.new(File.open("#{template_dir}/repomd.xml.erb", nil, "-") { |file|
                     file.read
                 }).result(binding)
 

data/templates/deb_release.erb

@@ -1,7 +1,13 @@
 Date: <%= date %>
 Suite: <%= release %>
+<% if origin -%>
+Origin: <%= origin %>
+<% end -%>
+<% if label -%>
+Label: <%= label %>
+<% end -%>
 MD5Sum:
  d41d8cd98f00b204e9800998ecf8427e                  0 Release
-<% release_info.each_pair do |k,v| %> <%= 
- "#{release_info[k]['md5sum']}                  #{release_info[k]['size']} #{k}" %>  
-<% end %>
+<% release_info.each_pair do |k,v| -%>
+ <%= "#{release_info[k]['md5sum']}                  #{release_info[k]['size']} #{k}" %>
+<% end -%>

metadata

@@ -1,128 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: prm
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 9
-  version: 0.2.9
+version: !ruby/object:Gem::Version
+  version: 0.2.10
 platform: ruby
-authors: 
+authors:
 - Brett Gailey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-08-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: peach
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: clamp
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: arr-pm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: arr-pm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-description: "PRM (Package Repository Manager) is an Operating System independent Package Repository tool. It allows you to quickly build Debian and Yum Package Repositories. PRM supports Repository syncing to DreamObjects "
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'PRM (Package Repository Manager) is an Operating System independent
+  Package Repository tool. It allows you to quickly build Debian and Yum Package Repositories.
+  PRM supports Repository syncing to DreamObjects '
 email: brett.gailey@dreamhost.com
-executables: 
+executables:
 - prm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/prm/rpm.rb
-- lib/prm/repo.rb
+files:
+- bin/prm
 - lib/prm.rb
+- lib/prm/repo.rb
+- lib/prm/rpm.rb
 - templates/deb_release.erb
 - templates/filelists.xml.erb
 - templates/other.xml.erb
 - templates/primary.xml.erb
 - templates/repomd.xml.erb
-- bin/prm
 homepage: https://github.com/dnbert/prm
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Package Repository Manager
 test_files: []
-