frm 0.0.7 → 0.0.8

data/bin/frm

@@ -63,7 +63,7 @@ optparse.parse!
 
 
 ARGV.each do |package|
-  packages << package
+  packages << File.join(Dir.pwd,package)
 end
 
 

data/frm.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["bin"]
   s.require_paths = ["lib"]
 
-  s.add_dependency('aws-s3')
+  s.add_dependency('aws-sdk')
 
-  s.add_development_dependency('mock-aws-s3')	
 end
 

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,server='s3-us-west-1.amazonaws.com')
+    def initialize(package_release,access_key,secret_key,bucket,prefix)
       @release = package_release.release
       @bucket = bucket
       @prefix = prefix
-      @s3 = FRM::S3.new(access_key,secret_key,server)
+      @s3 = FRM::S3.new(access_key,secret_key)
       push_packages(package_release.packages)
       push_release_files(package_release)
     end

data/lib/frm/s3.rb

@@ -1,28 +1,27 @@
-my_dir = File.dirname __FILE__
-STDERR.puts "#{File.join my_dir, 's3'}"
-#require File.join my_dir, 'base'
-
+require 'aws-sdk'
 
 module FRM
   class S3  < Base
-    attr_reader :max_retries
-    @connection
-    def initialize(access_key_id,secret_access_key,server='s3.amazonaws.com')
-      require 'aws/s3'
+
+    attr_reader :max_retries, :s3
+
+    def initialize(access_key_id,secret_access_key)
       @max_retries = 10
-      @connection = AWS::S3::Base.establish_connection!(:access_key_id     => access_key_id,
-                                                        :secret_access_key => secret_access_key,
-                                                        :server => server )
+      AWS.config(:access_key_id => access_key_id, 
+                 :secret_access_key => secret_access_key)
+      @s3 = AWS::S3.new
     end
+
     
     def key?(key,bucket)
-      AWS::S3::S3Object.exists?(key,bucket)
+      @s3.buckets[bucket].objects[key].exists?
     end
+
     
     def put(key,value,bucket)
       @max_retries.times do |i|
         begin
-          AWS::S3::S3Object.store(key,value,bucket,:server => 's3-us-west-1.amazonaws.com',:access => :public_read)
+          @s3.buckets[bucket].objects[key].write(value)
           return true
         rescue Object => o
           print_retry(__method__,o)
@@ -31,12 +30,12 @@ module FRM
       end
       raise "could not put object!!!"
     end
-
+    
+    
     def get(key,bucket)
       @max_retries.times do |i|
         begin
-          value = AWS::S3::S3Object.value(key,bucket)
-          return value
+          return @s3.buckets[bucket].objects[key].read
         rescue Object => o
           print_retry(__method__,o)
         end
@@ -45,32 +44,21 @@ module FRM
       raise "could not get object!!!"
     end
     
-    def get_stream(key,bucket)
-      @max_retries.times do |i|
-        begin
-          stream = AWS::S3::S3Object.stream(key,bucket)
-          return stream
-        rescue Object => o
-          print_retry(__method__,o)
-        end
-        raise "could not get object!!!" if i == (@max_retries - 1)
-      end
-      raise "could not get object!!!"
-    end
     
     def delete(key,bucket)
       begin
-        AWS::S3::S3Object.delete(key,bucket)
-        true
+        @s3.buckets[bucket].objects[object].delete
+        return true
       rescue Object => o
         print_retry(__method__,o)
       end
     end
 
-    def move(old_key,new_key,vucket)
+
+    def move(old_key,new_key,bucket)
       begin
-        AWS::S3::S3Object.rename(old_key,new_key,bucket)
-        return
+        @s3.buckets[bucket].objects[old_key].move_to(new_key)
+        return true
       rescue Object => o
         print_retry(__method__,o)
       end

data/lib/frm/version.rb

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

data/lib/frm.rb

@@ -1,4 +1,3 @@
-DEFAULT_HOST =  's3-us-west-1.amazonaws.com' # stupid hack to point to the right s3 region
 
 require 'zlib'
 require 'tempfile'
@@ -6,10 +5,10 @@ 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'
+require_relative 'frm/base'
+require_relative 'frm/s3'
+require_relative 'frm/package'
+require_relative 'frm/release'
+require_relative 'frm/release_pusher'
+require_relative 'frm/deb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frm
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-s3
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !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
-        version: '0'
-  type: :development
-  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:
 - ermal14@gmail.com