capistrano-s3 0.2.1 → 0.2.2

data/NEWS

@@ -0,0 +1,3 @@
+New in 0.2.2
+
+* Bugfix : fixed an error caused previously by removing SASS & HAML dependency.

data/README.md

@@ -1,4 +1,4 @@
-# s3-static-site
+# capistrano-s3
 
 > Allows static websites deployment to Amazon S3 website buckets using Capistrano.
 
@@ -20,11 +20,11 @@ Setup capistrano, create a public folder and set your S3 bucket configurations i
 
 ### Configuring deployment
 
-s3-static-site overrides the default Capistrano recipes for Rails projects with its own simple s3 publishing scripts.
+capistrano-s3 overrides the default Capistrano recipes for Rails projects with its own simple s3 publishing scripts.
 
 ```ruby
 # config/deploy.rb
-require 's3-static-site'
+require 'capistrano-s3'
 
 set :bucket, "www.cool-website-bucket.com"
 set :access_key_id, "CHANGETHIS"
@@ -37,7 +37,7 @@ and  configure a bucket per stage configuration.
 
 #### S3 write options
 
-s3-static-site sets files `:content_type` and `:acl` to `:public_read`, add or override with :
+capistrano-s3 sets files `:content_type` and `:acl` to `:public_read`, add or override with :
 
 ```ruby
 set :bucket_write_options, {
@@ -47,28 +47,21 @@ set :bucket_write_options, {
 
 See aws-sdk [S3Object.write doc](http://rubydoc.info/github/amazonwebservices/aws-sdk-for-ruby/master/AWS/S3/S3Object#write-instance_method) for all available options.
 
-### Advanced static website generation & assets management
+### Website generation & assets management
 
 If you wish to manage your assets with a packaging system, a simple way do to it
 is using a combination of :
 
-- [Sinatra](https://github.com/sinatra/sinatra) : simple web framework that we extend for our needs
-- [Sinatra-AssetPack](https://github.com/rstacruz/sinatra-assetpack) : deals with version management for all kind of assets
-- [Sinatra-Static](https://github.com/paulasmuth/sinatra-static) : generate your complete website in `public/`, allowing an `s3-static-site` deployment
-
-IMPORTANT : to achieve `Sinatra-AssetPack` and `Sinatra-Static` compatibility, see [pull request #1](https://github.com/paulasmuth/sinatra-static/pull/1)
-or use [a patched fork](https://github.com/hooktstudios/sinatra-static).
+- [sinatra](https://github.com/sinatra/sinatra) : simple web framework that we extend for our needs
+- [sinatra-assetpack](https://github.com/hooktstudios/sinatra-assetpack) : deals with version management for all kind of assets
+- [sinatra-export](https://github.com/hooktstudios/sinatra-export) : generate your complete website in `public/`, allowing an `s3-static-site` deployment
 
 Once you get this together, add a capistrano task to trigger website generation before deploy :
 
 ```ruby
 # config/deploy.rb
 before 'deploy' do
-  run_locally "bundle exec ruby app.rb"
+  run_locally "bundle exec ruby sinata:export"
   run_locally "bundle exec rake assetpack:build"
 end
-```
-
-## Copyright
-
-Copyright (c) 2012 Josh Delsman & miomoba, Inc. See LICENSE.txt for details.
+```

data/capistrano-s3.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "capistrano-s3"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.1"
+  gem.version       = "0.2.2"
 
   # Gem dependencies
   gem.add_dependency("aws-sdk")

data/lib/capistrano/s3.rb

@@ -0,0 +1,34 @@
+require 'capistrano/s3/publisher'
+
+unless Capistrano::Configuration.respond_to?(:instance)
+  abort "capistrano-s3 requires Capistrano >= 2."
+end
+
+Capistrano::Configuration.instance(true).load do
+  def _cset(name, *args, &block)
+    set(name, *args, &block) if !exists?(name)
+  end
+  
+  _cset :deployment_path, Dir.pwd.gsub("\n", "") + "/public"
+  
+  # Deployment recipes
+  namespace :deploy do
+    namespace :s3 do      
+      desc "Empties bucket of all files. Caution when using this command, as it cannot be undone!"
+      task :empty do
+        Publisher.clear!(access_key_id, secret_access_key)
+      end
+
+      desc "Upload files to the bucket in the current state"
+      task :upload_files do
+        Publisher.publish!(access_key_id, secret_access_key, bucket, deployment_path, bucket_write_options)
+      end
+    end
+    
+    task :update do
+      s3.upload_files
+    end
+
+    task :restart do; end
+  end
+end

data/lib/capistrano/s3/publisher.rb

@@ -0,0 +1,57 @@
+require 'aws/s3'
+require 'mime/types'
+
+module Publisher
+
+  def self.publish!(key, secret, bucket, source, extra_options)
+    s3 = self.establish_connection!(key, secret)
+
+    self.files(source).each do |file|
+      if !File.directory?(file)
+        path = self.base_file_path(source, file)
+        path.gsub!(/^\//, "") # Remove preceding slash for S3
+
+        contents = open(file)
+
+        types = MIME::Types.type_for(File.basename(file))
+        if types.empty?
+          options = {
+            :acl => :public_read
+          }
+        else
+          options = {
+            :acl => :public_read,
+            :content_type => types[0]
+          }
+        end
+        options.merge!(extra_options)
+        s3.buckets[bucket].objects[path].write(contents, options)
+      end
+    end
+  end
+
+  def self.clear!(key, secret, bucket)    
+    s3 = self.establish_connection!(key, secret)
+    s3.buckets[bucket].clear!
+  end
+
+  private
+
+    # Establishes the connection to Amazon S3
+    def self.establish_connection!(key, secret)
+      # Send logging to STDOUT
+      AWS.config(:logger => Logger.new(STDOUT))
+      AWS::S3.new(
+        :access_key_id => key,
+        :secret_access_key => secret
+      )
+    end
+
+    def self.base_file_path(root, file)
+      file.gsub(root, "")
+    end
+  
+    def self.files(deployment_path)
+      Dir.glob("#{deployment_path}/**/*")
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -70,11 +70,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
+- NEWS
 - README.md
 - Rakefile
 - capistrano-s3.gemspec
-- lib/capistrano-s3.rb
+- lib/capistrano/s3.rb
+- lib/capistrano/s3/publisher.rb
 homepage: http://github.com/hooktstudios/capistrano-s3
 licenses:
 - MIT

data/lib/capistrano-s3.rb

@@ -1,79 +0,0 @@
-require 'aws/s3'
-require 'mime/types'
-
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort "capistrano-s3 requires Capistrano >= 2."
-end
-
-Capistrano::Configuration.instance(true).load do
-  def _cset(name, *args, &block)
-    set(name, *args, &block) if !exists?(name)
-  end
-  
-  _cset :deployment_path, Dir.pwd.gsub("\n", "") + "/public"
-  
-  def base_file_path(file)
-    file.gsub(deployment_path, "")
-  end
-  
-  def files
-    Dir.glob("#{deployment_path}/**/*")
-  end
-  
-  # Establishes the connection to Amazon S3
-  def establish_connection!
-    # Send logging to STDOUT
-    AWS.config(:logger => Logger.new(STDOUT))
-
-    AWS::S3.new(
-      :access_key_id => access_key_id,
-      :secret_access_key => secret_access_key
-    )
-  end
-  
-  # Deployment recipes
-  namespace :deploy do
-    namespace :s3 do      
-      desc "Empties bucket of all files. Caution when using this command, as it cannot be undone!"
-      task :empty do
-        _s3 = establish_connection!
-        _s3.buckets[bucket].clear!
-      end
-
-      desc "Upload files to the bucket in the current state"
-      task :upload_files do
-        _s3 = establish_connection!
-
-        files.each do |file|
-          if !File.directory?(file)
-            path = base_file_path(file)
-            path.gsub!(/^\//, "") # Remove preceding slash for S3
-
-            contents = case File.extname(path)
-            open(file)
-
-            types = MIME::Types.type_for(File.basename(file))
-            if types.empty?
-              options = {
-                :acl => :public_read
-              }
-            else
-              options = {
-                :acl => :public_read,
-                :content_type => types[0]
-              }
-            end
-            options.merge!(bucket_write_options)
-            _s3.buckets[bucket].objects[path].write(contents, options)
-          end
-        end
-      end
-    end
-    
-    task :update do
-      s3.upload_files
-    end
-
-    task :restart do; end
-  end
-end