vagrant-fabric 0.1.0 → 0.2.0

data/lib/vagrant-fabric/config.rb

@@ -5,12 +5,18 @@ module VagrantPlugins
       attr_accessor :fabric_path
       attr_accessor :python_path
       attr_accessor :tasks
+      attr_accessor :remote
+      attr_accessor :remote_install
+      attr_accessor :remote_password
 
       def initialize
         @fabfile_path = UNSET_VALUE
-        @fabric_path  = UNSET_VALUE
-        @python_path  = UNSET_VALUE
-        @tasks        = UNSET_VALUE
+        @fabric_path = UNSET_VALUE
+        @python_path = UNSET_VALUE
+        @tasks = UNSET_VALUE
+        @remote = UNSET_VALUE
+        @remote_install = UNSET_VALUE
+        @remote_password = UNSET_VALUE
       end
 
       def finalize!
@@ -18,6 +24,9 @@ module VagrantPlugins
         @fabric_path = "fab" if @fabric_path == UNSET_VALUE
         @python_path = "python" if @python_path == UNSET_VALUE
         @tasks = [] if @tasks == UNSET_VALUE
+        @remote = false if @remote == UNSET_VALUE
+        @remote_install = false if @remote_install == UNSET_VALUE
+        @remote_password = "vagrant" if @remote_password == UNSET_VALUE
       end
 
       def execute(command)
@@ -34,26 +43,33 @@ module VagrantPlugins
       end
 
       def validate(env)
-        errors = _detected_errors
+        if not @remote == true
+          errors = _detected_errors
 
-        errors << "fabfile does not exist." if not File.exist?(fabfile_path)
+          errors << "fabfile does not exist." if not File.exist?(fabfile_path)
 
-        command = "#{fabric_path} -V"
-        output = execute(command)
-        errors << "fabric command does not exist." if not output
+          install_fabric if @remote == true and @install == true
 
-        command = "#{fabric_path} -f #{fabfile_path} -l"
-        output = execute(command)
-        errors << "#{fabfile_path} could not recognize by fabric." if not $?.success?
+          command = "#{fabric_path} -V"
+          output = execute(command)
+          errors << "fabric command does not exist." if not output
 
-        for task in tasks
-          task = task.split(':').first
-          command = "#{fabric_path} -f #{fabfile_path} -d #{task}"
+          command = "#{fabric_path} -f #{fabfile_path} -l"
           output = execute(command)
-          errors << "#{task} task does not exist." if not $?.success?
+          errors << "#{fabfile_path} could not recognize by fabric." if not $?.success?
+
+          for task in tasks
+            task = task.split(':').first
+            command = "#{fabric_path} -f #{fabfile_path} -d #{task}"
+            output = execute(command)
+            errors << "#{task} task does not exist." if not $?.success?
+          end
+
+          {"fabric provisioner" => errors}
         end
+      end
 
-        { "fabric provisioner" => errors }
+      def install_fabric()
       end
     end
   end

data/lib/vagrant-fabric/provisioner.rb

@@ -2,12 +2,25 @@ module VagrantPlugins
   module Fabric
     class Provisioner < Vagrant.plugin("2", :provisioner)
       def provision
-        ssh_info = machine.ssh_info
+        ssh_info = @machine.ssh_info
         user = ssh_info[:username]
         host = ssh_info[:host]
         port = ssh_info[:port]
         private_key = ssh_info[:private_key_path]
-        system "#{config.fabric_path} -f #{config.fabfile_path} -i #{private_key} --user=#{user} --hosts=#{host} --port=#{port} #{config.tasks.join(' ')}"
+        if config.remote == false
+          system "#{config.fabric_path} -f #{config.fabfile_path} " +
+                "-i #{private_key} --user=#{user} --hosts=#{host} " +
+                "--port=#{port} #{config.tasks.join(' ')}"
+        else
+          if config.install
+            @machine.communicate.sudo("pip install fabric")
+            @machine.env.ui.info "Finished to install fabric library your VM."
+          end
+          @machine.communicate.execute("#{config.fabric_path} -f #{config.fabfile_path} " +
+              "--user=#{user} --hosts=127.0.0.1 --password=#{config.remote_password} " +
+              "#{config.tasks.join(' ')}")
+          @machine.env.ui.info"Finished to execute tasks of fabric."
+        end
       end
     end
   end

data/lib/vagrant-fabric/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Fabric
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/vagrant-fabric.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = VagrantPlugins::Fabric::VERSION
   spec.platform      = Gem::Platform::RUBY
   spec.authors       = ["Takahiro Fujiwara"]
-  spec.email         = ["wutali.no@gmail.com"]
+  spec.email         = ["email@wuta.li"]
   spec.homepage      = "http://blog.wuta.li"
   spec.description   = "Enables Vagrant to provision with python fabric script."
   spec.summary       = "Enables Vagrant to provision with python fabric script."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-fabric
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,7 +45,7 @@ dependencies:
         version: '0'
 description: Enables Vagrant to provision with python fabric script.
 email:
-- wutali.no@gmail.com
+- email@wuta.li
 executables: []
 extensions: []
 extra_rdoc_files: []