frm 0.0.5 → 0.0.7

data/lib/frm/base.rb

@@ -1,12 +1,5 @@
 module FRM
   class Base
-    # my_dir = File.dirname __FILE__
-    # require File.join my_dir, 's3'
-    require 'zlib'
-    require 'tempfile'
-    require 'digest/md5'
-    require 'digest/sha1'
-    require 'digest/sha2'
     
     def compute_md5(string)
       Digest::MD5.hexdigest(string)
@@ -73,9 +66,56 @@ module FRM
     
     def merge_package_file(in_pipe,out_pipe,package_list)
       sorted_list = package_list.sort { |a,b| a['Package'] <=> b['Package'] }
-      # while (next_stub = parse_package_stub in_pipe)
-      #   STDERR.puts "next_stub[0] = #{next_stub[0]}"
-      # end
+      merge(in_pipe,out_pipe,sorted_list)
     end
+    
+    private 
+
+    def create_package_stub(package_hash)
+      return_value = ''
+      package_hash.each do |key,value|
+        return_value << "#{key}: #{value}\n"
+      end
+      return_value << "\n"
+    end
+
+    def merge(in_pipe,out_pipe,package_list)
+      return if out_pipe.closed? 
+      return if in_pipe.closed? and package_list.empty
+
+      if package_list.empty? 
+        while line = in_pipe.gets
+          out_pipe.puts line
+        end
+        in_pipe.close
+        out_pipe.close
+        return
+      end
+
+      if in_pipe.closed? 
+        package_list.each {|package_hash| out_pipe.write(create_package_stub(package_hash)) }
+        out_pipe.close 
+        return
+      end
+      
+      current_package, stub = parse_package_stub in_pipe
+
+      if current_package['Package'] < package_list.first['Package']
+        out_pipe.puts stub
+        out_pipe.puts ""
+        merge(in_pipe,out_pipe,package_list)
+        return
+      elsif current_package['Package'] > package_list.first['Package']
+        while ( ! package_list.empty? ) and current_package['Package'] > package_list.first['Package'] 
+          out_pipe.write create_package_stub(package_list.shift)
+        end
+      elsif current_package['Package'] == package_list.first['Package']
+        out_pipe.write create_package_stub(package_list.shift)
+      end
+      
+      merge(in_pipe,out_pipe,package_list)
+      return nil 
+    end
+    
   end
 end

data/lib/frm/deb.rb

@@ -1,152 +1,5 @@
-DEFAULT_HOST =  's3-us-west-1.amazonaws.com' # stupid hack to point to
-# the right region
-
 module FRM
   
