quicksync 0.0.7 → 0.0.7.1

data/config/.quicksync_config

@@ -1,25 +1,20 @@
 $default_options = 
 	{
-	  :run_method => :execute,
+		:run_method => :generate,
+		:src => "/users/shaun/Dropbox/dtg/development/mgm-sugarcrm/custom",
+		:dest => "/inetpub/wwwroot/SugarCRM-main/dev/current/custom",
+		:host => "dev.crm.mgmwireless.com",
+		:user => "sugarcrm",
+		:exclude => %w(.DS_Store .log),
+		:include => %w(),
+		:copy_options => %w(recursive stats compress),
 		:settings => {
 	 		:ssh_app => 	"rsh",
 	 		:rsync_app => 	"rsync",
 	 		:log_file =>	"",
-	 		:verbose =>		true,
+	 		:verbose =>		false,
 	 		:silent =>		false,
 	 	},
-		:from => {
-	 		:host => 	"local",
-	 		:user => 	"",
-	 		:dir =>   "/users/shaun/Dropbox/dtg/development/mgm-sugarcrm/data",
-		},
-		:to => {
-	 		:host => 	"dev.crm.mgmwireless.com",
-	 		:user => 	"sugarcrm",
-	 		:dir => 	"/inetpub/wwwroot/SugarCRM-main/dev/current/data",
-		},
-		:exclude => %w(.DS_Store .log .csv mytest.txt),
-		:include => %w(),
-		:copy_options => %w(progress stats times perms compress dry-run),
 	}
 	
+	

data/config/quicksync.yaml

@@ -0,0 +1,25 @@
+:run_method: :generate
+:src: /users/shaun/Dropbox/dtg/development/mgm-sugarcrm/custom
+:dest: /inetpub/wwwroot/SugarCRM-main/dev/current/custom
+:host: dev.crm.mgmwireless.com
+:user: sugarcrm
+:exclude:
+ - DS_Store
+ - .log
+:include: 
+:copy_options:
+ - recursive
+ - stat
+ - compress
+:settings: 
+ :ssh_app: rsh
+ :rsync_app: rsync
+ :log_file: ~
+ :verbose: false
+ :silent: false
+:sync_types:
+ :pull_from: :local
+ :push_to: :local
+ :copy_local: :local
+ :copy_remote: :remote
+  

data/lib/core_ext.rb

@@ -10,8 +10,15 @@ String.class_eval do
     return false if self == false || self.blank? || self =~ (/\A(false|f|no|n|0)\Z/i)
     raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
   end
-  
-  
+
+end
+
+Hash.class_eval do
+  def symbolize_keys
+    self.keys.each do |key|
+      self[(key.to_sym rescue key) || key] = self.delete(key)
+    end
+  end
 end
 
 def blank?(var)

data/lib/quicksync.rb

@@ -5,15 +5,27 @@ require 'quicksync/rsync'
 require 'quicksync/cli'
 require 'etc'
 
-search_paths = [Etc.getpwuid.dir, File.join(Pathname.new(File.dirname(__FILE__)).parent,"config")]
-file_name = ".quicksync_config"
-config_file = ""
-search_paths.each { |p| 
-  if File.exists?("#{p}/#{file_name}") 
-    config_file = "#{p}/#{file_name}"
-    break
+module QuickSync
+  
+  def self.Config
+    @config ||= QuickSync.LoadConfig
   end
-}
-
+  
+  def self.LoadConfig
+    
+    home_path = Etc.getpwuid.dir
+    gem_path = File.join(Pathname.new(File.dirname(__FILE__)).parent,"config")
+    search_paths = [home_path, gem_path]
+    yaml_filename = "quicksync.yaml"
+    yaml_file= "#{gem_path}/#{yaml_filename}"
+    search_paths.each { |p|
+      file = "#{p}/#{yaml_filename}"
+      if File.exists?(file)
+        yaml_file = file
+        break
+      end
+    }
+    return YAML::load( File.open( yaml_file ) )
+  end
+end
 
