shuck 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shuck (0.0.2)
+    shuck (0.0.3)
       builder
       thor
 
@@ -18,6 +18,9 @@ GEM
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mime-types (1.16)
+    right_aws (2.0.0)
+      right_http_connection (>= 1.2.1)
+    right_http_connection (1.2.4)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -38,6 +41,7 @@ DEPENDENCIES
   aws-s3
   builder
   bundler (>= 1.0.0)
+  right_aws
   ruby-debug19
   shuck!
   thor

data/README.md

@@ -0,0 +1,8 @@
+== Introduction ==
+Shuck is a lightweight interface for S3 that can have any backend.  It is
+mainly useful for testing of S3 in a sandbox environment without actually
+making calls to Amazon.  For now there is a basic file store backend.
+
+== Running Tests ==
+In order to run the tests add the following line to your /etc/hosts:
+    127.0.0.1 s3.localhost

data/Rakefile

@@ -8,3 +8,6 @@ Rake::TestTask.new(:test) do |t|
   t.ruby_opts << '-I.'
 end
 
+task :test_server do |t|
+  system("bundle exec bin/shuck --port 10453 --root test_root")
+end

data/lib/shuck/cli.rb

@@ -5,9 +5,10 @@ module Shuck
   class CLI < Thor
     default_task("server")
 
-    desc "server", "Run a server"
-    method_option :root, :type => :string, :aliases => '-r'
+    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 :hostname, :type => :string, :aliases => '-h', :desc => "The root name of the host.  Defaults to localhost."
     def server
       store = nil
       if options[:root]
@@ -18,8 +19,14 @@ module Shuck
         puts "You must specify a root to use a file store (the current default)"
         exit(-1)
       end
-      puts "Loading Shuck with #{root} on port #{options[:port]}"
-      server = Shuck::Server.new(options[:port],store)
+
+      hostname = 's3.amazonaws.com'
+      if options[:hostname]
+        hostname = options[:hostname]
+      end
+
+      puts "Loading Shuck with #{root} on port #{options[:port]} with hostname #{hostname}"
+      server = Shuck::Server.new(options[:port],store,hostname)
       server.serve
     end
   end

data/lib/shuck/server.rb

@@ -4,24 +4,37 @@ require 'shuck/xml_adapter'
 
 module Shuck
   class Servlet < WEBrick::HTTPServlet::AbstractServlet
-    def initialize(server,store)
+    def initialize(server,store,hostname)
       super(server)
       @store = store
+      @hostname = hostname
     end
 
     def do_GET(request, response)
       path = request.path
       path_len = path.size
+      host = request["HOST"]
+      path_style_request = true
+      bucket = nil
+      if host != @hostname
+        bucket = host.split(".")[0]
+        path_style_request = false
+      end
 
-      if path == "/"
+      if path == "/" and path_style_request
         response.status = 200
         response['Content-Type'] = 'text/xml'
         buckets = @store.buckets
         response.body = XmlAdapter.buckets(buckets)
       else
-        elems = path[1,path_len].split("/")
-        bucket = elems[0]
-        if elems.size == 1
+        if path_style_request
+          elems = path[1,path_len].split("/")
+          bucket = elems[0]
+        else
+          elems = path.split("/")
+        end
+
+        if elems.size == 1 
           bucket_obj = @store.get_bucket(bucket)
           if bucket_obj
             response.status = 200
@@ -51,16 +64,38 @@ module Shuck
     def do_PUT(request,response)
       path = request.path
       path_len = path.size
+      path_style_request = true
+      host = request["Host"]
+      bucket = nil
+      path_style_request = true
+      if host != @hostname
+        bucket = host.split(".")[0]
+        path_style_request = false
+      end
+
       if path == "/"
-        puts "Unsure what to do"
-      else 
-        elems = path[1,path_len].split("/")
-        bucket = elems[0]
-        if elems.size == 1
+        if bucket
           @store.create_bucket(bucket)
