guard-s3 0.1.1 → 0.1.2

data/README.md

@@ -1,10 +1,10 @@
 # guard-s3
 
-guard-s3 is a simple guard library that syncs local directories with S3 as files are changed. 
+guard-s3 is a simple guard library that syncs local directories with S3 as files are changed.
 
 # Usage
 
-This is a sample Guardfile
+This is a sample Guardfile that will automatically upload all files in the Guard *watchdir* directory into the specified s3 bucket. By default, *watchdir* is the directory from which guard was called, but it can be specified using the `--watchdir/-w` parameter.  See the [guard main documentation for details](https://github.com/guard/guard#guard----).
 
     opts = {
       :access_key_id      => 'ACCESS_KEY_ID_XXXXXX',
@@ -16,9 +16,14 @@ This is a sample Guardfile
     guard 's3', opts do
       watch(/.*/)
     end
-    
+
+ 
 
 # Dependencies
 
  - guard
- - aws-s3
+ - aws-s3
+
+# Changes this version
+
+ - Fixed `watchdir` behavior. Guard-s3 will now watch and upload from the directory path specified in the Guardfile relative to the guard `watchdir`.

data/guard-s3.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "guard-s3"
   s.version     = Guard::S3::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["James Welsh"]
-  s.email       = ["james at supermatter dot com"]
+  s.authors     = ["James Welsh", "Austin Mullins"]
+  s.email       = ["james at supermatter dot com", "Austin dot Mullins at WalkeDesigns dot com"]
   s.homepage    = "http://github.com/guard/guard-s3"
   s.summary     = %q{A simple guard library for syncing files with s3}
   s.description = %q{A simple guard library for syncing files with s3}

data/lib/guard/s3.rb

@@ -22,12 +22,12 @@ module ::Guard
       @bucket         = options[:bucket]
       @s3_permissions = options[:s3_permissions]
       @debug          = true
-      @pwd            = watchdir || Dir.pwd
+      @watchdir       = (Dsl.options[:watchdir] && File.expand_path(Dsl.options[:watchdir])) || Dir.pwd
     end
         
     def run_on_change(paths)
       paths.each do |path|
-        file  = File.join(pwd, path)        
+        file  = File.join(@watchdir, path)        
         begin
           if exists?(file)
             log "Nothing uploaded. #{file} already exists!"
@@ -56,9 +56,5 @@ module ::Guard
       puts "[#{Time.now}] #{msg}"
     end
 
-    def watchdir
-      # TODO: Nicer way to detect Guard watching a directory explicitly?
-      ::Guard::Dsl.class_variable_get(:@@options).watchdir
-    end
   end
 end

data/lib/guard/s3/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module S3
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: guard-s3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
 - James Welsh
+- Austin Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70217174640680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217174640680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70217174640220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +38,16 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217174640220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple guard library for syncing files with s3
 email:
 - james at supermatter dot com
+- Austin dot Mullins at WalkeDesigns dot com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -68,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-s3
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple guard library for syncing files with s3