fakes3 0.1.5 → 0.1.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0fd5e9498cd058b485b059f03ca06d9030d8d7c1
+  data.tar.gz: 31b5e10a57f2a723a8a04bbdec62f7c726c8cb5c
+SHA512:
+  metadata.gz: 56353c5a81798343a51989019c484a5e203b91188e813a3bddbb33ff120d451b5d99c7c6c2d9cbf13b2c929f9c651eb9d0f846ddae3d1529fbfc3718b96d07e0
+  data.tar.gz: b24c2db7d546dd0772dd2c897f90d2ae331b9b286f326be62e8d5794eaa606b331e48a0216c3fddb0ccffa42719c7802b1b8952f3d9c0b796d8a27943470e6cb

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gem 'fakes3', :path => '.' # for dev and test, use local fakes3
 # Specify your gem's dependencies in fakes3.gemspec
 gemspec

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    fakes3 (0.1.5)
+    fakes3 (0.1.5.2)
       builder
       thor
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    aws-s3 (0.6.2)
+    aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
-    builder (3.0.0)
-    mime-types (1.18)
-    rake (0.9.2.2)
-    right_aws (3.0.4)
+    builder (3.2.2)
+    mime-types (1.25)
+    rake (10.1.0)
+    right_aws (3.1.0)
       right_http_connection (>= 1.2.5)
-    right_http_connection (1.3.0)
-    thor (0.14.6)
-    xml-simple (1.1.1)
+    right_http_connection (1.4.0)
+    thor (0.18.1)
+    xml-simple (1.1.2)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -6,7 +6,8 @@ Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "."
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files =
+    FileList['test/*_test.rb'].exclude('test/s3_commands_test.rb')
 end
 
 desc "Run the test_server"

data/bin/fakes3

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 
+$: << './lib'
+
 require 'fakes3/cli'
 FakeS3::CLI.start

data/lib/fakes3/cli.rb

@@ -9,6 +9,7 @@ module FakeS3
     desc "server", "Run a server on a particular hostname"
     method_option :root, :type => :string, :aliases => '-r', :required => true
     method_option :port, :type => :numeric, :aliases => '-p', :required => true
+    method_option :address, :type => :string, :aliases => '-a', :required => false, :desc => "Bind to this address. Defaults to 0.0.0.0"
     method_option :hostname, :type => :string, :aliases => '-h', :desc => "The root name of the host.  Defaults to s3.amazonaws.com."
     method_option :limit, :aliases => '-l', :type => :string, :desc => 'Rate limit for serving (ie. 50K, 1.0M)'
     def server
@@ -42,8 +43,10 @@ module FakeS3
         end
       end
 
+      address = options[:address] || '0.0.0.0'
+
       puts "Loading FakeS3 with #{root} on port #{options[:port]} with hostname #{hostname}"
-      server = FakeS3::Server.new(options[:port],store,hostname)
+      server = FakeS3::Server.new(address,options[:port],store,hostname)
       server.serve
     end
 

data/lib/fakes3/file_store.rb

@@ -81,6 +81,9 @@ module FakeS3
         real_obj.content_type = metadata.fetch(:content_type) { "application/octet-stream" }
         #real_obj.io = File.open(File.join(obj_root,"content"),'rb')
         real_obj.io = RateLimitableFile.open(File.join(obj_root,"content"),'rb')
+        real_obj.size = metadata.fetch(:size) { 0 }
+        real_obj.creation_date = File.ctime(obj_root).iso8601()
+        real_obj.modified_date = metadata.fetch(:modified_date) { File.mtime(File.join(obj_root,"content")).iso8601() }
         return real_obj
       rescue
         puts $!
@@ -126,6 +129,8 @@ module FakeS3
       obj.name = dst_name
       obj.md5 = src_metadata[:md5]
       obj.content_type = src_metadata[:content_type]
+      obj.size = src_metadata[:size]
+      obj.modified_date = src_metadata[:modified_date]
 
       src_obj = src_bucket.find(src_name)
       dst_bucket.add(obj)
@@ -157,6 +162,8 @@ module FakeS3
         metadata_struct = {}
         metadata_struct[:md5] = md5.hexdigest
         metadata_struct[:content_type] = request.header["content-type"].first
+        metadata_struct[:size] = File.size(content)
+        metadata_struct[:modified_date] = File.mtime(content).iso8601()
 
         File.open(metadata,'w') do |f|
           f << YAML::dump(metadata_struct)
@@ -166,6 +173,8 @@ module FakeS3
         obj.name = object_name
         obj.md5 = metadata_struct[:md5]
         obj.content_type = metadata_struct[:content_type]
