vagrant-rsync 0.2.0 → 0.2.1

data/lib/vagrant-rsync/cap/ensure_rsync.rb

@@ -0,0 +1,46 @@
+require_relative '../errors'
+
+module VagrantPlugins
+  module Rsync
+    module Cap
+      class EnsureRsync
+
+        def self.ensure_rsync(machine, env)
+          return unless machine.communicate.ready?
+
+          if rsync_installed?(machine)
+            env.ui.info I18n.t('vagrant_rsync.rsync_installed')
+          else
+            env.ui.info I18n.t('vagrant_rsync.installing_rsync')
+            install_rsync!(machine)
+          end
+        end
+
+        def self.rsync_installed?(machine)
+          machine.communicate.execute("rsync --version") rescue false
+        end
+
+        def self.install_rsync!(machine)
+          machine.communicate.tap do |comm|
+            case machine.guest.name
+            when :debian, :ubuntu
+              comm.sudo "apt-get update"
+              comm.sudo "apt-get install rsync"
+            when :fedora, :centos, :redhat
+              comm.sudo "yum install rsync"
+            when :suse
+              comm.sudo "yast2 -i rsync"
+            when :gentoo
+              comm.sudo "emerge rsync"
+            when :arch
+              comm.sudo "pacman -s rsync"
+            else
+              raise Errors::RsyncNotAvailableError, guest: machine.guest.name
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-rsync/cap/rsync_folders.rb

@@ -0,0 +1,43 @@
+module VagrantPlugins
+  module Rsync
+    module Cap
+      class RsyncFolders
+        def self.rsync_folders(machine)
+          machine.config.vm.synced_folders.each do |id, data|
+            next if data[:nfs]
+
+            hostpath  = File.expand_path(data[:hostpath], machine.env.root_path)
+            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
+            guestpath = data[:guestpath]
+            ssh_info  = machine.ssh_info
+
+            command = [
+              "rsync", "--verbose", "--delete", "--archive", "-z",
+              "--exclude", ".vagrant/",
+              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
+              hostpath,
+              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"
+            ]
+
+            options = {}
+            command << '-vvv' if options[:verbose]
+
+            if options[:verbose]
+              ## should the vagrant way of outputting text
+              #@env.ui.say(:info,command.join(" "))
+            end
+
+            r = Vagrant::Util::Subprocess.execute(*command)
+            #@env.ui.say(:info, "done") if options[:verbose]
+            if r.exit_code != 0
+              raise Errors::RsyncError,
+                :guestpath => guestpath,
+                :hostpath => hostpath,
+                :stderr => r.stderr
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rsync/command.rb

@@ -0,0 +1,50 @@
+require 'optparse'
+
+module VagrantPlugins
+  module Rsync
+    class Command < Vagrant.plugin("2", :command)
+      def execute
+        options = {}
+        options[:install_rsync] = true
+        options[:verbose] = false
+
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant rsync [vm-name]"
+
+          o.on("-n", "--no-install", "Do not attempt to install rysnc if not found") do |ni|
+            options[:install_rsync] = !ni
+          end
+
+          o.on('-v', '--verbose', "Run verbosely") do |v|
+            options[:verbose] = v
+          end
+
+          o.on( '-h', '--help', 'Display this screen' ) do
+            puts opts
+            exit
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        with_target_vms(argv) do |vm|
+          raise Vagrant::Errors::VMNotCreatedError if vm.state.id == :not_created
+          raise Vagrant::Errors::VMInaccessible if vm.state.id == :inaccessible
+        end
+
+        with_target_vms(argv) do |machine|
+          if options[:install_rsync]
+            @env.ui.info I18n.t('vagrant_rsync.ensure_rsync')
+            machine.guest.capability(:ensure_rsync, @env)
+          end
+
+          @env.ui.info I18n.t('vagrant_rsync.rsync_folders')
+          machine.guest.capability(:rsync_folders)
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-rsync/errors.rb

@@ -0,0 +1,10 @@
+module VagrantPlugins
+  module Rsync
+    module Errors
+      class RsyncNotAvailableError < Vagrant::Errors::VagrantError
+        error_key(:rsync_not_available)
+      end
+    end
+  end
+end
+

data/lib/{plugin.rb → vagrant-rsync/plugin.rb}

@@ -10,8 +10,11 @@ if Vagrant::VERSION < "1.1.0"
   raise "The Vagrant AWS plugin is only compatible with Vagrant 1.1+"
 end
 
+# Add our custom translations to the load path
+I18n.load_path << File.expand_path("../../../locales/en.yml", __FILE__)
+
 module VagrantPlugins