-load "#{config_file}"

data/lib/quicksync/rsync.rb

@@ -1,159 +1,141 @@
-
-
 module QuickSync
   class RSync
 
-    attr_accessor :settings, :from, :to, :exclude, :include, :copy_options, :run_method
-    attr_reader :default_options, :logger
-    
+    attr_accessor :src, :dest, :user, :host, :exclude, :include, :copy_options, :settings, :run_method, :run_on, :sync_types
+    attr_reader :default_options, :logger, :sync_type, :config
     def initialize
       @logger = QuickSync.Logger
       @logger.level = QuickSync::Logger::INFO
-      @default_options = $default_options
-      
+      @default_options = QuickSync.Config
+      @sync_types = @default_options[:sync_types]
+
     end
     
-    def copy_options_to_s
-      return copy_options.map{ |o| "--#{o}"}.join(' ')
+    def set_sync_type(sync_type)
+      puts "sync_type value set to #{sync_type.to_sym}"
+      @sync_type = sync_type.to_sym
     end
     
-    def include_to_s
-      if include.any?
-        return include.map { |i| "--include=\"#{i}\"" }.join(' ')
-       end
+
+    def src_fully_qualified
+      return src
     end
-    
-    def exclude_to_s
-      if exclude.any?
-        return exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
+
+    def dest_fully_qualified
+      if sync_type == :pull_from || sync_type == :push_to
+        return "#{user}@#{host}:#{dest}"
+      else
+        return "#{dest}"
       end
     end
-    
-    def default_options
-      @default_options
+
+    def run_on
+      # logger.debug "run_on function called, :sync_type=#{sync_type}, sync_types[sync_type]=#{sync_types[sync_type]}"
+      return sync_types[sync_type]
     end
 
-    def parse_options(from_v,to_v,options)
-   
-      if from_v.nil? || from_v.empty?
-        raise ArgumentError, ":from can not be empty"
-      end
+    def pull_from(src,dest,options={})
+      set_sync_type(__method__)
+      return sync(src,dest,options)
+    end
 
-      if to_v.nil? || to_v.empty?
-        raise ArgumentError, ":to can not be empty"
-      end
-      
-      logger.debug "QuickSync.parse_options: from class=#{from_v.class}"
+    def push_to(src,dest,options={})
+      set_sync_type(__method__)
+      return sync(src,dest,options)
+    end
 
-      @from = from_v == String ? default_options[:from].merge({:dir=>from_v}): default_options[:from].merge(from_v)
-      @to = to_v == String ? default_options[:to].merge({:dir=>to_v}): default_options[:to].merge(to_v)
-      @exclude =  options.length > 0 && ! options[:exclude].nil? ? options[:exclude]: default_options[:exclude]
-      @include =  options.length > 0 && ! options[:include].nil? ? options[:include]: default_options[:include]
-      @copy_options = options.length > 0 && ! options[:copy_options].nil? ? default_options[:copy_options].concat(options[:copy_options]).uniq!: default_options[:copy_options]
-      @settings = options.length > 0 && ! options[:settings].nil? ? default_options[:settings].merge(options[:settings]): default_options[:settings]
-      @run_method = default_options[:run_method]
-     
-      logger.debug "QuickSync.parse_options:"
-      logger.debug "  from=#{from}"
-      logger.debug "  to=#{to}"
-      logger.debug "  exclude=#{exclude}"
-      logger.debug "  include=#{include}"
-      logger.debug "  copy_options=#{copy_options}"
-      logger.debug "  settings=#{settings}"
+    def copy_local(src,dest,options={})
+      set_sync_type(__method__)
+      return sync(src,dest,options)
+    end
 
+    def copy_remote(src,dest,options={})
+      set_sync_type(__method__)
+      return sync(src,dest,options)
     end
