frm 0.0.3 → 0.0.4

data/.gitignore

@@ -2,3 +2,6 @@
 .bundle
 Gemfile.lock
 pkg/*
+*~
+*.swp
+tmp/*

data/Rakefile

@@ -1,13 +1,16 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-frm_base = File.dirname __FILE__
+@frm_base = File.dirname __FILE__
+
+require File.join @frm_base, 'test', 'rake'
+
 
 namespace :bump do
   
   desc "bump the patch version number"
   task :patch do
-    version_file_path = File.join frm_base, 'lib', 'frm', 'version.rb'
+    version_file_path = File.join @frm_base, 'lib', 'frm', 'version.rb'
     current_version_file = File.read version_file_path
     current_version_file =~ /VERSION[^\d]+(\d+)\.(\d+)\.(\d+)(\.([^'"]*))?/
     major,minor,patch = $1, $2, $3

data/bin/frm

@@ -19,7 +19,10 @@ def print_and_exit(message)
 end
 
 optparse = OptionParser.new do|opts|
-  opts.banner = "Usage: frm.rb [options] package1 [package2]B ..."
+  opts.banner = "Welcome to Effin Repo Manager
+FRM allows you to easily create debian repos on S3
+
+Usage: frm [options] package1 [package2] ..."
 
   options[:access_key] = nil
   opts.on( '-a', '--access-key ACCESS_KEY', 'S3 public access key' ) do |key|
@@ -80,7 +83,7 @@ end
 Dir.chdir(File.dirname(File.dirname(__FILE__)))
 
 # require the necessary FRM libs
-require File.join Dir.pwd, 'lib', 'deb'
+require File.join Dir.pwd, 'lib', 'frm'
 
 puts "creating release..."
 package_release = FRM::PackageRelease.new(packages)

data/frm.gemspec

@@ -19,4 +19,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["bin"]
   s.require_paths = ["lib"]
+
+  s.add_dependency('aws-s3')
+
+  s.add_development_dependency('mock-aws-s3')	
 end
+

data/lib/frm/base.rb

@@ -0,0 +1,81 @@
+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)
+    end
+    
+    def compute_sha1(string)
+      Digest::SHA1.hexdigest(string)
+    end
+    
+    def compute_sha2(string)
+      Digest::SHA2.hexdigest(string)
+    end
+
+    # TODO:
+    # there has to be a better way to use gpg withen ruby. found many
+    # broken solutions :\ 
+    def gpg_clearsign(message)
+      `echo "#{message}" | gpg --clearsign`
+    end
+
+    # TODO: same as above
+    def gpg_detached(message)
+      `echo "#{message}" | gpg -abs`
+    end
+    
+
+    def generate_gzip_pipe(contents)
+      read_buffer, write_buffer = IO.pipe
+      gzip_writer = Zlib::GzipWriter.new write_buffer
+      gzip_writer.mtime = 1 # ensure that the header is determinstic
+      gzip_writer.write contents
+      gzip_writer.close
+      read_buffer
+    end
+    
+    def gunzip_pipe(gziped_pipe)
+      gzip_reader = Zlib::GzipReader.new gziped_pipe
+      unzipped_string = gzip_reader.read
+      gzip_reader.close
+      return unzipped_string
+    end
+    
+    def parse_package_stub(read_buffer)
+      package = {}
+      stub = ""
+      while line = read_buffer.gets
+        return nil if line.strip.empty? 
+        raise "bad input" unless (match = line.match /^\w+\-?\w+?: /)
+        stub << line
+        key = match[0].delete ': ' # if match
+        value = match.post_match.strip
+        package[key] = value
+        if key == 'Description'
+          while (line = read_buffer.gets).strip != ""
+            package['Description'] << line
+            stub << line
+          end
+          package['Description'].rstrip!
+          return package, stub
+        end
+      end
+      nil
+    end
+    
+    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
+    end
+  end
+end

data/lib/frm/deb.rb

@@ -2,93 +2,12 @@ DEFAULT_HOST =  's3-us-west-1.amazonaws.com' # stupid hack to point to
 # the right region
 
 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)
-    end
-    
-    def compute_sha1(string)
-      Digest::SHA1.hexdigest(string)
-    end
-    
-    def compute_sha2(string)
-      Digest::SHA2.hexdigest(string)
-    end
-
-    # TODO:
-    # there has to be a better way to use gpg withen ruby. found many
-    # broken solutions :\ 
-    def gpg_clearsign(message)
-      `echo "#{message}" | gpg --clearsign`
-    end
-
-    # TODO: same as above
-    def gpg_detached(message)
-      `echo "#{message}" | gpg -abs`
-    end
-    
-
-    def generate_gzip_pipe(contents)
-      read_buffer, write_buffer = IO.pipe
-      gzip_writer = Zlib::GzipWriter.new write_buffer
-      gzip_writer.mtime = 1 # ensure that the header is determinstic
-      gzip_writer.write contents
-      gzip_writer.close
-      read_buffer
-    end
-    
-    def gunzip_pipe(gziped_pipe)
-      gzip_reader = Zlib::GzipReader.new gziped_pipe
-      unzipped_string = gzip_reader.read
-      gzip_reader.close
-      return unzipped_string
-    end
-    
-    def parse_package_stub(read_buffer)
-      package = {}
-      stub = ""
-      while line = read_buffer.gets
-        return nil if line.strip.empty? 
-        raise "bad input" unless (match = line.match /^\w+\-?\w+?: /)
-        stub << line
-        key = match[0].delete ': ' # if match
-        value = match.post_match.strip
-        package[key] = value
-        if key == 'Description'
-          while (line = read_buffer.gets).strip != ""
-            package['Description'] << line
-            stub << line
-          end
-          package['Description'].rstrip!
-          return package, stub
-        end
-      end
-      nil
-    end
-    
-    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
-    end
-end
-  
   
   class Package < Base
     attr_accessor :repo_filename
     attr_reader :path, :content, :md5, :sha1, :sha2 , :size
     def initialize(path)
+      raise "you need to specify a path!!!" if path.nil?
       @path = path
       raise "Can not find file '#{path}'" unless File.exists?(path)
       begin
@@ -267,47 +186,6 @@ Description: Cloudscaling APT repository
     end
     
     
-    def generate_release
-      return "Origin: apt.cloudscaling.com
-     Label: apt repository natty
-     Codename: natty
-     Date: Thu, 22 Dec 2011 00:29:55 UTC
-     Architectures: amd64
-     Components: main universe multiverse
-     Description: Cloudscaling APT repository
-     MD5Sum:
-      a4b943ff89790ccdc186875dad67827b 5813 main/binary-amd64/Packages
-      004fd3f868ebbe7501fb2e1c0c54e2a7 2148 main/binary-amd64/Packages.gz
-      79dd2fee35fba7255dcd40e1f6529591 134 main/binary-amd64/Release
-      d41d8cd98f00b204e9800998ecf8427e 0 universe/binary-amd64/Packages
-      7029066c27ac6f5ef18d660d5741979a 20 universe/binary-amd64/Packages.gz
-      018c8e37146b908a6bde46012a83d4ba 138 universe/binary-amd64/Release
-      d41d8cd98f00b204e9800998ecf8427e 0 multiverse/binary-amd64/Packages
-      7029066c27ac6f5ef18d660d5741979a 20 multiverse/binary-amd64/Packages.gz
-      4680f88c741bad22529909db5be4f608 140 multiverse/binary-amd64/Release
-     SHA1:
-      6e03924030eab56cb9735a52ec710537e682bcfc 5813 main/binary-amd64/Packages
-      5f2989bae96e148cb5f18accc4357305926ab1e1 2148 main/binary-amd64/Packages.gz
-      6d932af9af761f418e5374f73dcd09badb4fe57e 134 main/binary-amd64/Release
-      da39a3ee5e6b4b0d3255bfef95601890afd80709 0 universe/binary-amd64/Packages
-      46c6643f07aa7f6bfe7118de926b86defc5087c4 20 universe/binary-amd64/Packages.gz
-      4d428e7ad434df47cffc40cabf8e238ee76ea434 138 universe/binary-amd64/Release
-      da39a3ee5e6b4b0d3255bfef95601890afd80709 0 multiverse/binary-amd64/Packages
-      46c6643f07aa7f6bfe7118de926b86defc5087c4 20 multiverse/binary-amd64/Packages.gz
-      c8a7d2eb24ece57d460106506fcff99cb2ada015 140 multiverse/binary-amd64/Release
-     SHA256:
-      dd8283f06beb4a5fc06ac62d3ae098e5ba2717daef2a15b5f3e9233eb64e0227 5813 main/binary-amd64/Packages
-      b197c5a3c1fe6a6d286e9f066a0cade289e3a2fc485c90407179951634788aa8 2148 main/binary-amd64/Packages.gz
-      690b44df6fe65f40f260b73394e87804df78c9ccf13999889259faeed3eec40d 134 main/binary-amd64/Release
-      e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 universe/binary-amd64/Packages
-      59869db34853933b239f1e2219cf7d431da006aa919635478511fabbfc8849d2 20 universe/binary-amd64/Packages.gz
-      32f35b1fc2bdc5a11b53abeadaaa77771b15acb5305777484bf4390d697ae5bd 138 universe/binary-amd64/Release
-      e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 multiverse/binary-amd64/Packages
-      59869db34853933b239f1e2219cf7d431da006aa919635478511fabbfc8849d2 20 multiverse/binary-amd64/Packages.gz
-      f29816e3a4f90a8b4c688fdb2ac3056d5fb7349857c9ea8da2fbccf8e931baca 140 multiverse/binary-amd64/Release"
-    end
-    
-    
     def generate_package_line(key='',value='')
       valid_options = %w{Package Version Architecture Maintainer Standards-Version Homepage Priority Depends Filename Size SHA256 SHA1 MD5sum Description}
       raise "Bogus option passed: #{key}" unless valid_options.include?(key)                

data/lib/frm/s3.rb

@@ -1,6 +1,6 @@
 my_dir = File.dirname __FILE__
 STDERR.puts "#{File.join my_dir, 's3'}"
-require File.join my_dir, 'base'
+#require File.join my_dir, 'base'
 
 
 module FRM

data/lib/frm/version.rb

@@ -1,3 +1,3 @@
 module Frm
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/frm.rb

@@ -1,3 +1,3 @@
-module Frm
-  # Your code goes here...
-end
+require File.join @frm_base, 'lib', 'frm', 'base'
+require File.join @frm_base, 'lib', 'frm', 's3'
+require File.join @frm_base, 'lib', 'frm', 'deb'

data/test/Packages.txt

@@ -0,0 +1,155 @@
+Package: kyotocabinet
+Version: 1.2.68
+Architecture: amd64
+Maintainer: <jenkins@ci>
+Standards-Version: 3.9.1
+Homepage: http://nourlgiven.example.com/no/url/given
+Priority: extra
+Section: default
+Filename: pool/main/k/kyotocabinet/kyotocabinet_1.2.68_amd64.deb
+Size: 3718964
+SHA256: 0646abf6c54a00afd213272386fb58ca777357bee99a53464b6f9a6e79344fde
+SHA1: 6d2fb30095bb6ca876ca2ffc22523911aede9dfa
+MD5sum: f1fc7e4c0bc8e3874d37c8df668c6fb3
+Description: no description given
+
+Package: pod-services
+Version: 0.0.4
+Architecture: amd64
+Maintainer: <jenkins@ci>
+Depends: zeromq, kyotocabinet, ruby1.9.2-full, libavahi-compat-libdnssd1, rubygem-bundler
+Standards-Version: 3.9.1
+Homepage: http://nourlgiven.example.com/no/url/given
+Priority: extra
+Section: default
+Filename: pool/main/p/pod-services/pod-services_0.0.4_amd64.deb
+Size: 59230358
+SHA256: 6c5e8044d13dfb1c337767474a8094416c0913650aff71a2fe4aaec4d0f8ee9d
+SHA1: 467fcc65ed729c845bad981743b5774e359a40df
+MD5sum: 4b6ed193ca6d4d8002e39413b8966cca
+Description: no description given
+
+Package: python-kyotocabinet
+Version: 1.1
+Architecture: amd64
+Maintainer: <jenkins@ci>
+Depends: kyotocabinet
+Standards-Version: 3.9.1
+Homepage: http://fallabs.com/kyotocabinet/
+Priority: extra
+Section: default
+Filename: pool/main/p/python-kyotocabinet/python-kyotocabinet_1.1_amd64.deb
+Size: 1309704
+SHA256: f71dcafe4074bbbe68105d9dcd4700313f2543147a88e10392761736719b83a1
+SHA1: b0772977ec9c1d4b8313b76f20188b24646ea8fb
+MD5sum: cf02d0adc90e110893165834a0993c0d
+Description: a straightforward implementation of DBM
+
+Package: python-netifaces
+Version: 0.5
+Architecture: amd64
+Maintainer: <jenkins@ci>
+Standards-Version: 3.9.1
+Homepage: http://alastairs-place.net/netifaces
+Priority: extra
+Section: default
+Filename: pool/main/p/python-netifaces/python-netifaces_0.5_amd64.deb
+Size: 14126
+SHA256: 433969c5ff6e56a5c5ca9925c01ecc1df591080e95544d4f0ee61fa9d263abf4
+SHA1: 512bc3b46bbc8d7b45fda8ff496c6cee6208bf03
+MD5sum: 66e6739aadb3c6e3def550b36ac10eeb
+Description: Portable network interface information.
+
+Package: python-pybonjour
+Version: 1.1.1
+Architecture: all
+Maintainer: <jenkins@ci>
+Depends: libavahi-compat-libdnssd1
+Standards-Version: 3.9.1
+Homepage: http://o2s.csail.mit.edu/o2s-wiki/pybonjour
+Priority: extra
+Section: default
+Filename: pool/main/p/python-pybonjour/python-pybonjour_1.1.1_all.deb
+Size: 30490
+SHA256: 7e23aeb59599f60da61acd3275038d5603515e00b215a2dd94a222c648c2bc8a
+SHA1: ae97584f4471165306fea16d9cd0628f1b7f797f
+MD5sum: efa7004bbffc372abeb99070997e295b
+Description: Pure-Python interface to Apple Bonjour and compatible DNS-SD libraries
+
+Package: python-pyzmq
+Version: 2.1.7.1
+Architecture: amd64
+Maintainer: <jenkins@ci>
+Depends: zeromq
+Standards-Version: 3.9.1
+Homepage: http://github.com/zeromq/pyzmq
+Priority: extra
+Section: default
+Filename: pool/main/p/python-pyzmq/python-pyzmq_2.1.7.1_amd64.deb
+Size: 1198458
+SHA256: 039fac7f7dbf0c5c8da6179a13756a216cf8c7d192c8c451631a005a10e6085d
+SHA1: 6f34087234c6c64d5563249bcbe0ae789807cf50
+MD5sum: bd0364643376bce244b87f6cc4824896
+Description: Python bindings for 0MQ.
+
+Package: python-thlayli
+Version: 0.3
+Architecture: all
+Maintainer: <jenkins@ci>
+Depends: python-netifaces (>= 0), python-kyotocabinet (>= 0), python-pybonjour (>= 0), python-pyzmq (>= 0)
+Standards-Version: 3.9.1
+Homepage: http://clouldscaling.com/
+Priority: extra
+Section: default
+Filename: pool/main/p/python-thlayli/python-thlayli_0.3_all.deb
+Size: 13426
+SHA256: f860439b4db71b5bd85d103b4460dce8464c468d00a8632e3ae1a0a32cc35c57
+SHA1: a457cfbc4737acbe1def6c49c0ca56ff5d425479
+MD5sum: 3dd096d608ad55b04754bc1ad4ac3457
+Description: Thlayli is a simple tuplespace for coordinating distributed work.
+
+Package: ruby1.9.2-full
+Version: 1.9.2
+Architecture: amd64
+Maintainer: <jenkins@ci>
+Standards-Version: 3.9.1
+Homepage: http://nourlgiven.example.com/no/url/given
+Priority: extra
+Section: default
+Filename: pool/main/r/ruby1.9.2-full/ruby1.9.2-full_1.9.2_amd64.deb
+Size: 10923378
+SHA256: 1640650ad27b765681d9148f0e23f40b5d86ba6e60370f63bf6402fb0fec4f6f
+SHA1: d9748b34ca4d2a284bac86ec3040f685adc4964c
+MD5sum: 2baa87f011d61b8a884ded2a0ccf43d8
+Description: no description given
+
+Package: rubygem-bundler
+Version: 1.0.18
+Architecture: all
+Maintainer: André Arko
+Standards-Version: 3.9.1
+Homepage: http://gembundler.com
+Priority: extra
+Section: Languages/Development/Ruby
+Filename: pool/main/r/rubygem-bundler/rubygem-bundler_1.0.18_all.deb
+Size: 341144
+SHA256: b2e51a45a90707261ed36648847409783542fc092bc18a11a63a1db0b76ca4b3
+SHA1: ca3d01e1e0e3608b785562bc5d31d413e74e0d77
+MD5sum: 13d7db51446b5bbed40f8db407597733
+Description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
+
+Package: zeromq
+Version: 2.1.7
+Architecture: amd64
+Maintainer: <jenkins@ci>
+Standards-Version: 3.9.1
+Homepage: http://nourlgiven.example.com/no/url/given
+Priority: extra
+Section: default
+Filename: pool/main/z/zeromq/zeromq_2.1.7_amd64.deb
+Size: 1899468
+SHA256: e41fcb46155591beb120a95f11a574e39e7a4e60e61f373ba1843d5fea63f280
+SHA1: d25801f69462a1b9d1a91c396de98d9a7b4c2e95
+MD5sum: 48b46e195bd4ea7d6140e1ca1520a199
+Description: no description given
+

data/test/{deb_test2.rb → deb.rb}

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'minitest/autorun'
-
-my_dir = File.dirname __FILE__
-require File.join my_dir, 'deb'
+require 'mock-aws-s3'
 
 class TestReleasePusher < MiniTest::Unit::TestCase
   def setup
@@ -11,12 +9,9 @@ class TestReleasePusher < MiniTest::Unit::TestCase
     @tempfile2 = File.open('/tmp/bar_1.2.3.4_amd64.deb','w+') { |f| f.write 'bar' }
     @tempfile3 = File.open('/tmp/martin_1.2.3.4_amd64.deb','w+') { |f| f.write 'martin' }
     
-    hashes = %w{
-                /home/martin/sheep/modules/substratum/debs/pod-services-0.5.0-967-amd64.deb
-                /home/martin/sheep/modules/substratum/debs/cs-chef-0.9.1-1782-all.deb
-                /home/martin/sheep/modules/substratum/debs/ruby1.9.2-1-amd64.deb
-              }
-
+    hashes = []
+    hashes << File.join(@@frm_test_base, 'debs', 'frm_foo-1.0.0.deb')
+    hashes << File.join(@@frm_test_base, 'debs', 'frm_bar-1.0.0.deb')
     
     @package_release = FRM::PackageRelease.new(hashes)
     @release_pusher = FRM::ReleasePusher.new(@package_release,'1234','abcd',\

data/test/deb_test.rb

@@ -11,52 +11,9 @@ class TestReleasePusher < MiniTest::Unit::TestCase
     @tempfile2 = File.open('/tmp/bar_1.2.3.4_amd64.deb','w+') { |f| f.write 'bar' }
     @tempfile3 = File.open('/tmp/martin_1.2.3.4_amd64.deb','w+') { |f| f.write 'martin' }
     
-    hashes = [{
-                "Package" => "foo",
-                "Version" => "1.2.68",
-                "Architecture" => "amd64",
-                "Maintainer" => "support@cloudscaling.com",
-                "Homepage" => "http://www.cloudscaling.com",
-                "Priority" => "extra",
-                "Depends" => %w{one two three},
-                "section" => "main",
-                "path_to_deb" => '/tmp/foo_1.2.68_amd64.deb',
-                "Description" => 'some
- multiline
- description'
-              },
-              {
-                "Package" => "bar",
-                "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'
-              },
-              {
-                "Package" => "martin",
-                "Version" => "1.2.3.4",
-                "Architecture" => "amd64",
-                "Maintainer" => "support@cloudscaling.com",
-                "Homepage" => "http://www.cloudscaling.com",
-                "Priority" => "extra",
-                "section" => "main",
-                "path_to_deb" => '/tmp/martin_1.2.3.4_amd64.deb'
-              },
-              {
-                "Package" => "cs-chef",
-                "Version" => "1.2.3.4",
-                "Architecture" => "amd64",
-                "Maintainer" => "support@cloudscaling.com",
-                "Homepage" => "http://www.cloudscaling.com",
-                "Priority" => "extra",
-                "section" => "main",
-                "path_to_deb" => '/tmp/debs/cs-chef-0.9.1-1782-all.deb'
-              }
-             ]
+    hashes = []
+    hashes << File.join(@@frm_test_base, 'debs', 'frm_foo-1.0.0.deb')
+    hashes << File.join(@@frm_test_base, 'debs', 'frm_bar-1.0.0.deb')
     
     @package_release = FRM::PackageRelease.new(hashes)
     @release_pusher = FRM::ReleasePusher.new(@package_release,'abcd','1234',\
@@ -64,7 +21,7 @@ class TestReleasePusher < MiniTest::Unit::TestCase
   end
 
   def test
-    puts "@release_pusher.inspect = #{@release_pusher.inspect}"
+#    puts "@release_pusher.inspect = #{@release_pusher.inspect}"
   end
   
 end
@@ -74,68 +31,49 @@ end
     @tempfile1 = File.open('/tmp/foo_1.2.68_amd64.deb','w+') { |f| f.write 'foo' }
     @tempfile2 = File.open('/tmp/bar_1.2.3.4_amd64.deb','w+') { |f| f.write 'bar' }
     
-    hashes = [{
-                "Package" => "foo",
-                "Version" => "1.2.68",
-                "Architecture" => "amd64",
-                "Maintainer" => "support@cloudscaling.com",
-                "Homepage" => "http://www.cloudscaling.com",
-                "Priority" => "extra",
-                "Depends" => %w{one two three},
-                "section" => "main",
-                "path_to_deb" => '/tmp/foo_1.2.68_amd64.deb',
-                "Description" => 'some
- multiline
- description'
-              },
-              {
-                "Package" => "bar",
-                "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'
-              }
-             ]
+    hashes = []
+    hashes << File.join(@@frm_test_base, 'debs', 'frm_foo-1.0.0.deb')
+    hashes << File.join(@@frm_test_base, 'debs', 'frm_bar-1.0.0.deb')
     
     @package_release = FRM::PackageRelease.new(hashes)
   end
   
   def test()
-    correct_output = "Package: foo
-Version: 1.2.68
+    correct_output = "Package: frm-foo
+Version: 1.0
+License: unknown
+Vendor: martin@host-c1e5ea34
 Architecture: amd64
-Maintainer: <support@cloudscaling.com>
-Standards-Version: 3.9.1
-Homepage: http://www.cloudscaling.com
+Maintainer: <martin@host-c1e5ea34>
+Installed-Size: 0
+#Pre-Depends: 
+Section: default
 Priority: extra
-Depends: one, two, three
-Filename: pool/main/f/foo/foo_1.2.68_amd64.deb
-Size: 3
-MD5sum: acbd18db4cc2f85cedef654fccc4a4d8
-SHA1: 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33
-SHA256: 2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae
-Description: some
- multiline
- description
-
-Package: bar
-Version: 1.2.3.4
+Homepage: http://example.com/no-uri-given
+Description: no description given
+Filename: pool/main/f/frm-foo/frm_foo-1.0.0.deb
+Size: 716
+MD5sum: 0faf8cabf49a615adacbe6d80c4aee3b
+SHA1: 78c6be70488c78d63b6eb233f891e80d3af0b779
+SHA256: 5f0de3c65226c13e9c215478ba784afe54b0592aa46766ff19b1140644bbda71
+
+Package: frm-bar
+Version: 1.0
+License: unknown
+Vendor: martin@host-c1e5ea34
 Architecture: amd64
-Maintainer: <support@cloudscaling.com>
-Standards-Version: 3.9.1
-Homepage: http://www.cloudscaling.com
+Maintainer: <martin@host-c1e5ea34>
+Installed-Size: 0
+#Pre-Depends: 
+Section: default
 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
+Homepage: http://example.com/no-uri-given
 Description: no description given
+Filename: pool/main/f/frm-bar/frm_bar-1.0.0.deb
+Size: 716
+MD5sum: b21df912829a23f9846ddd022fc74c74
+SHA1: 0592c2eb2f3f5a830109d63b83ab438c7c258d14
+SHA256: 131f5d16fdd7ddf8bf9c4983d77022b268c02b2864ce9a9f841704631417515d
 
 "
     assert @package_release.package_file == correct_output
@@ -152,7 +90,6 @@ Description: Cloudscaling APT repository
   end
   
   def test_generate_release
-#    skip 'need to finish generate_release function'
     correct_release_file = "Origin: apt.cloudscaling.com
 Label: apt repository natty
 Codename: natty
@@ -161,16 +98,16 @@ Architectures: amd64
 Components: main universe multiverse
 Description: Cloudscaling APT repository
 MD5Sum:
- 32aed966f2f629d6229d14cd37da740e 896 main/binary-amd64/Packages
- a2ea734a1d863873d0acd98845bd0573 438 main/binary-amd64/Packages.gz
+ c0ff97432f4ac04c99b2ddee0a1d5fed 986 main/binary-amd64/Packages
+ 5bfa5912649f52c32d2e740fc727ebd5 462 main/binary-amd64/Packages.gz
  79dd2fee35fba7255dcd40e1f6529591 134 main/binary-amd64/Release
 SHA1:
- b2f872140a4e651609c1ce7538dba871a4ad49de 896 main/binary-amd64/Packages
- 86b1fc7c8905cf35a9ff2544bb277c332e93b7d1 438 main/binary-amd64/Packages.gz
+ 2ecb580a151f0cf625016352b2a474b787cc0ac3 986 main/binary-amd64/Packages
+ 80a6c1f004fb7b6bcb1ce3f86d16e53b5735ac84 462 main/binary-amd64/Packages.gz
  6d932af9af761f418e5374f73dcd09badb4fe57e 134 main/binary-amd64/Release
 SHA256:
- 14139ad7300259e51e2c0d75891966d10f9382adbda61c7348990ccf125e4d4f 896 main/binary-amd64/Packages
- 67014ee7cc96108af726aae5636d26225c2cd833301765e44cf6cb6ea7719698 438 main/binary-amd64/Packages.gz
+ ae8b50085f2405febff78f86fe7d89d93d9ff94ceccfbfa975c0bd79e63ce385 986 main/binary-amd64/Packages
+ cb8501ace11b9bdbfd0d65006a116313f5c6fda625d6383a549e80b982fc6eac 462 main/binary-amd64/Packages.gz
  690b44df6fe65f40f260b73394e87804df78c9ccf13999889259faeed3eec40d 134 main/binary-amd64/Release
 "
     assert @package_release.release_file == correct_release_file
@@ -184,55 +121,24 @@ class TestPackage < MiniTest::Unit::TestCase
     @tempfile1 = File.open('/tmp/foo','w+') { |f| f.write 'foo' }
     @tempfile2 = File.open('/tmp/bar','w+') { |f| f.write 'bar' }
 
-    @hash = {
-      "Package" => "foo",
-      "Version" => "1.2.68",
-      "Architecture" => "amd64",
-      "Maintainer" => "support@cloudscaling.com",
-      "Homepage" => "http://www.cloudscaling.com",
-      "Priority" => "extra",
-      "Depends" => %w{one two three},
-      "section" => "main",
-      "path_to_deb" => '/tmp/foo',
-      "Description" => 'some
- multiline
- description'
-    }
+    package = File.join(@@frm_test_base, 'debs', 'frm_foo-1.0.0.deb')
     
-    @package1 = FRM::Package.new(@hash)
+    @package1 = FRM::Package.new(package)
   end
   
-  def test()
-    assert @package1.name == 'foo'
-    assert @package1.content == 'foo'
-  end
-
   def test_bad_file()
-    bad_hash = {
-      "Package" => "foo",
-      "Version" => "1.2.68",
-      "Architecture" => "amd64",
-      "Maintainer" => "support@cloudscaling.com",
-      "Homepage" => "http://www.cloudscaling.com",
-      "Priority" => "extra",
-      "Depends" => %w{one two three},
-      "section" => "main",
-      "path_to_deb" => '/some/bad/path',
-      "Description" => 'some
- multiline
- description'
-    }
-    assert_raises(RuntimeError) { FRM::Package.new(bad_hash) } 
+    bad_package = "/some/bad/path"
+    assert_raises(RuntimeError) { FRM::Package.new(bad_package) } 
   end
   
   def test_good_file()
-    assert @package1.content == 'foo'
+    assert Digest::MD5.hexdigest(@package1.content) == '0faf8cabf49a615adacbe6d80c4aee3b'
   end
 
   def test_hashes()
-    assert @package1.md5 == 'acbd18db4cc2f85cedef654fccc4a4d8'
-    assert @package1.sha1 == '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33'
-    assert @package1.sha2 == '2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae'
+    assert @package1.md5 == '0faf8cabf49a615adacbe6d80c4aee3b'
+    assert @package1.sha1 == '78c6be70488c78d63b6eb233f891e80d3af0b779'
+    assert @package1.sha2 == '5f0de3c65226c13e9c215478ba784afe54b0592aa46766ff19b1140644bbda71'
     
   end
   
@@ -374,32 +280,7 @@ Description: Cloudscaling APT repository
 "
     assert @deb.generate_package_release == package_release_file
   end
-  
-  def test_generate_release
-    skip 'need to finish generate_release function'
-    release_file = "Origin: apt.cloudscaling.com
-Label: apt repository natty
-Codename: natty
-Date: Thu, 22 Dec 2011 00:29:55 UTC
-Architectures: amd64
-;Components: main universe multiverse
-Description: Cloudscaling APT repository
-MD5Sum:
- a4b943ff89790ccdc186875dad67827b 5813 main/binary-amd64/Packages
- 004fd3f868ebbe7501fb2e1c0c54e2a7 2148 main/binary-amd64/Packages.gz
- 79dd2fee35fba7255dcd40e1f6529591 134 main/binary-amd64/Release
-SHA1:
- 6e03924030eab56cb9735a52ec710537e682bcfc 5813 main/binary-amd64/Packages
- 5f2989bae96e148cb5f18accc4357305926ab1e1 2148 main/binary-amd64/Packages.gz
- 6d932af9af761f418e5374f73dcd09badb4fe57e 134 main/binary-amd64/Release
-SHA256:
- dd8283f06beb4a5fc06ac62d3ae098e5ba2717daef2a15b5f3e9233eb64e0227 5813 main/binary-amd64/Packages
- b197c5a3c1fe6a6d286e9f066a0cade289e3a2fc485c90407179951634788aa8 2148 main/binary-amd64/Packages.gz
- 690b44df6fe65f40f260b73394e87804df78c9ccf13999889259faeed3eec40d 134 main/binary-amd64/Release
-"
-    assert @deb.generate_release == release_file
-  end
-  
+    
   def generate_random_string
     rand(36**rand(50)).to_s(36)
   end
@@ -446,7 +327,7 @@ Description: no description given
 
   
   def test_merge_package_file
-    package_file = File.open 'Packages.txt'
+    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)

data/test/lib/test.rb

@@ -0,0 +1,13 @@
+# this is the place to put common testing code
+
+def compare_line_by_line(chunk1,chunk2)
+  arr1=chunk1.split("\n")
+  arr2=chunk2.split("\n")
+  arr1.each_with_index do |line,i|
+    unless line == arr2[i]
+      puts "line number #{i} is different:"
+      puts "  #{line}" 
+      puts "  #{arr2[i]}"
+    end
+  end
+end

data/test/rake.rb

@@ -0,0 +1,27 @@
+@@frm_test_base = File.join @frm_base, 'test'
+
+require File.join @@frm_test_base, 'lib', 'test'
+
+namespace :test do
+  
+  desc "run the s3 test"
+  task :s3 do
+    require File.join @frm_base, 'lib', 'frm'
+    require File.join @@frm_test_base, 's3'
+  end
+  
+  desc "run the deb test"
+  task :deb do
+    require File.join @frm_base, 'lib', 'frm'
+    require File.join @@frm_test_base, 'deb'
+  end
+
+
+  desc "run the old deb test"
+  task :old_deb do
+    require File.join @frm_base, 'lib', 'frm'
+    require File.join @@frm_test_base, 'deb_test'
+  end
+  
+end
+

data/test/s3.rb

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'minitest/autorun'
-my_dir = File.dirname __FILE__
-require File.join my_dir, 's3'
-
+require 'mock-aws-s3'
 
 # this is a stupid hack to get the @@bucket region set properly
 DEFAULT_HOST =  's3-us-west-1.amazonaws.com'
@@ -14,7 +12,7 @@ class TestFRM < MiniTest::Unit::TestCase
   @@access_key_id = 'abcd'
   @@secret_key_id = '1234'
   @@bucket = 'some-bucket'
-  @@prefix = 'testing/tmp/' + Time.now.strftime("%Y/%m/%d/%H:%M:%S ")
+  @@prefix = 'testing/'
   @@server = 's3-us-west-1.amazonaws.com'
   @@timestamp = rand(9999).to_s
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Martin Rhoads
@@ -16,8 +16,33 @@ cert_chain: []
 
 date: 2012-03-31 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mock-aws-s3
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: FRM makes it easy to build package repositories on S3
 email: 
 - ermal14@gmail.com
@@ -35,11 +60,17 @@ files:
 - bin/frm
 - frm.gemspec
 - lib/frm.rb
+- lib/frm/base.rb
 - lib/frm/deb.rb
 - lib/frm/s3.rb
 - lib/frm/version.rb
+- test/Packages.txt
+- test/deb.rb
 - test/deb_test.rb
-- test/deb_test2.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
 has_rdoc: true
 homepage: https://github.com/ermal14/frm
@@ -73,7 +104,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Effin Repo Manager
-test_files: 
-- test/deb_test.rb
-- test/deb_test2.rb
-- test/s3.rb
+test_files: []
+