ropes 0.0.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48a5648903288d68f746ab41892ab96d4af86a97
-  data.tar.gz: ef3392c150c428119d7053565f7c62937ed87413
+  metadata.gz: f0340a39d71d97eed45a3581d0b888b7baecaf26
+  data.tar.gz: aa6e407db435d64f5357122f501a378fa40cd60b
 SHA512:
-  metadata.gz: dea4492261bd84e3672aaa8800872a8081ce0c8964c19b03732db6d653f692616a608ce6eaf3f81c3844b91427e47920e80fb8c7c74f4cfb48bcb8aa9c75263b
-  data.tar.gz: 69cf5e37707b36252885d931bea89755eff955962f25f53c2beb19ba581b9a0ac03957a3042fcf7aac6fd094b5d49f7e36619abf5b42716a61e7975fdbe9abb4
+  metadata.gz: f487454858ff5e087d7fd48df9c6836d61ec5d44b3eecd3f3f5ebf393c032a19c16ad78dd50463cd0a121e0ded135781780390ff895cc37300426a97775b927a
+  data.tar.gz: ef54892b3d5374d2817c31f00f6d193f8346ffaf8df4b98e6a4d2d536efaadf3e22f680fe56da8c85169d1007f19ae967f4aa902ef1ca1a97859401632583320

data/lib/ropes/repository.rb

@@ -19,7 +19,7 @@ module Ropes
         type 
         distribution 
         version 
-        architecture 
+        architectures 
         components 
         description
         package_base}.reject do |required_option|
@@ -29,6 +29,7 @@ module Ropes
       raise "Missing options: #{missing_options.join(", ")}" unless missing_options.empty?
 
       raise InvalidRepositoryType, "Repository type #{options[:type]} is neither :apt or :yum" unless options[:type] == :yum or options[:type] == :apt
+      raise Error, "Architectures must be an array" unless options[:architectures].is_a? Array
 
       @release_file     = nil
       @packages_file     = nil
@@ -89,9 +90,9 @@ module Ropes
 
     # Get the Packages file as a string
 
-    def packages_file
-      return @packages_file unless @packages_file.nil?
-      entries = @packages.map do |package|
+    def packages_file(arch)
+      packages_for_arch = @packages.select {|p| p["architecture"] == arch}
+      entries = packages_for_arch.map do |package|
         lines = []
         @field_order.each do |field|
           if package[field] != nil
@@ -109,15 +110,19 @@ module Ropes
         end
         lines.join("\n")
       end
-      @packages_file = entries.join("\n\n") + "\n"
+      if entries.empty?
+        ""
+      else
+        entries.join("\n\n") + "\n"
+      end
     end
 
     # Get the Packages file as a gzip'ed string
 
-    def packages_file_gz
+    def packages_file_gz(arch)
       io = StringIO.new("w")
       gz = Zlib::GzipWriter.new(io)
-      gz.write(packages_file())
+      gz.write(packages_file(arch))
       gz.close
       io.string
     end
@@ -125,13 +130,6 @@ module Ropes
     # Get the Release file as a string
 
     def release_file 
-
-      # Have to create the files in real life to get the real size
-      temp_packages_file = Tempfile.new("Packages")
-      temp_packages_file.write packages_file
-      temp_packages_file_gz= Tempfile.new("Packages.gz")
-      temp_packages_file_gz.write packages_file_gz
-
       lines = []
       lines << "Origin: #{@options[:origin]}"
       lines << "Label: #{@options[:origin]}"
@@ -139,12 +137,19 @@ module Ropes
       lines << "Version: #{@options[:version]}"
       lines << "Codename: #{@options[:distribution]}"
       lines << "Date: #{Time.new.utc.strftime '%a, %d %b %Y %H:%M:%S UTC'}"
-      lines << "Architectures: #{@options[:architecture]}"
+      lines << "Architectures: #{@options[:architectures].join(" ")}"
       lines << "Components: #{@options[:components]}"
       lines << "Description: #{@options[:description]}"
       lines << "MD5Sum:"
-      lines << " #{Digest::MD5.hexdigest(packages_file)}                   #{temp_packages_file.size} #{@options[:components]}/binary-#{@options[:architecture]}/Packages"
-      lines << " #{Digest::MD5.hexdigest(packages_file_gz)}                   #{temp_packages_file_gz.size} #{@options[:components]}/binary-#{@options[:architecture]}/Packages.gz"
+      @options[:architectures].each do |arch|
+        # Have to create the files in real life to get the real size
+        temp_packages_file = Tempfile.new("Packages")
+        temp_packages_file.write packages_file(arch)
+        temp_packages_file_gz = Tempfile.new("Packages.gz")
+        temp_packages_file_gz.write packages_file_gz(arch)
+        lines << " #{Digest::MD5.hexdigest(packages_file(arch))}                   #{temp_packages_file.size} #{@options[:components]}/binary-#{arch}/Packages"
+        lines << " #{Digest::MD5.hexdigest(packages_file_gz(arch))}                   #{temp_packages_file_gz.size} #{@options[:components]}/binary-#{arch}/Packages.gz"
+      end
       lines.join("\n") + "\n"
     end
 

data/lib/ropes/version.rb

@@ -1,3 +1,3 @@
 module Ropes
-  VERSION = "0.0.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ropes
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Sykes