s3sync-cf 0.0.0 → 0.0.1

data/bin/s3sync

@@ -416,102 +416,106 @@ ENDUSAGE
     end
     
     if $S3syncOptions['--cf-invalidate'] && $S3syncOptions['--cf-dist-id']
-      puts "Invalidating following assets from s3 - #{filesToInvalidateOnCloudfront.inspect}" if $S3syncOptions['--verbose']
-      unless false && $S3syncOptions['--dryrun']
-      acf = RightAws::AcfInterface.new($AWS_ACCESS_KEY_ID, $AWS_SECRET_ACCESS_KEY)
-      invalidate_resp = acf.create_invalidation($S3syncOptions['--cf-dist-id'], :path => filesToInvalidateOnCloudfront)
-      puts invalidate_resp.inspect
-      end
+	puts "Invalidating following assets from s3 - #{filesToInvalidateOnCloudfront.inspect}" if $S3syncOptions['--verbose']
+	  unless false && $S3syncOptions['--dryrun']
+		  begin
+			    acf = RightAws::AcfInterface.new($AWS_ACCESS_KEY_ID, $AWS_SECRET_ACCESS_KEY)
+			    invalidate_resp = acf.create_invalidation($S3syncOptions['--cf-dist-id'], :path => filesToInvalidateOnCloudfront)
+		            puts invalidate_resp.inspect
+		    rescue Exception => xcp
+			    puts xcp.message
+		    end
+	    end
     end
   end #main
 
 
   # ---------- NODE ---------- #
   class Node
-    attr_reader :name
-    attr_reader :size
-    attr_reader :tag
-    attr_reader :date
-    def initialize(name='', size = 0, tag = '', date = Time.now.utc)
-      @name = name
-      @size = size
-      @tag = tag
-      @date = date
-    end
-    def directory?()
-      @tag == $S3syncDirTag and @size == $S3syncDirString.length
-    end
+	  attr_reader :name
+	  attr_reader :size
+	  attr_reader :tag
+	  attr_reader :date
+	  def initialize(name='', size = 0, tag = '', date = Time.now.utc)
+		  @name = name
+		  @size = size
+		  @tag = tag
+		  @date = date
+	  end
+	  def directory?()
+		  @tag == $S3syncDirTag and @size == $S3syncDirString.length
+	  end
   end
 
   # ---------- S3Node ---------- #
   class S3Node < Node
