ssync 0.1.0 → 0.2.0

data/README.md

@@ -28,6 +28,16 @@ To sync, run `ssync sync` and away it goes.
 In the case of a corrupted/incomplete synchronisation, run `ssync sync -f`
 or `ssync sync --force` to force a checksum comparison.
 
+## Sync to Multiple Buckets
+
+If you would like to sync to more than one S3 buckets, you may do so by:
+
+    ssync setup s3-bucket-name-1
+    ssync sync s3-bucket-name-1
+
+    ssync setup s3-bucket-name-2
+    ssync sync s3-bucket-name-2
+
 ## Why?
 
 This library was written because we needed to be able to back up loads of

data/lib/ssync/command.rb

@@ -19,6 +19,11 @@ module Ssync
     def initialize(action = :sync, *args)
       @@action = action.to_sym
       @@args   = *args
+
+      if @@args[0] && @@args[0][0, 1] != "-"
+        Setup.default_config[:last_used_bucket] = @@args[0]
+        write_default_config!(Setup.default_config)
+      end
     end
 
     def run!
@@ -29,9 +34,7 @@ module Ssync
     private
 
     def pre_run_check!
-      if action_eq?(:setup) && config_exists?
-        e! "Cannot run the setup, there is already an Ssync configuration in '#{config_path}'."
-      elsif action_eq?(:sync) && !config_exists?
+      if action_eq?(:sync) && !config_exists?(default_config_path) && !config_exists?
         e! "Cannot run the sync, there is no Ssync configuration, try 'ssync setup' to create one first."
       end
     end
@@ -39,7 +42,7 @@ module Ssync
     def perform_action!
       case @@action
       when :setup
-        aquire_lock! { Ssync::Setup.run! }
+        Ssync::Setup.run!
       when :sync
         aquire_lock! { Ssync::Sync.run! }
       when :help

data/lib/ssync/helpers.rb

@@ -30,16 +30,24 @@ module Ssync
       Ssync::Command.action == action.to_sym
     end
 
-    def config_exists?
-      File.exist?(config_path)
+    def config_exists?(path = config_path)
+      File.exist?(path)
+    end
+
+    def ssync_filename
+      ".ssync-#{read_default_config[:last_used_bucket]}"
+    end
+
+    def default_config_path
+      "#{ENV['HOME']}/.ssync.defaults.yml"
     end
 
     def config_path
-      ENV['HOME'] + "/.ssync.yml"
+      "#{ENV['HOME']}/#{ssync_filename}.yml"
     end
 
     def lock_path
-      ENV['HOME'] + "/.ssync.lock"
+      "#{ENV['HOME']}/#{ssync_filename}.lock"
     end
 
     def aquire_lock!
@@ -62,10 +70,22 @@ module Ssync
       end
     end
 
+    def read_default_config
+      begin
+        open(default_config_path, "r") { |f| YAML::load(f) }
+      rescue
+        {}
+      end
+    end
+
     def write_config!(config)
       open(config_path, "w") { |f| YAML::dump(config, f) }
     end
 
+    def write_default_config!(config)
+      open(default_config_path, "w") { |f| YAML::dump(config, f) }
+    end
+
     def options_set?(*options)
       false
       [options].flatten.each do |option|

data/lib/ssync/setup.rb

@@ -3,8 +3,16 @@ module Ssync
     class << self
       include Helpers
 
+      def default_config
+        @default_config ||= read_default_config
+      end
+
+      def default_config=(config)
+        @default_config = config
+      end
+
       def config
-        @config
+        @config ||= read_config
       end
 
       def config=(config)
@@ -12,9 +20,7 @@ module Ssync
       end
 
       def run!
-        display "Welcome to Ssync! You will now be asked a few questions, the results will be stored at '#{config_path}'."
-
-        config = read_config
+        display "Welcome to Ssync! You will now be asked for a few questions."
 
         config[:aws_access_key] = ask config[:aws_access_key], "What is the AWS Access Key ID?"
         config[:aws_secret_key] = ask config[:aws_secret_key], "What is the AWS Secret Access Key?"
@@ -24,7 +30,7 @@ module Ssync
         if aws_credentials_is_valid?(config)
           display "Successfully connected to AWS."
 
-          config[:aws_dest_bucket] = ask config[:aws_dest_bucket], "Which bucket would you like to put your backups in? Ssync will create the bucket for you if it doesn't exist."
+          default_config[:last_used_bucket] = config[:aws_dest_bucket] = ask(config[:aws_dest_bucket], "Which bucket would you like to put your backups in? Ssync will create the bucket for you if it doesn't exist.")
 
           if bucket_exists?(config)
             if bucket_empty?(config)
@@ -53,9 +59,11 @@ module Ssync
 
         config[:find_options] = ask config[:find_options], "Do you have any options for 'find'? (e.g. \! -path *.git*)."
 
-        display "Writing the supplied details to '#{config_path}' for future reference ..."
+        display "Saving configuration data ..."
+        write_default_config!(default_config)
         write_config!(config)
-        display "All done! You may now use 'ssync sync' to syncronise your files to the S3 bucket."
+        display "All done! The configuration file is stored in '#{config_path}'."
+        display "You may now use 'ssync sync' to syncronise your files to the S3 bucket."
       end
 
       def aws_credentials_is_valid?(config = read_config)

data/lib/ssync/sync.rb

@@ -45,11 +45,11 @@ module Ssync
       end
 
       def last_sync_started
-        ENV['HOME'] + "/.ssync.last-sync.started"
+        ENV['HOME'] + "/#{ssync_filename}.last-sync.started"
       end
 
       def last_sync_completed
-        ENV['HOME'] + "/.ssync.last-sync.completed"
+        ENV['HOME'] + "/#{ssync_filename}.last-sync.completed"
       end
 
       def last_sync_recorded?
@@ -99,19 +99,17 @@ module Ssync
       end
 
       def local_manifest_path
-        "/tmp/ssync.manifest.local"
+        "/tmp/#{ssync_filename}.manifest.local"
       end
 
       def parse_manifest(location)
         []
-        if File.exist?(location)
-          open(location, "r") do |file|
-            file.collect do |line|
-              path, checksum = *line.chomp.match(/^MD5\((.*)\)= (.*)$/).captures
-              { :path => path, :checksum => checksum }
-            end
+        open(location, "r") do |file|
+          file.collect do |line|
+            path, checksum = *line.chomp.match(/^MD5\((.*)\)= (.*)$/).captures
+            { :path => path, :checksum => checksum }
           end
-        end
+        end if File.exist?(location)
       end
 
       def push_file(file)

data/lib/ssync/version.rb

@@ -1,3 +1,3 @@
 module Ssync
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Fred Wu