shuck 0.0.1 → 0.0.2

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+tmp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shuck (0.0.1)
+    shuck (0.0.2)
       builder
       thor
 
@@ -9,10 +9,15 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
     builder (2.1.2)
     columnize (0.3.2)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
+    mime-types (1.16)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -24,11 +29,13 @@ GEM
     ruby_core_source (0.1.4)
       archive-tar-minitar (>= 0.5.2)
     thor (0.14.4)
+    xml-simple (1.0.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-s3
   builder
   bundler (>= 1.0.0)
   ruby-debug19

data/Rakefile

@@ -1,2 +1,10 @@
 require 'bundler'
+require 'rake/testtask'
 Bundler::GemHelper.install_tasks
+
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList['test/*_test.rb']
+  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.ruby_opts << '-I.'
+end
+

data/bin/shuck

@@ -1,5 +1,3 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'ruby-debug'
 require 'shuck/cli'
 Shuck::CLI.start

data/lib/shuck/bucket.rb

@@ -0,0 +1,18 @@
+require 'builder'
+require 'shuck/s3_object'
+
+module Shuck
+  class Bucket
+    attr_accessor :name,:creation_date,:objects
+
+    def initialize(name,creation_date,objects)
+      @name = name
+      @creation_date = creation_date
+      @objects = []
+      objects.each do |obj|
+        @objects << obj
+      end
+    end
+
+  end
+end

data/lib/shuck/cli.rb

@@ -6,12 +6,20 @@ module Shuck
     default_task("server")
 
     desc "server", "Run a server"
-    method_option :root, :type => :string, :aliases => '-r',:required => true
+    method_option :root, :type => :string, :aliases => '-r'
     method_option :port, :type => :numeric, :aliases => '-p', :required => true
     def server
       root = File.expand_path(options[:root])
       puts "Loading Shuck with #{root} on port #{options[:port]}"
-      server = Shuck::Server.new(options[:port],options[:root])
+      store = nil
+      if options[:root]
+        store = FileStore.new(options[:root])
+      end
+      if store.nil?
+        puts "You must specify a root to use a file store (the current default)"
+        exit(-1)
+      end
+      server = Shuck::Server.new(options[:port],store)
       server.serve
     end
   end

data/lib/shuck/file_store.rb

@@ -0,0 +1,56 @@
+require 'fileutils'
+require 'time'
+require 'shuck/bucket'
+
+module Shuck
+  class FileStore
+    def initialize(root)
+      @root = root
+      @buckets = []
+      @bucket_hash = {}
+      Dir[File.join(root,"*")].each do |bucket|
+        bucket_name = File.basename(bucket)
+        bucket_obj = Bucket.new(bucket_name,Time.now,[])
+        @buckets << bucket_obj
+        @bucket_hash[bucket_name] = bucket_obj
+      end
+    end
+
+    def buckets
+      @buckets
+    end
+
+    def get_bucket(bucket)
+      @bucket_hash[bucket]
+    end
+
+    def create_bucket(bucket)
+      FileUtils.mkdir_p(File.join(@root,bucket))
+      bucket_obj = Bucket.new(bucket,Time.now,[])
+      @buckets << bucket_obj
+      @bucket_hash[bucket] = bucket_obj
+    end
+
+    def get_object(bucket,object)
+      begin 
+        io = File.open(File.join(@root,bucket,object),'rb')
+        return io
+      rescue
+        puts $!
+        return nil
+      end
+    end
+
+    def store_object(bucket,object,request)
+      begin
+        File.open(File.join(@root,bucket,object),'w') do |f|
+          request.body do |chunk|
+            f << chunk
+          end
+        end
+      rescue
+        puts $!
+      end
+    end
+  end
+end

data/lib/shuck/s3_object.rb

@@ -0,0 +1,5 @@
+module Shuck
+  class S3Object
+    attr_accessor :name,:size,:creation_date
+  end
+end

data/lib/shuck/server.rb

@@ -1,11 +1,12 @@
 require 'webrick'
-require 'shuck/store'
+require 'shuck/file_store'
+require 'shuck/xml_adapter'
 
 module Shuck
   class Servlet < WEBrick::HTTPServlet::AbstractServlet
-    def initialize(server,root)
+    def initialize(server,store)
       super(server)
-      @store = Store.new(root)
+      @store = store
     end
 
     def do_GET(request, response)
@@ -15,15 +16,22 @@ module Shuck
       if path == "/"
         response.status = 200
         response['Content-Type'] = 'text/xml'
-        response.body = @store.buckets
+        buckets = @store.buckets
+        response.body = XmlAdapter.buckets(buckets)
       else
         elems = path[1,path_len].split("/")
         bucket = elems[0]
         if elems.size == 1
-          bucket_list = @store.get_bucket(bucket)
-          response.status = 200
-          response.body = bucket_list
-          response['Content-Type'] = "text/xml" 
+          bucket_obj = @store.get_bucket(bucket)
+          if bucket_obj
+            response.status = 200
+            response.body = XmlAdapter.bucket(bucket_obj)
+            response['Content-Type'] = "application/xml" 
+          else
+            response.status = 404
+            response.body = XmlAdapter.error_no_such_bucket(bucket)
+            response['Content-Type'] = "application/xml" 
+          end
         else
           object = elems[1,elems.size].join('/')
           io = @store.get_object(bucket,object)
@@ -72,16 +80,20 @@ module Shuck
   end
 
   class Server
-    def initialize(port,root)
+    def initialize(port,store)
       @port = port
-      @root = root
+      @store = store
     end
 
     def serve
       @server = WEBrick::HTTPServer.new(:Port => @port)
-      @server.mount "/", Servlet, @root
+      @server.mount "/", Servlet, @store
       trap "INT" do @server.shutdown end
       @server.start
     end
+
+    def shutdown
+      @server.shutdown
+    end
   end
 end

data/lib/shuck/version.rb

@@ -1,3 +1,3 @@
 module Shuck
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/shuck/xml_adapter.rb

@@ -0,0 +1,62 @@
+require 'builder'
+require 'time'
+
+module Shuck
+  class XmlAdapter
+    def self.buckets(buckets)
+      output = ""
+      xml = Builder::XmlMarkup.new(:target => output)
+      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+      xml.ListAllMyBucketsResult(:xmlns => "http://s3.amazonaws.com/doc/2006-03-01/") { |lam|
+        lam.Owner { |owner|
+          owner.ID("123")
+          owner.DisplayName("Shuck")
+        }
+        lam.Buckets { |buckets|
+          @buckets.each do |bucket|
+            buckets.Bucket do |b|
+              b.Name(bucket.name)
+              b.CreationDate(bucket.creation_date.xmlschema)
+            end
+          end
+        }
+      }
+      output
+    end
+
+    # <?xml version="1.0" encoding="UTF-8"?>
+    #<Error>
+    #  <Code>NoSuchKey</Code>
+    #  <Message>The resource you requested does not exist</Message>
+    #  <Resource>/mybucket/myfoto.jpg</Resource> 
+    #  <RequestId>4442587FB7D0A2F9</RequestId>
+    #</Error> 
+    def self.error_no_such_bucket(name)
+      output = ""
+      xml = Builder::XmlMarkup.new(:target => output)
+      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+      xml.Error { |err|
+        err.Code("NoSuchBucket")
+        err.Message("The resource you requested does not exist")
+        err.Resource(name)
+        err.RequestId(1)
+      }
+      output
+    end
+
+    def self.bucket(bucket)
+      output = ""
+      xml = Builder::XmlMarkup.new(:target => output)
+      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+      xml.ListBucketResult(:xmlns => "http://s3.amazonaws.com/doc/2006-03-01/") { |lbr|
+        lbr.Name(bucket.name)
+        lbr.Prefix
+        lbr.Marker
+        lbr.MaxKeys("1000")
+        lbr.IsTruncated("false")
+      }
+      output
+    end
+
+  end
+end

data/lib/shuck.rb

@@ -1,5 +1,3 @@
 require 'shuck/version'
+require 'shuck/file_store'
 require 'shuck/server'
-module Shuck
-  # Your code goes here...
-end

data/shuck.gemspec

@@ -16,6 +16,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_dependency "thor"
   s.add_dependency "builder"
 

data/test/s3_commands_test.rb

@@ -0,0 +1,58 @@
+require 'test/test_helper'
+require 'fileutils'
+require 'shuck/server'
+require 'aws/s3'
+
+class S3CommandsTest < Test::Unit::TestCase
+  include AWS::S3
+
+  def setup
+    AWS::S3::Base.establish_connection!(:access_key_id => "123", :secret_access_key => "abc", :server => "localhost", :port => "10453" )
+  end
+
+  def teardown
+    AWS::S3::Base.disconnect!
+  end
+
+  def test_create_bucket
+    bucket = Bucket.create("mybucket")
+    assert_not_nil bucket
+  end
+
+  def test_store
+    bucket = Bucket.create("mybucket")
+    S3Object.store("hello","world","mybucket")
+
+    output = ""
+    obj = S3Object.stream("hello","mybucket") do |chunk|
+      output << chunk
+    end
+    assert_equal "world", output
+  end
+
+  def test_large_store
+    bucket = Bucket.create("mybucket")
+    buffer = ""
+    500000.times do
+      buffer << "#{(rand * 100).to_i}"
+    end
+
+    buf_len = buffer.length
+    S3Object.store("big",buffer,"mybucket")
+
+    output = ""
+    S3Object.stream("big","mybucket") do |chunk|
+      output << chunk
+    end
+    assert_equal buf_len,output.size
+  end
+
+  def test_find_nil_bucket
+    begin
+      bucket = Bucket.find("unknown")
+      assert_fail "Bucket.find didn't throw an exception"
+    rescue
+      assert_equal AWS::S3::NoSuchBucket,$!.class
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+require 'test/unit'
+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)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Curtis Spencer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -08:00
+date: 2010-11-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: aws-s3
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,10 +56,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: thor
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -71,6 +71,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: Use Shuck to test basic S3 functionality without actually connecting to S3
 email: 
 - curtis@sevenforge.com
