veewee 0.3.0.beta1 → 0.3.0.beta2

data/README.md

@@ -11,18 +11,18 @@ Besides building Vagrant boxes, veewee can also be used for:
 
 Before you start read through:
 
-- the [requirements](veewee/tree/master/doc/requirements.md)
-- the [installation](veewee/tree/master/doc/installation.md) procedure
+- the [requirements](https://github.com/jedi4ever/veewee/tree/master/doc/requirements.md)
+- the [installation](https://github.com/jedi4ever/veewee/tree/master/doc/installation.md) procedure
 
 Depending on how you want to use veewee, read through one of the following guides: (**work in progres**)
 
-- [guide for vagrant](veewee/tree/master/doc/vagrant.md)
+- [guide for vagrant](https://github.com/jedi4ever/veewee/tree/master/doc/vagrant.md)
 
-- [guide for Virtualbox](veewee/tree/master/doc/vbox.md)
-- [guide for Vmware fusion](veewee/tree/master/doc/fusion.md)
-- [guide for KVM](veewee/tree/master/doc/kvm.md)
+- [guide for Virtualbox](https://github.com/jedi4ever/veewee/tree/master/doc/vbox.md)
+- [guide for Vmware fusion](https://github.com/jedi4ever/veewee/tree/master/doc/fusion.md)
+- [guide for KVM](https://github.com/jedi4ever/veewee/tree/master/doc/kvm.md)
 
-You can also look at the more detailed pages on each subject in the [documentation directory](veewee/tree/master/doc)
+You can also look at the more detailed pages on each subject in the [documentation directory](https://github.com/jedi4ever/veewee/tree/master/doc)
 
 People have reported good experiences, why don't you give it a try?
 

data/Rakefile

@@ -42,20 +42,39 @@ task :iso, [:template_name] do |t,args|
       response = nil
       while found==false
         uri=URI.parse(url)
-        Net::HTTP.start(uri.host,uri.port) {|http|
-          response = http.head(uri.path)
-        }
-        unless response['location'].nil?
-          #puts "Redirecting to "+response['location']
-          url=response['location']
-        else
-          found=true
+        if uri.is_a?(URI::HTTP)
+          Net::HTTP.start(uri.host,uri.port) {|http|
+            response = http.head(uri.path)
+          }
+          unless response['location'].nil?
+            #puts "Redirecting to "+response['location']
+            url=response['location']
+          else
+            length=response['content-length']
+            found=true
+          end
+        elsif uri.is_a?(URI::FTP)
+          require 'net/ftp'
+          ftp = Net::FTP.new(uri.host)
+          ftp.login
+          begin
+            length = ftp.size(uri.path)
+            found = true
+          rescue Net::FTPReplyError => e
+            reply = e.message
+            err_code = reply[0,3].to_i
+            unless err_code == 500 || err_code == 502
+              # other problem, raise
+              raise "Got ftp site but doesn't support size subcommand"
+            end
+            # fallback solution 
+          end
+
         end
       end
-      length=response['content-length']
       if length.to_i < 10000
         puts definition.iso_src
-        p response['content-type']
+        puts "Incorrect length #{length.to_i}"
         puts uri.host,uri.port, uri.path,response.code
       end
     rescue Exception => ex

data/bin/veewee

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+begin
+  require 'rubygems'
+rescue LoadError
+end
+
 require 'veewee'
 
 env = Veewee::Environment.new

data/doc/vagrant.md

@@ -17,7 +17,7 @@ this is essentially making a copy based on the  templates provided above.
 
     Veewee::Definition.declare( {
     :cpu_count => '1', :memory_size=> '256', 
-    :disk_size => '10140', :disk_format => 'VDI',
+    :disk_size => '10140', :disk_format => 'VDI', :disk_variant => 'Standard',
     :os_type_id => 'Ubuntu',
     :iso_file => "ubuntu-10.10-server-i386.iso", 
     :iso_src => "http://releases.ubuntu.com/maverick/ubuntu-10.10-server-i386.iso",
@@ -104,7 +104,7 @@ I suggest the easiest way is to get an account on github and fork of the veewee
 
 If you don't use rvm, be sure to execute vagrant through bundle exec
 
-    $ alias vagrant="bundle exec vagrant"
+    $ alias veewee="bundle exec veewee"
 
 Start of an existing one
 

data/lib/veewee/command/fusion.rb

@@ -81,6 +81,7 @@ module Veewee
 
       desc "validate [NAME]", "Validates a box against vmfusion compliancy rules"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      method_option :tags, :type => :array , :default => %w{vmfusion puppet chef}, :aliases => "-t", :desc => "tags to validate"
       def validate(box_name)
         venv=Veewee::Environment.new(options)
         venv.ui=env.ui

data/lib/veewee/command/kvm.rb

@@ -82,6 +82,7 @@ module Veewee
 
       desc "validate [NAME]", "Validates a box against kvm compliancy rules"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      method_option :tags,:type => :array , :default => %w{kvm puppet chef}, :aliases => "-t", :desc => "tags to validate"
       def validate(box_name)
         venv=Veewee::Environment.new(options)
         venv.ui=env.ui

data/lib/veewee/command/parallels.rb

@@ -79,6 +79,7 @@ module Veewee
 
       desc "validate [NAME]", "Validates a box against parallels compliancy rules"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      method_option :tags,:type => :array, :default => %w{parallels puppet chef}, :aliases => "-t", :desc => "tags to validate"
       def validate(box_name)
         venv=Veewee::Environment.new(options)
         venv.ui=env.ui

data/lib/veewee/command/vagrant/validate.rb

@@ -5,7 +5,9 @@ module Veewee
     module Vagrant
       class Validate < ::Vagrant::Command::Base
         def execute
-          options = {}
+          options = {
+            'tags' => %w{vagrant puppet chef virtualbox}
+          }
 
           opts = OptionParser.new do |opts|
             opts.banner = "Validates a box against vagrant compliancy rules"
@@ -16,8 +18,8 @@ module Veewee
               options['debug'] = d
             end
 
-            opts.on("-f", "--force", "force overwrite") do |f|
-              options['force'] = f
+            opts.on("-t", "--tags vagrant,puppet,chef", Array, "tags to validate") do |t|
+              options['tags'] = t
             end
 
           end

data/lib/veewee/command/vbox.rb

@@ -114,6 +114,7 @@ module Veewee
 
       desc "validate [NAME]", "Validates a box against vagrant compliancy rules"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      method_option :tags, :type => :array , :default => %w{vagrant virtualbox puppet chef}, :aliases => "-t", :desc => "tags to validate"
       def validate(box_name)
         begin
         venv=Veewee::Environment.new(options)

data/lib/veewee/config/ostypes.yml

@@ -112,7 +112,7 @@ FreeBSD:
 FreeBSD_64:
   :fusion: FreeBSD_64
   :kvm:
-  :vbox: FreeBSD-64
+  :vbox: FreeBSD_64
   :parallels: freebsd
 Oracle:
   :fusion: oraclelinux
@@ -134,6 +134,16 @@ Debian_64:
   :kvm:
   :vbox: Debian_64
   :parallels: debian
+Debian6:
+  :fusion: debian6
+  :kvm:
+  :vbox: Debian
+  :parallels: debian
+Debian6_64:
+  :fusion: debian6-64
+  :kvm:
+  :vbox: Debian_64
+  :parallels: debian
 Gentoo:
   :fusion: other26xlinux
   :kvm:
@@ -179,7 +189,27 @@ RedHat_64:
   :kvm:
   :vbox: RedHat_64
   :parallels: redhat
-Centos4:
+RedHat5:
+  :fusion: rhel5
+  :kvm:
+  :vbox: RedHat
+  :parallels: redhat
+RedHat5_64:
+  :fusion: rhel5-64
+  :kvm:
+  :vbox: RedHat_64
+  :parallels: redhat
+RedHat6:
+  :fusion: rhel6
+  :kvm:
+  :vbox: RedHat
+  :parallels: redhat
+RedHat6_64:
+  :fusion: rhel6-64
+  :kvm:
+  :vbox: RedHat_64
+  :parallels: redhat
+Centos:
   :fusion: centos
   :kvm:
   :vbox: RedHat
@@ -219,6 +249,10 @@ SUSE_64:
   :kvm:
   :vbox: OpenSUSE_64
   :parallels: suse
+SLES11:
+  :fusion: sles11
+SLES11_64:
+  :fusion: sles11-64
 Fedora:
   :fusion: fedora
   :kvm:

data/lib/veewee/definition.rb

@@ -11,7 +11,7 @@ module Veewee
     attr_accessor :path
 
     attr_accessor :cpu_count,:memory_size,:iso_file
-    attr_accessor :disk_size, :disk_format
+    attr_accessor :disk_size, :disk_format, :disk_variant
 
     attr_accessor :os_type_id
 
@@ -72,7 +72,7 @@ module Veewee
       @postinstall_files=[]; @postinstall_timeout = 10000;
 
       @iso_file=""
-      @disk_size = '10240'; @disk_format = 'VDI'
+      @disk_size = '10240'; @disk_format = 'VDI'; @disk_variant = 'Standard'
 
       #        :hostiocache => 'off' ,
       #        :os_type_id => 'Ubuntu',

data/lib/veewee/environment.rb

@@ -80,7 +80,9 @@ module Veewee
 
       # We need to set this variable before the first call to the logger object
       if options.has_key?("debug")
-        ENV['VEEWEE_LOG']="STDOUT"
+        if options["debug"] == true
+          ENV['VEEWEE_LOG']="STDOUT"
+        end
       end
 
       logger.info("environment") { "Environment initialized (#{self})" }

data/lib/veewee/provider/core/box.rb

@@ -13,6 +13,7 @@ require 'veewee/provider/core/box/sudo'
 require 'veewee/provider/core/box/ssh'
 require 'veewee/provider/core/box/issh'
 require 'veewee/provider/core/box/floppy'
+require 'veewee/provider/core/box/validate_tags'
 
 module Veewee
   module Provider
@@ -21,6 +22,7 @@ module Veewee
         attr_accessor :definition
         attr_accessor :env
         attr_accessor :name
+        attr_accessor :provider
 
         include ::Veewee::Provider::Core::Helper::Tcp
         include ::Veewee::Provider::Core::Helper::Web

data/lib/veewee/provider/core/box/build.rb

@@ -70,7 +70,7 @@ module Veewee
           # This needs to be done after the kickstart:
           # As the dhcp request will likely occur just before the kickstart fetch
           until !self.ip_address.nil?
-            env.logger.info "wait for Ip addres"
+            env.logger.info "wait for Ip address"
             sleep 2
           end
 
@@ -119,7 +119,7 @@ module Veewee
           unless options["postinstall_exclude"].nil?
             options["postinstall_exclude"].each do |p|
               env.logger.info "Exclude pattern #{p}"
-              new_definition.postinstall_files.collect! { |f| f.match(p) ? f.gsub(/^/,"_"): f}
+              new_definition.postinstall_files.reject! { |f| f.match(p) }
             end
           end
 

data/lib/veewee/provider/core/box/scp.rb

@@ -10,7 +10,7 @@ module Veewee
             new_options=ssh_options.merge(options)
             self.when_ssh_login_works(self.ip_address,new_options) do
               begin
-                env.logger.info "About to transfer #{localfile} to #{remotefile} to the box #{name} - #{self.ip_address} - #{new_options}"
+                env.logger.info "About to transfer #{localfile} to #{remotefile} to the box #{name} - #{self.ip_address} - #{new_options.inspect}"
                 self.ssh_transfer_file(self.ip_address,localfile,remotefile,new_options)
               rescue RuntimeError => ex
                 ui.error("Error transfering file #{localfile} failed, possible not enough permissions to write? #{ex}",:prefix => false)

data/lib/veewee/provider/core/box/validate_tags.rb

@@ -0,0 +1,58 @@
+module Veewee
+  module Provider
+    module Core
+      module BoxCommand
+
+        def validate_tags(tags,options)
+
+          unless self.exists?
+            ui.error "Error:: You tried to validate box '#{name}' but it does not exit"
+            exit -1
+          end
+
+          unless self.running?
+            ui.error "Error:: You tried to validate box '#{name}' but it is not running"
+            exit -1
+          end
+
+          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']=@provider.name
+
+          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation","veewee.feature")
+
+          features=Array.new
+          features[0]=feature_path
+          features << "--tags"
+          features << tags.map {|t| "@#{t}"}.join(',')
+
+          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
+            ui.error("#{e.message} (#{e.class})")
+            ui.error(e.backtrace.join("\n"))
+            Kernel.exit(1)
+          end
+
+        end
+      end #Module
+
+    end #Module
+  end #Module
+end #Module

data/lib/veewee/provider/core/provider.rb

@@ -35,6 +35,11 @@ module Veewee
 
             # Get a real box object from the Provider
             box=Object.const_get("Veewee").const_get("Provider").const_get(type.to_s.capitalize).const_get("Box").new(name,env)
+
+            # Attach the provider to the box
+            box.provider = self
+
+            return box
           rescue Error => ex
             ui.error "Could not instante the box #{name} with provider #{type} ,#{ex}"
             raise

data/lib/veewee/provider/kvm/box/create.rb

@@ -21,8 +21,8 @@ module Veewee
             :memory_size => definition.memory_size.to_i*1024,
             :cpus => definition.cpu_count.to_i,
             :volume_capacity => "#{definition.disk_size}M",
-            :network_interface_type => "nat",
             :domain_type => options['use_emulation'] ? 'qemu': 'kvm',
+            :network_interface_type => "network",
             :iso_file => definition.iso_file,
             :arch => definition.os_type_id.end_with?("_64") ? "x86_64" : "i686",
             :iso_dir => env.config.veewee.iso_dir
@@ -64,7 +64,7 @@ module Veewee
           # Get the raw xml of the changed document
           new_xml=domain_doc.to_xml
 
-          # Undefine the existing domain 
+          # Undefine the existing domain
           s.undefine
 
           # Re-define the domain

data/lib/veewee/provider/kvm/box/helper/console_type.rb

@@ -8,9 +8,9 @@ module Veewee
       module BoxCommand
         # Type on the console
         def console_type(sequence,type_options={})
-          vnc_port=@connection.servers.all(:name => name).first.vnc_port
-          display_port=vnc_port.to_i - 5900
-          ui.success "Sending keystrokes to VNC port :#{display_port} - TCP port: #{vnc_port}"
+          tcp_port=@connection.servers.all(:name => name).first.display[:port]
+          display_port=tcp_port.to_i - 5900
+          ui.success "Sending keystrokes to VNC port :#{display_port} - TCP port: #{tcp_port}"
           vnc_type(sequence,"127.0.0.1",display_port)
         end
 

data/lib/veewee/provider/kvm/box/helper/ip.rb

@@ -3,8 +3,8 @@ module Veewee
     module Kvm
       module BoxCommand
         def ip_address
-          ip=@connection.servers.all(:name => "#{name}").first.addresses[:public]
-          return ip.first unless ip.nil?
+          ip=@connection.servers.all(:name => "#{name}").first.public_ip_address
+          return [*ip].first unless ip.nil?
           return ip
         end
 

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

@@ -15,11 +15,11 @@ module Veewee
         end
 
         def exists_volume?
-          !@connection.volumes.all(:name => "#{name}.img").nil?
+          @connection.list_volumes.find { |v| v[:name] == "#{name}.img" }
         end
 
         def exists_vm?
-          !@connection.servers.all(:name => name).nil?
+          @connection.list_domains.find { |d| d[:name] == name }
         end
 
       end # End Module

data/lib/veewee/provider/kvm/box/validate_kvm.rb

@@ -4,40 +4,8 @@ module Veewee
       module BoxCommand
 
         def validate_kvm(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']="kvm"
-
-          feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation","veewee.feature")
-
-          features=Array.new
-          features[0]=feature_path
-          features[1]="--tags"
-          features[2]="@kvm"
-
-          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
-            ui.error("#{e.message} (#{e.class})")
-            ui.error(e.backtrace.join("\n"))
-            Kernel.exit(1)
-          end
+          validate_tags( [ 'vbox', 'puppet', 'chef'],options)
 
         end
       end #Module