-        else 
-          object = elems[1,elems.size].join('/')
-          @store.store_object(bucket,object,request)
+        else
+          puts "Unsure what to do"
+        end
+      else 
+        if path_style_request
+          elems = path[1,path_len].split("/")
+          bucket = elems[0]
+        else
+          elems = path.split("/")
+        end
+
+        if path_style_request
+          if elems.size == 1 
+            @store.create_bucket(bucket)
+          else 
+            object = elems[1,elems.size].join('/')
+            @store.store_object(bucket,object,request)
+          end
+        else
+          @store.store_object(bucket,path,request)
         end
       end
       response.status = 200
@@ -80,14 +115,15 @@ module Shuck
   end
 
   class Server
-    def initialize(port,store)
+    def initialize(port,store,hostname = "localhost")
       @port = port
       @store = store
+      @hostname = hostname
     end
 
     def serve
       @server = WEBrick::HTTPServer.new(:Port => @port)
-      @server.mount "/", Servlet, @store
+      @server.mount "/", Servlet, @store,@hostname
       trap "INT" do @server.shutdown end
       @server.start
     end

data/lib/shuck/version.rb

@@ -1,3 +1,3 @@
 module Shuck
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/shuck.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "ruby-debug19"
   s.add_development_dependency "aws-s3"
+  s.add_development_dependency "right_aws"
   s.add_dependency "thor"
   s.add_dependency "builder"
 

data/test/right_aws_commands_test.rb

@@ -0,0 +1,54 @@
+require 'test/test_helper'
+require 'fileutils'
+require 'shuck/server'
+require 'right_aws'
+
+class RightAWSCommandsTest < Test::Unit::TestCase
+
+  def setup
+    @s3 = RightAws::S3Interface.new('1E3GDYEOGFJPIT7XXXXXX','hgTHt68JY07JKUY08ftHYtERkjgtfERn57XXXXXX', {:multi_thread => false, :logger => Logger.new('/tmp/x.log'), :server => 'localhost', :port => 10453, :protocol => 'http' })
+  end
+
+  def teardown
+  end
+
+  def test_create_bucket
+    bucket = @s3.create_bucket("s3media")
+    assert_not_nil bucket
+  end
+
+  def test_store
+    @s3.put("s3media","helloworld","Hello World Man!")
+    obj = @s3.get("s3media","helloworld")
+    assert_equal "Hello World Man!",obj[:object]
+
+    obj = @s3.get("s3media","helloworld", )
+  end
+
+  def test_large_store
+    @s3.put("s3media","helloworld","Hello World Man!")
+    buffer = ""
+    500000.times do
+      buffer << "#{(rand * 100).to_i}"
+    end
+#
+    buf_len = buffer.length
+    @s3.put("s3media","big",buffer)
+
+    output = ""
+    @s3.get("s3media","big") do |chunk|
+      output << chunk
+    end
+    assert_equal buf_len,output.size
+  end
+
+  def test_multi_directory
+    @s3.put("s3media","dir/right/123.txt","recursive")
+    output = ""
+    obj = @s3.get("s3media","dir/right/123.txt") do |chunk|
+      output << chunk
+    end
+    assert_equal "recursive", output
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Curtis Spencer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -08:00
+date: 2010-12-11 00:00:00 -08: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: right_aws
   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 Shuck to test basic S3 functionality without actually connecting to S3
 email: 
 - curtis@sevenforge.com
@@ -97,6 +110,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- README.md
 - Rakefile
 - bin/shuck
 - lib/shuck.rb
@@ -108,6 +122,7 @@ files:
 - lib/shuck/version.rb
 - lib/shuck/xml_adapter.rb
 - shuck.gemspec
+- test/right_aws_commands_test.rb
 - test/s3_commands_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -143,5 +158,6 @@ signing_key:
 specification_version: 3
 summary: Shuck is a phony S3 engine with minimal dependencies
 test_files: 
+- test/right_aws_commands_test.rb
 - test/s3_commands_test.rb
 - test/test_helper.rb