-  module CommandRSYNC
+  module Rsync
     class Plugin < Vagrant.plugin("2")
       name "rsync command"
       description <<-DESC
@@ -19,9 +22,19 @@ module VagrantPlugins
       DESC
 
       command("rsync") do
-        require File.expand_path("../command.rb", __FILE__)
+        require_relative 'command'
         Command
       end
+
+      guest_capability("linux", "ensure_rsync") do
+        require_relative "cap/ensure_rsync"
+        Cap::EnsureRsync
+      end
+
+      guest_capability("linux", "rsync_folders") do
+        require_relative "cap/rsync_folders"
+        Cap::RsyncFolders
+      end
     end
   end
 end

data/lib/vagrant-rsync/version.rb

@@ -0,0 +1,5 @@
+module VagrantPlugins
+  module Rsync
+    VERSION = "0.2.1"
+  end
+end

data/lib/vagrant-rsync.rb

@@ -1 +1,4 @@
-require 'plugin'
+require 'vagrant'
+
+require 'vagrant-rsync/version'
+require 'vagrant-rsync/plugin'

data/locales/en.yml

@@ -0,0 +1,14 @@
+en:
+  vagrant_rsync:
+    ensure_rsync: |-
+      Ensuring that rsync is installed on guest.
+    rsync_installed: |-
+      Rsync already installed.
+    installing_rsync: |-
+      Installing rsync...
+    rsync_folders: |-
+      Syncing shared folders to guest with rsync...
+  vagrant:
+    errors:
+      rsync_not_available: |-
+        Unable to install rsync on a machine of guest type '%{guest}'.

data/vagrant-rsync.gemspec

@@ -1,12 +1,12 @@
 $:.unshift File.expand_path("../lib", __FILE__)
-require "version"
+require 'vagrant-rsync/version'
 
 Gem::Specification.new do |s|
   s.name          = "vagrant-rsync"
-  s.version       = VagrantPlugins::RSYNC::VERSION
+  s.version       = VagrantPlugins::Rsync::VERSION
   s.platform      = Gem::Platform::RUBY
-  s.authors       = "Bill Cromie"
-  s.email         = "bill@cromie.org"
+  s.authors       = ["Bill Cromie", "Patrick Connolly"]
+  s.email         = ["bill@cromie.org","patrick@myplanetdigital.com"]
   s.homepage      = "https://github.com/cromulus/vagrant-rsync"
   s.summary       = "Enables Vagrant to rsync shared folders on remote guests with grace and aplomb."
   s.description   = "Enables Vagrant to rsync shared folders on remote guests with grace and aplomb."

metadata

@@ -1,69 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: vagrant-rsync
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
-authors:
+authors: 
 - Bill Cromie
+- Patrick Connolly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2013-09-05 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   name: rake
-description: Enables Vagrant to rsync shared folders on remote guests with grace and
-  aplomb.
-email: bill@cromie.org
+  requirement: *id001
+  prerelease: false
+description: Enables Vagrant to rsync shared folders on remote guests with grace and aplomb.
+email: 
+- bill@cromie.org
+- patrick@myplanetdigital.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - Guardfile
-- lib/command.rb
-- lib/plugin.rb
+- lib/vagrant-rsync/cap/ensure_rsync.rb
+- lib/vagrant-rsync/cap/rsync_folders.rb
+- lib/vagrant-rsync/command.rb
+- lib/vagrant-rsync/errors.rb
+- lib/vagrant-rsync/plugin.rb
+- lib/vagrant-rsync/version.rb
 - lib/vagrant-rsync.rb
-- lib/version.rb
 - License
+- locales/en.yml
 - RakeFile
 - README.md
 - vagrant-rsync.gemspec
 - Vagrantfile.testing
 - .gitignore
+has_rdoc: true
 homepage: https://github.com/cromulus/vagrant-rsync
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: vagrant-rsync
-rubygems_version: 2.0.3
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Enables Vagrant to rsync shared folders on remote guests with grace and aplomb.
 test_files: []
