microstatic 0.2.0 → 0.3.0

data/.ruby-gemset

@@ -0,0 +1 @@
+microstatic

data/.ruby-version

@@ -0,0 +1 @@
+default

data/bin/microstatic

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'microstatic'
+
+if ARGV.empty?
+  puts 'please specify a bucket name'
+  exit 1
+end
+
+bucket_name = ARGV[0]
+
+bucket_creator = Microstatic::S3BucketCreator.new( Microstatic.aws_creds_from_env )
+
+puts "creating bucket #{bucket_name} ..."
+bucket_creator.create( bucket_name )
+
+puts "done"

data/lib/microstatic.rb

@@ -1,2 +1,15 @@
 require "microstatic/version"
+
+require 'microstatic/uses_fog'
+
 require "microstatic/s3_deployer"
+require "microstatic/s3_bucket_creator"
+
+module Microstatic
+  def self.aws_creds_from_env
+    {
+      access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
+      secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY')
+    }
+  end
+end

data/lib/microstatic/s3_bucket_creator.rb

@@ -0,0 +1,17 @@
+module Microstatic
+
+class S3BucketCreator
+  include UsesFog
+
+  def initialize( aws_creds )
+    check_and_store_aws_creds(aws_creds)
+  end
+
+  def create( bucket_name )
+    connection.put_bucket( bucket_name )
+    connection.put_bucket_acl( bucket_name, 'public-read' )
+    connection.put_bucket_website( bucket_name, 'index.html', :key => '404.html' )
+  end
+end
+
+end

data/lib/microstatic/s3_deployer.rb

@@ -1,24 +1,20 @@
 require 'digest/md5'
 require 'pathname'
 
-require 'aws/s3'
+module Microstatic
 
 # The following is based on code generously 
 # shared by Giles Alexander (@gga)
-class Microstatic::S3Deployer
+class S3Deployer
+  include UsesFog
   def initialize( local_dir, bucket, aws_creds )
-    [:access_key_id,:secret_access_key].each do |required_key|
-      raise ArgumentError, "must supply :#{required_key}" unless aws_creds.key?(required_key)
-    end
+    check_and_store_aws_creds(aws_creds)
 
     @local_dir = Pathname.new(local_dir)
     @bucket = bucket
-    @aws_creds = aws_creds
   end
 
   def upload
-    AWS::S3::Base.establish_connection!(@aws_creds)
-
     Pathname.glob(@local_dir+"**/*") do |child|
       upload_file(child) unless child.directory?
     end
@@ -28,23 +24,23 @@ class Microstatic::S3Deployer
     s3_key = file.relative_path_from(@local_dir).to_s
 
     begin
-      s3_object = AWS::S3::S3Object.find(s3_key, @bucket)
-    rescue AWS::S3::NoSuchKey
+      s3_object = connection.head_object(@bucket,s3_key)
+    rescue Excon::Errors::NotFound
       s3_object = false
     end
 
     if !s3_object
       log_action('CREATE', s3_key)
-      AWS::S3::S3Object.store(s3_key, file.open, @bucket)
+      connection.put_object( @bucket, s3_key, file.open, 'x-amz-acl' => 'public-read' )
     else
-      s3_md5 = s3_object.about['etag'].sub(/"(.*)"/,'\1')
+      s3_md5 = s3_object.headers['ETag'].sub(/"(.*)"/,'\1')
       local_md5 = Digest::MD5.hexdigest( file.read )
 
       if( s3_md5 == local_md5 )
         log_action('NO CHANGE', s3_key)
       else
         log_action('UPDATE', s3_key)
-        AWS::S3::S3Object.store(s3_key, file.open, @bucket)
+        connection.put_object( @bucket, s3_key, file.open )
       end
     end
   end
@@ -55,3 +51,4 @@ class Microstatic::S3Deployer
   end
 end
 
+end

data/lib/microstatic/uses_fog.rb

@@ -0,0 +1,21 @@
+require 'fog'
+
+module Microstatic
+  module UsesFog
+    def check_and_store_aws_creds( aws_creds )
+      [:access_key_id,:secret_access_key].each do |required_key|
+        raise ArgumentError, "must supply :#{required_key}" unless aws_creds.key?(required_key)
+      end
+
+      @aws_creds = aws_creds
+    end
+
+    def connection
+      @_connection ||= Fog::Storage.new({
+        :provider => 'AWS',
+        :aws_access_key_id => @aws_creds.fetch(:access_key_id),
+        :aws_secret_access_key => @aws_creds.fetch(:secret_access_key)
+      })
+    end
+  end
+end

data/lib/microstatic/version.rb

@@ -1,3 +1,3 @@
 module Microstatic
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/microstatic.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Microstatic::VERSION
 
-  gem.add_runtime_dependency "aws-s3", "~>0.6.3"
+  gem.add_runtime_dependency "fog", ">=1"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "bundler"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microstatic
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-s3
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,24 @@ description: The microstatic gem turns generating your static site and deploying
   to S3 into a one-liner.
 email:
 - phodgson@thoughtworks.com
-executables: []
+executables:
+- microstatic
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/microstatic
 - lib/microstatic.rb
 - lib/microstatic/rake.rb
+- lib/microstatic/s3_bucket_creator.rb
 - lib/microstatic/s3_deployer.rb
+- lib/microstatic/uses_fog.rb
 - lib/microstatic/version.rb
 - microstatic.gemspec
 - spec/integration/fixtures/example_file.txt
@@ -128,15 +133,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2953068700068104113
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2953068700068104113
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Generate static sites from git and deploy them to an S3 bucket.

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create default@microstatic