-    
-    def pull_from(from,to,options={})
-      parse_options(from,to,options)
-      # if from[:dir] does not exist then abort as there is nothing to do
+
+    def sync(src,dest,options={})
+      parse_options(src,dest,options)
       cmd = generate_cmd
-      logger.info "RSync.pull_from: run_method=#{run_method}"
+      logger.info "quicksync command:\n  #{cmd}"
       if run_method == :execute
-        # run the actual command before returning it
         logger.info "RSync.pull_from: about to execute command"
-        system(cmd)
-        
+      # system(cmd)
       end
-      logger.info "quicksync command:\n  #{cmd}"
+
       return cmd
     end
-    
-    def push_to(from,to,options={})
-      parse_options(from,to,options)
-      # if from[:dir] does not exist then abort as there is nothing to do
-      cmd = generate_cmd
-      logger.info "RSync.push_to: run_method=#{run_method}"
-      if run_method == :execute
-        # run the actual command before returning it
-        logger.info "RSync.push_to: about to execute command"
-        system(cmd)
-        
-      end
-      logger.info "quicksync command:\n  #{cmd}"
-      return cmd
+
+    def to_str
+      out = "QuickSync.to_str:\n"
+      out += "  :src=#{src}\n"
+      out += "  :dest=#{dest}\n"
+      out += "  :dest_fully_qualified=#{dest_fully_qualified}\n"
+      out += "  :host=#{host}\n"
+      out += "  :user=#{user}\n"
+      out += "  :exclude=#{exclude.join(',')}\n" if ! exclude.nil?
+      out += "  :include=#{include.join(',')}\n" if ! include.nil?
+      out += "  :copy_options=#{copy_options.join(" --")}\n"
+      out += "  :settings=#{settings}\n"
+      out += "  :sync_type=#{sync_type}\n"
+      out += "  :sync_types=#{sync_types}\n"
+      out += "  :run_on=#{run_on}\n"
+      out += "  :run_method=#{run_method}\n"
+      return out
     end
-    
-    def run_on
-      if is_local(from[:host])  && is_local(to[:host]) 
-        return :local
-      elsif is_local(from[:host])  && is_remote(to[:host])
-        return :local
-      elsif is_remote(from[:host])  && is_remote(to[:host])
-        return :remote
-      elsif is_remote(from[:host])  && is_local(to[:host])
-        return :remote
-      else
-        return :local
+
+    def parse_options(src,dest,options)
+
+      if src.nil? || src.empty?
+        raise ArgumentError, ":src can not be empty"
       end
-    end
-    
-    def is_local(the_host)
-      if ! the_host.nil?  && ! the_host.empty?  && the_host.include?("local")
-        return true
-      else
-        return false
+
+      if dest.nil? || dest.empty?
+        raise ArgumentError, ":dest can not be empty"
       end
+
+      @src =  ( ! src.nil? && ! src.empty? ) ? src: default_options[:src]
+      @dest = ( ! dest.nil? && ! dest.empty? ) ? dest: default_options[:dest]
+      @host = ( ! host.nil? && ! host.empty? ) ? host: default_options[:host]
+      @user = ( ! user.nil? && ! user.empty? ) ? user: default_options[:user]
+      @exclude =  options.length > 0 && ! options[:exclude].nil? ? options[:exclude]: default_options[:exclude]
+      @include =  options.length > 0 && ! options[:include].nil? ? options[:include]: default_options[:include]
+      @copy_options =  options.length > 0 && ! options[:copy_options].nil? ? options[:copy_options]: default_options[:copy_options]
+      @settings = options.length > 0 && ! options[:settings].nil? ? default_options[:settings].merge(options[:settings]): default_options[:settings]
+      @run_method =  options.length > 0 && ! options[:run_method].nil? ? options[:run_method]: default_options[:run_method]
+
+      logger.important " parse_options: #{self.to_str}"
+
     end
     
-    def is_remote(the_host)
-      if ! the_host.nil?  && ! the_host.empty?  && ! the_host.include?("local")
-        return true
-      else
-        return false
-      end
+    def copy_options_to_s
+      return copy_options.map{ |o| "--#{o}"}.join(' ')
     end
