prm 0.0.10 → 0.0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 75ef0957fa6855086e8aa443fb198e56a7594fca
+  data.tar.gz: fbf255327cd5cafdf6af4d8e4be33add5aabf98d
+SHA512:
+  metadata.gz: 64d92c2804c22413c73dfe17a23b6f7e278165f64360a3bb79afc362e31a7e142ed91aa4cdbe0622efb7b6b05b77e8b9e201c6499f53916e64435e9a14dcd78a
+  data.tar.gz: 838db20c18fba5e50c06b2d8b30a4e010b07b137679f5b710b50ff151b8aa7b74ed5045af7b778b5fb47ccfcec9717c542c85527018f141beec112681cb4b5f0

data/bin/prm

@@ -10,7 +10,7 @@ rescue LoadError
   require 'prm'
 end
 
-version_info = "0.0.10"
+version_info = "0.0.11"
 
 class Main < Clamp::Command
 	option ["-t", "--type"], "TYPE", "Type of repo to create", :required => true

data/lib/prm/repo.rb

@@ -37,10 +37,9 @@ module Debian
 
         d = File.open(pfpath, "w+")	
         npath = "dists/" + r + "/" + c + "/" + "binary-" + a + "/"
-        control_data = []
+        packages_text = []
 
         Dir.glob("#{fpath}*.deb").peach do |deb|
-            temp_control = ''
             md5sum = ''
             tdeb = deb.split('/').last
             md5sum_path = path + "/dists/" + r + "/" + c + "/" + "binary-" + a + "/md5-results/" + tdeb
@@ -60,27 +59,27 @@ module Debian
                 File.open(md5sum_path, 'w') { |file| file.write(md5sum) }
             end
 
+            package_info = [
+              "Filename: #{npath}#{tdeb}",
+              "MD5sum: #{md5sum}",
+              "Size: #{init_size}"
+            ]
 
-            `echo "Filename: #{npath}#{tdeb}" >> tmp/#{tdeb}/control`
-            `echo "MD5sum: #{md5sum}" >> tmp/#{tdeb}/control`
-            `echo "Size: #{init_size}" >> tmp/#{tdeb}/control`
-            temp_control << `cat tmp/#{tdeb}/control`
-            control_data << temp_control
+            # 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
 
         FileUtils.rmtree 'tmp/'
 
-        d.write control_data
         d.close
 
-        data = ''
-        f = File.open(pfpath, "r").each { |line|
-            data << line
-        }
-        f.close
-
         Zlib::GzipWriter.open(pfpath + ".gz") do |gz|
-            gz.write data
+          f = File.new(pfpath, "r")
+          f.each do |line|
+            gz.write(line)
+          end
         end
     end
 
@@ -117,9 +116,7 @@ module Debian
             end
         end
 
-        template = File.join(File.dirname(__FILE__), "..", "..", "templates/deb_release.erb")
-        #puts template
-        erb = ERB.new(File.open(template) { |file|
+        erb = ERB.new(File.open('templates/deb_release.erb') { |file|
             file.read
         }).result(binding)
 
@@ -139,7 +136,9 @@ module Debian
 end
 
 module DHO
-    def sync_to_dho(path, accesskey, secretkey)
+    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,
@@ -180,6 +179,9 @@ module DHO
                 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
 end
 
@@ -203,7 +205,7 @@ module PRM
             if "#{@type}" == "deb"
                 build_apt_repo(path,pcomponent,parch,prelease,gpg)
             elsif "#{@type}" == "sync"
-                sync_to_dho(path, accesskey, secretkey)
+                sync_to_dho(path, accesskey, secretkey,pcomponent,prelease)
             elsif "#{@type}" == "rpm"
                 # add rpm stuff here
             end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: prm
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors:
 - Brett Gailey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: peach
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-s3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: PRM (Package Repository Manager) is an Operating System independent Package
@@ -69,30 +62,28 @@ extra_rdoc_files: []
 files:
 - lib/prm/repo.rb
 - lib/prm.rb
-- templates/deb_release.erb
 - bin/prm
 homepage: https://github.com/dnbert/prm
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Package Repository Manager
 test_files: []

data/templates/deb_release.erb

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