fakes3 0.1.6.0 → 0.1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc9d8c94ab0b848399aae28b8031acf3a27cadb
-  data.tar.gz: d46b07e6f772a54bcece517ae7a7c6517a4243c8
+  metadata.gz: 69d4e3942f56c4509fb48ff63077170b7be0cef0
+  data.tar.gz: f02b9f875c59110a0247c2fae8a65fd819e355e2
 SHA512:
-  metadata.gz: 9db326bbb641bfedc2be1553b1846dcaab6a886d133a50be6912de8bce365a4bf509e73399650508148d125bee1cd11039a2988d2a644d081f7bdc2ef79f79d3
-  data.tar.gz: 3dafd2e1c59227812fd5b004c99e8a9c41287402d154cc3eea8d70fba121b94b6d88822e37f173e5362de976f8d7a46c39ec1dedbcb63fb0ee8a854a33d3861b
+  metadata.gz: 7011a1d606e2336f6b344b64c341aa1fc96a571aa60cddf5044bea0aa9afe376fa2d42e8113de3f418ed7862a4f9681c11d3076bea217776226da38f4d591d7c
+  data.tar.gz: 9e6566785bb12340bd0b4eeb23464c2b02c9b343cf4742b19747e6f7de3b5fd753703e91e349231537960fe347dde22da8859002fbb4cfd86bc5d9945b493d89

data/.gitignore

