mccloud 0.0.15 → 0.0.16

data/README.md

@@ -165,7 +165,7 @@ Usefull if your cloud doesn't have an ip, but you can create start,stop, etc...
 
     end
 
-### Provider kvm
+### Provider kvm (might not work out of the box)
 
 this works together with veewee that support creating kvm template machines.
 Like on vagrant, mccloud clones a veewee created vm 
@@ -331,7 +331,8 @@ The mounting we then do our provision.sh script:
     end
 
 
-### Vmfusion
+### Vmfusion vm
+need to check this
 
 ## Provisioners
 

data/lib/mccloud/command/bootstrap.rb

@@ -10,7 +10,7 @@ module Mccloud
       def execute
         env.load!
         env.config.providers.each do |name,provider|
-          env.logger.debug("Asking provider #{name} to reload box #{box_name}")
+          env.logger.debug("Asking provider #{name} to boostrap box #{box_name}")
           provider.bootstrap(box_name,command,options)
         end
       end

data/lib/mccloud/config.rb

@@ -85,10 +85,7 @@ module Mccloud
         #        http://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
         instance_eval(mccloud_file)
       rescue LoadError => e
-        raise ::Mccloud::Error, "Error processing configfile - Sorry"
-        env.ui.error "Error loading configfile - Sorry"
-        env.ui.error e.message
-        exit -1
+        raise ::Mccloud::Error, "Error loading configfile - Sorry: #{e.message}"
       rescue NoMethodError => e
         raise ::Mccloud::Error, "Some method got an error in the configfile - Sorry\n#{$!}\n#{e.message}"
       rescue Errno::ENOENT => e

data/lib/mccloud/provider/core/vm/rsync.rb

@@ -20,6 +20,21 @@ module Mccloud::Provider
         rsync(clean_src_path,dest,options)
       end
 
+      def windows_client?
+        ::Mccloud::Util::Platform.windows?
+      end
+
+      # cygwin rsync path must be adjusted to work
+      def adjust_rsync_path(path)
+        return path unless windows_client?
+        path.gsub(/^(\w):/) { "/cygdrive/#{$1}" }
+      end
+
+      # see http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
+      def rsync_permissions
+        '--chmod=ugo=rwX' if windows_client?
+      end
+
       # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/185404
       # This should work on windows too now
       # This will result in a ShellResult structure with stdout, stderr and status
@@ -40,7 +55,7 @@ module Mccloud::Provider
             exit -1
           end
 
-          command="rsync --exclude '.DS_Store' --exclude '.hg' --exclude '.git' #{mute} --delete-excluded --delete  -az -e 'ssh #{ssh_commandline_options(options)}' '#{src}' '#{@user}@#{self.ip_address}:#{dest_path}'"
+          command="rsync #{rsync_permissions} --exclude '.DS_Store' --exclude '.hg' --exclude '.git' #{mute} --delete-excluded --delete  -az -e 'ssh #{ssh_commandline_options(options)}' '#{adjust_rsync_path(src)}' '#{@user}@#{self.ip_address}:#{dest_path}'"
         else
           env.ui.info "[#{@name}] - rsync error: #{src} does no exist"
           exit

data/lib/mccloud/provider/host/vm/scp.rb

@@ -7,29 +7,24 @@ module Mccloud::Provider
         scp(src,dest,options)
       end
 
-       def scp(src,dest,options = {})
+      def scp(src,dest,options = {})
 
-         if options[:user]
-
-           if options[:password]
-             Net::SCP.start(ip_address,options[:user],:password => options[:password], :port => options[:port]) do |auth_scp|
-               auth_scp.upload!(src,dest)
-             end
-           else
-             Net::SCP.start(ip_address,options[:user],:port => options[:port]) do |auth_scp|
-               auth_scp.upload!(src,dest)
-             end
-           end
+        # override options from Mccloudfile with parameter options
+        ssh_options = mccloudfile_options.merge(options)
+        
+        Net::SCP.start(ip_address,ssh_options[:user],ssh_options) do |auth_scp|
+          auth_scp.upload!(src,dest)
+        end
+      end
 
-         else
-           Net::SCP.start(ip_address,@user, :port => options[:port]) do |auth_scp|
-               auth_scp.upload!(src,dest)
-             end
-           # This does not allow to specify a non standard port
-           #Net::SCP.upload!(ip_address,@user,src,dest,options)
-         end
+      def mccloudfile_options
+        opts = Hash.new
+        (opts[:user] = @user) if @user
+        (opts[:keys] = @private_key_path) if @private_key_path
+        (opts[:port] = @port) if @port
+        opts
       end
 
-       end #module
-      end #module
-    end #module
+   end #module
+  end #module
+end #module

data/lib/mccloud/provisioner/puppet.rb

@@ -1,4 +1,3 @@
-require 'mccloud/util/rsync'
 require 'mccloud/util/ssh'
 require 'erb'
 require 'tempfile'

data/lib/mccloud/util/platform.rb

@@ -14,6 +14,10 @@ module Mccloud
           platform.include?("darwin9")
         end
 
+        def windows?
+          platform.include?("mswin") || platform.include?("mingw")
+        end
+
         [:darwin, :bsd, :linux].each do |type|
           define_method("#{type}?") do
             platform.include?(type.to_s)

data/lib/mccloud/version.rb

@@ -2,5 +2,5 @@ module Mccloud
 end
 
 unless defined?(Mccloud::VERSION)
-  ::Mccloud::VERSION = "0.0.15"
+  ::Mccloud::VERSION = "0.0.16"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mccloud
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Patrick Debois
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-06 00:00:00 Z
+date: 2013-02-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -422,7 +422,6 @@ files:
 - lib/mccloud/ui.rb
 - lib/mccloud/util/platform.rb
 - lib/mccloud/util/rostruct.rb
-- lib/mccloud/util/rsync.rb
 - lib/mccloud/util/ssh.rb
 - lib/mccloud/util/sshkey.rb
 - lib/mccloud/version.rb

data/lib/mccloud/util/rsync.rb

@@ -1,25 +0,0 @@
-require "pty"
-module Mccloud
-  module Util
-    def self.rsync(path,vm,instance)
-      unless !File.exists?(path)
-        env.logger.info "[#{vm.name}] - rsyncing #{path}"
-        command="rsync  --exclude='.DS_Store' --exclude='.git' --exclude='.hg' --delete --delete-excluded  -az -e 'ssh -p 22 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i \"#{vm.private_key}\"' '#{path}/' '#{vm.user}@#{instance.public_ip_address}:/tmp/#{File.basename(path)}/'"
-      else
-        raise Mccloud::Error, "[#{vm.name}] - rsync error: #{path} does no exist"
-      end
-    begin
-      PTY.spawn( command ) do |r, w, pid|
-        begin
-          r.each { |line| print line;}
-       rescue Errno::EIO
-       end
-     end
-   rescue PTY::ChildExited => e
-      puts "The child process exited!"
-         end
-      #Kernel.exec(command)
-    end
-  end
-end
-