rbfs 0.0.2 → 0.0.3

data/.travis.yml

@@ -0,0 +1,7 @@
+---
+script: 'rake spec'
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)

data/bin/rbfs

@@ -2,9 +2,6 @@
 require 'rbfs'
 require 'rbfs/command'
 
-config = Rbfs::Command.config
-hosts = Rbfs::Hosts.new(config[:hosts])
-hosts.each do |host|
-  puts "#{host} (#{host.ip})" if config[:verbose]
-  host.sync(config)
-end
+command = Rbfs::Command.new
+success = command.sync
+exit 1 unless success

data/lib/rbfs.rb

@@ -1,6 +1,4 @@
 require "rbfs/version"
-require "rbfs/hosts"
 
 module Rbfs
-  # Your code goes here...
 end

data/lib/rbfs/args.rb

@@ -16,12 +16,21 @@ module Rbfs
         opts.on("-r", "--root ROOT", "Root path to sync") do |v|
           options[:root] = v
         end
+        opts.on("-s", "--subpath PATH", "Subpath of root to sync") do |v|
+          options[:subpath] = v
+        end
         opts.on("-v", "--[no-]verbose", "Print extra debugging info") do |v|
           options[:verbose] = v
         end
         opts.on("-d", "--dry", "Test config settings") do |v|
           options[:dry] = v
         end
+        opts.on("-t", "--[no-]threaded", "Run all hosts concurrently") do |v|
+          options[:threaded] = v
+        end
+        opts.on("--timeout TIMEOUT", "Set I/O timeout") do |v|
+          options[:timeout] = v
+        end
       end.parse!
 
       options

data/lib/rbfs/command.rb

@@ -1,12 +1,75 @@
 require 'rbfs/args'
 require 'rbfs/config'
+require "rbfs/host_parser"
+require "rbfs/rsync"
+require "rbfs/futures"
+require "rbfs/logger"
 
 module Rbfs
   class Command
-    def self.config
-      args = Rbfs::Args.new.parse
-      options = Rbfs::Config.new(args[:config]).parse
-      options.merge(args)
+    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]
+    end
+
+    def parse_config
+      config = {}
+      cmdline_args = Rbfs::Args.new.parse
+      if cmdline_args[:config]
+        config_args = Rbfs::Config.new(cmdline_args[:config]).parse
+        config = config_args.merge(cmdline_args)
+      else
+        config = cmdline_args
+      end
+      config[:logger] = Logger.new(config)
+      config
+    end
+
+    def logger
+      @config[:logger]
+    end
+
+    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|
+          if result[:exitcode] != 0
+            logger.error "  | #{line}"
+          else
+            logger.info "  | #{line}"
+          end
+        end
+        success = false if result[:exitcode] != 0
+      end
+      success
+    end
+
+    def sync_hosts
+      config[:root] = File.join(config[:root], config[:subpath]) if config[:subpath]
+      logger.info "Syncing #{config[:root]}..."
+      hosts = Rbfs::HostParser.new(File.open(config[:hosts]))
+      hosts.collect do |host|
+        [host, sync_host(host)]
+      end
+    end
+
+    def sync_host(host)
+      if config[:threaded]
+        Future.new do
+          Rsync.new(config, host).sync
+        end
+      else
+        Rsync.new(config, host).sync
+      end
     end
   end
 end

data/lib/rbfs/futures.rb

@@ -0,0 +1,27 @@
+module Rbfs
+  class Future < BasicObject
+    def initialize(&callable)
+      @thread ||= ::Thread.new { callable.call }
+    end
+
+    def value
+      @thread.value
+    end
+
+    def inspect
+      if @thread.alive?
+        "#<Future running>"
+      else
+        value.inspect
+      end
+    end
+
+    def method_missing(method, *args)
+      value.send(method, *args)
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      value.respond_to?(method, include_private)
+    end
+  end
+end

data/lib/rbfs/host.rb

@@ -1,9 +1,5 @@
-require 'rbfs/rsync'
-
 module Rbfs
   class Host
-    include Rsync
-
     def initialize(raw)
       @raw = raw
     end
@@ -19,5 +15,9 @@ module Rbfs
     def name
       @raw.split[1]
     end
+
+    def alias
+      @raw.split[2]
+    end
   end
 end

data/lib/rbfs/host_parser.rb

@@ -0,0 +1,20 @@
+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/lib/rbfs/logger.rb

@@ -0,0 +1,26 @@
+module Rbfs
+  class Logger
+    attr_reader :config
+
+    def initialize(config)
+      @config = config
+    end
+
+    def info(msg)
+      puts "\033[0;32m#{msg}" if config[:verbose]
+    end
+
+    def error(msg)
+      puts "\033[0;31m#{msg}"
+    end
+
+    def critical(msg)
+      puts "\033[0;31m#{msg}"
+      exit 1
+    end
+
+    def notice(msg)
+      puts "\033[0;33m#{msg}"
+    end
+  end
+end

data/lib/rbfs/rsync.rb

@@ -1,10 +1,32 @@
 module Rbfs
-  module Rsync
-    def sync(config)
-      command = "rsync -ave ssh --delete #{config[:root]} #{ip}:#{config[:root]}"
-      command += " -n" if config[:dry]
-      result = `#{command}`
-      puts result if config[:verbose]
+  class Rsync
+    def initialize(config = {}, host = nil)
+      @config = config
+      @host = host
+    end
+
+    def sync
+      args = ["-ae", "ssh", "--delete", @config[:root], "#{@host.ip}:#{@config[:root]}"]
+      args << "-v" if @config[:verbose]
+      args << "-n" if @config[:dry]
+      args << "--timeout=#{@config[:timeout]}" if @config[:timeout]
+      output = command("rsync", args)
+      exitcode = $?
+      {:output => output, :exitcode => exitcode}
+    end
+
+    def command(cmd, options = [], &block)
+      cmd_line = "#{cmd} "
+      cmd_line += options.join(' ')
+      run_command(cmd_line, &block)
+    end
+
+    def run_command(cmd, &block)
+      if block_given?
+        IO.popen("#{cmd} 2>&1", &block)
+      else
+        `#{cmd} 2>&1`
+      end
     end
   end
 end

data/lib/rbfs/version.rb

@@ -1,3 +1,3 @@
 module Rbfs
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/rbfs.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/spec/rbfs/host_parser_spec.rb

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,38 @@
+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

data/spec/rbfs/rsync_spec.rb

@@ -0,0 +1,23 @@
+require 'rbfs/rsync'
+
+describe Rbfs::Rsync do
+  it "should run_command" do
+    Rbfs::Rsync.new.run_command("echo test").should eql("test\n")
+  end
+
+  it "should run_command block" do
+    Rbfs::Rsync.new.run_command("echo test") do |io|
+      io.read.should eql("test\n")
+    end
+  end
+
+  it "should command" do
+    Rbfs::Rsync.new.command("echo", ["test"]).should eql("test\n")
+  end
+
+  it "should command block" do
+    Rbfs::Rsync.new.command("echo", ["test"]) do |io|
+      io.read.should eql("test\n")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbfs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-07-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17891980 !ruby/object:Gem::Requirement
+  requirement: &15800280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *17891980
+  version_requirements: *15800280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17891020 !ruby/object:Gem::Requirement
+  requirement: &15799780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17891020
+  version_requirements: *15799780
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &15799280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *15799280
 description: Ruby File Sync
 email:
 - jbussdieker@gmail.com
@@ -42,6 +53,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -50,11 +62,16 @@ files:
 - lib/rbfs/args.rb
 - lib/rbfs/command.rb
 - lib/rbfs/config.rb
+- lib/rbfs/futures.rb
 - lib/rbfs/host.rb
-- lib/rbfs/hosts.rb
+- lib/rbfs/host_parser.rb
+- lib/rbfs/logger.rb
 - lib/rbfs/rsync.rb
 - lib/rbfs/version.rb
 - rbfs.gemspec
+- spec/rbfs/host_parser_spec.rb
+- spec/rbfs/host_spec.rb
+- spec/rbfs/rsync_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -79,5 +96,8 @@ rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Ruby File Sync
-test_files: []
+test_files:
+- spec/rbfs/host_parser_spec.rb
+- spec/rbfs/host_spec.rb
+- spec/rbfs/rsync_spec.rb
 has_rdoc: 

data/lib/rbfs/hosts.rb

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