rbfs 0.0.10 → 0.0.14

data/README.md

@@ -1,29 +1,11 @@
 # Rbfs
 
-TODO: Write a gem description
+[![Build Status](https://travis-ci.org/jbussdieker/ruby-rbfs.png?branch=master)](https://travis-ci.org/jbussdieker/ruby-rbfs)
+[![Code Climate](https://codeclimate.com/github/jbussdieker/ruby-rbfs.png)](https://codeclimate.com/github/jbussdieker/ruby-rbfs)
+[![Gem Version](https://badge.fury.io/rb/rbfs.png)](http://badge.fury.io/rb/rbfs)
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'rbfs'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install rbfs
+Ruby File Sync
 
 ## Usage
 
 TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/Rakefile

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

data/lib/rbfs/args.rb

@@ -16,6 +16,12 @@ module Rbfs
         opts.on("-r", "--root ROOT", "Root path to sync") do |v|
           options[:root] = v
         end
+        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

@@ -1,6 +1,6 @@
+require 'hosts_file'
 require 'rbfs/args'
 require 'rbfs/config'
-require "rbfs/host_parser"
 require "rbfs/rsync"
 require "rbfs/futures"
 require "rbfs/logger"
@@ -9,10 +9,15 @@ module Rbfs
   class Command
     attr_accessor :config
 
-    def initialize
-      @config = parse_config
-      logger.critical "No hosts file specified" unless config[:hosts]
-      logger.critical "Root path not specified" unless config[:root]
+    def initialize(config = nil)
+      if config
+        @config = config
+      else
+        @config = parse_config unless config
+      end
+      @config[:logger] = Logger.new(@config)
+      logger.critical "No hosts file specified" unless @config[:hosts]
+      logger.critical "Root path not specified" unless @config[:root]
     end
 
     def parse_config
@@ -24,7 +29,9 @@ module Rbfs
       else
         config = cmdline_args
       end
-      config[:logger] = Logger.new(config)
+      unless config[:remote_root]
+        config[:remote_root] = config[:root]
+      end
       config
     end
 
@@ -34,25 +41,26 @@ module Rbfs
 
     def sync
       success = true
-      results = sync_hosts
-      results.each do |host, result|
-        if result[:exitcode] != 0
-          logger.error "#{host}: #{result[:exitcode].to_i}"
-        else
-          logger.info "#{host}: #{result[:exitcode].to_i}"
-        end
-        result[:output].split("\n").each do |line|
-          logger.puts "  | #{line}"
+
+      sync_hosts.each do |host, result|
+        logger.info "#{host.name}: #{result.error}"
+        result.changes.each do |change|
+          logger.puts "  | #{change.filename} (#{change.summary})"
         end
-        success = false if result[:exitcode] != 0
+        success = false unless result.success?
       end
+
       success
     end
 
     def sync_hosts
-      config[:root] = File.join(config[:root], config[:subpath]) if config[:subpath]
+      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]}..."
-      hosts = Rbfs::HostParser.new(File.open(config[:hosts]))
+      hosts = HostsFile.load(config[:hosts])
       hosts.collect do |host|
         [host, sync_host(host)]
       end

data/lib/rbfs/rsync.rb

@@ -1,3 +1,5 @@
+require 'rsync'
+
 module Rbfs
   class Rsync
     def initialize(config = {}, host = nil)
@@ -10,24 +12,35 @@ module Rbfs
     end
 
     def remote_url
-      "#{@host.ip}:#{@config[:root]}"
+      "#{@host.ip}:#{@config[:remote_root]}"
+    end
+
+    def local_root
+      if File.directory?(@config[:root])
+        @config[:root] + "/"
+      else
+        @config[:root]
+      end
     end
 
     def mkdir
-      args = [@host.ip, "mkdir", "-p", @config[:root]]
+      args = [@host.ip, "mkdir", "-p", @config[:remote_root]]
       command("ssh", args)
     end
 
     def rsync
-      args = ["-ae", "ssh", "--delete", @config[:root], remote_url]
+      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]
-      command("rsync", args)
+      ::Rsync.run(local_root, remote_url, args)
     end
 
     def sync
-      mkdir
+      if File.directory?(@config[:root])
+        mkdir
+      end
       rsync
     end
 

data/lib/rbfs/version.rb

@@ -1,3 +1,3 @@
 module Rbfs
-  VERSION = "0.0.10"
+  VERSION = "0.0.14"
 end

data/rbfs.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rsync", "~> 0.0"
+  spec.add_dependency "hosts_file", "~> 0.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/spec/rbfs/command_spec.rb

@@ -0,0 +1,92 @@
+require 'rbfs/command'
+require 'tmpdir'
+
+describe Rbfs::Command do
+  def make_test_dir(&block)
+    Dir.mktmpdir do |dir|
+      @tmpdir = dir
+      File.open(File.join(@tmpdir, "hosts"), 'w') {|f| f.write("127.0.0.1 testhost")}
+      Dir.mkdir(File.join(@tmpdir, "local"))
+      Dir.mkdir(File.join(@tmpdir, "remote"))
+      yield
+    end
+  end
+
+  def build_simple_test_dir
+    File.open(File.join(@tmpdir, "local", "sample.txt"), 'w') do |f|
+      f.write("hello world!")
+    end
+  end
+
+  def build_multipath_test_dir
+    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
+    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|
+      f.write("hello world!")
+    end
+  end
+
+  def get_tree(subpath)
+    `cd #{@tmpdir}/#{subpath}; tree`
+  end
+
+  context "simple", :local => true do
+    around(:each) do |example|
+      make_test_dir do
+        example.run
+      end
+    end
+
+    it "should do simple file sync" do
+      build_simple_test_dir
+      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"))
+    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"))
+    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"))
+    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"))
+    end
+  end
+end

data/spec/rbfs/rsync_spec.rb

@@ -12,7 +12,7 @@ describe Rbfs::Rsync do
   end
 
   it "should command" do
-    Rbfs::Rsync.new.command("echo", ["test"]).should eql("test\n")
+    Rbfs::Rsync.new.command("echo", ["test"])[:output].should eql("test\n")
   end
 
   it "should command block" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbfs
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000Z
+date: 2013-07-24 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rsync
+  requirement: &10282820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *10282820
+- !ruby/object:Gem::Dependency
+  name: hosts_file
+  requirement: &10281820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *10281820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14450720 !ruby/object:Gem::Requirement
+  requirement: &10280700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *14450720
+  version_requirements: *10280700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14449700 !ruby/object:Gem::Requirement
+  requirement: &10279760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14449700
+  version_requirements: *10279760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14447860 !ruby/object:Gem::Requirement
+  requirement: &10278940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14447860
+  version_requirements: *10278940
 description: Ruby File Sync
 email:
 - jbussdieker@gmail.com
@@ -63,15 +85,12 @@ files:
 - lib/rbfs/command.rb
 - lib/rbfs/config.rb
 - lib/rbfs/futures.rb
-- lib/rbfs/host.rb
-- lib/rbfs/host_parser.rb
 - lib/rbfs/logger.rb
 - lib/rbfs/rsync.rb
 - lib/rbfs/version.rb
 - rbfs.gemspec
+- spec/rbfs/command_spec.rb
 - spec/rbfs/futures_spec.rb
-- spec/rbfs/host_parser_spec.rb
-- spec/rbfs/host_spec.rb
 - spec/rbfs/rsync_spec.rb
 homepage: ''
 licenses: []
@@ -98,8 +117,7 @@ signing_key:
 specification_version: 3
 summary: Ruby File Sync
 test_files:
+- spec/rbfs/command_spec.rb
 - spec/rbfs/futures_spec.rb
-- spec/rbfs/host_parser_spec.rb
-- spec/rbfs/host_spec.rb
 - spec/rbfs/rsync_spec.rb
 has_rdoc: 

data/lib/rbfs/host.rb

@@ -1,23 +0,0 @@
-module Rbfs
-  class Host
-    def initialize(raw)
-      @raw = raw
-    end
-
-    def ip
-      @raw.split.first
-    end
-
-    def to_s
-      name
-    end
-
-    def name
-      @raw.split[1]
-    end
-
-    def alias
-      @raw.split[2]
-    end
-  end
-end

data/lib/rbfs/host_parser.rb

@@ -1,20 +0,0 @@
-require "rbfs/host"
-
-module Rbfs
-  class HostParser
-    include Enumerable
-
-    def initialize(file)
-      @file = file
-    end
-    
-    def each(&block)
-      lines = @file.read.split("\n")
-      lines.reject! {|line| line.strip.start_with? "#" }
-      lines.reject! {|line| line.strip.empty? }
-      lines.each do |line|
-        yield(Host.new(line))
-      end
-    end
-  end
-end

data/spec/rbfs/host_parser_spec.rb

@@ -1,30 +0,0 @@
-require 'rbfs/host_parser'
-require 'stringio'
-
-describe Rbfs::HostParser do
-  def test_case(string, size)
-    io = StringIO.new(string)
-    hp = Rbfs::HostParser.new(io)
-    hp.collect {|v|v}.length.should eql(size)
-  end
-
-  it "should handle a file with only comments" do
-    test_case("# TEST", 0)
-  end
-
-  it "should handle a file with one host" do
-    test_case("1.1.1.1 HOSTNAME", 1)
-  end
-
-  it "should handle a basic file" do
-    test_case("# TEST\n1.1.1.1 HOSTNAME", 1)
-  end
-
-  it "should handle empty lines" do
-    test_case("\n\n# TEST\n1.1.1.1 HOSTNAME\n\n", 1)
-  end
-
-  it "should handle multiple lines" do
-    test_case("1.1.1.1 HOSTNAME\n1.1.1.1 HOSTNAME\n1.1.1.1 HOSTNAME", 3)
-  end
-end

data/spec/rbfs/host_spec.rb

@@ -1,38 +0,0 @@
-require 'rbfs/host'
-
-describe Rbfs::Host do
-  def test_example(line, ip, name=nil, alias_name=nil)
-    host = Rbfs::Host.new(line)
-    host.ip.should eql(ip)
-    host.name.should eql(name)
-    host.alias.should eql(alias_name)
-  end
-
-  it "should handle minimal syntax" do
-    test_example("1.1.1.1", "1.1.1.1")
-  end
-
-  it "should handle basic syntax" do
-    test_example("1.1.1.1 HOSTNAME", "1.1.1.1", "HOSTNAME")
-  end
-
-  it "should handle advanced syntax" do
-    test_example("1.1.1.1 HOSTNAME HOST", "1.1.1.1", "HOSTNAME", "HOST")
-  end
-
-  it "should support tab separation" do
-    test_example("1.1.1.1\tHOSTNAME", "1.1.1.1", "HOSTNAME")
-  end
-
-  it "should tolerate lots of tab separation" do
-    test_example("1.1.1.1\t\t\t\t\t\t\tHOSTNAME", "1.1.1.1", "HOSTNAME")
-  end
-
-  it "should tolerate lots of spaces" do
-    test_example("1.1.1.1        HOSTNAME", "1.1.1.1", "HOSTNAME")
-  end
-
-  it "should tolerate lots of aliases" do
-    test_example("1.1.1.1 HOSTNAME HOSTA HOSTB HOSTC HOSTD", "1.1.1.1", "HOSTNAME", "HOSTA")
-  end
-end