-  class Package < Base
-    attr_accessor :repo_filename
-    attr_reader :path, :content, :md5, :sha1, :sha2 , :size, :release
-    def initialize(path,release='natty')
-      raise "you need to specify a path!!!" if path.nil?
-      @path = path
-      raise "Can not find file '#{path}'" unless File.exists?(path)
-      @release = release
-      begin
-        @content = File.read(path)
-      rescue Object => o
-        STDERR.puts "Could not open file '#{path}'. Exiting..."
-        STDERR.puts o.inspect
-        STDERR.puts o.backtrace
-        raise "Could not open file '#{path}'. Exiting..."
-      end
-      @size = File.size(@path)
-      @md5 = compute_md5(@content)
-      @sha1 = compute_sha1(@content)
-      @sha2 = compute_sha2(@content)
-    end
-  end
-
-  class PackageRelease < Base
-    attr_reader :packages, :standards_version, :priority, :package_file, :gzipped_package_file, :release_file, :short_release_file, :component, :release
-    def initialize(packages={},release='natty',component='main/binary-amd64')
-      @release = release
-      @component = component
-      @standards_version = standards_version
-      @priority = priority
-      @packages = []
-      packages.each { |package| @packages << Package.new(package,@release) }
-      @package_file = generate_package_file
-      @gzipped_package_file = generate_gzip_pipe(@package_file).read
-      @short_release_file = generate_short_release_file
-      @release_file = generate_release_file
-    end
-    
-    private
-    
-    def generate_release_file()
-      partial_release_file = "Origin: apt.cloudscaling.com
-Label: apt repository #{@release}
-Codename: #{@release}
-Date: Thu, 22 Dec 2011 00:29:55 UTC
-Architectures: amd64
-Components: main universe multiverse
-Description: Cloudscaling APT repository
-MD5Sum:
- #{compute_md5(@package_file)} #{@package_file.size} #{@component}/Packages
- #{compute_md5(@gzipped_package_file)} #{@gzipped_package_file.size} #{@component}/Packages.gz
- #{compute_md5(@short_release_file)} #{@short_release_file.size} #{@component}/Release
-SHA1:
- #{compute_sha1(@package_file)} #{@package_file.size} #{@component}/Packages
- #{compute_sha1(@gzipped_package_file)} #{@gzipped_package_file.size} #{@component}/Packages.gz
- #{compute_sha1(@short_release_file)} #{@short_release_file.size} #{@component}/Release
-SHA256:
- #{compute_sha2(@package_file)} #{@package_file.size} #{@component}/Packages
- #{compute_sha2(@gzipped_package_file)} #{@gzipped_package_file.size} #{@component}/Packages.gz
- #{compute_sha2(@short_release_file)} #{@short_release_file.size} #{@component}/Release
-"
-      return partial_release_file
-    end
-
-    def generate_short_release_file
-      "Component: main
-Origin: apt.cloudscaling.com
-Label: apt repository #{@release}
-Architecture: amd64
-Description: Cloudscaling APT repository
-"
-    end
-    
-
-    def filename(package)
-      filename = File.basename package.path
-      shortname = `dpkg --field #{package.path} Package`.chomp
-      first_letter = shortname[0]
-      package.repo_filename = "pool/main/#{first_letter}/#{shortname}/#{filename}"
-    end
-    
-    def generate_package_file()
-      package_file = ''
-      @packages.each { |package| package_file << generate_package_stub(package) }
-      return package_file
-    end
-    
-    def generate_package_stub(package)
-      package_stub = ''
-      package_stub << `dpkg --field #{package.path}`
-      package_stub << "Filename: #{filename(package)}\n"
-      package_stub << "Size: #{package.size}\n"
-      package_stub << "MD5sum: #{package.md5}\n"
-      package_stub << "SHA1: #{package.sha1}\n"
-      package_stub << "SHA256: #{package.sha2}\n"
-      package_stub << "\n"
-      return package_stub
-    end
-  end
-
-  class ReleasePusher < Base
-    def initialize(package_release,access_key,secret_key,bucket,prefix,server='s3-us-west-1.amazonaws.com')
-      @release = package_release.release
-      @bucket = bucket
-      @prefix = prefix
-      @s3 = FRM::S3.new(access_key,secret_key,server)
-      push_packages(package_release.packages)
-      push_release_files(package_release)
-    end
-
-    private
-
-
-    def push_release_files(package_release)
-      # TODO: un-hardcode this
-      release_path = @prefix + "/dists/#{@release}/Release"
-      @s3.put(release_path,package_release.release_file,@bucket)
-
-      in_release_path = @prefix + "/dists/#{@release}/InRelease"
-      @s3.put(in_release_path,gpg_clearsign(package_release.release_file),@bucket)
-
-      gpg_release_path = @prefix + "/dists/#{@release}/Release.gpg"
-      @s3.put(gpg_release_path,gpg_detached(package_release.release_file),@bucket)
-
-      release_file_path = @prefix + "/dists/#{@release}/" + package_release.component
-      @s3.put(release_file_path + '/Release',package_release.short_release_file,@bucket)
-      @s3.put(release_file_path + '/Packages',package_release.package_file,@bucket)
-      @s3.put(release_file_path + '/Packages.gz',package_release.gzipped_package_file,@bucket)
-    end
-    
-
-    def push_packages(packages)
-      packages.each { |package| push_package(package) }
-    end
-    
-    def push_package(package)
-      remote_path = @prefix + '/' + package.repo_filename
-      @s3.put(remote_path,package.content,@bucket)
-    end
-    
-
-  end
-  
-  
   
   class Deb  < Base
     
@@ -154,7 +7,7 @@ Description: Cloudscaling APT repository
     end
     
     def generate_package_file(in_packages=[])
-      packages = in_packages.dup
+      packages = in_packages.sort { |a,b| a['Package'] <=> b['Package'] }
       package_file = ''
       packages.each { |package| package_file << generate_package_stub(package) }
       return package_file

data/lib/frm/package.rb