@@ -3,3 +3,6 @@ pkg/*
 .bundle
 tmp
 test_root
+
+# Don't check in RVM/rbenv files
+.ruby-version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fakes3 (0.1.6.0)
+    fakes3 (0.1.6.1)
       builder
       thor
 

data/fakes3.gemspec

@@ -7,9 +7,10 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Curtis Spencer"]
   s.email       = ["thorin@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/jubos/fake-s3"
   s.summary     = %q{FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects}
   s.description = %q{Use FakeS3 to test basic S3 functionality without actually connecting to S3}
+  s.license     = "MIT"
 
   s.rubyforge_project = "fakes3"
 

data/lib/fakes3/cli.rb

@@ -12,6 +12,9 @@ module FakeS3
     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)'
+    method_option :sslcert, :type => :string, :desc => 'Path to SSL certificate'
+    method_option :sslkey, :type => :string, :desc => 'Path to SSL certificate key'
+
     def server
       store = nil
       if options[:root]
@@ -21,8 +24,7 @@ module FakeS3
       end
 
       if store.nil?
-        puts "You must specify a root to use a file store (the current default)"
-        exit(-1)
+        abort "You must specify a root to use a file store (the current default)"
       end
 
       hostname = 's3.amazonaws.com'
@@ -38,15 +40,20 @@ module FakeS3
         begin
           store.rate_limit = options[:limit]
         rescue
-          puts $!.message
-          exit(-1)
+          abort $!.message
         end
       end
 
       address = options[:address] || '0.0.0.0'
+      ssl_cert_path = options[:sslcert]
+      ssl_key_path = options[:sslkey]
+
+      if (ssl_cert_path.nil? && !ssl_key_path.nil?) || (!ssl_cert_path.nil? && ssl_key_path.nil?)
+        abort "If you specify an SSL certificate you must also specify an SSL certificate key"
+      end
 
       puts "Loading FakeS3 with #{root} on port #{options[:port]} with hostname #{hostname}"
-      server = FakeS3::Server.new(address,options[:port],store,hostname)
+      server = FakeS3::Server.new(address,options[:port],store,hostname,ssl_cert_path,ssl_key_path)
       server.serve
     end
 

data/lib/fakes3/file_store.rb

@@ -9,6 +9,11 @@ require 'yaml'
 module FakeS3
   class FileStore
     SHUCK_METADATA_DIR = ".fakes3_metadataFFF"
+    # S3 clients with overly strict date parsing fails to parse ISO 8601 dates
+    # without any sub second precision (e.g. jets3t v0.7.2), and the examples
+    # given in the official AWS S3 documentation specify three (3) decimals for
+    # sub second precision.
+    SUBSECOND_PRECISION = 3
 
     def initialize(root)
       @root = root
@@ -82,8 +87,10 @@ module FakeS3
         #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).utc.iso8601()
-        real_obj.modified_date = metadata.fetch(:modified_date) { File.mtime(File.join(obj_root,"content")).utc.iso8601() }
+        real_obj.creation_date = File.ctime(obj_root).utc.iso8601(SUBSECOND_PRECISION)
+        real_obj.modified_date = metadata.fetch(:modified_date) do
+          File.mtime(File.join(obj_root,"content")).utc.iso8601(SUBSECOND_PRECISION)
+        end
         real_obj.custom_metadata = metadata.fetch(:custom_metadata) { {} }
         return real_obj
       rescue
@@ -218,13 +225,14 @@ module FakeS3
       metadata[:md5] = Digest::MD5.file(content).hexdigest
       metadata[:content_type] = request.header["content-type"].first
       metadata[:size] = File.size(content)
-      metadata[:modified_date] = File.mtime(content).utc.iso8601()
+      metadata[:modified_date] = File.mtime(content).utc.iso8601(SUBSECOND_PRECISION)
+      metadata[:custom_metadata] = {}
 
       # Add custom metadata from the request header
       request.header.each do |key, value|
         match = /^x-amz-meta-(.*)$/.match(key)
-        if match
-          metadata_struct[:custom_metadata][match[1]] = value.join(', ')
+        if match && (match_key = match[1])
+          metadata[:custom_metadata][match_key] = value.join(', ')
         end
       end
       return metadata

data/lib/fakes3/server.rb

@@ -1,5 +1,7 @@
 require 'time'
 require 'webrick'
+require 'webrick/https'
+require 'openssl'
 require 'fakes3/file_store'
 require 'fakes3/xml_adapter'
 require 'fakes3/bucket_query'
@@ -171,10 +173,10 @@ module FakeS3
       filename = 'default'
       filename = $1 if request.body =~ /filename="(.*)"/
       key=key.gsub('${filename}', filename)
-      
+
       bucket_obj = @store.get_bucket(s_req.bucket) || @store.create_bucket(s_req.bucket)
       real_obj=@store.store_object(bucket_obj, key, s_req.webrick_request)
-      
+
       response['Etag'] = "\"#{real_obj.md5}\""
       response.body = ""
       if success_action_redirect
@@ -212,11 +214,11 @@ module FakeS3
       response.status = 204
       response.body = ""
     end
-    
+
     def do_OPTIONS(request, response)
       super
       response["Access-Control-Allow-Origin"]="*"
-    end  
+    end
 
     private
 
@@ -322,7 +324,7 @@ module FakeS3
     def normalize_post(webrick_req,s_req)
       path = webrick_req.path
       path_len = path.size
-      
+
       s_req.path = webrick_req.query['key']
 
       s_req.webrick_request = webrick_req
@@ -373,15 +375,30 @@ module FakeS3
 
 
   class Server
-    def initialize(address,port,store,hostname)
+    def initialize(address,port,store,hostname,ssl_cert_path,ssl_key_path)
       @address = address
       @port = port
       @store = store
       @hostname = hostname
+      @ssl_cert_path = ssl_cert_path
+      @ssl_key_path = ssl_key_path
+      webrick_config = {
+        :BindAddress => @address,
+        :Port => @port
+      }
+      if !@ssl_cert_path.to_s.empty?
+        webrick_config.merge!(
+          {
+            :SSLEnable => true,
+            :SSLCertificate => OpenSSL::X509::Certificate.new(File.read(@ssl_cert_path)),
+            :SSLPrivateKey => OpenSSL::PKey::RSA.new(File.read(@ssl_key_path))
+          }
+        )
+      end
+      @server = WEBrick::HTTPServer.new(webrick_config)
     end
 
     def serve
-      @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.6.0"
+  VERSION = "0.1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes3
 version: !ruby/object:Gem::Version
-  version: 0.1.6.0
+  version: 0.1.6.1
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,8 +146,9 @@ files:
 - test/s3_commands_test.rb
 - test/s3cmd_test.rb
 - test/test_helper.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/jubos/fake-s3
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []