vagrant-vmpooler 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0d88612ba343bb8bccc2c7c5b864801457a39b
-  data.tar.gz: 0de7d735dbf5d48e145eff3e687f7ce5eee0bb28
+  metadata.gz: 5d940e98cf20dcaf718a7e09499790febb1a0b7a
+  data.tar.gz: 70a13319df7418a492acf928e29634fb36bc1786
 SHA512:
-  metadata.gz: a7f8a5b26259e0f6c1821bc19e3a84b4c498a5c38456a895f5cc564682b741160eb2781b180ebb8de4e704019350583fdef6ecee7b63e4b7304cf3785916bab5
-  data.tar.gz: 02068a5799c0ffe62d050e43fd4fc4cd66bca0b922fadb393f9f3eb0fb2637700b6e3615c6258fa9f4389f6b70c0a588c168b44e7e9822da5221fffebb5546a6
+  metadata.gz: abfd2fae9e113fb6e77155dbb4bc0ba665a41aa3cdd29a2089e6bb1a67cb58943756b43d86e20891b42ddff67e31463f1ffaec4e11e5422b5313de8b1a2236b2
+  data.tar.gz: 2f2921074f9814b701dc077d41e1135a8caed95800a1b5a7d1985f486974977ca3dc6eba563b8fff08ee5f5af72c8c27ea405cf65589e0cbe30343086873ea8b

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "vmfloaty", "0.5.0"
+gem "vmfloaty", "0.6.0"
 
 group :development do
   gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"

data/README.md

@@ -21,7 +21,7 @@ To quickly get started, install the vagrant plugin with the command below. Then
 ```
 $ vagrant plugin install vagrant-vmpooler
 ...
-$ vagrant box add dummy https://github.com/briancain/vagrant-vmpooler/blob/master/example_box/dummy.box
+$ vagrant box add dummy https://github.com/briancain/vagrant-vmpooler/raw/master/example_box/dummy.box
 ...
 $ vagrant up --provider=vmpooler
 ...
@@ -44,8 +44,7 @@ SCRIPT
 Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
 
-  # vagrant-vmpooler already assumes you are root
-  config.vm.provision :shell, :inline => provision_script, privileged: false
+  config.vm.provision :shell, :inline => provision_script
 
   config.vm.provider :vmpooler do |vmpooler|
     vmpooler.os = "centos-7-x86_64"

data/example_box/Vagrantfile

@@ -4,14 +4,12 @@
 # Provisioning script
 provision_script = <<SCRIPT
 #!/bin/bash
-echo "Hello there" > ~/hi.txt
+sudo echo "Hello there" > ~/hi.txt
 SCRIPT
 
 Vagrant.configure("2") do |config|
   config.vm.box = "dummy"
-
-  # vagrant-vmpooler already assumes you are root
-  config.vm.provision :shell, :inline => provision_script, privileged: false
+  config.vm.provision :shell, :inline => provision_script
 
   config.vm.provider :vmpooler do |vmpooler|
     vmpooler.os = "centos-7-x86_64"

data/lib/vagrant-vmpooler/action/delete_server.rb

@@ -33,6 +33,9 @@ module VagrantPlugins
             response_body = Pooler.delete(verbose, url, os, token)
 
             if response_body[id]['ok'] == false
+              # the only way this can happen is if the vm existed at one point
+              # but got deleted from vmpoolers redis db. We should probably
+              # still delete it from vagrants internal state if this is true
               env[:ui].info(I18n.t("vagrant_vmpooler.not_deleted"))
             else
               env[:ui].info(I18n.t("vagrant_vmpooler.deleted"))

data/lib/vagrant-vmpooler/action/disable_tty.rb

@@ -0,0 +1,25 @@
+
+module VagrantPlugins
+  module Vmpooler
+    module Action
+      class DisableTty
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant_vmpooler::action::disable_tty")
+        end
+
+        def call(env)
+          ssh_info = env[:machine].ssh_info
+          os_flavor = env[:machine].provider_config.os
+          disable_tty_command = "sed -i 's/^Defaults\s*requiretty/#Defaults requiretty/' /etc/sudoers"
+          # i18n
+          env[:ui].info(I18n.t("vagrant_vmpooler.disable_tty"))
+
+          env[:machine].communicate.execute(disable_tty_command, :error_check => true)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-vmpooler/action.rb

@@ -89,6 +89,7 @@ module VagrantPlugins
               b1.use action_prepare_boot
               b1.use CreateServer
               b1.use SetupRsync
+              b1.use DisableTty
             else
               b1.use action_resume
             end
@@ -207,6 +208,7 @@ module VagrantPlugins
       autoload :TakeSnapshot, action_root.join("take_snapshot")
       autoload :WaitForState, action_root.join("wait_for_state")
       autoload :SetupRsync, action_root.join("setup_rsync")
+      autoload :DisableTty, action_root.join("disable_tty")
     end
   end
 end

data/lib/vagrant-vmpooler/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vmpooler
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/locales/en.yml

@@ -1,5 +1,7 @@
 en:
   vagrant_vmpooler:
+    disable_tty: |-
+      Disabling tty...
     install_rsync: |-
       Installing rsync...
     not_supported: |-

data/vagrant-vmpooler.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary       = "Enables Vagrant to manage machines in vmpooler."
   s.description   = "Enables Vagrant to manage machines in vmpooler."
 
-  s.add_runtime_dependency "vmfloaty", ">= 0.5.0"
+  s.add_runtime_dependency "vmfloaty", ">= 0.6.0"
 
   s.add_development_dependency "rspec-its"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vmfloaty
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +57,7 @@ files:
 - lib/vagrant-vmpooler/action.rb
 - lib/vagrant-vmpooler/action/create_server.rb
 - lib/vagrant-vmpooler/action/delete_server.rb
+- lib/vagrant-vmpooler/action/disable_tty.rb
 - lib/vagrant-vmpooler/action/hard_reboot_server.rb
 - lib/vagrant-vmpooler/action/is_created.rb
 - lib/vagrant-vmpooler/action/is_paused.rb