s3-static-site 0.1.0 → 0.2.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.DS_STORE

data/Gemfile

@@ -1,14 +1,3 @@
-source "http://rubygems.org"
+source :rubygems
 
-gem "aws-s3"
-gem "capistrano"
-gem "haml"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
+gemspec

data/Gemfile.lock

@@ -1,45 +1,45 @@
+PATH
+  remote: .
+  specs:
+    s3-static-site (0.2.0)
+      aws-sdk
+      capistrano
+      haml
+
 GEM
   remote: http://rubygems.org/
   specs:
-    aws-s3 (0.6.2)
-      builder
-      mime-types
-      xml-simple
-    builder (3.0.0)
-    capistrano (2.5.19)
+    aws-sdk (1.5.7)
+      httparty (~> 0.7)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
+    capistrano (2.12.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.0.0)
-    git (1.2.5)
-    haml (3.0.25)
-    highline (1.6.1)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mime-types (1.16)
+      net-ssh-gateway (>= 1.1.0)
+    haml (3.1.6)
+    highline (1.6.13)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
+      multi_xml
+    json (1.7.3)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.1.0)
-    net-ssh-gateway (1.0.1)
+    net-ssh (2.5.2)
+    net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
-    xml-simple (1.0.14)
+    nokogiri (1.5.5)
+    uuidtools (2.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-s3
-  bundler (~> 1.0.0)
-  capistrano
-  haml
-  jeweler (~> 1.5.2)
-  rcov
-  shoulda
+  s3-static-site!

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Josh Delsman
+Copyright (c) 2012 Joshua Delsman/miomoba, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,41 +1 @@
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-require 'jeweler'
-
-Jeweler::Tasks.new do |gem|
-  gem.name        = "s3-static-site"
-  gem.homepage    = "http://github.com/voxxit/s3-static-site"
-  gem.license     = "MIT"
-  gem.summary     = %Q{Using Ruby and Capistrano, build and deploy a static website to Amazon S3}
-  gem.description = %Q{Using Ruby and Capistrano, build and deploy a static website to Amazon S3}
-  gem.email       = "jdelsman@voxxit.com"
-  gem.authors     = ["Josh Delsman"]
-end
-
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
+require 'rake'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/s3-static-site.rb

@@ -10,7 +10,7 @@ Capistrano::Configuration.instance(true).load do
     set(name, *args, &block) if !exists?(name)
   end
   
-  _cset :deployment_path, `pwd`.gsub("\n", "") + "/public/"
+  _cset :deployment_path, `pwd`.gsub("\n", "") + "/public"
   
   def base_file_path(file)
     file.gsub(deployment_path, "")
@@ -22,8 +22,11 @@ Capistrano::Configuration.instance(true).load do
   
   # Establishes the connection to Amazon S3
   def establish_connection!
-    AWS::S3::Base.establish_connection!(
-      :access_key_id     => access_key_id,
+    # 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
@@ -33,22 +36,18 @@ Capistrano::Configuration.instance(true).load do
     namespace :s3 do      
       desc "Empties bucket of all files. Caution when using this command, as it cannot be undone!"
       task :empty do
-        establish_connection!
-        
-        puts "Emptying bucket..."
-
-        AWS::S3::Bucket.find(bucket).delete_all
+        _s3 = establish_connection!
+        _s3.buckets[bucket].clear!
       end
 
       desc "Upload files to the bucket in the current state"
       task :upload_files do
-        establish_connection!
+        _s3 = establish_connection!
 
         files.each do |file|
           if !File.directory?(file)
             path = base_file_path(file)
-
-            puts "Uploading #{path}..."
+            path.gsub!(/^\//, "") # Remove preceding slash for S3
 
             contents = case File.extname(path)
             when ".haml"
@@ -65,14 +64,13 @@ Capistrano::Configuration.instance(true).load do
               open(file)
             end
 
-            AWS::S3::S3Object.store(path, contents, bucket, :access => :public_read)
+            _s3.buckets[bucket].objects[path].write(contents, :acl => :public_read)
           end
         end
       end
     end
     
     task :update do
-      s3.empty
       s3.upload_files
     end
 

data/s3-static-site.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Josh Delsman"]
+  gem.email         = ["jdelsman@voxxit.com"]
+  gem.description   = "Using Ruby and Capistrano, build and deploy a static website to Amazon S3"
+  gem.summary       = "Using Ruby and Capistrano, build and deploy a static website to Amazon S3"
+  gem.homepage      = "http://github.com/voxxit/s3-static-site"
+  gem.licenses      = ["MIT"]
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "s3-static-site"
+  gem.require_paths = ["lib"]
+  gem.version       = "0.2.0"
+
+  # Gem dependencies
+  gem.add_dependency("aws-sdk")
+  gem.add_dependency("capistrano")
+  gem.add_dependency("haml")
+end

metadata

@@ -1,106 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: s3-static-site
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Josh Delsman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-22 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-07-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id007
-description: Using Ruby and Capistrano, build and deploy a static website to Amazon S3
-email: jdelsman@voxxit.com
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Using Ruby and Capistrano, build and deploy a static website to Amazon
+  S3
+email:
+- jdelsman@voxxit.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
-files: 
-- .document
+extra_rdoc_files: []
+files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -108,39 +75,30 @@ files:
 - Rakefile
 - VERSION
 - lib/s3-static-site.rb
-- test/helper.rb
-- test/test_s3-static-site.rb
-has_rdoc: true
+- s3-static-site.gemspec
 homepage: http://github.com/voxxit/s3-static-site
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4424967007506553392
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Using Ruby and Capistrano, build and deploy a static website to Amazon S3
-test_files: 
-- test/helper.rb
-- test/test_s3-static-site.rb
+test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/test/helper.rb

@@ -1,21 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 's3-static-site'
-
-class Test::Unit::TestCase
-end

data/test/test_s3-static-site.rb

@@ -1,4 +0,0 @@
-require 'helper'
-
-class TestS3StaticSite < Test::Unit::TestCase
-end