vagrant-node 1.1.1 → 1.1.3

data/lib/vagrant-node/dbmanager.rb

@@ -10,8 +10,10 @@ module DB
 	class DBManager
 
 		DOWNLOAD_ERROR=-1
-		DOWNLOAD_PROCESS=0
-		DOWNLOAD_SUCCESS=0
+		DOWNLOAD_STOP=0		
+		DOWNLOAD_START=1
+		DOWNLOAD_SUCCESS=2
+		DOWNLOAD_UNCOMPRESS = 3
 
 		def initialize(data_dir)
 			@db=check_database(data_dir)
@@ -91,48 +93,79 @@ module DB
           @db.query(sql)
         end
         
+		def quote_string(s)
+	  		s.gsub(/\\/, '\&\&').gsub(/'/, "''") # ' (for ruby-mode)
+		end
+
+
+		UNESCAPES = {
+		    'a' => "\x07", 'b' => "\x08", 't' => "\x09",
+		    'n' => "\x0a", 'v' => "\x0b", 'f' => "\x0c",
+		    'r' => "\x0d", 'e' => "\x1b", "\\\\" => "\x5c",
+		    "\"" => "\x22", "'" => "\x27"
+		}
+
+		def unescape(str)
+		  # Escape all the things
+		  str.gsub(/\\(?:([#{UNESCAPES.keys.join}])|u([\da-fA-F]{4}))|\\0?x([\da-fA-F]{2})/) {
+		    if $1
+		      if $1 == '\\' then '\\' else UNESCAPES[$1] end
+		    elsif $2 # escape \u0000 unicode
+		      ["#$2".hex].pack('U*')
+		    elsif $3 # escape \0xff or \xff
+		      [$3].pack('H2')
+		    end
+		  }
+		end
+
+
         def set_queued_process_error(id,exception)          
           
           errlog = []		
-
-          errcode=PROCESS_ERROR
           
-          # decoded=exception.message.to_s.tr("\n"," ")
-          # puts exception.message.to_s
-          # pp exception.message.to_s
-          # pp decoded
 
+          errcode=PROCESS_ERROR
           
-
+          #Code to avoid some annoying things related to special chars
+    	  error_msg=exception.message
+    	  error_msg=quote_string(error_msg).to_json    	  
+    	  error_msg=error_msg[1,error_msg.size-2]
+    	  
+    	  
+    	     	  
           if (exception.class==VMActionException)
-          	errlog << {"vmname" => exception.vmname,"provider"=>exception.provider,"status" => exception.message.to_s.tr("\'","\"")}	
+          	#errlog << {"vmname" => exception.vmname,"provider"=>exception.provider,"status" => @db.escape(error_msg)}	
+          	errlog << {"vmname" => exception.vmname,"provider"=>exception.provider,"status" => error_msg}	
           elsif (exception.class==RestException)
           	errcode=exception.code
-          	errlog << {"status" => exception.message.to_s.tr("\'","\"")}	          	
+          	errlog << {"status" => error_msg}	          	
           else
-          	errlog << {"status" => exception.message.to_s.tr("\'","\"")}	          	
+          	# errlog << {"status" => exception.message.to_s.tr("\'","\"")}	          	
+          	errlog << {"status" => error_msg}	          	
           end
+
+          #sql="UPDATE #{OPERATION_QUEUE_TABLE_NAME} SET #{OPERATION_STATUS_COLUMN} = #{errcode},#{OPERATION_RESULT_COLUMN} = '#{errlog.to_json}' WHERE #{OPERATION_ID_COLUMN}= #{id}"
           
           
+          sql="UPDATE #{OPERATION_QUEUE_TABLE_NAME} SET #{OPERATION_STATUS_COLUMN} = #{errcode},#{OPERATION_RESULT_COLUMN} = '#{errlog.to_json}' WHERE #{OPERATION_ID_COLUMN}= #{id}"
           
-          sql="UPDATE #{OPERATION_QUEUE_TABLE_NAME} SET #{OPERATION_STATUS_COLUMN} = #{errcode},#{OPERATION_RESULT_COLUMN} = '#{errlog.to_json}'  WHERE #{OPERATION_ID_COLUMN}= #{id}"
-          
-          
-          #errlog << {"vmname" => "TODO","status" => exception.message.to_s}
+
           
+
           #@db.execute(sql,errcode,errlog.to_json,id)
           @db.query(sql)
         end
         
         def get_queued_process_result(id)          
           check_operation_timeout
-          sql="SELECT #{OPERATION_STATUS_COLUMN},#{OPERATION_RESULT_COLUMN} FROM #{OPERATION_QUEUE_TABLE_NAME} WHERE #{OPERATION_ID_COLUMN}= #{id};"          
+          #sql="SELECT #{OPERATION_STATUS_COLUMN},QUOTE(#{OPERATION_RESULT_COLUMN}) as operation_result FROM #{OPERATION_QUEUE_TABLE_NAME} WHERE #{OPERATION_ID_COLUMN}= #{id};"                    
+          sql="SELECT #{OPERATION_STATUS_COLUMN},#{OPERATION_RESULT_COLUMN} FROM #{OPERATION_QUEUE_TABLE_NAME} WHERE #{OPERATION_ID_COLUMN}= #{id};"                    
           @db.query(sql)                    
         end
         
         def get_queued_last
           check_operation_timeout
-          sql="SELECT #{OPERATION_STATUS_COLUMN},#{OPERATION_RESULT_COLUMN} FROM #{OPERATION_QUEUE_TABLE_NAME};"
+          sql="SELECT #{OPERATION_STATUS_COLUMN},#{OPERATION_RESULT_COLUMN} FROM #{OPERATION_QUEUE_TABLE_NAME};"          
           @db.query(sql)
         end
         
@@ -141,14 +174,57 @@ module DB
           sql="DELETE FROM #{OPERATION_QUEUE_TABLE_NAME}"
           @db.query(sql)          
         end
+
+        def are_boxes_queued
+           result=@db.query("SELECT * FROM #{DOWNLOAD_BOX_TABLE} WHERE #{DOWNLOAD_STATUS_COLUMN} = #{DOWNLOAD_STOP}")
+
+           result.size!=0
+
+        end
         
-        def add_box_download_info(box_name,box_url)           	
-        	sql="INSERT INTO #{DOWNLOAD_BOX_TABLE}(#{DOWNLOAD_BOX_COLUMN},#{DOWNLOAD_URL_COLUMN},#{DOWNLOAD_PROGRESS_COLUMN},#{DOWNLOAD_REMAINING_COLUMN},#{DOWNLOAD_STATUS_COLUMN}) VALUES ('#{box_name}','#{box_url}','0%','--:--:--',#{DOWNLOAD_PROCESS})"
+        def start_box_download
+
+        	result=@db.query("SELECT * FROM #{DOWNLOAD_BOX_TABLE} WHERE #{DOWNLOAD_STATUS_COLUMN} = #{DOWNLOAD_STOP}")                   	
+
+
+        	id_next=result.first["id"]
+
+
+        	sql="UPDATE #{DOWNLOAD_BOX_TABLE} SET  
+        			#{DOWNLOAD_PROGRESS_COLUMN}='0%',
+        			#{DOWNLOAD_REMAINING_COLUMN}='--:--:--',
+        			#{DOWNLOAD_STATUS_COLUMN}=#{DOWNLOAD_START} 
+        			WHERE #{DOWNLOAD_ID_COLUMN}=#{id_next}"
+
             @db.query(sql)          
+
+            id_next	
+        end
+
+        def add_box_download_info(box_name,box_url)           	
+        	sql="INSERT INTO #{DOWNLOAD_BOX_TABLE}(#{DOWNLOAD_BOX_COLUMN},#{DOWNLOAD_URL_COLUMN},#{DOWNLOAD_PROGRESS_COLUMN},#{DOWNLOAD_REMAINING_COLUMN},#{DOWNLOAD_STATUS_COLUMN}) VALUES ('#{box_name}','#{box_url}','WAITING','WAITING',#{DOWNLOAD_STOP})"
+            @db.query(sql)                      
+            
             last_id=@db.query("SELECT LAST_INSERT_ID() as last")            
             last_id.first["last"]
         end
 
+        def is_box_downloading
+        	result=@db.query("SELECT * FROM #{DOWNLOAD_BOX_TABLE} WHERE #{DOWNLOAD_STATUS_COLUMN} = #{DOWNLOAD_START}")
+			return false if result.size==0	
+			return true
+        end
+
+        def get_box_to_download
+        	result=@db.query("SELECT * FROM #{DOWNLOAD_BOX_TABLE} WHERE #{DOWNLOAD_STATUS_COLUMN} = #{DOWNLOAD_STOP}")                   	
+        	
+        	((result.size==0)?nil:result.first)
+        		
+
+        	#id_next=result.first["id"]
+        	#id_next
+        end
+
         def get_box_download        	        	
         	sql="SELECT * FROM #{DOWNLOAD_BOX_TABLE}"
         	@db.query(sql)
@@ -165,7 +241,7 @@ module DB
         end
 
         def set_box_download_error(id)
-        	sql="UPDATE #{DOWNLOAD_BOX_TABLE} SET #{DOWNLOAD_STATUS_COLUMN} = #{DOWNLOAD_ERROR}, #{DOWNLOAD_PROGRESS_COLUMN} = 'ERROR' WHERE #{DOWNLOAD_ID_COLUMN}=#{id}"
+        	sql="UPDATE #{DOWNLOAD_BOX_TABLE} SET #{DOWNLOAD_STATUS_COLUMN} = #{DOWNLOAD_ERROR}, #{DOWNLOAD_PROGRESS_COLUMN} = 'ERROR',#{DOWNLOAD_REMAINING_COLUMN}='ERROR' WHERE #{DOWNLOAD_ID_COLUMN}=#{id}"
         	@db.query(sql)
         end
 
@@ -175,13 +251,15 @@ module DB
         	@db.query(sql)
         end
 
-        def add_box_uncompression(box_name,box_url)
-        	sql="INSERT INTO #{DOWNLOAD_BOX_TABLE}(#{DOWNLOAD_BOX_COLUMN},#{DOWNLOAD_URL_COLUMN},#{DOWNLOAD_PROGRESS_COLUMN},#{DOWNLOAD_REMAINING_COLUMN},#{DOWNLOAD_STATUS_COLUMN}) VALUES ('#{box_name}','#{box_url}','Uncompressing','Uncompressing',#{DOWNLOAD_PROCESS})"
+        def add_box_uncompression(id)
+
+        	sql="UPDATE #{DOWNLOAD_BOX_TABLE}  SET #{DOWNLOAD_PROGRESS_COLUMN}='Uncompressing',#{DOWNLOAD_REMAINING_COLUMN}='Uncompressing',#{DOWNLOAD_STATUS_COLUMN}=#{DOWNLOAD_UNCOMPRESS} WHERE #{DOWNLOAD_ID_COLUMN}=#{id}"
+        	#sql="INSERT INTO #{DOWNLOAD_BOX_TABLE}(#{DOWNLOAD_BOX_COLUMN},#{DOWNLOAD_URL_COLUMN},#{DOWNLOAD_PROGRESS_COLUMN},#{DOWNLOAD_REMAINING_COLUMN},#{DOWNLOAD_STATUS_COLUMN}) VALUES ('#{box_name}','#{box_url}','Uncompressing','Uncompressing',#{DOWNLOAD_STOP})"
             #@db.execute(sql,box_name,box_url,DOWNLOAD_PROCESS)          
             @db.query(sql)          
 
-            last_id=@db.query("SELECT LAST_INSERT_ID() as last")            
-            last_id.first["last"]
+            # last_id=@db.query("SELECT LAST_INSERT_ID() as last")            
+            # last_id.first["last"]
         end
 
         def set_box_uncompression_error(id)
@@ -191,7 +269,7 @@ module DB
         end
 
         def clear_box_uncompression(id)
-        	sql="DELETE FROM #{DOWNLOAD_BOX_TABLE} WHERE #{DOWNLOAD_STATUS_COLUMN}!=#{id}"        	
+        	sql="DELETE FROM #{DOWNLOAD_BOX_TABLE} WHERE #{DOWNLOAD_ID_COLUMN}=#{id}"        	
         	@db.query(sql)
         end
 
@@ -262,7 +340,7 @@ module DB
 		DOWNLOAD_ID_COLUMN = 'id'
 		DOWNLOAD_BOX_COLUMN = 'box_name'
 		DOWNLOAD_URL_COLUMN = 'box_url'
-		DOWNLOAD_STATUS_COLUMN = 'download_status'
+		DOWNLOAD_STATUS_COLUMN = 'download_status'		
 		DOWNLOAD_PROGRESS_COLUMN = 'download_progress'
 		DOWNLOAD_REMAINING_COLUMN = 'download_remaining'
 		CONFIG_DBUSER = 'dbuser'
@@ -317,7 +395,7 @@ module DB
 			  `#{DOWNLOAD_URL_COLUMN}` text NOT NULL,
 			  `#{DOWNLOAD_PROGRESS_COLUMN}` VARCHAR(10),
 			  `#{DOWNLOAD_STATUS_COLUMN}` int(11) NOT NULL,
-			  `#{DOWNLOAD_REMAINING_COLUMN}` VARCHAR(10),
+			  `#{DOWNLOAD_REMAINING_COLUMN}` VARCHAR(10),			  		  
 			  PRIMARY KEY (`#{DOWNLOAD_ID_COLUMN}`)
 			) ENGINE=InnoDB DEFAULT CHARSET=utf8;")
 

data/lib/vagrant-node/exceptions.rb

@@ -32,8 +32,7 @@ module Vagrant
     class ExceptionMutator < RestException
       include Vagrant::Errors
       def initialize(exception)
-        if (exception.is_a?(Vagrant::Errors::VagrantError))         
-          puts exception.class
+        if (exception.is_a?(Vagrant::Errors::VagrantError))                   
           case exception               
           when BaseVMNotFound,
                BoxNotFound,

data/lib/vagrant-node/nodeservercommand.rb

@@ -9,29 +9,26 @@ module Vagrant
 			START_COMMAND = "start"
 			STOP_COMMAND = "stop"
 			def initialize(argv, env)
-		      super
+				super
 
-		      @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
-					@subcommands = Vagrant::Registry.new
-					
-					@subcommands.register(:start) do
-						require File.expand_path("../nodeserverstart", __FILE__)
-						NodeServerStart
-					end
-					
-					@subcommands.register(:stop) do
-						require File.expand_path("../nodeserverstop", __FILE__)
-						NodeServerStop
-					end
-					
-					@subcommands.register(:passwd) do
-            require File.expand_path("../nodeserverpasswd", __FILE__)
-            NodeServerPasswd
-          end
+				@main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+				@subcommands = Vagrant::Registry.new
+
+				@subcommands.register(:start) do
+					require File.expand_path("../nodeserverstart", __FILE__)
+					NodeServerStart
+				end
+
+				@subcommands.register(:stop) do
+					require File.expand_path("../nodeserverstop", __FILE__)
+					NodeServerStop
+				end
+
+				@subcommands.register(:passwd) do
+	            	require File.expand_path("../nodeserverpasswd", __FILE__)
+	            	NodeServerPasswd
+	          	end
 					
-#				puts "MAIN ARGS #{@main_args}"
-#				puts "SUB COMMAND #{@sub_command}"
-#				puts "SUB ARGS #{@sub_args}"
 			end
 			
 			def execute
@@ -47,17 +44,7 @@ module Vagrant
 				
 				command_class.new(@sub_args, @env).execute
 				
-#				case @sub_command
-#					when START_COMMAND then
-#						@env.lock_path contiene la ruta al fichero de lock
-						#incluyendo el nombre de este, por lo tanto se pasa
-						#únicamente la ruta						
-#						ServerAPI::ServerManager.run(File.dirname(@env.lock_path))
-#					when STOP_COMMAND then
-#						ServerAPI::ServerManager.stop(File.dirname(@env.lock_path))
-#					else
-#						return help
-#				end				
+	
 				0
 			end
 			

data/lib/vagrant-node/nodeserverpasswd.rb

@@ -77,24 +77,7 @@ module Vagrant
                 print "Can't connect to mysql with current configuration, please review provided credentials. Please execute again this command to reconfigure"
                 DB::DBManager.delete_config_file(@env.data_dir)                
               end
-
-              # #if (exception.class==Mysql2::Error)
-              # if (i<1)                                
-              #   puts "Configuring database connection "
-              #   puts "Do you let us create "
-              #   puts "Insert privilege database user:"
-              #   user=STDIN.noecho(&:gets).chomp
-              #   print "\n"
-              #   print "Insert privilege database password:"
-              #   password=STDIN.noecho(&:gets).chomp
-              #   print "\n"
-              #   print "Insert database name:"
-              #   database=STDIN.noecho(&:gets).chomp
-              #   print "\n"
-              #   DB::DBManager.create_config_file(@env.data_dir,'localhost',database,user,password)
-              #   i=i+1
-              #   retry
-              # end
+              
             end
             
             if (!db.nil?)
@@ -136,9 +119,7 @@ module Vagrant
   
   
             
-          # else
-            # puts "INTRODUCIDA EN TERMINAL"
-          # end           
+                 
           
           
           		         		

data/lib/vagrant-node/nodeserverstart.rb

@@ -15,7 +15,9 @@ module Vagrant
               # options[:password] = b
         # end
       end        
-          
+
+      raise Errors::NoEnvironmentError if !@env.root_path
+
       argv = parse_options(opts)
       return if !argv  
       raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length > 1

data/lib/vagrant-node/server.rb

@@ -42,6 +42,8 @@ module Vagrant
 							:AccessLog => access_log
 						}
 						
+
+
 						
 						#begin
 							server = WEBrick::HTTPServer.new(options)	
@@ -52,6 +54,8 @@ module Vagrant
 
 							trap("USR1") { 
 								
+								puts "SERVER.RB RESTARTING SERVER"
+								
 								#Stopping server
 								server.shutdown
 								

data/lib/vagrant-node/util/downloader.rb

@@ -64,7 +64,9 @@ module Vagrant
 
           # Setup the proc that'll receive the real-time data from
           # the downloader.
-          last_id=@db.add_box_download_info(@box_name,@source)
+          last_id = @db.start_box_download          
+          
+          #last_id=@db.add_box_download_info(@box_name,@source)
           
           comienzo = Time.now();
           
@@ -139,12 +141,18 @@ module Vagrant
           end
           
 
-          if ((!interrupted) && (result.exit_code==0))
-              # @db.update_box_download_info(last_id,"100%","--:--:--")                            
-              @db.delete_box_download(last_id)
-          else                                              
+          # if ((!interrupted) && (result.exit_code==0))
+          #     # @db.update_box_download_info(last_id,"100%","--:--:--")                            
+          #     @db.delete_box_download(last_id)
+          # else                                              
+          #     @db.set_box_download_error(last_id)
+          # end
+
+          if (interrupted || (result.exit_code!=0))                  
               @db.set_box_download_error(last_id)
           end
+
+          
           
           
           # If the download was interrupted, then raise a specific error

data/lib/vagrant-node/util/hwfunctions.rb

@@ -0,0 +1,73 @@
+
+require 'pp'
+
+module Vagrant
+module Node
+module Util
+
+	class HwFunctions
+		MAJOR_SATA = 8
+		MAJOR_IDE = 3
+		MAJOR_FIELD = 0
+		MINOR_FIELD = 1
+		NAME_FIELD = 2
+		def self.get_mem_values
+
+			mem = []
+
+			mem_file = "/proc/meminfo"
+			mem_values = IO.readlines(mem_file) 
+
+			
+			mem[0] = (mem_values[0].split[1].to_i / 1024.0).round(2) #Converting to MB
+			mem[1] = (mem_values[1].split[1].to_i / 1024.0).round(2) #Converting to MB
+
+			mem
+
+		end
+
+		def self.get_disk_values
+
+			disk = []
+
+			stat_file = "/proc/diskstats"
+
+
+			IO.readlines(stat_file).each do |line|
+				major_number = line.split[MAJOR_FIELD].to_i
+				minor_number = line.split[MINOR_FIELD].to_i
+				
+				if (((major_number==MAJOR_SATA) || (major_number==MAJOR_IDE)) && minor_number!=0)
+					#In this point you have all single disk partitions
+					#But we only want mounted ones					
+					resout= `df -h`					
+					resout.split("\n").each do |line1|
+						if (line1.split[0]=="/dev/"+line.split[NAME_FIELD])
+							entry =[]
+							entry[0] = line.split[NAME_FIELD]
+							entry[1] = line1.split[1]
+							entry[2] = line1.split[3]
+							entry[3] = line1.split[4]
+							disk << {:partition=>"/dev/"+line.split[NAME_FIELD],
+									:total=>line1.split[1],
+									:free=>line1.split[3],
+									:freepercent=>line1.split[4]}
+							# disk.push entry
+						end
+					end
+					
+
+				end
+			end
+
+			
+			
+			disk
+
+		end
+		
+	end
+
+end
+end
+end