+        obj.size = metadata_struct[:size]
+        obj.modified_date = metadata_struct[:modified_date]
 
         bucket.add(obj)
         return obj

data/lib/fakes3/s3_object.rb

@@ -1,7 +1,7 @@
 module FakeS3
   class S3Object
     include Comparable
-    attr_accessor :name,:size,:creation_date,:md5,:io,:content_type
+    attr_accessor :name,:size,:creation_date,:modified_date,:md5,:io,:content_type
 
     def hash
       @name.hash

data/lib/fakes3/server.rb

@@ -87,9 +87,14 @@ module FakeS3
 
         response.status = 200
         response['Content-Type'] = real_obj.content_type
-        content_length = File::Stat.new(real_obj.io.path).size
-        response['Etag'] = real_obj.md5
+        stat = File::Stat.new(real_obj.io.path)
+
+        response['Last-Modified'] = stat.mtime.iso8601()
+        response.header['ETag'] = "\"#{real_obj.md5}\""
         response['Accept-Ranges'] = "bytes"
+        response['Last-Ranges'] = "bytes"
+
+        content_length = stat.size
 
         # Added Range Query support
         if range = request.header["range"].first
@@ -113,6 +118,7 @@ module FakeS3
           end
         end
         response['Content-Length'] = File::Stat.new(real_obj.io.path).size
+        response['Last-Modified'] = real_obj.modified_date
         if s_req.http_verb == 'HEAD'
           response.body = ""
         else
@@ -135,7 +141,7 @@ module FakeS3
         end
 
         real_obj = @store.store_object(bucket_obj,s_req.object,s_req.webrick_request)
-        response['Etag'] = real_obj.md5
+        response.header['ETag'] = "\"#{real_obj.md5}\""
       when Request::CREATE_BUCKET
         @store.create_bucket(s_req.bucket)
       end
@@ -207,10 +213,7 @@ module FakeS3
           elems = path.split("/")
         end
 
-        if elems.size == 0
-          # List buckets
-          s_req.type = Request::LIST_BUCKETS
-        elsif elems.size == 1
+        if elems.size < 2
           s_req.type = Request::LS_BUCKET
           s_req.query = query
         else
@@ -311,14 +314,15 @@ module FakeS3
 
 
   class Server
-    def initialize(port,store,hostname)
+    def initialize(address,port,store,hostname)
+      @address = address
       @port = port
       @store = store
       @hostname = hostname
     end
 
     def serve
-      @server = WEBrick::HTTPServer.new(:Port => @port)
+      @server = WEBrick::HTTPServer.new(:BindAddress => @address, :Port => @port)
       @server.mount "/", Servlet, @store,@hostname
       trap "INT" do @server.shutdown end
       @server.start

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "0.1.5"
+  VERSION = "0.1.5.2"
 end

data/lib/fakes3/xml_adapter.rb