@@ -0,0 +1,24 @@
+module FRM
+  class Package < Base
+    attr_accessor :repo_filename
+    attr_reader :path, :content, :md5, :sha1, :sha2 , :size, :release
+    def initialize(path,release='natty')
+      raise "you need to specify a path!!!" if path.nil?
+      @path = path
+      raise "Can not find file '#{path}'" unless File.exists?(path)
+      @release = release
+      begin
+        @content = File.read(path)
+      rescue Object => o
+        STDERR.puts "Could not open file '#{path}'. Exiting..."
+        STDERR.puts o.inspect
+        STDERR.puts o.backtrace
+        raise "Could not open file '#{path}'. Exiting..."
+      end
+      @size = File.size(@path)
+      @md5 = compute_md5(@content)
+      @sha1 = compute_sha1(@content)
+      @sha2 = compute_sha2(@content)
+    end
+  end
+end

data/lib/frm/release.rb

@@ -0,0 +1,107 @@
+module FRM
+  
+  class PackageRelease < Base
+    attr_reader :packages, :standards_version, :priority, :package_file, :gzipped_package_file, :release_file, :short_release_file, :component, :release, :i386_release_file, :i386_packages_file, :gzipped_i386_packages_file
+    def initialize(packages={},release='natty',component='main/binary-amd64')
+      @release = release
+      @component = component
+      @standards_version = standards_version
+      @priority = priority
+      @packages = []
+      packages.each { |package| @packages << Package.new(package,@release) }
+      if component == 'main/binary-amd64'
+        generate_i386_stubs
+      end
+      @i386_release_file = <<EOF
+Component: main
+Origin: apt.cloudscaling.com
+Label: apt repository #{@release}
+Architecture: i386
+Description: Cloudscaling APT repository
+EOF
+      @i386_packages_file = ""
+      @gzipped_i386_packages_file = generate_gzip_pipe(@i386_packages_file).read
+      @package_file = generate_package_file
+      @gzipped_package_file = generate_gzip_pipe(@package_file).read
+      @short_release_file = generate_short_release_file
+      @release_file = generate_release_file
+    end
+    
+    private
+
+    
+    # ubuntu precicse 64 wants i386 debs by default :\
+    def generate_i386_stubs()
+    end
+
+    
+    def generate_release_file()
+      partial_release_file = "Origin: apt.cloudscaling.com
+Label: apt repository #{@release}
+Codename: #{@release}
+Date: Thu, 22 Dec 2011 00:29:55 UTC
+Architectures: amd64 i386
+Components: main universe multiverse
+Description: Cloudscaling APT repository
+MD5Sum:
+ #{compute_md5(@package_file)} #{@package_file.size} #{@component}/Packages
+ #{compute_md5(@gzipped_package_file)} #{@gzipped_package_file.size} #{@component}/Packages.gz
+ #{compute_md5(@short_release_file)} #{@short_release_file.size} #{@component}/Release
+ #{compute_md5(@i386_packages_file)} #{@i386_packages_file.size} main/binary-i386/Packages
+ #{compute_md5(@gzipped_i386_packages_file)} #{@gzipped_i386_packages_file.size} main/binary-i386/Packages.gz
+ #{compute_md5(@i386_release_file)} #{@i386_release_file.size} main/binary-i386/Release
+SHA1:
+ #{compute_sha1(@package_file)} #{@package_file.size} #{@component}/Packages
+ #{compute_sha1(@gzipped_package_file)} #{@gzipped_package_file.size} #{@component}/Packages.gz
+ #{compute_sha1(@short_release_file)} #{@short_release_file.size} #{@component}/Release
+ #{compute_sha1(@i386_packages_file)} #{@i386_packages_file.size} main/binary-i386/Packages
+ #{compute_sha1(@gzipped_i386_packages_file)} #{@gzipped_i386_packages_file.size} main/binary-i386/Packages.gz
+ #{compute_sha1(@i386_release_file)} #{@i386_release_file.size} main/binary-i386/Release
+SHA256:
+ #{compute_sha2(@package_file)} #{@package_file.size} #{@component}/Packages
+ #{compute_sha2(@gzipped_package_file)} #{@gzipped_package_file.size} #{@component}/Packages.gz
+ #{compute_sha2(@short_release_file)} #{@short_release_file.size} #{@component}/Release
+ #{compute_sha2(@i386_packages_file)} #{@i386_packages_file.size} main/binary-i386/Packages
+ #{compute_sha2(@gzipped_i386_packages_file)} #{@gzipped_i386_packages_file.size} main/binary-i386/Packages.gz
+ #{compute_sha2(@i386_release_file)} #{@i386_release_file.size} main/binary-i386/Release
+"
+      return partial_release_file
+    end
+
+
+    def generate_short_release_file
+      "Component: main
+Origin: apt.cloudscaling.com
+Label: apt repository #{@release}
+Architecture: amd64
+Description: Cloudscaling APT repository
+"
+    end
+    
+
+    def filename(package)
+      filename = File.basename package.path
+      shortname = `dpkg --field #{package.path} Package`.chomp
+      first_letter = shortname[0]
+      package.repo_filename = "pool/main/#{first_letter}/#{shortname}/#{filename}"
+    end
+    
+    def generate_package_file()
+      package_file = ''
+      @packages.each { |package| package_file << generate_package_stub(package) }
+      return package_file
+    end
+    
+    def generate_package_stub(package)
+      package_stub = ''
+      package_stub << `dpkg --field #{package.path}`
+      package_stub << "Filename: #{filename(package)}\n"
+      package_stub << "Size: #{package.size}\n"
+      package_stub << "MD5sum: #{package.md5}\n"
+      package_stub << "SHA1: #{package.sha1}\n"
+      package_stub << "SHA256: #{package.sha2}\n"
+      package_stub << "\n"
+      return package_stub
+    end
+  end
+end

