vagrant_rbapi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613a6f3a5fb6388e59119cbcc5c4dcccde428166
-  data.tar.gz: 9f836f29dd33f7d686f9d14607c11e103bb1864b
+  metadata.gz: dd2e51f525f75f7feeb91545e982c873f06f0022
+  data.tar.gz: dc6c4a5415ded21a75f4ed05cf07d9ae1e35425d
 SHA512:
-  metadata.gz: c5e22232d7978caeb19e6d8c58f7d19ef43da77df3c8e249958a718152e47e39adc8e92f24ead57a4714eedcc114ac093a6d7f1c4aaa6294adc7bc14dc1690de
-  data.tar.gz: 65ef5907ae41010ef1f50f76fa3121c06122a99a0d93e93f4c577de7d9aba7ea13e85ea86f9be1f2b03e7161526dfe122845ffd1134fc3d5cd69682b2247bd4a
+  metadata.gz: c4397c3870dd4a3fa01084d61923a0f7a0b297355911b5672aca73cf13320625178dd3f549ec63a880c5b70c2cce56605ad860b40a7a68982f67651c4d86d735
+  data.tar.gz: 8e0324a0c28f7dbb674289fee1d56990f4a52e08910769662cff40fddd7671c598a0529d370cafcf32d37dfb3283fbbb49f6861b14c9d348545e9f3df34888ea

data/README.md

@@ -15,16 +15,13 @@ Usage
     irb(main):003:0> vagrant.status
     => "not created"
     irb(main):004:0> vagrant.up    
-    => "0"
     irb(main):005:0> vagrant.status
     => "running"
     irb(main):006:0> vagrant.ssh('uname -a')
     => "Linux precise64 3.2.0-23-generic #36-Ubuntu SMP Tue Apr 10 20:39:51 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux"
     irb(main):007:0> vagrant.halt
-    => "0"
     irb(main):008:0> vagrant.status
     => "poweroff"
     irb(main):009:0> vagrant.destroy
-    => "0"
     irb(main):010:0> vagrant.status
     => "not created"

data/lib/vagrant_rbapi.rb

@@ -1,6 +1,7 @@
 require 'vagrant_rbapi/version'
 require 'vagrant_rbapi/exceptions'
 
+require 'net/scp'
 require 'net/ssh'
 require 'open3'
 
@@ -23,26 +24,36 @@ class Vagrant_Rbapi
 		Open3.popen3(ENV, cmd) do |stdin, stdout, stderr, wait_thr|
 			out = stdout.read.to_s
 			err = stderr.read.to_s
-			val = wait_thr.value.to_s.split.last
+			val = wait_thr.value.to_s.split.last.to_i
 		end
-		return out, err, val
+		raise VagrantRbapi::CommandReturnedNonZero unless val == 0
+		return out
 	end
 
 	def status
-		out, err, val = vagrant_cmd(['status'])
+		out = vagrant_cmd(['status'])
 		status = out[/default(.*)\(/, 1].strip
 		return status
 	end
 
-	def up
+	def up(provider = 'virtualbox')
 		raise VagrantRbapi::BoxAlreadyRunning if self.status == 'running'
-		out, err, val = vagrant_cmd(['up'])
-		return val
+		vagrant_cmd(['up', "--provider=#{provider}"])
+	end
+
+	def halt
+		raise VagrantRbapi::BoxNotRunning if self.status != 'running'
+		vagrant_cmd(['halt', '--force'])
+	end
+
+	def destroy
+		raise VagrantRbapi::BoxNotCreated if self.status == 'not created'
+		vagrant_cmd(['destroy', '--force'])
 	end
 
 	def ssh_config
 		raise VagrantRbapi::BoxNotRunning if self.status != 'running'
-		out, err, val = vagrant_cmd(['ssh-config'])
+		out = vagrant_cmd(['ssh-config'])
 		hostname = out[/HostName (.*)$/, 1].strip
 		user = out[/User (.*)$/, 1].strip
 		port = out[/Port (.*)$/, 1].strip
@@ -60,15 +71,17 @@ class Vagrant_Rbapi
 		return out
 	end
 
-	def halt
+	def scp(direction, recursive, source, destination)
 		raise VagrantRbapi::BoxNotRunning if self.status != 'running'
-		out, err, val = vagrant_cmd(['halt', '--force'])
-		return val
-	end
-
-	def destroy
-		raise VagrantRbapi::BoxNotCreated if self.status == 'not created'
-		out, err, val = vagrant_cmd(['destroy', '--force'])
-		return val
+		config = ssh_config
+		if direction == :upload
+			Net::SCP.start(config[0], config[1], port: config[2], key_data: [File.read(config[3])]) do |scp|
+				scp.upload!(source, destination, recursive: recursive)
+			end
+		elsif direction == :download
+			Net::SCP.start(config[0], config[1], port: config[2], key_data: [File.read(config[3])]) do |scp|
+				scp.download!(source, destination, recursive: recursive)
+			end
+		end
 	end
 end

data/lib/vagrant_rbapi/exceptions.rb

@@ -1,4 +1,5 @@
 module VagrantRbapi
+	class CommandReturnedNonZero < StandardError; end
 	class BoxNotCreated < StandardError; end
 	class BoxNotRunning < StandardError; end
 	class BoxAlreadyRunning < StandardError; end

data/lib/vagrant_rbapi/version.rb

@@ -1,3 +1,3 @@
 module VagrantRbapi
-	VERSION = "0.0.1"
+	VERSION = '0.0.2'
 end

data/test/files/Lorem.txt

@@ -0,0 +1,6 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/test/minitest_helper.rb

@@ -1,2 +1,3 @@
+require 'fileutils'
 require 'minitest/autorun'
 require_relative '../lib/vagrant_rbapi'

data/test/test_destroy.rb

@@ -11,23 +11,23 @@ class TestDestroy < MiniTest::Unit::TestCase
 		Dir.chdir('../..')
 	end
 
-	def test_up_destroy
+	def test_destroy
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
 		assert_equal('not created', @vagrant.status)
 	end
 
-	def test_up_destroy_destroy
+	def test_destroy_destroy
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
 		assert_equal('not created', @vagrant.status)
 
 		assert_raises(VagrantRbapi::BoxNotCreated) { @vagrant.destroy }

data/test/test_halt.rb

@@ -11,32 +11,32 @@ class TestHalt < MiniTest::Unit::TestCase
 		Dir.chdir('../..')
 	end
 
-	def test_up_halt_destroy
+	def test_halt
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
-		assert_equal("0", @vagrant.halt)
+		@vagrant.halt
 		assert_equal('poweroff', @vagrant.status)
 
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
 		assert_equal('not created', @vagrant.status)
 	end
 
-	def test_up_halt_halt_destroy
+	def test_halt_halt
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
-		assert_equal("0", @vagrant.halt)
+		@vagrant.halt
 		assert_equal('poweroff', @vagrant.status)
 
 		assert_raises(VagrantRbapi::BoxNotRunning) { @vagrant.halt }
 		assert_equal('poweroff', @vagrant.status)
 
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
 		assert_equal('not created', @vagrant.status)
 	end
 end

data/test/test_scp.rb

@@ -0,0 +1,62 @@
+require_relative 'minitest_helper'
+
+class TestSSH < MiniTest::Unit::TestCase
+	def setup
+		precise64 = File.join(File.expand_path(File.dirname(File.dirname(__FILE__))), 'test/precise64')
+		@vagrant = Vagrant_Rbapi.new(precise64)
+	end
+
+	def teardown
+		@vagrant.destroy if @vagrant.status != 'not created'
+		Dir.chdir('../..')
+	end
+
+	def test_scp
+		assert_equal('not created', @vagrant.status)
+
+		@vagrant.up
+		assert_equal('running', @vagrant.status)
+
+		@vagrant.scp(:upload, false, File.expand_path('../files/Lorem.txt'), '/home/vagrant/Lorem.txt')
+		assert_equal('/home/vagrant/Lorem.txt: ASCII text', @vagrant.ssh('file ~/Lorem.txt'))
+
+		@vagrant.scp(:upload, false, File.expand_path('../files/Lorem.gif'), '/home/vagrant/Lorem.gif')
+		assert_equal('/home/vagrant/Lorem.gif: GIF image data, version 89a, 125 x 125', @vagrant.ssh('file ~/Lorem.gif'))
+
+		@vagrant.scp(:download, false, '/home/vagrant/Lorem.txt', File.expand_path('../files/Lorem2.txt'))
+		assert_equal('../files/Lorem2.txt: ASCII text', `file ../files/Lorem2.txt`.strip)
+
+		@vagrant.scp(:download, false, '/home/vagrant/Lorem.gif', File.expand_path('../files/Lorem2.gif'))
+		assert_equal('../files/Lorem2.gif: GIF image data, version 89a, 125 x 125', `file ../files/Lorem2.gif`.strip)
+
+		@vagrant.scp(:upload, true, File.expand_path('../files'), '/home/vagrant/')
+		assert_equal('/home/vagrant/files/Lorem.txt: ASCII text', @vagrant.ssh('file ~/files/Lorem.txt'))
+		assert_equal('/home/vagrant/files/Lorem.gif: GIF image data, version 89a, 125 x 125', @vagrant.ssh('file ~/files/Lorem.gif'))
+
+		FileUtils.rm('../files/Lorem2.txt') if File.file?('../files/Lorem2.txt')
+		FileUtils.rm('../files/Lorem2.gif') if File.file?('../files/Lorem2.gif')
+
+		@vagrant.destroy
+		assert_equal('not created', @vagrant.status)
+	end
+
+	def test_scp_recursive
+		assert_equal('not created', @vagrant.status)
+
+		@vagrant.up
+		assert_equal('running', @vagrant.status)
+
+		@vagrant.scp(:upload, true, File.expand_path('../files'), '/home/vagrant/')
+		assert_equal('/home/vagrant/files/Lorem.txt: ASCII text', @vagrant.ssh('file ~/files/Lorem.txt'))
+		assert_equal('/home/vagrant/files/Lorem.gif: GIF image data, version 89a, 125 x 125', @vagrant.ssh('file ~/files/Lorem.gif'))
+
+		@vagrant.scp(:download, true, '/home/vagrant/files', File.expand_path('../files'))
+		assert_equal('../files/files/Lorem.txt: ASCII text', `file ../files/files/Lorem.txt`.strip)
+		assert_equal('../files/files/Lorem.gif: GIF image data, version 89a, 125 x 125', `file ../files/files/Lorem.gif`.strip)
+
+		FileUtils.rm_r('../files/files') if File.directory?('../files/files')
+
+		@vagrant.destroy
+		assert_equal('not created', @vagrant.status)
+	end
+end

data/test/test_ssh.rb

@@ -11,20 +11,30 @@ class TestSSH < MiniTest::Unit::TestCase
 		Dir.chdir('../..')
 	end
 
-	def test_up_ssh_destroy
+	def test_ssh
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
 		assert_includes(@vagrant.ssh('cat /etc/lsb-release'), 'Ubuntu 12.04 LTS')
 		assert_equal('I am a Box', @vagrant.ssh('echo "I am a Box"'))
-		assert_nil(@vagrant.ssh('sudo shutdown -h now'))
 
+		@vagrant.destroy
+		assert_equal('not created', @vagrant.status)
+	end
+
+	def test_ssh_shutdown
+		assert_equal('not created', @vagrant.status)
+
+		@vagrant.up
+		assert_equal('running', @vagrant.status)
+
+		@vagrant.ssh('sudo shutdown -h now')
 		sleep 5 while @vagrant.status == 'running'
 		assert_equal('poweroff', @vagrant.status)
 
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
 		assert_equal('not created', @vagrant.status)
 	end
 end

data/test/test_ssh_config.rb

@@ -11,10 +11,10 @@ class TestSSHConfig < MiniTest::Unit::TestCase
 		Dir.chdir('../..')
 	end
 
-	def test_up_ssh_config_destroy
+	def test_ssh_config
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
 		assert_equal('127.0.0.1', @vagrant.ssh_config[0])
@@ -22,7 +22,7 @@ class TestSSHConfig < MiniTest::Unit::TestCase
 		assert_equal('2222', @vagrant.ssh_config[2])
 		assert_equal(File.join(File.expand_path('~/'), '.vagrant.d/insecure_private_key'), @vagrant.ssh_config[3])
 		
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
 		assert_equal('not created', @vagrant.status)
 	end
 end

data/test/test_up.rb

@@ -11,26 +11,43 @@ class TestUp < MiniTest::Unit::TestCase
 		Dir.chdir('../..')
 	end
 
-	def test_up_destroy
+	def test_up
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
 		assert_equal('not created', @vagrant.status)
 	end
 
-	def test_up_up_destroy
+	def test_up_up
 		assert_equal('not created', @vagrant.status)
 
-		assert_equal("0", @vagrant.up)
+		@vagrant.up
 		assert_equal('running', @vagrant.status)
 
 		assert_raises(VagrantRbapi::BoxAlreadyRunning) { @vagrant.up }
 		assert_equal('running', @vagrant.status)
 
-		assert_equal("0", @vagrant.destroy)
+		@vagrant.destroy
+		assert_equal('not created', @vagrant.status)
+	end
+
+	def test_up_vbox
+		assert_equal('not created', @vagrant.status)
+
+		@vagrant.up('virtualbox')
+		assert_equal('running', @vagrant.status)
+
+		@vagrant.destroy
+		assert_equal('not created', @vagrant.status)
+	end
+
+	def test_up_foobar
+		assert_equal('not created', @vagrant.status)
+
+		assert_raises(VagrantRbapi::CommandReturnedNonZero) { @vagrant.up('foobar') }
 		assert_equal('not created', @vagrant.status)
 	end
 end

data/test/test_which.rb

@@ -11,7 +11,7 @@ class TestWhich < MiniTest::Unit::TestCase
 		Dir.chdir('../..')
 	end
 
-	def test_which_with_vagrant_in_path
+	def test_which
 		assert_equal `which vagrant`.strip, @vagrant.vagrant_bin
 	end
 end

data/vagrant_rbapi.gemspec

@@ -3,20 +3,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant_rbapi/version'
 
 Gem::Specification.new do |spec|
-	spec.name          = "vagrant_rbapi"
+	spec.name          = 'vagrant_rbapi'
 	spec.version       = VagrantRbapi::VERSION
-	spec.authors       = ["Peter Wilmott"]
-	spec.email         = ["p@p8952.info"]
-	spec.summary       = %q{vagrant_rbapi}
-	spec.description   = %q{vagrant_rbapi}
-	spec.homepage      = ""
-	spec.license       = "GPL3"
+	spec.authors       = ['Peter Wilmott']
+	spec.email         = ['p@p8952.info']
+	spec.summary       = %q{Ruby bindings for interacting with Vagrant boxes}
+	spec.description   = %q{Ruby bindings for interacting with Vagrant boxes}
+	spec.homepage      = ''
+	spec.license       = 'GPL3'
 
 	spec.files         = `git ls-files -z`.split("\x0")
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-	spec.require_paths = ["lib"]
+	spec.require_paths = ['lib']
 
-	spec.add_runtime_dependency 'rake'
+	spec.add_runtime_dependency 'net-scp'
 	spec.add_runtime_dependency 'net-ssh'
+	spec.add_runtime_dependency 'rake'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_rbapi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Peter Wilmott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -38,7 +38,21 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: vagrant_rbapi
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby bindings for interacting with Vagrant boxes
 email:
 - p@p8952.info
 executables: []
@@ -53,10 +67,13 @@ files:
 - lib/vagrant_rbapi.rb
 - lib/vagrant_rbapi/exceptions.rb
 - lib/vagrant_rbapi/version.rb
+- test/files/Lorem.gif
+- test/files/Lorem.txt
 - test/minitest_helper.rb
 - test/precise64/Vagrantfile
 - test/test_destroy.rb
 - test/test_halt.rb
+- test/test_scp.rb
 - test/test_ssh.rb
 - test/test_ssh_config.rb
 - test/test_up.rb
@@ -85,12 +102,15 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: vagrant_rbapi
+summary: Ruby bindings for interacting with Vagrant boxes
 test_files:
+- test/files/Lorem.gif
+- test/files/Lorem.txt
 - test/minitest_helper.rb
 - test/precise64/Vagrantfile
 - test/test_destroy.rb
 - test/test_halt.rb
+- test/test_scp.rb
 - test/test_ssh.rb
 - test/test_ssh_config.rb
 - test/test_up.rb