@@ -124,7 +124,7 @@ module FakeS3
       objects.each do |s3_object|
         lbr.Contents { |contents|
           contents.Key(s3_object.name)
-          contents.LastModifed(s3_object.creation_date)
+          contents.LastModified(s3_object.modified_date)
           contents.ETag("\"#{s3_object.md5}\"")
           contents.Size(s3_object.size)
           contents.StorageClass("STANDARD")

data/test/boto_test.rb

@@ -0,0 +1,25 @@
+require 'test/test_helper'
+require 'fileutils'
+
+class BotoTest < Test::Unit::TestCase
+  def setup
+    cmdpath = File.expand_path(File.join(File.dirname(__FILE__),'botocmd.py'))
+    @botocmd = "python #{cmdpath} -t localhost -p 10453"
+  end
+
+  def teardown
+  end
+
+  def test_store
+    File.open(__FILE__,'rb') do |input|
+      File.open("/tmp/fakes3_upload",'wb') do |output|
+        output << input.read
+      end
+    end
+    output = `#{@botocmd} put /tmp/fakes3_upload s3://s3cmd_bucket/upload`
+    assert_match(/stored/,output)
+
+    FileUtils.rm("/tmp/fakes3_upload")
+  end
+
+end

data/test/botocmd.py

@@ -0,0 +1,87 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# fakes3cmd.py -- an s3cmd-like script that accepts a custom host and portname
+import re
+import os
+from optparse import OptionParser
+
+try:
+    from boto.s3.connection import S3Connection, OrdinaryCallingFormat
+    from boto.s3.key import Key
+except ImportError:
+    raise Exception('You must install the boto package for python')
+
+
+class FakeS3Cmd(object):
+    COMMANDS = ['mb', 'rb', 'put', ]
+    def __init__(self, host, port):
+        self.host = host
+        self.port = port
+        self.conn = None
+        self._connect()
+
+    def _connect(self):
+        print 'Connecting: %s:%s' % (self.host, self.port)
+        self.conn = S3Connection(is_secure=False,
+                             calling_format=OrdinaryCallingFormat(),
+                             aws_access_key_id='',
+                             aws_secret_access_key='',
+                             port=self.port, host=self.host)
+
+
+    @staticmethod
+    def _parse_uri(path):
+        match = re.match(r's3://([^/]+)(?:/(.*))?', path, re.I)
+        ## (bucket, key)
+        return match.groups()
+
+    def mb(self, path, *args):
+        if not self.conn:
+            self._connect()
+
+        bucket, _ = self._parse_uri(path)
+        self.conn.create_bucket(bucket)
+        print 'made bucket: [%s]' % bucket
+
+    def rb(self, path, *args):
+        if not self.conn:
+            self._connect()
+
+        bucket, _ = self._parse_uri(path)
+        self.conn.delete_bucket(bucket)
+        print 'removed bucket: [%s]' % bucket
+
+    def put(self, *args):
+        if not self.conn:
+            self._connect()
+
+        args = list(args)
+        path = args.pop()
+        bucket_name, prefix = self._parse_uri(path)
+        bucket = self.conn.create_bucket(bucket_name)
+        for src_file in args:
+            key = Key(bucket)
+            key.key = os.path.join(prefix, os.path.basename(src_file))
+            key.set_contents_from_filename(src_file)
+            print 'stored: [%s]' % key.key
+
+
+if __name__ == "__main__":
+    # check for options. TODO: This requires a more verbose help message
+    # to explain how the positional arguments work.
+    parser = OptionParser()
+    parser.add_option("-t", "--host", type="string", default='localhost')
+    parser.add_option("-p", "--port", type='int', default=80)
+    o, args = parser.parse_args()
+
+    if len(args) < 2:
+        raise ValueError('you must minimally supply a desired command and s3 uri')
+
+    cmd = args.pop(0)
+
+    if cmd not in FakeS3Cmd.COMMANDS:
+        raise ValueError('%s is not a valid command' % cmd)
+
+    fs3 = FakeS3Cmd(o.host, o.port)
+    handler = getattr(fs3, cmd)
+    handler(*args)

data/test/right_aws_commands_test.rb

@@ -60,4 +60,33 @@ class RightAWSCommandsTest < Test::Unit::TestCase
     assert_equal "Hello World",obj[:object]
   end
 
+  def test_larger_lists
+    @s3.create_bucket('right_aws_many')
+    (0..50).each do |i|
+      ('a'..'z').each do |letter|
+        name = "#{letter}#{i}"
+        @s3.put('right_aws_many', name, 'asdf')
+      end
+    end
+
+    keys = @s3.list_bucket('right_aws_many')
+    assert_equal(1000, keys.size)
+    assert_equal('a0', keys.first[:key])
+  end
+
+  def test_destroy_bucket
+    @s3.create_bucket('deletebucket')
+    @s3.delete_bucket('deletebucket')
+
+    begin
+      bucket = @s3.list_bucket('deletebucket')
+      fail("Shouldn't succeed here")
+    rescue RightAws::AwsError
+      assert $!.message.include?('NoSuchBucket')
+    rescue
+      fail 'Should have caught NoSuchBucket Exception'
+    end
+
+  end
+
 end

metadata

@@ -1,112 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fakes3
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.1.5.2
 platform: ruby
-authors: 
+authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-20 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: right_aws
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: right_aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-description: Use FakeS3 to test basic S3 functionality without actually connecting to S3
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Use FakeS3 to test basic S3 functionality without actually connecting
+  to S3
+email:
 - thorin@gmail.com
-executables: 
+executables:
 - fakes3
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -128,44 +124,40 @@ files:
 - lib/fakes3/unsupported_operation.rb
 - lib/fakes3/version.rb
 - lib/fakes3/xml_adapter.rb
+- test/boto_test.rb
+- test/botocmd.py
 - test/local_s3_cfg
 - test/right_aws_commands_test.rb
 - test/s3_commands_test.rb
 - test/s3cmd_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-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 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fakes3
-rubygems_version: 1.3.7
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects
-test_files: 
+specification_version: 4
+summary: FakeS3 is a server that simulates S3 commands so you can test your S3 functionality
+  in your projects
+test_files:
+- test/boto_test.rb
+- test/botocmd.py
 - test/local_s3_cfg
 - test/right_aws_commands_test.rb
 - test/s3_commands_test.rb