veewee 0.3.0.alpha4 → 0.3.0.alpha5

data/lib/veewee/provider/vmfusion/box/helper/ssh_options.rb

@@ -0,0 +1,20 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        # Translate the definition ssh options to ssh options that can be passed to Net::Ssh calls
+        def ssh_options
+          ssh_options={
+            :user => definition.ssh_user,
+            :port => 22,
+            :password => definition.ssh_password,
+            :timeout => definition.ssh_login_timeout.to_i
+          }
+          return ssh_options
+        end
+
+      end
+    end
+  end
+end

data/lib/veewee/provider/vmfusion/box/helper/status.rb

@@ -0,0 +1,20 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        # Check if box is running
+        def running?
+          return false if raw.nil?
+          return raw.running?
+        end
+
+        # Check if the box already exists
+        def exists?
+          return raw.exists?
+        end
+
+      end
+    end
+  end
+end

data/lib/veewee/provider/vmfusion/box/helper/vnc.rb

@@ -0,0 +1,61 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        def vnc_port
+           lines=File.readlines(raw.vmx_path)
+           matches=lines.grep(/^RemoteDisplay.vnc.port/)
+           if matches.length==0
+              raise Veewee::Error,"No VNC port found, maybe it is not enabled?"
+           else
+              value=matches.first.split("\"")[1].to_i
+              return value
+           end
+        end
+
+        # This tries to guess a port for the VNC Display
+        def guess_vnc_port
+          min_port=5920
+          max_port=6000
+          guessed_port=nil
+
+          for port in (min_port..max_port)
+            unless is_tcp_port_open?("127.0.0.1", port)
+              guessed_port=port
+              break
+            end
+          end
+
+          if guessed_port.nil?
+            env.ui.info "No free VNC port available: tried #{min_port}..#{max_port}"
+            exit -1
+          else
+            env.ui.info "Found VNC port #{guessed_port} available"
+          end
+
+          return guessed_port
+        end
+
+        def vnc_display_port
+          self.vnc_port - 5900
+        end
+
+        def vnc_enabled?
+           lines=File.readlines(raw.vmx_path)
+           matches=lines.grep(/^RemoteDisplay.vnc.enabled/)
+           if matches.length==0
+              return false
+           else
+              if matches.first.split("\"")[1].downcase == 'true'
+                return true
+              else
+                return false
+              end
+           end
+        end
+
+      end
+    end
+  end
+end

data/lib/veewee/provider/vmfusion/box/poweroff.rb

@@ -0,0 +1,13 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        def poweroff(options={})
+          raw.halt unless raw.nil?
+        end
+
+      end
+    end
+  end
+end

data/lib/veewee/provider/vmfusion/box/ssh.rb

@@ -0,0 +1,12 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        def ssh(command,options)
+          super(command,options)
+        end
+      end
+    end
+  end
+end

data/lib/veewee/{builder/vmfusion/helper → provider/vmfusion/box}/template.rb

@@ -1,10 +1,9 @@
 require 'erb'
 
 module Veewee
-  module Builder
+  module Provider
     module Vmfusion
-
-      module BoxHelper
+      module BoxCommand
       class ErbBinding < OpenStruct
         def get_binding
           return binding()
@@ -14,14 +13,20 @@ module Veewee
       def vmx_template(definition)
         # We only want specific variables for ERB
 
+        floppy_path=nil
+        unless definition.floppy_files.nil?
+          floppy_path=File.join(definition.path,'virtualfloppy.img')
+        end
+
         data = {
           :cpu_count => definition.cpu_count, :memory_size => definition.memory_size,
           :controller_type => "lsilogic",
           :fusion_os_type => definition.os_type_id,
+          :floppyfile => floppy_path,
           :mac_addres => "auto generated",
           :iso_file => "#{File.join(env.config.veewee.iso_dir,definition.iso_file)}",
           :box_name => name,
-          :vnc_port => vnc_port
+          :vnc_port => guess_vnc_port
         }
 
         vars = ErbBinding.new(data)

data/lib/veewee/{builder/vmfusion/helper → provider/vmfusion/box}/template.vmx.erb