data/lib/frm/release_pusher.rb

@@ -0,0 +1,52 @@
+module FRM
+  
+  class ReleasePusher < Base
+    def initialize(package_release,access_key,secret_key,bucket,prefix,server='s3-us-west-1.amazonaws.com')
+      @release = package_release.release
+      @bucket = bucket
+      @prefix = prefix
+      @s3 = FRM::S3.new(access_key,secret_key,server)
+      push_packages(package_release.packages)
+      push_release_files(package_release)
+    end
+
+    private
+
+
+    def push_release_files(package_release)
+      # TODO: un-hardcode this
+      release_path = @prefix + "/dists/#{@release}/Release"
+      @s3.put(release_path,package_release.release_file,@bucket)
+
+      in_release_path = @prefix + "/dists/#{@release}/InRelease"
+      @s3.put(in_release_path,gpg_clearsign(package_release.release_file),@bucket)
+
+      gpg_release_path = @prefix + "/dists/#{@release}/Release.gpg"
+      @s3.put(gpg_release_path,gpg_detached(package_release.release_file),@bucket)
+
+      release_file_path = @prefix + "/dists/#{@release}/" + package_release.component
+      @s3.put(release_file_path + '/Release',package_release.short_release_file,@bucket)
+      @s3.put(release_file_path + '/Packages',package_release.package_file,@bucket)
+      @s3.put(release_file_path + '/Packages.gz',package_release.gzipped_package_file,@bucket)
+
+
+      i386_release_file_path = @prefix + "/dists/#{@release}/" + 'main/binary-i386'
+      @s3.put(i386_release_file_path + '/Release',package_release.i386_release_file,@bucket)
+      @s3.put(i386_release_file_path + '/Packages',package_release.i386_packages_file,@bucket)
+      @s3.put(i386_release_file_path + '/Packages.gz',package_release.gzipped_i386_packages_file,@bucket)
+    end
+    
+
+    def push_packages(packages)
+      packages.each { |package| push_package(package) }
+    end
+    
+    def push_package(package)
+      remote_path = @prefix + '/' + package.repo_filename
+      @s3.put(remote_path,package.content,@bucket)
+    end
+    
+
+  end
+  
+end

data/lib/frm/version.rb

@@ -1,3 +1,3 @@
 module Frm
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/frm.rb

@@ -1,3 +1,15 @@
+DEFAULT_HOST =  's3-us-west-1.amazonaws.com' # stupid hack to point to the right s3 region
+
+require 'zlib'
+require 'tempfile'
+require 'digest/md5'
+require 'digest/sha1'
+require 'digest/sha2'
+
 require 'frm/base'
 require 'frm/s3'
+require 'frm/package'
+require 'frm/release'
+require 'frm/release_pusher'
 require 'frm/deb'
+

data/test/deb_test.rb

