ale 0.0.3.pre3 → 0.0.3.pre4

data/README.md

@@ -10,15 +10,6 @@ Installation
 
     gem install ale
 
-Setting Up a Website
---------------------
+Getting Started
+---------------
 
-Getting a S3 bucket set up for websites takes a little bit of work up front,
-but it is something you only have to do once and then it is smooth saling.
-Starting by logging into (S3 console)[http://console.aws.amazon.com/] and
-creating a bucket with the same name as the URL for you website. Make sure
-that the bucket includes a subdomain (like 'www', for example). Once you've
-created your bucket, click on *Properties* nears the top and then on the
-tab named *Website*. Check the box labeled *Enabled* and then fill in
-the text box for *Index Document* (something like `index.html` works well).
-That's it for S3.

data/ale.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ['lib']
   
-  s.add_dependency('aws-sdk',  '~> 1.1.3')
-  s.add_dependency('thor',     '~> 0.14.6')
+  s.add_dependency('crack',               '~> 0.3.1')
+  s.add_dependency('net-http-persistent', '~> 2.1')
+  s.add_dependency('thor',                '~> 0.14.6')
 end

data/lib/ale.rb

@@ -1,4 +1,5 @@
 module Ale
+  autoload :Bucket,   'ale/bucket'
   autoload :CLI,      'ale/cli'
   autoload :Config,   'ale/config'
   autoload :Site,     'ale/site'

data/lib/ale/bucket.rb

@@ -0,0 +1,130 @@
+require 'base64'
+require 'crack'
+require 'mime/types'
+require 'net/http/persistent'
+require 'time'
+
+module Ale
+  class Bucket
+    attr_reader :name
+    
+    class << self
+      def create(name)
+        self.new(name).tap {|bucket| bucket.create }
+      end
+    end
+  
+    def initialize(name)
+      @name = name
+    end
+    
+    # Creates the bucket on S3. It does not throw an error if the bucket
+    # already exsists.
+    #
+    def create
+      request = Net::HTTP::Put.new(uri.request_uri)
+      request.add_field('x-amz-acl', 'private')
+      send(uri, request)
+    end
+    
+    # Allows the bucket to be used to host websites.
+    #
+    def enable_website
+      uri = uri(query: 'website')
+      request = Net::HTTP::Put.new(uri.request_uri)
+      request.body = File.read(File.expand_path('../../templates/website_configuration.xml', __FILE__))
+      send(uri, request)
+    end
+    
+    # Returns true of the bucket exsists on S3.
+    #
+    def exists?
+      request = Net::HTTP::Head.new(uri.request_uri)
+      send(uri, request) do |response|
+        return response.class == Net::HTTPOK
+      end
+    end
+    
+    # Returns an array of all of the objects in the bucket.
+    #
+    def objects
+      uri = uri(prefix: 'prefix=/')
+      request = Net::HTTP::Get.new(uri.request_uri)
+      send(uri, request) do |response|
+        list = Crack::XML.parse(response.body)
+        # Make sure we're returning an Array.
+        return [list['ListBucketResult']['Contents']].flatten.compact
+      end
+    end
+    
+    # Removes an  object form the bucket.
+    #
+    def remove(key)
+      uri = uri(key)
+      request = Net::HTTP::Delete.new(uri.request_uri)
+      send(uri, request)
+    end
+    
+    # Uploads a file to the specified key on S3.
+    #
+    def upload(file, key, permissions = 'private')
+      uri = uri(key)
+      file = File.open(file, 'rb')
+      request = Net::HTTP::Put.new(uri.request_uri)
+      request.add_field('Content-Length', file.size)
+      request.add_field('Content-Type', MIME::Types.of(file.path))
+      request.add_field('x-amz-acl', permissions)
+      request.body_stream = file
+      send(uri, request)
+    end
+    
+  private
+  
+    # Creates an authorization string for the request.
+    # http://s3.amazonaws.com/doc/s3-developer-guide/RESTAuthentication.html
+    #
+    def authorization(uri, request)
+      string_to_sign = "#{request.class::METHOD}\n"
+      string_to_sign << "\n"
+      string_to_sign << "#{request['Content-Type']}\n"
+      string_to_sign << "#{request['Date']}\n"
+      
+      amz_headers = request.to_hash.collect {|h,v| "#{h}:#{v.join(',')}" if h =~ /x-amz-/ }.compact.sort
+      string_to_sign << amz_headers.join("\n") << "\n" unless amz_headers.empty?
+      
+      string_to_sign << uri.request_uri
+      
+      digest = OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), Ale::Config.amazon_secret_access_key, string_to_sign)
+      signature = Base64.encode64(digest).chomp
+      
+      "AWS #{Ale::Config.amazon_access_key_id}:#{signature}"
+    end
+  
+    # Helps construct URIs for interacting the S3's REST API.
+    #
+    def uri(options_or_path = {}, options = {})
+      if options_or_path.is_a?(Hash)
+        options, path = options_or_path, '/'
+      else
+        path = options_or_path
+      end
+      path = URI.escape(path.sub(/^\//, ''))
+      URI::HTTP.build(options.merge(host: 's3.amazonaws.com', path: "/#{name}/#{path}"))
+    end
+  
+    def connection
+      @_connection ||= Net::HTTP::Persistent.new("ale/#{name}")
+    end
+    
+    # Send a request object to the URI passed in.
+    #
+    def send(uri, request, &block)
+      unless request.to_hash.key?('Content-Type')
+        request.add_field('Content-Type', 'application/x-www-form-urlencoded')
+      end
+      request.add_field('Date', Time.now.utc.rfc822)
+      request.add_field('Authorization', authorization(uri, request))
+      connection.request(uri, request, &block)
+    end
+  end
+end

data/lib/ale/cli.rb

@@ -33,6 +33,21 @@ module Ale
       end
     end
     
+    desc 'setup', 'Creates the bucket on S3 and enabled it for websites'
+    def setup
+      opts = options.dup
+      
+      Ale.alefile = opts[:alefile]    
+      Ale::Config.load(Ale.alefile)
+      
+      say("Setting up website for bucket: #{Ale::Config.bucket}")
+      uploader.setup!
+    rescue AlefileNotFound
+      say('Count not locale Alefile', :red)
+    rescue BucketNotSpecified
+      say('No bucket specificed in Alefile', :red)
+    end
+    
     desc 'upload', 'Uploads the built site to S3'
     method_option 'alefile', :type => :string, :banner =>
       'Use the specified alefile instead of Alefile'
@@ -42,9 +57,8 @@ module Ale
       Ale.alefile = opts[:alefile]    
       Ale::Config.load(Ale.alefile)
       
-      uploader.upload!
-      
       say("Uploading site in #{uploader.site.directory}")
+      uploader.upload!
     rescue AlefileNotFound
       say('Count not locale Alefile', :red)
     rescue BucketNotFound

data/lib/ale/uploader.rb

@@ -1,9 +1,12 @@
-require 'aws-sdk'
-
 module Ale
   class Uploader
     attr_reader :site
     
+    def setup!
+      Ale::Bucket.create(Ale::Config.bucket)
+      bucket.enable_website
+    end
+    
     def initialize(site)
       @site = site
     end
@@ -18,7 +21,7 @@ module Ale
     def bucket
       return @bucket unless @bucket.nil?
       raise Ale::BucketNotSpecified if Ale::Config.bucket.empty?
-      @bucket = AWS::S3.new.buckets[Ale::Config.bucket]
+      @bucket = Ale::Bucket.new(Ale::Config.bucket)
       raise Ale::BucketNotFound unless @bucket.exists?
       @bucket
     end
@@ -45,7 +48,7 @@ module Ale
     end
     
     def permissions(file)
-      private_files.include?(file) ? :private : :public_read
+      private_files.include?(file) ? 'private' : 'public-read'
     end
     
     def private_files
@@ -58,9 +61,9 @@ module Ale
     
     def remove_stale_files_from_s3
       bucket.objects.each do |object|
-        unless files.include?("#{site.directory}/#{object.key}")
-          puts "Deleting old file #{object.key}"
-          object.delete
+        unless files.include?("#{site.directory}/#{object['Key']}")
+          puts "Deleting old file #{object['Key']}"
+          bucket.remove(object['Key'])
         end
       end
     end
@@ -69,17 +72,21 @@ module Ale
       files.each do |file|
         unless File.directory?(file)
           key = key_name(file)
-          object = bucket.objects[key]
-          if object.exists?
-            if object.last_modified < File.mtime(file)
+          keys_on_s3 = bucket.objects.map {|object| object['Key']}
+          
+          if keys_on_s3.include?(key)
+            object = bucket.objects.find {|obj| obj['Key'] == key }
+            last_modified = Time.parse(object['LastModified'])
+
+            if last_modified < File.mtime(file)
               puts "Updating file #{key}"
-              object.write(:file => file, :acl => permissions(file))
+              bucket.upload(file, key, permissions(file))
             else
               puts "File #{key} is already on S3"
             end
           else
-            puts "Uploading filed #{key}"
-            object.write(:file => file, :acl => permissions(file))
+            puts "Uploading file #{key}"
+            bucket.upload(file, key, permissions(file))
           end
         end
       end

data/lib/ale/version.rb

@@ -1,3 +1,3 @@
 module Ale
-  VERSION = '0.0.3.pre3'
+  VERSION = '0.0.3.pre4'
 end

data/lib/templates/website_configuration.xml

@@ -0,0 +1,8 @@
+<WebsiteConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+  <IndexDocument>
+    <Suffix>index.html</Suffix>
+  </IndexDocument>
+  <ErrorDocument>
+    <Key>404.html</Key>
+  </ErrorDocument>
+</WebsiteConfiguration>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ale
 version: !ruby/object:Gem::Version
-  version: 0.0.3.pre3
+  version: 0.0.3.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
+date: 2011-10-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: &70174158803320 !ruby/object:Gem::Requirement
+  name: crack
+  requirement: &70280802231900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70174158803320
+  version_requirements: *70280802231900
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: &70280802230400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70280802230400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70174158802060 !ruby/object:Gem::Requirement
+  requirement: &70280802227160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +43,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70174158802060
+  version_requirements: *70280802227160
 description: Takes a static site and uploads it to Amazon's S3.
 email: jeremy@jeremyboles.com
 executables:
@@ -47,12 +58,14 @@ files:
 - ale.gemspec
 - bin/ale
 - lib/ale.rb
+- lib/ale/bucket.rb
 - lib/ale/cli.rb
 - lib/ale/config.rb
 - lib/ale/site.rb
 - lib/ale/uploader.rb
 - lib/ale/version.rb
 - lib/templates/Alefile
+- lib/templates/website_configuration.xml
 - test/ale_defaults_test.rb
 - test/test_helper.rb
 homepage: https://github.com/jeremyboles/ale