@@ -38,7 +38,10 @@ powerType.powerOff = "soft"
 powerType.powerOn = "soft"
 powerType.suspend = "soft"
 powerType.reset = "soft"
-floppy0.present = "FALSE"
+<% if floppyfile.nil? %>floppy0.present = "FALSE" <% else %>floppy0.present = "TRUE"
+floppy0.fileType = "file"
+floppy0.fileName = "<%= floppyfile %>"
+floppy0.clientDevice = "FALSE"<% end %>
 extendedConfigFile = "<%= box_name %>.vmxf"
 checkpoint.vmState = ""
 #uuid.location = "56 4d 7a 3a bb 23 52 50-d4 b3 d3 46 6e f3 aa 63"
@@ -78,4 +81,4 @@ ethernet0.bsdName = "en0"
 ethernet0.displayName = "Ethernet"
 sound.startConnected = "FALSE"
 RemoteDisplay.vnc.enabled = "TRUE"
-RemoteDisplay.vnc.port = "<%= vnc_port %>"
+RemoteDisplay.vnc.port = "<%= vnc_port %>"

data/lib/veewee/provider/vmfusion/box/up.rb

@@ -0,0 +1,18 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        def up(options={})
+          gui_enabled=options[:nogui]==true ? false : true
+          if gui_enabled
+            raw.start unless raw.nil?
+          else
+            raw.start({:headless => true}) unless raw.nil?
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/veewee/provider/vmfusion/box/validate_vmfusion.rb

@@ -0,0 +1,47 @@
+module Veewee
+  module Provider
+    module Vmfusion
+      module BoxCommand
+
+        def validate_vmfusion(options)
+          require 'cucumber'
+
+          require 'cucumber/rspec/disable_option_parser'
+          require 'cucumber/cli/main'
+
+          # Passing ssh options via ENV varialbles to cucumber
+          # VEEWEE_SSH_USER, VEEWEE_SSH_PASSWORD ,VEEWEE_SSH_PORT
+          cucumber_vars=ssh_options
+          cucumber_vars.each do |key,value|
+            ENV['VEEWEE_'+key.to_s.upcase]=cucumber_vars[key].to_s
+          end
+
+          # Pass the name of the box
+          ENV['VEEWEE_BOXNAME']=@name
+          ENV['VEEWEE_PROVIDER']="vmfusion"
+
+          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation","veewee.feature")
+
+          features=Array.new
+          features[0]=feature_path
+          features[1]="--tags"
+          features[2]="@vmfusion"
+
+          begin
+            # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
+            failure = Cucumber::Cli::Main.execute(features.dup)
+            Kernel.exit(failure ? 1 : 0)
+          rescue SystemExit => e
+            Kernel.exit(e.status)
+          rescue Exception => e
+            env.ui.error("#{e.message} (#{e.class})")
+            env.ui.error(e.backtrace.join("\n"))
+            Kernel.exit(1)
+          end
+
+        end
+      end #Module
+
+    end #Module
+  end #Module
+end #Module

data/lib/veewee/provider/vmfusion/provider.rb

@@ -0,0 +1,20 @@
+require 'veewee/provider/core/provider'
+
+module Veewee
+  module Provider
+    module Vmfusion
+      class Provider < Veewee::Provider::Core::Provider
+
+        #include ::Veewee::Provider::Vmfusion::ProviderCommand
+
+        def check_requirements
+          unless File.exists?("/Library/Application Support/VMware Fusion/vmrun")
+            raise Veewee::Error,"The file /Library/Application Support/VMware Fusion/vmrun does not exists. Probably you don't have Vmware fusion installed"
+          end
+        end
+
+
+      end #End Class
+    end # End Module
+  end # End Module
+end # End Module

data/lib/veewee/providers.rb