-    @path = nil
-    @bucket = nil
-    @result = nil
-    def initialize(bucket, prefix, itemOrName)
-      @bucket = bucket
-      if itemOrName.kind_of? String
-        @name = itemOrName
-        @name.sub!(%r{/$}, "") # don't create directories with a slash on the end
-        #6/2007. the prefix can be filled but the name empty, in the case of s3sync -r somedir somebucket:
-        if (not prefix.empty? and @name.empty?)
-          @name = prefix
-          itemOrName = prefix
-          prefix = ""
-        end
-        slash = prefix.empty? ? "" : "/"
-        @path = prefix + slash + itemOrName
-      else
-        @name = (itemOrName.name.slice((prefix.length)..itemOrName.name.length) or '')
-        # depending whether the prefix is / tailed, the name might need trimming
-        @name.sub!(%r{^/},"") # get rid of leading slash in name if there (from above simplistic split)
-        @name.sub!(%r{/$}, "") # don't create directories with a slash on the end
-        @path = itemOrName.name
-        @path.sub!(%r{/$}, "") # don't create directories with a slash on the end
-        @size = itemOrName.size
-        @tag = itemOrName.tag.gsub(/"/,'')
-        @date = Time.xmlschema(itemOrName.date)
-      end
-      debug("s3 node object init. Name:#{@name} Path:#{@path} Size:#{@size} Tag:#{@tag} Date:#{@date}")
-    end
-    # get this item from s3 into the provided stream
-    # S3 pushes to the local item, due to how http streaming is implemented
-    def to_stream(s)
-      @result = S3sync.S3try(:get_stream, @bucket, @path, {}, s)
-    end
-    def symlink?()
-      unless @result
-        @result = S3sync.S3try(:head, @bucket, @path)
-      end
-      debug("symlink value is: #{@result.object.metadata['symlink']}")
-      @result.object.metadata['symlink'] == 'true'
-    end
-    def owner
-      unless @result
-        @result = S3sync.S3try(:head, @bucket, @path)
-      end
-      debug("Owner of this s3 node is #{@result.object.metadata['owner']}")
-      @result.object.metadata['owner'].to_i # if not there, will be nil => 0 which == root so good default
-    end
-    def group
-      unless @result
-        @result = S3sync.S3try(:head, @bucket, @path)
-      end
-      @result.object.metadata['group'].to_i # 0 default ok
-    end
-    def permissions
-      g = @result.object.metadata['permissions']
-      g ? g.to_i : 600 # default to owner only
-    end
-    def updateFrom(fromNode)
-      if fromNode.respond_to?(:stream)
-        meta = Hash.new
-        meta['owner'] = fromNode.owner.to_s
-        meta['group'] = fromNode.group.to_s
-        meta['permissions'] = fromNode.permissions.to_s
-        meta['symlink'] = 'true' if fromNode.symlink?
-        begin
-          theStream = fromNode.stream
+	  @path = nil
+	  @bucket = nil
+	  @result = nil
+	  def initialize(bucket, prefix, itemOrName)
+		  @bucket = bucket
+		  if itemOrName.kind_of? String
+			  @name = itemOrName
+			  @name.sub!(%r{/$}, "") # don't create directories with a slash on the end
+			  #6/2007. the prefix can be filled but the name empty, in the case of s3sync -r somedir somebucket:
+			  if (not prefix.empty? and @name.empty?)
+				  @name = prefix
+				  itemOrName = prefix
+				  prefix = ""
+			  end
+			  slash = prefix.empty? ? "" : "/"
+			  @path = prefix + slash + itemOrName
+		  else
+			  @name = (itemOrName.name.slice((prefix.length)..itemOrName.name.length) or '')
+			  # depending whether the prefix is / tailed, the name might need trimming
+			  @name.sub!(%r{^/},"") # get rid of leading slash in name if there (from above simplistic split)
+			  @name.sub!(%r{/$}, "") # don't create directories with a slash on the end
+			  @path = itemOrName.name
+			  @path.sub!(%r{/$}, "") # don't create directories with a slash on the end
+			  @size = itemOrName.size
+			  @tag = itemOrName.tag.gsub(/"/,'')
+			  @date = Time.xmlschema(itemOrName.date)
+		  end
+		  debug("s3 node object init. Name:#{@name} Path:#{@path} Size:#{@size} Tag:#{@tag} Date:#{@date}")
+	  end
+	  # get this item from s3 into the provided stream
+	  # S3 pushes to the local item, due to how http streaming is implemented
+	  def to_stream(s)
+		  @result = S3sync.S3try(:get_stream, @bucket, @path, {}, s)
+	  end
+	  def symlink?()
+		  unless @result
+			  @result = S3sync.S3try(:head, @bucket, @path)
+		  end
+		  debug("symlink value is: #{@result.object.metadata['symlink']}")
+		  @result.object.metadata['symlink'] == 'true'
+	  end
+	  def owner
+		  unless @result
+			  @result = S3sync.S3try(:head, @bucket, @path)
+		  end
+		  debug("Owner of this s3 node is #{@result.object.metadata['owner']}")
+		  @result.object.metadata['owner'].to_i # if not there, will be nil => 0 which == root so good default
+	  end
+	  def group
+		  unless @result
+			  @result = S3sync.S3try(:head, @bucket, @path)
+		  end
+		  @result.object.metadata['group'].to_i # 0 default ok
+	  end
+	  def permissions
+		  g = @result.object.metadata['permissions']
+		  g ? g.to_i : 600 # default to owner only
+	  end
+	  def updateFrom(fromNode)
+		  if fromNode.respond_to?(:stream)
+			  meta = Hash.new
+			  meta['owner'] = fromNode.owner.to_s
+			  meta['group'] = fromNode.group.to_s
+			  meta['permissions'] = fromNode.permissions.to_s
+			  meta['symlink'] = 'true' if fromNode.symlink?
+			  begin
+				  theStream = fromNode.stream
           theStream = ProgressStream.new(theStream, fromNode.size) if $S3syncOptions['--progress']
 
           s3o = S3::S3Object.new(theStream, meta)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: s3sync-cf
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 0
-  version: 0.0.0
+  prerelease: 
+  version: 0.0.1
 platform: ruby
 authors: 
 - arvindj
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
   type: :runtime
   version_requirements: *id001
@@ -81,23 +71,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Fork of s3sync to add cloudfront invalidation