@@ -94,7 +94,7 @@ Description: Cloudscaling APT repository
 Label: apt repository natty
 Codename: natty
 Date: Thu, 22 Dec 2011 00:29:55 UTC
-Architectures: amd64
+Architectures: amd64 i386
 Components: main universe multiverse
 Description: Cloudscaling APT repository
 MD5Sum:
@@ -178,6 +178,17 @@ class TestDeb < MiniTest::Unit::TestCase
                "Depends" => %w{one two three},
                "section" => "main",
                "path_to_deb" => '/tmp/bar_1.2.3.4_amd64.deb'
+             },
+             {
+               "Package" => "qqq",
+               "Version" => "1.2.3.4",
+               "Architecture" => "amd64",
+               "Maintainer" => "support@cloudscaling.com",
+               "Homepage" => "http://www.cloudscaling.com",
+               "Priority" => "extra",
+               "Depends" => %w{one two three},
+               "section" => "main",
+               "path_to_deb" => '/tmp/bar_1.2.3.4_amd64.deb'
              }
             ]
   end
@@ -214,7 +225,21 @@ Description: some
 
   
   def  test_generate_package_file
-    correct_output = "Package: foo
+correct_output = 'Package: bar
+Version: 1.2.3.4
+Architecture: amd64
+Maintainer: <support@cloudscaling.com>
+Homepage: http://www.cloudscaling.com
+Priority: extra
+Depends: one, two, three
+Filename: pool/main/b/bar/bar_1.2.3.4_amd64.deb
+Size: 3
+MD5sum: 37b51d194a7513e45b56f6524f2d51f2
+SHA1: 62cdb7020ff920e5aa642c3d4066950dd1f01f4d
+SHA256: fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9
+Description: no description given
+
+Package: foo
 Version: 1.2.68
 Architecture: amd64
 Maintainer: <support@cloudscaling.com>
@@ -230,21 +255,21 @@ Description: some
  multiline
  description
 
-Package: bar
+Package: qqq
 Version: 1.2.3.4
 Architecture: amd64
 Maintainer: <support@cloudscaling.com>
 Homepage: http://www.cloudscaling.com
 Priority: extra
 Depends: one, two, three
-Filename: pool/main/b/bar/bar_1.2.3.4_amd64.deb
+Filename: pool/main/q/qqq/qqq_1.2.3.4_amd64.deb
 Size: 3
 MD5sum: 37b51d194a7513e45b56f6524f2d51f2
 SHA1: 62cdb7020ff920e5aa642c3d4066950dd1f01f4d
 SHA256: fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9
 Description: no description given
 
-"
+'
     assert @deb.generate_package_file(@hash) == correct_output
   end
 
@@ -329,9 +354,8 @@ Description: no description given
   def test_merge_package_file
     package_file = File.open File.join @@frm_test_base, 'Packages.txt'
     read_buffer, write_buffer = IO.pipe
-
-    @deb.merge_package_file(package_file,write_buffer,@hash)
-    
+    merged_list = @deb.merge_package_file(package_file,write_buffer,@hash)
+    assert true
   end
   
   

metadata

@@ -1,58 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: frm
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 0.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Martin Rhoads
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-23 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: aws-s3
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mock-aws-s3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mock-aws-s3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: FRM makes it easy to build package repositories on S3
-email: 
+email:
 - ermal14@gmail.com
-executables: 
+executables:
 - frm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -63,6 +61,9 @@ files:
 - lib/frm.rb
 - lib/frm/base.rb
 - lib/frm/deb.rb
+- lib/frm/package.rb
+- lib/frm/release.rb
+- lib/frm/release_pusher.rb
 - lib/frm/s3.rb
 - lib/frm/version.rb
 - test/Packages.txt
@@ -73,37 +74,36 @@ files:
 - test/lib/test.rb
 - test/rake.rb
 - test/s3.rb
-has_rdoc: true
 homepage: https://github.com/ermal14/frm
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: frm
-rubygems_version: 1.3.7.1
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Effin Repo Manager
-test_files: []
-
+test_files:
+- test/Packages.txt
+- test/deb.rb
+- test/deb_test.rb
+- test/debs/frm_bar-1.0.0.deb
+- test/debs/frm_foo-1.0.0.deb
+- test/lib/test.rb
+- test/rake.rb
+- test/s3.rb