-    
-    def from_to_s 
-      
-      logger.debug "RSync.from_to_s: from=#{from}"
-      if ! from[:host].nil?  && ! from[:host].empty?  && ! from[:host].include?("local")
-        return from[:user]+"@"+from[:host] + ":" + from[:dir]
-      else 
-        return from[:dir]
+
+    def include_to_s
+      if include.any?
+        return include.map { |i| "--include=\"#{i}\"" }.join(' ')
       end
     end
-    
-    def to_to_s 
-      val = to[:dir]
-      if ! to[:host].nil?  && ! to[:host].empty?  && ! to[:host].include?("local")
-        val = to[:user]+"@"+to[:host] + ":" + to[:dir]
-      else 
-        return to[:dir]
+
+    def exclude_to_s
+      if exclude.any?
+        return exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
       end
     end
 
-
     def generate_cmd
       logger.debug "QuickSync.generated_cmd: method called"
-     
       cmd = "#{settings[:rsync_app]} #{copy_options_to_s}"
       cmd << " #{include_to_s}" if !include.nil? && include.any?
       cmd << " #{exclude_to_s}" if !exclude.nil? && exclude.any?
-      cmd << " #{from_to_s}/ #{to_to_s}"
-      
+      cmd << " #{src_fully_qualified}/ #{dest_fully_qualified}"
+
       return cmd
     end
 
+    
+
   end
 
 end

data/lib/quicksync/version.rb

@@ -1,3 +1,3 @@
 module QuickSync
-  VERSION = "0.0.7"
+  VERSION = "0.0.7.1"
 end

data/test/test_quicksync.rb

@@ -2,31 +2,55 @@ require 'helper'
 require 'quicksync'
 
 class TestQuickSync < Test::Unit::TestCase
+  
+  attr_accessor :src, :dest, :user, :host, :exclude, :include, :copy_options, :settings, :run_method, :copy_method, :run_on
+    
   def setup
-    $logger = QuickSync.Logger
-    $logger.level = QuickSync::Logger::INFO
+    @logger = QuickSync.Logger
+    @logger.level = QuickSync::Logger::INFO
+    @config = QuickSync.Config
+    @quicksync = QuickSync::RSync.new
+    @src = @config[:src]
+    @dest = @config[:dest]
+    @host = @config[:host]
+    @user = @config[:user]
+    @options = @config
 
   end
 
   def teardown
 
   end
-
-  def test_rsync
+  
+ 
+  def test_config
 
     assert_nothing_raised do
-     
-      options = $default_options
-      qs = QuickSync::RSync.new
+      @config = QuickSync.Config
+    end
+  end
 
-      from = options[:from]
-      to = options[:to]
-      cmd = qs.pull_from(from,to,options)
+  def test_rsync
 
+    puts "test_rsync: testing pull_from"
+    assert_nothing_raised do
+      cmd = @quicksync.pull_from(@src,@dest,@options)
+    end
+    puts "test_rsync: testing push_to"
+    assert_nothing_raised do
+      cmd = @quicksync.push_to(@src,@dest,@options)
+    end
+    puts "test_rsync: testing copy_local"
+    assert_nothing_raised do
+      cmd = @quicksync.copy_local(@src,@dest,@options)
+    end
+    puts "test_rsync: testing copy_remote"
+    assert_nothing_raised do
+      cmd = @quicksync.copy_remote(@src,@dest,@options)
     end
     
-  
     
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quicksync
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -205,6 +205,7 @@ files:
 - Rakefile
 - bin/quicksync
 - config/.quicksync_config
+- config/quicksync.yaml
 - lib/core_ext.rb
 - lib/quicksync.rb
 - lib/quicksync/cli.rb
@@ -228,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1428722002811476590
+      hash: -2741976033233478250
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -237,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1428722002811476590
+      hash: -2741976033233478250
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24