+

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjRjMzc4ODNmMmQ4ZDRiNTk0YWNiNTE3YmYyMjhjYTE1YzVlZGE0OQ==
-  data.tar.gz: !binary |-
-    NGU5MGE1NjE5NmZlOWViMDI5NzRhZGQxYWEwMjQxMThmZmQ5OTVlZg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzJmNDNmZWRkYjBmMjU5ZDM2ZjJhODM4NmNlYTI1YThhYWQ1Yjk4NzA4NmNl
-    MWExNTg5NmVlY2I4MTkzYzkyYzMyMmU3NGM0YWE1OWM5YWYyNTNlMWZmYTlj
-    MGQ0MmMyNDNkNzlmOGViN2Y3YjNhM2M1MjU3ZDQ5ZWI5YTU0ZTg=
-  data.tar.gz: !binary |-
-    YjliZmQwOGU2M2Y1YWRiYzE0Y2Q2N2U5MWExZWFjZTE2OTZjNGUxNDBlM2Vl
-    NmZmNzcxNWVjZjY5OTdiNDY4YTE0NGEwYWVmMTJhYTI5ZGVmMDAxZWYxNzRk
-    N2NhOTA5YjJmNjUzOGJkNDcyMzBiYTU1NGY0ZjI0M2FjOTc0ZmU=

data/lib/command.rb

@@ -1,111 +0,0 @@
-require 'optparse'
-require 'pp'
-module VagrantPlugins
-  module CommandRSYNC
-    class Command < Vagrant.plugin("2", :command)
-
-      class RsyncNotAvailableError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant.plugin.vagrant-rsync")
-      end
-
-      def verify_rsync(vm)
-        begin
-          vm.communicate.execute("rsync --version")
-        rescue Exception => e
-          @env.ui.say(:info, "rsync not found, installing rsync now. disable this with --no-install")
-          # should notify people we are installing rsync here.
-          case vm.guest.name
-          when :debian, :ubuntu
-            vm.communicate.sudo("apt-get update")
-            vm.communicate.sudo("apt-get install rsync")
-          when :fedora, :centos, :redhat
-            vm.communicate.sudo("yum install rsync")
-          when :suse
-            vm.communicate.sudo("yast2 -i rsync")
-          when :gentoo
-            vm.communicate.sudo("emerge rsync")
-          when :arch
-            vm.communicate.sudo("pacman -s rsync")
-          # when :solaris
-          #   vm.communicate.sudo("pkg install rsync")
-          # when :freebsd
-          #   vm.communicate.sudo("pkg_add -r rsync")
-          else
-            raise RsyncNotAvailableError
-          end
-        end
-      end
-
-      def execute
-        options = { :install_rsync => true,
-                    :verbose    => false}
-
-        opts = OptionParser.new do |opt|
-          opt.banner = "Usage: vagrant rsync [vm-name]"
-          opt.on("-n","--no-install", "do not attempt to install rysnc if not found") do |v|
-            options[:install_rsync] = false
-          end
-          opt.on('-v','--verbose',"Run verbosely") do |v|
-            options[:verbose] = true
-          end
-          opts.on( '-h', '--help', 'Display this screen' ) do
-            puts opts
-            exit
-          end
-        end
-
-        argv = parse_options(opts)
-        unless argv
-          argv=["default"]
-        end
-
-        with_target_vms(argv) do |vm|
-          raise Vagrant::Errors::VMNotCreatedError if vm.state.id == :not_created
-          raise Vagrant::Errors::VMInaccessible if vm.state.id == :inaccessible
-        end
-
-        with_target_vms(argv) do |vm|
-
-          if options[:install_rsync]
-            @env.ui.say(:info,"checking if rsync exists on host")
-            verify_rsync(vm)
-          end
-
-          vm.config.vm.synced_folders.each do |id, data|
-            next if data[:nfs]
-            hostpath  = File.expand_path(data[:hostpath], vm.env.root_path)
-            hostpath = "#{hostpath}/" if hostpath !~ /\/$/
-            guestpath = data[:guestpath]
-            ssh_info  = vm.ssh_info
-
-            rsync_options = "-aze --exclude #{vm.env.root_path}/.vagrant/ "
-            rsync_options << '-vvv' if options[:verbose]
-
-            command = [
-              "rsync", "--verbose", "--delete", "--archive", "-z",
-              "--exclude", ".vagrant/",
-              "-e", "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no -i '#{ssh_info[:private_key_path]}'",
-              hostpath,
-              "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
-
-
-            if options[:verbose]
-              ## should the vagrant way of outputting text
-              @env.ui.say(:info,command.join(" "))
-            end
-
-            r = Vagrant::Util::Subprocess.execute(*command)
-            @env.ui.say(:info, "done") if options[:verbose]
-            pp r.inspect
-            if r.exit_code != 0
-              raise Errors::RsyncError,
-                :guestpath => guestpath,
-                :hostpath => hostpath,
-                :stderr => r.stderr
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/version.rb

@@ -1,5 +0,0 @@
-module VagrantPlugins
-  module RSYNC
-    VERSION = "0.2.0"
-  end
-end