@@ -87,11 +100,16 @@ files:
 - Rakefile
 - bin/shuck
 - lib/shuck.rb
+- lib/shuck/bucket.rb
 - lib/shuck/cli.rb
+- lib/shuck/file_store.rb
+- lib/shuck/s3_object.rb
 - lib/shuck/server.rb
-- lib/shuck/store.rb
 - lib/shuck/version.rb
+- lib/shuck/xml_adapter.rb
 - shuck.gemspec
+- test/s3_commands_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -124,5 +142,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Shuck is a phony S3 engine with minimal dependencies
-test_files: []
-
+test_files: 
+- test/s3_commands_test.rb
+- test/test_helper.rb

data/lib/shuck/store.rb

@@ -1,76 +0,0 @@
-require 'builder'
-require 'fileutils'
-require 'time'
-
-module Shuck
-  class Store
-    def initialize(root)
-      @root = root
-      @buckets = []
-      Dir[File.join(root,"*")].each do |bucket|
-        @buckets << File.basename(bucket)
-      end
-    end
-
-    def buckets
-      output = ""
-      xml = Builder::XmlMarkup.new(:target => output)
-      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-      xml.ListAllMyBucketsResult(:xmlns => "http://s3.amazonaws.com/doc/2006-03-01/") { |lam|
-        lam.Owner { |owner|
-          owner.ID("123")
-          owner.DisplayName("Curtis Spencer")
-        }
-        lam.Buckets { |buckets|
-          @buckets.each do |bucket|
-            buckets.Bucket do |b|
-              b.Name(bucket)
-              b.CreationDate(Time.now.xmlschema)
-            end
-          end
-        }
-      }
-      output
-    end
-
-    def get_bucket(bucket)
-      output = ""
-      xml = Builder::XmlMarkup.new(:target => output)
-      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-      xml.ListBucketResult(:xmlns => "http://s3.amazonaws.com/doc/2006-03-01/") { |lbr|
-        lbr.Name(bucket)
-        lbr.Prefix
-        lbr.Marker
-        lbr.MaxKeys("1000")
-        lbr.IsTruncated("false")
-      }
-      output
-    end
-
-    def create_bucket(bucket)
-      FileUtils.mkdir_p(File.join(@root,bucket))
-    end
-
-    def get_object(bucket,object)
-      begin 
-        io = File.open(File.join(@root,bucket,object),'rb')
-        return io
-      rescue
-        puts $!
-        return nil
-      end
-    end
-
-    def store_object(bucket,object,request)
-      begin
-        File.open(File.join(@root,bucket,object),'w') do |f|
-          request.body do |chunk|
-            f << chunk
-          end
-        end
-      rescue
-        puts $!
-      end
-    end
-  end
-end