vagrant-libvirt 0.0.3 → 0.0.4

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 Vagrantfile
 !example_box/Vagrantfile
 .vagrant
+*.swp

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.4 (May 5, 2013)
+
+* Bug fix in number of parameters for provisioner.
+* Handle box URL when downloading a box.
+* Support for running ssh commands like `vagrant ssh -c "bash cli"`
+
 # 0.0.3 (Apr 11, 2013)
 
 * Cpu and memory settings for domains.
@@ -8,8 +14,8 @@
 # 0.0.2 (Apr 1, 2013)
 
 * Halt, suspend, resume, ssh and provision commands added.
-* IP address of VM is saved into $data_dir/ip file.
-* Provider can be set via VAGRANT_DEFAULT_PROVIDER env variable.
+* IP address of VM is saved into `$data_dir/ip` file.
+* Provider can be set via `VAGRANT_DEFAULT_PROVIDER` env variable.
 
 # 0.0.1 (Mar 26, 2013)
 

data/README.md

@@ -4,10 +4,10 @@ This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an
 [Libvirt](http://libvirt.org) provider to Vagrant, allowing Vagrant to
 control and provision machines via Libvirt toolkit.
 
-**Note:** Actual version (0.0.3) is still a development one. Feedback is
+**Note:** Actual version (0.0.4) is still a development one. Feedback is
 welcome and can help a lot :-)
 
-## Features (Version 0.0.3)
+## Features (Version 0.0.4)
 
 * Vagrant `up`, `destroy`, `suspend`, `resume`, `halt`, `ssh` and `provision` commands.
 * Upload box image (qcow2 format) to Libvirt storage pool.
@@ -140,21 +140,10 @@ Vagrant goes through steps below when creating new project:
 
 ## Networks
 
-Networking features in the form of `config.vm.network` are supported only
-in bridged format, no hostonly network is supported in current version of
+Networking features in the form of `config.vm.network` are not supported right
+now. Support for private network is planned to be added in next release of
 provider.
 
-Example of network interface definition:
-
-```ruby
-  config.vm.define :test_vm do |test_vm|
-    test_vm.vm.network :bridged, :bridge => "default", :adapter => 1
-  end
-```
-
-In example above, bridged network adapter connected to network `default` is
-defined.
-
 ## Obtaining Domain IP Address
 
 Libvirt doesn't provide standard way how to find out an IP address of running

data/lib/vagrant-libvirt/action/start_domain.rb

@@ -16,7 +16,12 @@ module VagrantPlugins
 
           domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain == nil
-          domain.start
+
+          begin
+            domain.start
+          rescue => e
+            raise Errors::FogError, :message => e.message
+          end
 
           @app.call(env)
         end

data/lib/vagrant-libvirt/action/timed_provision.rb

@@ -6,7 +6,10 @@ module VagrantPlugins
       # This is the same as the builtin provision except it times the
       # provisioner runs.
       class TimedProvision < Vagrant::Action::Builtin::Provision
-        def run_provisioner(env, p)
+        def run_provisioner(env, name, p)
+          env[:ui].info(I18n.t("vagrant.actions.vm.provision.beginning",
+                               :provisioner => name))
+
           timer = Util::Timer.time do
             super
           end

data/lib/vagrant-libvirt/action.rb

@@ -16,6 +16,7 @@ module VagrantPlugins
             if !env[:result]
               b2.use SetNameOfDomain
               b2.use HandleStoragePool
+              b2.use HandleBoxUrl
               b2.use HandleBoxImage
               b2.use CreateDomainVolume
               b2.use CreateDomain
@@ -221,6 +222,31 @@ module VagrantPlugins
         end
       end
 
+      # This is the action that will run a single SSH command.
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use ConnectLibvirt
+            b2.use Call, IsRunning do |env2, b3|
+              if !env2[:result]
+                b3.use MessageNotRunning
+                next
+              end
+
+              b3.use SSHRun
+            end
+          end
+
+        end
+      end
+
+
       action_root = Pathname.new(File.expand_path("../action", __FILE__))
       autoload :ConnectLibvirt, action_root.join("connect_libvirt")
       autoload :IsCreated, action_root.join("is_created")
@@ -231,6 +257,7 @@ module VagrantPlugins
       autoload :MessageNotRunning, action_root.join("message_not_running")
       autoload :MessageNotSuspended, action_root.join("message_not_suspended")
       autoload :HandleStoragePool, action_root.join("handle_storage_pool")
+      autoload :HandleBoxUrl, "vagrant/action/builtin/handle_box_url"
       autoload :HandleBoxImage, action_root.join("handle_box_image")
       autoload :SetNameOfDomain, action_root.join("set_name_of_domain")
       autoload :CreateDomainVolume, action_root.join("create_domain_volume")
@@ -247,6 +274,7 @@ module VagrantPlugins
       autoload :TimedProvision, action_root.join("timed_provision")
       autoload :WaitTillUp, action_root.join("wait_till_up")
       autoload :SyncFolders, action_root.join("sync_folders")
+      autoload :SSHRun,  "vagrant/action/builtin/ssh_run"
     end
   end
 end

data/lib/vagrant-libvirt/errors.rb

@@ -48,6 +48,10 @@ module VagrantPlugins
 
 
       # Fog libvirt exceptions
+      class FogError < VagrantLibvirtError
+        error_key(:fog_error)
+      end
+
       class FogLibvirtConnectionError < VagrantLibvirtError
         error_key(:fog_libvirt_connection_error)
       end

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Libvirt
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog