s3rbsync 0.1.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b92c0eb4eef95c67ba46d1c6fd7ecfc015cfa9e0
-  data.tar.gz: d41319c715362700ae405527c5fd630644b0daff
+  metadata.gz: 7dd4776953600f8c4d6bd227c213fc646dcb91ee
+  data.tar.gz: 067041d781ef4d1aad512ad6d3d713876a1d3116
 SHA512:
-  metadata.gz: ba965595e9bd6ec69d4cb1622d729a31033cfa2597a4ff34dd373537fdb7db59af7c72e11fbe9fa7522db78051ed5c80c344855bb4702a29e8fc4bd1f0d38de6
-  data.tar.gz: da9f5fb2ebd38789e7faa6a477a70d32261d2684cb1a52b4c0af280fdc98d6fe5fcfee5ed5fae60a6505846c5f22f2797d7d9707ae577068663e46982752f767
+  metadata.gz: d1f388e3d84625e92b6f3c40a704f78206cfcb1879cfa23c818178131eeba4967df85d111ee92f18a963c02d324078b9f442b867930f0b9dcda451053ff15db9
+  data.tar.gz: 5180f73c77c9c4e56097ecd4d9e07f92828377c9cf5d7cdf699ff0c59f6a942d4e1ce5418cbfd9f8f9dfe40f819bde1c14df42842592ebe9dcc01059f5496f74

data/Gemfile

@@ -1,8 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'thor'
-gem 'fog'
-
 group :development do
   gem "pry-debugger"
 end

data/README.md

@@ -1,6 +1,7 @@
-# S3rbsync
+# s3rbsync
 
-TODO: Write a gem description
+このライブラリを使うことで、特定のディレクトリをS3に同期させることができます。
+This library save to S3 in the AWS file in the directory specific.
 
 ## Installation
 
@@ -18,7 +19,38 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Overview
+
+```bash
+$ s3rbsync
+Commands:
+  s3rbsync help [COMMAND]  # Describe available commands or one specific command
+  s3rbsync init            # Set up S3rbsync. (ganerate configure)
+  s3rbsync sync            # Synchronize files to S3.
+  s3rbsync test            # The connection test to AWS.
+```
+
+### First step
+
+```bash
+$ s3rbsync init
+```
+
+### Connection Test
+
+```bash
+$ s3rbsync test
+```
+
+### Sync
+
+```bash
+ex.)
+$ s3rbsync sync -d /var/backups
+
+# Options:
+#   -d, [--directory=DIRECTORY]  # Default: ./   (current directory)
+```
 
 ## Contributing
 

data/lib/s3rbsync/command.rb

@@ -24,6 +24,20 @@ module S3rbsync
       end
     end
 
+    desc 'sync', "Synchronize files to S3."
+    method_option :directory, :type => :string, :aliases => "-d", :default => "./"
+    def sync
+      conf = S3rbsync::Configure.new
+      unless conf.valid?
+        say "Sync failed!: configure is invalid.", :red
+        exit 1
+      end
+      synchronizer = S3rbsync::Synchronizer.new(conf, options[:directory])
+      say "Sync start...", :cyan
+      synchronizer.sync!
+      say "...finish.", :cyan
+    end
+
     desc 'test', "The connection test to AWS."
     def test
       say "\nChecking config...\n", :cyan
@@ -40,7 +54,7 @@ module S3rbsync
       print "Test connection: "
       if conf.connected?
         say "OK", :green
-        #...
+        #]...
       else
         say "NG", :red
         say "  -> Connection falid: Chack config file, or 's3rbsync init'", :yellow

data/lib/s3rbsync/configure.rb

@@ -3,10 +3,10 @@ require 'yaml'
 module S3rbsync
   class Configure
     CONF_FILE = "#{ENV["HOME"]}/.aws.yml"
-    attr_accessor :access_key, :secret_key, :bucket_name
+    attr_accessor :access_key, :secret_key, :bucket_name, :region
 
     def initialize
-      @access_key = @secret_key = @bucket_name = @error_message = nil
+      @access_key = @secret_key = @bucket_name = @error_message = @region = nil
       begin
         @conf = YAML.load_file CONF_FILE
       rescue => e
@@ -15,9 +15,14 @@ module S3rbsync
         @access_key  = @conf[:aws_access_key]
         @secret_key  = @conf[:aws_secret_access_key]
         @bucket_name = @conf[:bucket_name]
+        @region      = @conf[:region]
       end
     end
 
+    def valid?
+      valid_yaml_file? and connected?
+    end
+
     def valid_yaml_file?
       @error_message.nil? and @access_key and @secret_key and @bucket_name
     end

data/lib/s3rbsync/synchronizer.rb

@@ -3,21 +3,73 @@ require 'fog'
 module S3rbsync
   class Synchronizer
 
-    def initialize(configure)
+    def initialize(configure, directory = nil)
       @configure = configure
-      @s3= Fog::Storage.new(:provider              => 'AWS',
-                            :aws_access_key_id     => @configure.access_key,
-                            :aws_secret_access_key => @configure.secret_key,
-                            :region                => (@configure.region || 'ap-northeast-1'),
-                            :persistent            => false )
+      @local_dir = directory
+      @s3 = Fog::Storage.new(:provider              => 'AWS',
+                             :aws_access_key_id     => @configure.access_key,
+                             :aws_secret_access_key => @configure.secret_key,
+                             :region                => (@configure.region || 'ap-northeast-1'),
+                             :persistent            => false )
+      @bucket = @s3.directories.get(@configure.bucket_name)
+      @queue = Queue.new
+    rescue => e
+      puts "----- Error -----"
+      puts e.message
+      exit 1
     end
 
     def connected?
-      @s3.get_bucket(@configure.bucket_name)
-    rescue
-      false
-    else
-      true
+      !!@bucket
     end
+
+    def sync!
+      # puts '...call sync!'
+      upload_files(@local_dir)
+    end
+
+
+    private
+
+    def upload_files(dir)
+      upload_in_directory(dir)
+      recursive_upload
+    end
+
+    def recursive_upload
+      upload_in_directory(@queue.pop, :recursible => true) until @queue.empty?
+    end
+
+    def upload_in_directory(dir, options={})
+      Dir.entries(dir).each do |file|
+        next if file.start_with?('.')
+
+        file_name = options[:recursible] ? File.join(dir, file) : file
+        if File.directory?(file_name)
+          @queue.push(file_name)
+        else
+          upload!(file_name)
+        end
+      end
+    end
+
+    def upload!(file_name)
+      remote_file = get_remote_file(file_name)
+      return if remote_file && (not modified?(file_name, remote_file))
+      remote_file.destroy if remote_file && modified?(file_name, remote_file)
+      @bucket.files.create(:key => "#{file_name}", :body => open(file_name), :public => false)
+      puts "copied #{file_name}"
+    end
+
+    def get_remote_file(file_name)
+      @bucket.files.get(file_name)
+    end
+
+    def modified?(local_file, remote_file)
+      # puts "verifying file: #{local_file}"
+      return true unless remote_file
+      File.mtime(local_file) > remote_file.last_modified
+    end
+
   end
 end

data/lib/s3rbsync/version.rb

@@ -1,3 +1,7 @@
 module S3rbsync
-  VERSION = "0.1.2"
+  MAJOR_VERSION  = 0
+  MINORE_VERSION = 7
+  PATCH_VERSION  = 0
+
+  VERSION = "#{MAJOR_VERSION}.#{MINORE_VERSION}.#{PATCH_VERSION}"
 end

data/s3rbsync.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "thor", "~> 0.18"
+  spec.add_runtime_dependency "fog", "~> 1.15"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: s3rbsync
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Naohiro Sakuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement