vgrnt 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a6d4695c381a141cfe79bc0e9e1f59a935b86f
-  data.tar.gz: 715132621d0eca3a4e2d56b9193fcabbd14c9c13
+  metadata.gz: 9ec9d0aba10f8e4965ff0be10e8734933faa88c0
+  data.tar.gz: a3434a03c3abe317c00a78cda479be664aa9e3cd
 SHA512:
-  metadata.gz: ff27c6d4a016745f9b270a37c3b4ead82389e309384065ed121b98bcf3b3c96251e2a2c300b7fc80f1cf746a4599b29387288eb4bac5d78b6661a0d62c6e725f
-  data.tar.gz: 1fbb99c60ba3c748d8921c8349e2a93cda9396b49f8fe1f1582a199acb1a8b2ba24bbf213694b50dfca267eb0faa25101090c918aebcdc6d74739f0647072f9e
+  metadata.gz: 1e73e399f049fbf2c68312e1b7ea5c55e9d22ae6dd21cc7f5cea59aba198d943493019014fe642ff4bfce9e9e6d14bff30d81bc9d6d8c70d90a24ee367ba88db
+  data.tar.gz: 6527718cba50263df9bafcf60aa40fed17f74eae4ea2c6d428b7383b2ceb4906503cb2f3e4eb045439de3623c03281676da206ed8a039ad3868a9d759044eaaf

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.0.4](https://github.com/dergachev/vagrant/compare/v0.0.3...v0.0.4) (Dec 3, 2013)
+
+BUGFIX:
+
+  - Fix `vgrnt ssh` hanging due to improper shellout technique.
+
+FEATURES:
+
+  - Added support for `vgrnt status`
+
+IMPROVEMENTS:
+
+  - Refactored codebase a bit
+  - Implemented acceptance tests (unit tests still non-existant)
+
 ## [0.0.3](https://github.com/dergachev/vagrant/compare/v0.0.2...v0.0.3) (Nov 12, 2013)
 
 FEATURES:

data/lib/vgrnt/base.rb

@@ -24,7 +24,7 @@ module Vgrnt
     end
   end
 
-  #  Undoes the automatic removal of -- in Thor::Options.peek. Otherwise "vgrnt ssh precise -- ls /" 
+  #  Undoes the automatic removal of -- in Thor::Options.peek. Otherwise "vgrnt ssh precise -- ls /"
   #  is parsed as "precise ls /". TODO: is there a less hacky way to handle this?
   class ::Thor::Options
     def peek
@@ -60,10 +60,10 @@ module Vgrnt
         if machine && machine[:state] == 'running'
           # found by running "VAGRANT_LOG=debug vagrant ssh"
           default_ssh_args = [
-            "vagrant@#{ssh_info[:ssh_ip]}", 
-            "-p", ssh_info[:ssh_port], 
-            "-o", "DSAAuthentication=yes", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", 
-            "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentitiesOnly=yes", 
+            "vagrant@#{ssh_info[:ssh_ip]}",
+            "-p", ssh_info[:ssh_port],
+            "-o", "DSAAuthentication=yes", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no",
+            "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentitiesOnly=yes",
             "-i", "~/.vagrant.d/insecure_private_key"
           ]
 
@@ -74,7 +74,14 @@ module Vgrnt
         end
       end
 
-      puts `#{ssh_command}`
+      # Using IO.popen is important:
+      # - POpen3 ignores STDIN. Backticks buffer stdout. Kernel::exec breaks rspec.
+      # - getc instead of gets fixes the 1 line lag.
+      IO.popen(ssh_command) do |io|
+        while c = io.getc do 
+          putc c
+        end
+      end
     end
 
     desc "ssh-config [vm-name]", "Store output of 'vagrant ssh-config' to .vgrnt-sshconfig"
@@ -151,7 +158,7 @@ module Vgrnt
         # TODO: handle substitution for commands like `usbfilter add 0 --target <uuid|name>`
 
         @logger.debug "Non-standard vboxmanage command detected (#{vboxmanage_subcommand}). Substituting 'VM_ID' for VM id."
-        
+
         # [VM_ID] is an optional literal token which will be replaced by the UUID of the VM referenced by Vagrant
         args.map! { |a| a == 'VM_UUID' ? machine[:id] : a }
         command = (["VBoxManage", vboxmanage_subcommand] + args).join(" ")

data/lib/vgrnt/util/vagrantfile.rb

@@ -1,37 +1,44 @@
-# TODO: test me
-
-$vagrant_config_vms = []
-
-module Vagrant
-  def self.configure(*args, &block)
-    yield Vgrnt::Util::Vagrantfile::Proxy.new
-  end
-end
-
 module Vgrnt
   module Util
     module Vagrantfile
-      class Proxy
-        def define(*args)
-          # $stderr.puts "Called define with args (#{args.join(", ")})"
-          $vagrant_config_vms << args.first
+
+      def self.defined_vms(path = nil)
+        Vagrant._eval_vagrantfile(path)
+      end
+
+      module Vagrant
+        def self._remove_named_arguments(source)
+          source = source.gsub(/([\s\(,])[a-zA-Z0-9_]+: ?/, '\1')
+          return source
         end
 
-        def method_missing(name, *args, &block)
-          return self
+        # eval Vagrantfile inside of Vgrnt::Util::Vagrantfile namespace
+        def self._eval_vagrantfile(path = nil)
+          # NOT THREAD SAFE (not sure how to do this given static methods)
+          @@vagrant_config_vms = []
+
+          vgrntfile_source = File.read(path || './Vagrantfile')
+          if RUBY_VERSION.to_f <= 1.8
+            vgrntfile_source = Vagrant::_remove_named_arguments(vgrntfile_source)
+          end
+          module_eval(vgrntfile_source)
+
+          @@vagrant_config_vms << :default if @@vagrant_config_vms.empty?
+          return @@vagrant_config_vms
+        end
+
+        def self.configure(*args, &block)
+          yield self
+        end
+
+        def self.define(*args)
+          @@vagrant_config_vms << args.first
         end
-      end
 
-      def self.defined_vms
-        # clear any previous value (else tests fail depending on exec order)
-        # NOT PARALLEL SAFE (not sure how to do this given static methods)
-        $vagrant_config_vms = []
-        load('./Vagrantfile')
-        # puts $vagrant_config_vms.inspect
-        if $vagrant_config_vms.empty?
-          $vagrant_config_vms << :default
+        # stub out anything else
+        def self.method_missing(*args)
+          return self
         end
-        return $vagrant_config_vms
       end
     end
   end

data/lib/vgrnt/version.rb

@@ -1,3 +1,3 @@
 module Vgrnt
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/acceptance/util_spec.rb

@@ -34,7 +34,7 @@ describe Vgrnt::Util::VirtualBox do
         expect(Vgrnt::Util::VirtualBox::showvminfo('vgrnt-test')).to include 'UUID'
       end
     end
-    
+
     describe "::runningMachines" do
       it 'ensure .vgrnt directory exists' do
         expect(in_vagrant_env { File.exists? '.vagrant' }).to be_true

data/spec/unit/fixtures/util_vagrantfile/Vagrantfile-misc1

@@ -0,0 +1,45 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# from https://github.com/tknerr/vagrant-managed-servers/blob/fa60145d9fca221092e81346e95624d49080e304/Vagrantfile
+
+# require plugin for testing via bundler
+Vagrant.require_plugin "vagrant-managed-servers"
+Vagrant.require_plugin "vagrant-omnibus"
+
+Vagrant.configure("2") do |config|
+
+  config.omnibus.chef_version = "11.4.4"
+
+  #
+  # fake a managed server by bringing up a virtualbox vm
+  #
+  config.vm.define :fake_managed_server do |fms_config|
+    fms_config.vm.box = "opscode_ubuntu-13.04_provisionerless"
+    fms_config.vm.box_url = "https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-13.04_provisionerless.box"
+  
+    fms_config.vm.network :private_network, ip: "33.33.77.35"
+  end
+
+  #
+  # configure managed provider to connect to `fake_managed_server`
+  #
+  config.vm.define :my_server do |ms_config|
+
+    ms_config.vm.box = "dummy"
+    ms_config.vm.box_url = "https://github.com/tknerr/vagrant-managed-servers/raw/master/dummy.box"
+  
+    ms_config.vm.provider :managed do |managed_config, override|
+      managed_config.server = "33.33.77.35"
+      override.ssh.username = "vagrant"
+      override.ssh.private_key_path = "#{ENV['HOME']}/.vagrant.d/insecure_private_key"
+    end
+
+    ms_config.vm.provision :chef_solo do |chef|
+      chef.cookbooks_path = [ './cookbooks' ]
+      chef.add_recipe "apt"
+      chef.add_recipe "apache2"
+    end
+  end
+
+end

data/spec/unit/fixtures/util_vagrantfile/Vagrantfile-multi

@@ -0,0 +1,13 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2') do |config|
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+  config.vm.define :vm1 do |config|
+  end
+
+  config.vm.define :vm2 do |config|
+  end
+end

data/spec/unit/fixtures/util_vagrantfile/Vagrantfile-plugins

@@ -0,0 +1,9 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.require_plugin "vagrant-berkshelf"
+
+Vagrant.configure('2') do |config|
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+end

data/spec/unit/fixtures/util_vagrantfile/Vagrantfile-simple

@@ -0,0 +1,7 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2') do |config|
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+end

data/spec/unit/util_spec.rb

@@ -1,13 +1,54 @@
-require 'spec_helper'
-
-# RSpec.configure do |c|
-#     c.include Helpers
-# end
+require "spec_helper"
 
 describe Vgrnt::Util::VirtualBox do
   describe "::showvminfo_command" do
-    it 'should generate VBoxManage command' do
-      expect(Vgrnt::Util::VirtualBox::showvminfo_command('test')).to eq 'VBoxManage showvminfo test --machinereadable'
+    it "should generate VBoxManage command" do
+      expect(Vgrnt::Util::VirtualBox::showvminfo_command("test")).to eq "VBoxManage showvminfo test --machinereadable"
+    end
+  end
+end
+
+describe Vgrnt::Util::Vagrantfile do
+
+  subject { described_class.defined_vms("spec/unit/fixtures/util_vagrantfile/" + vagrantfile) }
+
+  describe "::defined_vms" do
+    context "parsing Vagrantfile-simple" do
+      let(:vagrantfile) { "Vagrantfile-simple" }
+      it { should eq [:default] }
+    end
+
+    context "parsing Vagrantfile-multi" do
+      let(:vagrantfile) { "Vagrantfile-multi" }
+      it { should eq [:vm1, :vm2] }
+    end
+
+    context "parsing Vagrantfile-plugins" do
+      let(:vagrantfile) { "Vagrantfile-plugins" }
+      it { should eq [:default] }
+    end
+
+    context "parsing Vagrantfile-misc1" do
+      let(:vagrantfile) { "Vagrantfile-misc1" }
+      it { should eq [:fake_managed_server, :my_server] }
+    end
+  end
+
+  describe "Vagrant::_remove_named_arguments" do
+    def process(input)
+      Vgrnt::Util::Vagrantfile::Vagrant._remove_named_arguments(input)
+    end
+    it "works with simple named arguments" do
+      expect(process 'meth 1, scope: "meh", arg2: "meh"').to eq 'meth 1, "meh", "meh"'
+    end
+    it "works with space-free named arguments" do
+      expect(process 'meth 1, scope:"meh", arg2:"meh"').to eq 'meth 1, "meh", "meh"'
+    end
+    it "leaves symbols alone" do
+      expect(process 'meth :bob, 1, sum(:three)').to eq 'meth :bob, 1, sum(:three)'
     end
   end
 end
+
+# describe Vgrnt::Util::Vagrantfile do
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vgrnt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alex Dergachev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -95,6 +95,10 @@ files:
 - spec/acceptance/support/acceptance_helper.rb
 - spec/acceptance/util_spec.rb
 - spec/spec_helper.rb
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-misc1
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-multi
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-plugins
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-simple
 - spec/unit/util_spec.rb
 - vgrnt.gemspec
 homepage: https://github.com/dergachev/vgrnt
@@ -129,4 +133,8 @@ test_files:
 - spec/acceptance/support/acceptance_helper.rb
 - spec/acceptance/util_spec.rb
 - spec/spec_helper.rb
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-misc1
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-multi
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-plugins
+- spec/unit/fixtures/util_vagrantfile/Vagrantfile-simple
 - spec/unit/util_spec.rb