frm 0.0.8 → 0.0.9

data/.gitignore

@@ -5,3 +5,5 @@ pkg/*
 *~
 *.swp
 tmp/*
+\#*\#
+.\#*

data/bin/frm

@@ -50,6 +50,17 @@ Usage: frm [options] package1 [package2] ..."
     options[:release] = release
   end
 
+  options[:public_repo] = false
+  opts.on('-P','--public-repo true|false','public repo or not') do |public_repo|
+    raise "public_repo option can only be 'true' or 'false'" \
+      unless public_repo == 'true' || public_repo == 'false'
+    if public_repo == 'true'
+      options[:public_repo] = true
+    else
+      options[:public_repo] = false
+    end      
+  end
+
 
   # This displays the help screen, all programs are
   # assumed to have this option.
@@ -94,6 +105,6 @@ puts "creating release..."
 package_release = FRM::PackageRelease.new(packages,options[:release])
 
 puts "pushing release..."
-release_pusher = FRM::ReleasePusher.new(package_release,options[:access_key],options[:secret_key],options[:bucket],options[:prefix])
+release_pusher = FRM::ReleasePusher.new(package_release,options[:access_key],options[:secret_key],options[:bucket],options[:prefix],options[:public_repo])
 
 puts "looks like everything ran ok!"

data/lib/frm/base.rb

@@ -13,16 +13,32 @@ module FRM
       Digest::SHA2.hexdigest(string)
     end
 
+    def run(command)
+      output = `#{command} 2>&1`.chomp
+      unless $?.success?
+        STDERR.puts "failed to run command: #{command}"
+        STDERR.puts "output was: "
+        STDERR.puts output
+        raise "failed to run command: #{command}"
+      end
+      return output
+    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`
+      run "echo '#{message}' | gpg --clearsign"
     end
 
     # TODO: same as above
     def gpg_detached(message)
-      `echo "#{message}" | gpg -abs`
+      run "echo '#{message}' | gpg -abs"
+    end
+
+    # TODO: same as above
+    def gpg_export_pubkey
+      run "gpg --armor --export"
     end
     
 

data/lib/frm/release.rb

@@ -81,7 +81,7 @@ Description: Cloudscaling APT repository
 
     def filename(package)
       filename = File.basename package.path
-      shortname = `dpkg --field #{package.path} Package`.chomp
+      shortname = run("dpkg --field #{package.path} Package")
       first_letter = shortname[0]
       package.repo_filename = "pool/main/#{first_letter}/#{shortname}/#{filename}"
     end
@@ -94,7 +94,7 @@ Description: Cloudscaling APT repository
     
     def generate_package_stub(package)
       package_stub = ''
-      package_stub << `dpkg --field #{package.path}`
+      package_stub << run("dpkg --field #{package.path}") + "\n"
       package_stub << "Filename: #{filename(package)}\n"
       package_stub << "Size: #{package.size}\n"
       package_stub << "MD5sum: #{package.md5}\n"

data/lib/frm/release_pusher.rb

@@ -1,11 +1,11 @@
 module FRM
   
   class ReleasePusher < Base
-    def initialize(package_release,access_key,secret_key,bucket,prefix)
+    def initialize(package_release,access_key,secret_key,bucket,prefix,public_repo=false)
       @release = package_release.release
       @bucket = bucket
       @prefix = prefix
-      @s3 = FRM::S3.new(access_key,secret_key)
+      @s3 = FRM::S3.new(access_key,secret_key,public_repo)
       push_packages(package_release.packages)
       push_release_files(package_release)
     end
@@ -34,6 +34,8 @@ module FRM
       @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)
+      # push public key
+      @s3.put(@prefix + '/public.key',gpg_export_pubkey,@bucket)
     end
     
 

data/lib/frm/s3.rb

@@ -3,13 +3,14 @@ require 'aws-sdk'
 module FRM
   class S3  < Base
 
-    attr_reader :max_retries, :s3
+    attr_reader :max_retries, :s3, :acl
 
-    def initialize(access_key_id,secret_access_key)
+    def initialize(access_key_id,secret_access_key,public_repo=false)
       @max_retries = 10
       AWS.config(:access_key_id => access_key_id, 
                  :secret_access_key => secret_access_key)
       @s3 = AWS::S3.new
+      @acl = public_repo ? :public_read : :private
     end
 
     
@@ -21,7 +22,7 @@ module FRM
     def put(key,value,bucket)
       @max_retries.times do |i|
         begin
-          @s3.buckets[bucket].objects[key].write(value)
+          @s3.buckets[bucket].objects[key].write(value,acl: @acl)
           return true
         rescue Object => o
           print_retry(__method__,o)

data/lib/frm/version.rb

@@ -1,3 +1,3 @@
 module Frm
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frm
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors: