vagrant-node 1.0.0 → 1.1.1

data/lib/vagrant-node/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Node
-    VERSION = "1.0.0"
+    VERSION = "1.1.1"
   end
 end

data/vagrant-node.gemspec

@@ -1,6 +1,9 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+
+
 require 'vagrant-node/version'
 
 Gem::Specification.new do |spec|
@@ -19,17 +22,26 @@ This plugin has been developed in the context of the Catedra SAES of the Univers
 
   spec.rubyforge_project = "vagrant-node"
 
-  spec.add_dependency "sinatra"
+  spec.add_dependency "sinatra"  
   spec.add_dependency "json"
   spec.add_dependency "rack"
+  #IMPORTANT Mysql DEV libraries must be installed on system
+  spec.add_dependency "mysql2"  
+  spec.add_dependency "usagewatch"  
+  spec.add_dependency "facter"  
   spec.add_dependency "rubyzip", '< 1.0.0'
-  spec.add_dependency "sqlite3"
+  # spec.add_dependency "sqlite3"
   spec.add_dependency "ruby2ruby", "~> 2.0.6"
   spec.add_dependency "ruby_parser", "~> 3.2.2"
+  spec.add_dependency "sys-cpu"
+  
+   
+  
   #spec.add_dependency "sambal"
   #spec.add_dependency "rexml"
 
-  spec.files         = `git ls-files`.split($/)
+  #spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split("\n")
   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"]
@@ -37,3 +49,5 @@ This plugin has been developed in the context of the Catedra SAES of the Univers
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-node
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 17
   prerelease: 
   segments: 
   - 1
-  - 0
-  - 0
-  version: 1.0.0
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Francisco Javier Lopez de San Pedro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-12 00:00:00 Z
+date: 2014-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -60,23 +60,21 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyzip
+  name: mysql2
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
-        - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: usagewatch
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -90,9 +88,39 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby2ruby
+  name: facter
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -104,11 +132,11 @@ dependencies:
         - 6
         version: 2.0.6
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ruby_parser
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -120,11 +148,25 @@ dependencies:
         - 2
         version: 3.2.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: sys-cpu
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -135,11 +177,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,7 +191,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id012
 description: This Vagrant plugin allows you to configure a vm environment as a node in a client/server infraestructure. See also vagrant-nodemaster
 email: 
 - fjsanpedro@gmail.com
@@ -166,8 +208,7 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-node.rb
-- lib/vagrant-node/actions/.svn/entries
-- lib/vagrant-node/actions/.svn/text-base/snapshot.rb.svn-base
+- lib/vagrant-node/actions/boxadd.rb
 - lib/vagrant-node/actions/snapshot.rb
 - lib/vagrant-node/api.rb
 - lib/vagrant-node/apidesc.rb
@@ -179,9 +220,11 @@ files:
 - lib/vagrant-node/nodeserverpasswd.rb
 - lib/vagrant-node/nodeserverstart.rb
 - lib/vagrant-node/nodeserverstop.rb
+- lib/vagrant-node/obmanager.rb
 - lib/vagrant-node/pidfile.rb
 - lib/vagrant-node/pwmanager.rb
 - lib/vagrant-node/server.rb
+- lib/vagrant-node/util/downloader.rb
 - lib/vagrant-node/version.rb
 - vagrant-node.gemspec
 homepage: http://www.catedrasaes.org

data/lib/vagrant-node/actions/.svn/entries

@@ -1,62 +0,0 @@
-10
-
-dir
-9519
-svn+ssh://fjlopez@merovingio.inf.um.es/opt/svn-csaesumu/anotaciones/virtualizacion/plugin_vagrant/vagrant-node.v.1.0/lib/vagrant-node/actions
-svn+ssh://fjlopez@merovingio.inf.um.es/opt/svn-csaesumu
-
-
-
-2013-11-12T10:06:01.121208Z
-9519
-fjlopez
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ba35cbf9-6f3f-4c47-8bc9-f733df4a0683
-
-snapshot.rb
-file
-9673
-
-
-
-2013-12-12T12:01:25.734270Z
-902583c2ad2de012ee3561adccd9ea17
-2013-12-20T12:34:18.314374Z
-9673
-fjlopez
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8490
-

data/lib/vagrant-node/actions/.svn/text-base/snapshot.rb.svn-base

@@ -1,310 +0,0 @@
-require 'pp'
-require "rexml/document"
-require 'rubygems'
-require 'zip/zip'
-
-
-module Vagrant
-  module Node
-  	
-  	class SnapshotAction
-  		LIST = :list
-  		TAKE = :take
-  		DELETE = :delete
-  		RESTORE = :restore
-  		BACKUP = :backup
-  		ERROR = :error
-  		
-			def initialize(app, env)
-				@app = app
-			end
-		
-			def call(env)
-				
-				#FIXME generate a result code error to this case in order 
-				#to provide more info to the client
-				raise RestException.new(406,"Couldn't perform the operation because machine is not yet created") if env[:machine].state.id==:not_created    
-				#return @app.call(env) if env[:machine].state.id==:not_created
-				
-				current_driver=env[:machine].provider.driver
-				
-				begin				
-					current_driver.check_snapshot_stuff
-				rescue Exception => e
-					case env[:machine].provider_name.to_s					
-						when "virtualbox" then							
-							attach_vbox_methods(current_driver)
-					end
-					
-				end
-				
-				case env[:machine_action]
-					when LIST then
-						env[:snapshots_list]=current_driver.list
-					when TAKE then
-						env[:last_snapshot]=current_driver.take_snapshot(env[:snapshot_name],env[:snapshot_desc])
-					when RESTORE then						
-						env[:restore_result]=current_driver.restore_snapshot(env[:snapshot_id])
-					when DELETE then					             
-            env[:delete_result]=current_driver.delete_snapshot(env[:snapshot_id])            
-					when BACKUP then
-						env[:bak_filename]=current_driver.backup_vm(env[:machine].name.to_s,env[:machine].data_dir)
-				end
-				
-				@app.call(env)
-				
-			end
-			
-			private
-			
-			def attach_vbox_methods(driver)
-				
-				def driver.check_snapshot_stuff
-						return true
-				end					
-					
-				#FIXME Si no se hace con --pause y la máquina esta running
-				#se produce un error y deja a la máquina en estado 'gurumeditating'
-				def driver.take_snapshot(name,description=" ")						
-          
-          raise RestException.new(400,"Snapshot name can't be emtpy") if name.empty?						
-					
-					#Snapshots with the same name are not allowed
-					begin
-					   #if this command doesn't fail means that there is a snapshot with the same name
-					   execute("snapshot",self.uuid,"showvminfo",name)					   
-					   raise RestException.new(400,"There is a snapshot with the same name, please choose another name for the new snapshot")
-					rescue Vagrant::Errors::VBoxManageError => e
-					  #Doing nothing continue with the snapshot creation
-					end
-					 
-					
-					#Execute the take command
-					if (description)
-						execute("snapshot",self.uuid,"take",name,"--description",description,"--pause")
-					else
-						execute("snapshot",self.uuid,"take",name,"--pause")
-					end
-
-					snapshot = {}					
-					
-					#Getting the uuid of the latest snapshot
-					execute("snapshot",self.uuid,"list").split("\n").each do |line|						
-						if line =~ /Name:\s(.*?)\s\(UUID:\s(.*?)\)\s\*$/						
-							snapshot[:name] = $1
-							snapshot[:id] = $2
-						end
-					
-					end
-					
-					
-					#return snapshot
-					snapshot
-						
-						
-				end #driver.take_snapshot
-			
-				def driver.delete_snapshot(snapid)
-				  raise RestException.new(400,"Snapshot Identifier can't be emtpy") if snapid.empty?
-				  begin
-  				  execute("snapshot",self.uuid,"delete",snapid)
-  				  return true
-				  rescue =>e
-  			   if e.message =~ /VBOX_E_OBJECT_NOT_FOUND/
-  			     raise RestException.new(404,"The snapshot identifier provided doesn't exist")
-  			   elsif e.message =~ /NS_ERROR_FAILURE/
-  			     raise RestException.new(500,"Internal VBoxManage Error: can't delete the snapshot, try shutting down the Vm")
-  			   else
-  			    raise RestException.new(500,"Internal VBoxManage Error")
-  			   end  				   
-				  end
-				end 
-				
-				
-				
-				def driver.backup_vm(vmname,path)						
-					
-					zipfilename=nil
-					begin
-						#Execute the export command
-						
-						
-						time = Time.now						
-						basename = "Backup.#{vmname}.#{time.year}.#{time.month}.#{time.day}.#{time.hour}.#{time.min}.#{time.sec}"
-						zipfilename = path.to_s + '/'+ basename + '.zip'
-						
-						vmdir = nil
-						execute("showvminfo",self.uuid,"--machinereadable").split("\n").each do |line|
-							vmdir = File.dirname($1) if line =~ /^CfgFile="(.*?)"$/													 
-						end
-
-						
-						Zip::ZipFile.open(zipfilename, Zip::ZipFile::CREATE) do |zipfile|
-								Dir[File.join(vmdir, '**', '**')].each do |file|									
-									zipfile.add(file.sub(vmdir+"/", ''), file)
-								end
-						end
-							
-						zipfilename					
-						
-					rescue => e						
-						File.delete(zipfilename) if File.exists?(zipfilename)
-						return ERROR
-					end
-						
-						
-				end #driver.backup_vm
-				
-				
-				
-#				def driver.export_vm(path)						
-#					
-#					begin
-						#Execute the export command
-#						basename = "Backup.#{Time.now.to_i.to_s}"
-#						filename = path + basename
-#						execute("export",self.uuid,"--output",filename.to_s+".ovf")
-#						zipfilename = filename.to_s + '.zip'
-#						
-#						files_to_zip = []
-#						Dir.chdir(path)
-#						Dir.glob(basename+"*") do |file|
-#							files_to_zip << file
-#						end
-#						
-#						Zip::ZipFile.open(zipfilename, Zip::ZipFile::CREATE) do |zipfile|
-#							files_to_zip.each do |file|
-#								zipfile.add(file,file)
-#							end
-#						end
-#												
-#						
-#						Cleaning files						
-#						files_to_zip.each do |file|
-#							File.delete(file)								
-#						end
-#						return zipfilename					
-#						
-#					rescue => e
-#						puts e.message
-#						return ERROR
-#					end
-						
-						
-				#end #driver.export_vm
-				
-				
-				def driver.list
-					config = nil
-					current_snapshot = nil
-					
-					execute("showvminfo",self.uuid,"--machinereadable").split("\n").each do |line|
-						config = $1 if line =~ /^CfgFile="(.*?)"$/
-													
-					end						
-					
-					snapshots = []				
-					
-					doc = REXML::Document.new File.new(config)
-					machine = doc.elements["VirtualBox/Machine"]
-					
-					@current_snapshot = machine.attributes["currentSnapshot"]
-					
-					snapshots = search_snapshot(machine) if @current_snapshot
-					
-					
-					snapshots						
-					
-						
-				end #driver.list
-				
-				def driver.search_snapshot(path)
-					
-					snapshots = []
-					if path					
-						path.elements.each("Snapshot") { |element|
-							snapshot = {}
-							original_uuid = element.attributes["uuid"]	
-							snapshot[:uuid] = original_uuid[1..original_uuid.length-2]							
-							snapshot[:name] = element.attributes["name"]							
-							snapshot[:timestamp] = element.attributes["timeStamp"]
-							
-							if 	element.elements["Description"]						
-								snapshot[:description] =	element.elements["Description"].text
-							else 
-								snapshot[:description] =	" "
-							end
-							
-							if (original_uuid==@current_snapshot)
-								snapshot[:current_state] = true
-							else
-								snapshot[:current_state] = false
-							end
-							
-							snapshot[:snapshots] = search_snapshot(element.elements["Snapshots"])
-							
-							snapshots << snapshot						
-						}
-					end #driver.search_snapshot(path)
-					
-					#return snapshot array
-					snapshots
-					
-				end
-
-				#snapipd could be the snapshot uuid or its name
-				def driver.restore_snapshot(snapid)						
-						
-					snapshots = []
-					
-					begin
-													
-						result = execute("snapshot",self.uuid,"restore",snapid)
-						
-						if result =~ /^Restoring snapshot\s(.*?)$/
-								snapshots << $1									
-						end
-						
-						#return snapshot array						
-						snapshots
-						
-					rescue Vagrant::Errors::VBoxManageError => e
-							return snapshots if e.message=~ /Could not find a snapshot named/						
-					end						
-				end
-								
-			end # attach_vbox_methods(driver)		
-			 
-			
-  	end
-  	
-  end
-end
-
-#				def driver.list
-#						puts "LISTING SNAPSHOT"
-#						begin
-#						snapshots = []
-#						puts "UUID #{self.uuid}"
-#						execute("snapshot",self.uuid,"list").split("\n").each do |line|
-#							snapshot = {}							
-#
-#							if line =~ /Name:\s(.*?)\s\(UUID:\s(.*?)\)$/								
-#								snapshot[:name] = $1
-#								snapshot[:id] = $2
-#								snapshot[:current_state] = false						 	
-#						 	elsif line =~ /Name:\s(.*?)\s\(UUID:\s(.*?)\)\s\*$/						
-#								snapshot[:name] = $1
-#								snapshot[:id] = $2
-#								snapshot[:current_state] = true
-#						 	end					
-#						 	snapshots.push(snapshot)		
-#						end
-#						rescue Exception => e
-#							puts e.message
-#						end
-#						
-#						puts snapshots
-#						return snapshots
-#				end
-