@@ -0,0 +1,31 @@
+module Veewee
+
+    class Providers
+      def initialize(env)
+        @env=env
+        @providers=Hash.new
+      end
+
+      def [](name)
+             return @providers[name] if @providers.has_key?(name)
+
+             begin
+               require_path='veewee/provider/'+name.to_s.downcase+"/provider"
+               require require_path
+
+               provider=Object.const_get("Veewee").const_get("Provider").const_get(name.to_s.capitalize).const_get("Provider").new(name,{},@env)
+
+               @providers[name]=provider
+             rescue ::Veewee::Error => e
+                raise
+             rescue Error => e
+               env.ui.error "Error loading provider with #{name},#{$!}"
+             end
+      end
+
+      def length
+        @providers.length
+      end
+
+  end
+end #Module Veewee

data/lib/veewee/template.rb

@@ -0,0 +1,26 @@
+module Veewee
+  class Template
+
+    attr_accessor :env
+
+    attr_reader :name,:path
+
+    def initialize(name,path,env)
+      @name=name
+      @path=path
+      @env=env
+      return self
+    end
+
+    def exists?
+      filename=Dir.glob("#{path}/definition.rb")
+      if filename.length!=0
+          env.logger.debug("[Template] template '#{name}' is valid")
+          return true
+      else
+        return false
+      end
+    end
+
+  end
+end

data/lib/veewee/templates.rb

@@ -0,0 +1,71 @@
+module Veewee
+  class Templates
+
+    attr_accessor :env
+
+    def initialize(env)
+      @env=env
+      return self
+    end
+
+    def [](name)
+      result=nil
+      valid_paths(env.template_path).each do |template_dir|
+        template=Veewee::Template.new(name,File.join(template_dir,name),@env)
+        if template.exists?
+          result=template
+          return result
+        else
+          return nil
+        end
+      end
+    end
+
+    # Fetch all Templates
+    def each(&block)
+      templates=Hash.new
+
+      valid_paths(env.template_path).each do |template_dir|
+
+        env.logger.debug("[Template] Searching #{template_dir} for templates")
+
+        subdirs=Dir.glob("#{template_dir}/*")
+        subdirs.each do |sub|
+          if File.directory?("#{sub}")
+            name=sub.sub(/#{template_dir}\//,'')
+            template=Veewee::Template.new(name,sub,@env)
+            if template.exists?
+                env.logger.debug("[Template] template '#{name}' found")
+              templates[name]=template
+            end
+          end
+        end
+      end
+
+      if templates.length==0
+        env.logger.debug("[Template] no templates found") 
+      end
+
+      templates.each(&block)
+    end
+
+    private
+    # Traverses path to see which exist or not
+    # and checks if available
+    def valid_paths(paths)
+      valid_paths=paths.collect { |path|
+        if File.exists?(path) && File.directory?(path)
+          env.logger.info "Path #{path} exists"
+          File.expand_path(path)
+        else
+          env.logger.info "Path #{path} does not exist, skipping"
+          nil
+        end
+      }
+      return valid_paths.compact
+    end
+
+
+
+  end
+end

data/lib/veewee/ui.rb

@@ -2,7 +2,7 @@ module Veewee
 
   # Vagrant UIs handle communication with the outside world (typically
   # through a shell). They must respond to the typically logger methods
-  # of `warn`, `error`, `info`, and `confirm`.
+  # of `warn`, `error`, `info`, and `success`.
   class UI
     attr_accessor :env
 
@@ -10,8 +10,10 @@ module Veewee
       @env = env
     end
 
-    [:warn, :error, :info, :confirm].each do |method|
-      define_method(method) do |message|
+    [:warn, :error, :info, :success].each do |method|
+      define_method(method) do |message, *argv|
+        opts , *argv = argv
+        opts ||= {}
         # Log normal console messages
         env.logger.info("ui") { message }
       end
@@ -31,7 +33,7 @@ module Veewee
         @shell = shell
       end
 
-      [[:warn, :yellow], [:error, :red], [:info, nil], [:confirm, :green]].each do |method, color|
+      [[:warn, :yellow], [:error, :red], [:info, nil], [:success, :green]].each do |method, color|
         class_eval <<-CODE
           def #{method}(message, opts=nil)
             super(message)

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.3.0.alpha4"
+  ::Veewee::VERSION="0.3.0.alpha5"
 end