rbfs 1.0.16 → 1.0.17

data/.travis.yml

@@ -1,5 +1,5 @@
 ---
-script: 'rake spec'
+script: 'rake travis'
 rvm:
   - 1.8.7
   - 1.9.2

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new(:spec)
+
+RSpec::Core::RakeTask.new(:travis) do |t|
   t.rspec_opts = "--tag ~local"
 end

data/lib/rbfs/args.rb

@@ -19,9 +19,6 @@ module Rbfs
         opts.on("-e", "--remote-root ROOT", "Remote root path to sync") do |v|
           options[:remote_root] = v
         end
-        opts.on("--shell SHELL", "Remote shell to use") do |v|
-          options[:shell] = v
-        end
         opts.on("-s", "--subpath PATH", "Subpath of root to sync") do |v|
           options[:subpath] = v
         end

data/lib/rbfs/command.rb

@@ -39,13 +39,23 @@ module Rbfs
       @config[:logger]
     end
 
+    def sync_path
+      if config[:subpath]
+        File.join(config[:root], config[:subpath])
+      else
+        config[:root]
+      end
+    end
+
     def sync
       success = true
 
       sync_hosts.each do |host, result|
         logger.info "#{host.name}: #{result.error}"
         result.changes.each do |change|
-          logger.puts "  | #{change.filename} (#{change.summary})"
+          if config[:verbose]
+            logger.puts "  | #{change.filename} (#{change.summary})"
+          end
         end
         success = false unless result.success?
       end
@@ -54,12 +64,7 @@ module Rbfs
     end
 
     def sync_hosts
-      if config[:subpath]
-        config[:root] = File.join(config[:root], config[:subpath])
-        config[:remote_root] = File.join(config[:remote_root], config[:subpath])
-      end
-
-      logger.info "Syncing #{config[:root]}..."
+      logger.info "Syncing #{sync_path}..."
       hosts = HostsFile.load(config[:hosts])
       hosts.collect do |host|
         [host, sync_host(host)]

data/lib/rbfs/rsync.rb

@@ -7,38 +7,51 @@ module Rbfs
       @host = host
     end
 
+    def config
+      @config
+    end
+
     def logger
-      @config[:logger]
+      config[:logger]
+    end
+
+    def sub_root(path)
+      if config[:subpath]
+        File.join(path, config[:subpath])
+      else
+        path
+      end
     end
 
     def remote_url
-      "#{@host.ip}:#{@config[:remote_root]}"
+      "#{@host.ip}:#{remote_root}"
+    end
+
+    def remote_root
+      sub_root(config[:remote_root])
     end
 
     def local_root
-      if File.directory?(@config[:root])
-        @config[:root] + "/"
-      else
-        @config[:root]
-      end
+      path = sub_root(config[:root])
+      path += "/" if File.directory?(path)
+      path
     end
 
     def mkdir
-      args = [@host.ip, "mkdir", "-p", @config[:remote_root]]
+      args = [@host.ip, "mkdir", "-p", File.dirname(remote_root)]
       command("ssh", args)
     end
 
     def rsync
       args = ["-a", "--delete"]
-      args << "-e #{@config[:shell]}" if @config[:shell]
-      args << "-v" if @config[:verbose]
-      args << "-n" if @config[:dry]
-      args << "--timeout=#{@config[:timeout]}" if @config[:timeout]
+      args << "-v" if config[:verbose]
+      args << "-n" if config[:dry]
+      args << "--timeout=#{config[:timeout]}" if config[:timeout]
       ::Rsync.run(local_root, remote_url, args)
     end
 
     def sync
-      if File.directory?(@config[:root])
+      if config[:subpath]
         mkdir
       end
       rsync

data/lib/rbfs/version.rb

@@ -1,3 +1,3 @@
 module Rbfs
-  VERSION = "1.0.16"
+  VERSION = "1.0.17"
 end

data/spec/rbfs/command_spec.rb

@@ -12,20 +12,23 @@ describe Rbfs::Command do
     end
   end
 
-  def build_simple_test_dir
+  # /sample.txt
+  def build_simple
     File.open(File.join(@tmpdir, "local", "sample.txt"), 'w') do |f|
       f.write("hello world!")
     end
   end
 
-  def build_multipath_test_dir
+  # /somepath/sample.txt
+  def build_subpath_simple
     Dir.mkdir(File.join(@tmpdir, "local", "somepath"))
     File.open(File.join(@tmpdir, "local", "somepath", "sample.txt"), 'w') do |f|
       f.write("hello world!")
     end
   end
 
-  def build_deeppath_test_dir
+  # /somepath/someotherpath/sample.txt
+  def build_deeppath_simple
     Dir.mkdir(File.join(@tmpdir, "local", "somepath"))
     Dir.mkdir(File.join(@tmpdir, "local", "somepath", "someotherpath"))
     File.open(File.join(@tmpdir, "local", "somepath", "someotherpath", "sample.txt"), 'w') do |f|
@@ -37,6 +40,26 @@ describe Rbfs::Command do
     `cd #{@tmpdir}/#{subpath}; tree`
   end
 
+  def run_sync_test
+    Rbfs::Command.new(
+      :hosts => File.join(@tmpdir, "hosts"),
+      :root => File.join(@tmpdir, "local"),
+      :remote_root => File.join(@tmpdir, "remote")
+    ).sync
+    get_tree("remote").should eql(get_tree("local"))
+  end
+
+  def run_deeppath_test(subpath)
+    build_deeppath_simple
+    Rbfs::Command.new(
+      :hosts => File.join(@tmpdir, "hosts"),
+      :root => File.join(@tmpdir, "local"),
+      :subpath => subpath,
+      :remote_root => File.join(@tmpdir, "remote")
+    ).sync
+    get_tree("remote").should eql(get_tree("local"))
+  end
+
   context "simple", :local => true do
     around(:each) do |example|
       make_test_dir do
@@ -45,48 +68,35 @@ describe Rbfs::Command do
     end
 
     it "should do simple file sync" do
-      build_simple_test_dir
+      build_simple
       Rbfs::Command.new(
         :hosts => File.join(@tmpdir, "hosts"),
         :root => File.join(@tmpdir, "local") + "/sample.txt",
-        :shell => '"ssh -o StrictHostKeyChecking=no"',
         :remote_root => File.join(@tmpdir, "remote") + "/sample.txt"
       ).sync
-      get_tree("local").should eql(get_tree("remote"))
+      get_tree("remote").should eql(get_tree("local"))
     end
 
     it "should do simple path sync" do
-      build_simple_test_dir
-      Rbfs::Command.new(
-        :hosts => File.join(@tmpdir, "hosts"),
-        :root => File.join(@tmpdir, "local"),
-        :shell => '"ssh -o StrictHostKeyChecking=no"',
-        :remote_root => File.join(@tmpdir, "remote")
-      ).sync
-      get_tree("local").should eql(get_tree("remote"))
+      build_simple
+      run_sync_test
     end
 
     it "should do multi path sync" do
-      build_multipath_test_dir
-      Rbfs::Command.new(
-        :hosts => File.join(@tmpdir, "hosts"),
-        :root => File.join(@tmpdir, "local"),
-        :shell => '"ssh -o StrictHostKeyChecking=no"',
-        :remote_root => File.join(@tmpdir, "remote")
-      ).sync
-      get_tree("local").should eql(get_tree("remote"))
+      build_subpath_simple
+      run_sync_test
     end
 
     it "should do sub path sync" do
-      build_deeppath_test_dir
-      Rbfs::Command.new(
-        :hosts => File.join(@tmpdir, "hosts"),
-        :root => File.join(@tmpdir, "local"),
-        :subpath => "somepath/someotherpath/",
-        :shell => '"ssh -o StrictHostKeyChecking=no"',
-        :remote_root => File.join(@tmpdir, "remote")
-      ).sync
-      get_tree("local").should eql(get_tree("remote"))
+      run_deeppath_test("somepath")
+    end
+
+    it "should do deep sub path sync" do
+      run_deeppath_test("somepath/someotherpath")
+    end
+
+    it "should do deep sub path file sync" do
+      run_deeppath_test("somepath/someotherpath/sample.txt")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbfs
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsync
-  requirement: &19509060 !ruby/object:Gem::Requirement
+  requirement: &9835680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19509060
+  version_requirements: *9835680
 - !ruby/object:Gem::Dependency
   name: hosts_file
-  requirement: &19507900 !ruby/object:Gem::Requirement
+  requirement: &9833240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19507900
+  version_requirements: *9833240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19505500 !ruby/object:Gem::Requirement
+  requirement: &9832140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *19505500
+  version_requirements: *9832140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19504860 !ruby/object:Gem::Requirement
+  requirement: &9831340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19504860
+  version_requirements: *9831340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19503760 !ruby/object:Gem::Requirement
+  requirement: &9830360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19503760
+  version_requirements: *9830360
 description: Ruby File Sync
 email:
 - jbussdieker@gmail.com