fakes3 0.1.4 → 0.1.5

data/Gemfile

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fakes3 (0.1.3)
+    fakes3 (0.1.5)
       builder
       thor
 
@@ -14,6 +14,7 @@ GEM
       xml-simple
     builder (3.0.0)
     mime-types (1.18)
+    rake (0.9.2.2)
     right_aws (3.0.4)
       right_http_connection (>= 1.2.5)
     right_http_connection (1.3.0)
@@ -27,4 +28,5 @@ DEPENDENCIES
   aws-s3
   bundler (>= 1.0.0)
   fakes3!
+  rake
   right_aws

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011,2012 Curtis W Spencer (@jubos) and Spool
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,15 +1,17 @@
+require 'rubygems'
 require 'bundler'
 require 'rake/testtask'
 include Rake::DSL
 Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new(:test) do |t|
+  t.libs << "."
   t.test_files = FileList['test/*_test.rb']
-  t.ruby_opts = ['-rubygems'] if defined? Gem
-  t.ruby_opts << '-I.'
 end
 
 desc "Run the test_server"
 task :test_server do |t|
   system("bundle exec bin/fakes3 --port 10453 --root test_root")
 end
+
+task :default => :test

data/bin/fakes3

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

data/fakes3.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "fakes3/version"
+require File.join(File.dirname(__FILE__), 'lib', 'fakes3', 'version')
 
 Gem::Specification.new do |s|
   s.name        = "fakes3"
@@ -17,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "aws-s3"
   s.add_development_dependency "right_aws"
+  s.add_development_dependency "rake"
   #s.add_development_dependency "aws-sdk"
   #s.add_development_dependency "ruby-debug"
   #s.add_development_dependency "ruby-debug19"

data/lib/fakes3/file_store.rb

@@ -75,15 +75,16 @@ module FakeS3
       begin
         real_obj = S3Object.new
         obj_root = File.join(@root,bucket,object_name,SHUCK_METADATA_DIR)
-        metadata = YAML.parse(File.open(File.join(obj_root,"metadata"),'rb').read)
+        metadata = YAML.load(File.open(File.join(obj_root,"metadata"),'rb'))
         real_obj.name = object_name
-        real_obj.md5 = metadata[:md5].value
-        real_obj.content_type = metadata[:content_type] ? metadata[:content_type].value : "application/octet-stream"
+        real_obj.md5 = metadata[:md5]
+        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')
         return real_obj
       rescue
         puts $!
+        $!.backtrace.each { |line| puts line }
         return nil
       end
     end
@@ -94,7 +95,7 @@ module FakeS3
     def copy_object(src_bucket_name,src_name,dst_bucket_name,dst_name)
       src_root = File.join(@root,src_bucket_name,src_name,SHUCK_METADATA_DIR)
       src_metadata_filename = File.join(src_root,"metadata")
-      src_metadata = YAML.parse(File.open(src_metadata_filename,'rb').read)
+      src_metadata = YAML.load(File.open(src_metadata_filename,'rb').read)
       src_content_filename = File.join(src_root,"content")
 
       dst_filename= File.join(@root,dst_bucket_name,dst_name)

data/lib/fakes3/version.rb

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

data/test/right_aws_commands_test.rb

@@ -24,7 +24,7 @@ class RightAWSCommandsTest < Test::Unit::TestCase
     obj = @s3.get("s3media","helloworld")
     assert_equal "Hello World Man!",obj[:object]
 
-    obj = @s3.get("s3media","helloworld", )
+    obj = @s3.get("s3media","helloworld")
   end
 
   def test_large_store

data/test/s3_commands_test.rb

@@ -124,7 +124,7 @@ class S3CommandsTest < Test::Unit::TestCase
     S3Object.delete("something_to_delete","ruby_aws_s3")
 
     assert_raise AWS::S3::NoSuchKey do
-      should_throw = S3Object.find("something_to_delete","find_bucket")
+      should_throw = S3Object.find("something_to_delete","ruby_aws_s3")
     end
   end
 

data/test/s3cmd_test.rb

@@ -1,13 +1,10 @@
 require 'test/test_helper'
 require 'fileutils'
 
-# You need to have s3cmd installed to use this
-# Also, s3cmd doesn't support path style requests, so in order to properly test
-# it you need to modify your dns by changing /etc/hosts or using dnsmasq
 class S3CmdTest < Test::Unit::TestCase
-
   def setup
     config = File.expand_path(File.join(File.dirname(__FILE__),'local_s3_cfg'))
+    raise "Please install s3cmd" if `which s3cmd`.empty?
     @s3cmd = "s3cmd --config #{config}"
   end
 
@@ -52,5 +49,4 @@ class S3CmdTest < Test::Unit::TestCase
 
   def test_intra_bucket_copy
   end
-
 end

data/test/test_helper.rb

@@ -1,8 +1,4 @@
 require 'test/unit'
+require 'rubygems'
 require 'bundler/setup'
-
-testdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift testdir unless $LOAD_PATH.include?(testdir)
-
-libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
-$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
+require 'fakes3'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Curtis Spencer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 -07:00
+date: 2012-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,7 +59,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -69,10 +69,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: thor
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -84,6 +84,19 @@ dependencies:
         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"
+  type: :runtime
+  version_requirements: *id006
 description: Use FakeS3 to test basic S3 functionality without actually connecting to S3
 email: 
 - thorin@gmail.com
@@ -97,6 +110,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- MIT-LICENSE
 - README.md
 - Rakefile
 - bin/fakes3