s3up 0.1.0 → 0.2.0

data/bin/s3up

@@ -5,11 +5,12 @@ require 'trollop'
 require 's3up'
 
 options = Trollop::options do
-  opt :verbose, "verbose logging"
-  opt :'generate-manifest', "create a json manifest file"
-  opt :dump, "show the manifest output"
-  opt :folder, "folders to include", :default => '**'
-  opt :types, "file types to include", :default => 'jpg,mp3'
+  opt :init, 'create .s3uprc file in current directory'
+  opt :verbose, 'verbose logging'
+  opt :'generate-manifest', 'create a json manifest file'
+  opt :dump, 'show the manifest output'
+  opt :folder, 'folders to include', :default => '**'
+  opt :types, 'file types to include', :type => :string
   opt :manifest, 'specify file name for the json manifest', :default => 'manifest.json', :type => :string
   opt :bucket, 'destination bucket', :type => :string
   opt :prefix, 'destination key prefix', :type => :string
@@ -21,8 +22,12 @@ end
 
 s3up = S3up.new( options )
 
-if options[ :'generate-manifest' ]
-  s3up.generate_manifest
+if options[ :init ]
+  s3up.init
 else
-  s3up.upload
+  if options[ :'generate-manifest' ]
+    s3up.generate_manifest
+  else
+    s3up.upload
+  end
 end

data/lib/s3up.rb

@@ -14,6 +14,26 @@ class S3up
     @files = Dir.glob( glob, File::FNM_CASEFOLD )
   end
 
+  def init
+    keys = @command_line_options.keys.select { | k | k.match( /_given/ ) }.map { | k | k[ 0 .. -7 ] }
+    init_options = @command_line_options.select {|k| keys.include?( k.to_s ) }
+    init_options.delete( :init )
+    options = {
+      :id => 'AWS_ACCESS_KEY_ID',
+      :key => 'AWS_SECRET_ACCESS_KEY',
+      :bucket => 's3up.test.bucket',
+      :prefix => 'key_prefix/',
+      :types => 'jpg,png,mp3,json',
+      :threads => 10
+    }
+    options.merge!( init_options )
+    File.open( './.s3uprc', 'w' ) do | file |
+      options.each do | key, value |
+        file.puts "#{ key }: #{ value }"
+      end
+    end
+  end
+
   def overwrite_options( options )
     options.each { | key, value | @options[ key.to_sym ] = value if value }
   end
@@ -21,11 +41,12 @@ class S3up
   def load_options( file )
     if File.exists?( File.expand_path( file ) )
       options = YAML.load_file( File.expand_path( file ) )
-      overwrite_options( options )
+      overwrite_options( options ) if options
     end
   end
 
   def setup_options( options )
+    @command_line_options = options
     @options = {}
     load_options( '~/.s3uprc' )
     load_options( './.s3uprc' )
@@ -33,18 +54,37 @@ class S3up
     puts @options if @options[ :verbose ]
   end
 
+  def file_changed( key, file )
+    stat = File.stat( file )
+    key.refresh( true )
+    if stat.size != key.size
+      puts "file changed" if @options[ :verbose ]
+      true
+    else
+      puts "file not changed" if @options[ :verbose ]
+      false
+    end
+  end
+  
+  def s3
+    @s3 ||= Aws::S3.new( @options[ :id ], @options[ :key ], :connection_mode  => :per_thread )
+  end
+
   def upload_file( bucket_name, filename, key_name = filename )
-    s3 = Aws::S3.new( @options[ :id ], @options[ :key ], :connection_mode  => :per_thread )
     bucket = s3.bucket( bucket_name )
     key = Aws::S3::Key.create( bucket ,key_name )
-    key.put( File.open( filename ).read, 'public-read' )
-    puts "uploaded: #{ key.full_name }" if @options[ :verbose ]
+    if @options[ :force ] || file_changed( key, filename )
+      key.put( File.open( filename ).read, 'public-read' )
+      puts "uploaded: #{ key.full_name }"
+    else 
+      puts "skipped: #{ key.full_name }"
+    end
   rescue Exception => e
     puts e
   end
 
   def create_bucket( bucket_name )
-    s3 = Aws::S3.new( @options[ :id ], @options[ :key ] )
+    # s3 = Aws::S3.new( @options[ :id ], @options[ :key ] )
     bucket = s3.bucket( bucket_name, true, 'public-read' )
   rescue Exception => e
     puts e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3up
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-01-11 00:00:00.000000000 -08:00
+date: 2012-01-11 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2153277080 !ruby/object:Gem::Requirement
+  requirement: &2157185420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153277080
+  version_requirements: *2157185420
 - !ruby/object:Gem::Dependency
   name: work_queue
-  requirement: &2153276520 !ruby/object:Gem::Requirement
+  requirement: &2157184720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153276520
+  version_requirements: *2157184720
 - !ruby/object:Gem::Dependency
   name: aws
-  requirement: &2153275920 !ruby/object:Gem::Requirement
+  requirement: &2157184120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153275920
+  version_requirements: *2157184120
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &2153275360 !ruby/object:Gem::Requirement
+  requirement: &2157183540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153275360
+  version_requirements: *2157183540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153274720 !ruby/object:Gem::Requirement
+  requirement: &2157182900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,8 +66,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153274720
-description: Directory recursive multithreaded s3 uploader
+  version_requirements: *2157182900
+description: Directory recursing multi-threaded S3 uploader
 email: opensource@dashwire.com
 executables:
 - s3up
@@ -77,7 +77,7 @@ files:
 - lib/s3up.rb
 - bin/s3up
 has_rdoc: true
-homepage: http://rubygems.org/gems/s3up
+homepage: https://github.com/Dashwire/s3up
 licenses: []
 post_install_message: 
 rdoc_options: []