s3_dir 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a17c51ae36e976e230825df8db63b8b29ff2a01
-  data.tar.gz: c9135601df89eb46385f1d079fb67f6a51a59e63
+  metadata.gz: 92a816d5e2e14b3c1238da1987a697f5748be223
+  data.tar.gz: b7aca8ce2710278a087d70ba5bb63e599a010ab4
 SHA512:
-  metadata.gz: e0ab809198e1182d1ef12ec2940372f8be210a7a7d40316ac7680ef19e1f523e6abaf3f83a41606134a85b0198d168ece6b324b8363b5bc40c1295841fa2ee8c
-  data.tar.gz: 9d033deadc24d90f77a3ed7bf36a2041d29afcf2ad6b0a86284ed3793532b158a689cb380912ef67cb1ae6b0c82bd6e1c49fc79888d83ee8dd05fbd11ebb0022
+  metadata.gz: a83953cdbdd9118062ca6c564eb6469e9107b8fd5ff0a89eb213c20ad35530ad5fb44c0e4a54f16c7dc64632f20298059fa4843b52edc2dae37a5b36973b8e69
+  data.tar.gz: c6225bc8585036a0920d716dab714348053da2d4761042844b0d8a29a6f61f40fe999948a785004ab3d3ee47e134dfeefcc31f86699953bf8ef814a65777611c

data/lib/s3_dir/version.rb

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

data/lib/s3_dir.rb

@@ -1,5 +1,6 @@
 require_relative 's3_dir/version'
 require 'fog/aws/storage'
+require 'digest/md5'
 
 # S3Dir uploads files to S3
 #
@@ -26,51 +27,76 @@ require 'fog/aws/storage'
 #     of its contents not public.
 #
 module S3Dir
+
   # Upload files to S3 
   def self.upload dir, key, options={}
-    files_path = File.expand_path(dir)
+    uploader = Uploader.new(dir, key, options)
+    uploader.upload
+  end
+
+  class Uploader
+    attr_reader :key
+    attr_reader :bucket
+    attr_reader :storage
+    attr_reader :is_public
+    attr_reader :files_path
+
+    def initialize dir, key, options
+      @files_path = File.expand_path(dir)
 
-    # Merge defaults with passed-in options
-    settings = {credential: ENV['FOG_CREDENTIAL'],
-                private: false}.merge(options)
+      # Merge defaults with passed-in options
+      settings = {credential: ENV['FOG_CREDENTIAL'],
+                  private: false}.merge(options)
 
-    # We have to manually extract fog credentials here
-    # because we'll need those settings when creating a new
-    # Fog::Storage object with custom settings
-    all_credentials = YAML::load_file(File.join(ENV['HOME'], '.fog'))
-    credential = settings[:credential]
-    credentials = all_credentials[credential]
-    access_key = credentials[:aws_access_key_id]
-    secret_key = credentials[:aws_secret_access_key]
-    region = credentials[:region] || 'us-west-2'
+      # Configure Fog
+      Fog.credential = settings[:credential]
 
-    # If we don't specify this endpoint, Fog will complain about
-    # not using the correct endpoint if the bucket has dots in
-    # the name (i.e. website bucket)
-    endpoint = 'http://s3.amazonaws.com'
+      # Get a region
+      region = Fog.credentials[:region] || 'us-west-2'
 
-    # This may be a public bucket
-    is_public = !settings[:private]
+      # If we don't specify this endpoint, Fog will complain about
+      # not using the correct endpoint if the bucket has dots in
+      # the name (i.e. website bucket)
+      endpoint = 'http://s3.amazonaws.com'
 
-    # Set up our storage object
-    # We have to specify path_style here because Fog will complain about
-    # our website bucket (if we're using a bucket with dots in the name)
-    # not being covered by the SSL certificate.
-    storage = Fog::Storage.new(provider: 'aws', aws_access_key_id: access_key,
-                               aws_secret_access_key: secret_key,
-                               path_style: true, region: region,
-                               endpoint: endpoint)
-    bucket = storage.directories.get(key)
-    bucket ||= storage.directories.create(key: key, public: is_public)
+      # This may be a public bucket
+      @is_public = !settings[:private]
 
-    Dir.chdir(files_path) do
-      Dir['**/*'].each do |entry|
-        if File.directory?(entry)
-          bucket.files.create(key: entry, public: is_public)
-        else
-          bucket.files.create(key: entry, public: is_public, body: File.open(entry))
+      # Set up our storage object
+      # We have to specify path_style here because Fog will complain about
+      # our website bucket (if we're using a bucket with dots in the name)
+      # not being covered by the SSL certificate.
+      fog_options = Fog.credentials.merge({provider: 'aws', path_style: true,
+                                           region: region, endpoint: endpoint})
+      fog_options.delete(:key_name)
+      @storage = Fog::Storage.new(fog_options)
+      @bucket = storage.directories.get(key)
+      @bucket ||= storage.directories.create(key: key, public: is_public)
+      @key = key
+    end
+
+    def upload
+      Dir.chdir(files_path) do
+        Dir['**/*'].each do |entry|
+          File.directory?(entry) ? create_directory(entry) : create_file(entry)
         end
       end
     end
+
+    private
+
+    def create_directory entry
+      bucket.files.create(key: entry, public: is_public)
+    end
+
+    def create_file entry
+      storage.head_object(key, entry, {'If-None-Match' => md5(entry)})
+    rescue Excon::Errors::NotFound
+      bucket.files.create(key: entry, public: is_public, body: File.open(entry))
+    end
+
+    def md5 entry
+      Digest::MD5.digest(entry)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_dir
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - nuex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,4 +106,3 @@ signing_key:
 specification_version: 4
 summary: Uploads a directory of files to an AWS S3 bucket
 test_files: []
-has_rdoc: