xp5k 0.0.4 → 0.0.5

data/lib/xp5k/version.rb

@@ -1,3 +1,3 @@
 module XP5K
-  VERSION='0.0.4'
+  VERSION='0.0.5'
 end

data/lib/xp5k/xp.rb

@@ -8,17 +8,20 @@ module XP5K
 
     include Term::ANSIColor
 
-    attr_accessor :jobs, :jobs2submit, :deployments, :todeploy, :connection, :roles
-    attr_reader :starttime
+    attr_accessor :jobs, :jobs2submit, :deployments, :todeploy, :connection, :roles, :deployed_nodes
+    attr_reader :starttime, :links_deployments
 
     def initialize(options = {})
-      @jobs        = []
-      @jobs2submit = []
-      @deployments = []
-      @todeploy    = []
-      @roles       = []
-      @starttime   = Time.now
-      @logger      = options[:logger] || Logger.new(STDOUT)
+      @jobs               = []
+      @jobs2submit        = []
+      @deployments        = []
+      @todeploy           = []
+      @roles              = []
+      @links_deployments  = {"jobs" => {}, "roles" => {}}
+      @deployed_nodes     = {"jobs" => {}, "roles" => {}}
+      @starttime          = Time.now
+      @logger             = options[:logger] || Logger.new(STDOUT)
+
       XP5K::Config.load unless XP5K::Config.loaded?
 
       @connection = Restfully::Session.new(
@@ -52,24 +55,34 @@ module XP5K
         x[:roles].each do |rolename|
           x[:nodes] += role_with_name(rolename).servers
         end
-        deployment = @connection.root.sites[x[:site].to_sym].deployments.submit(x)
-        self.deployments << { :uid => deployment["uid"], :site => deployment["site_uid"] }
-        #update_cache
-        puts "Waiting for the deployment ##{deployment['uid']} to be terminated..."
-        while deployment.reload['status'] == 'processing'
-          print(".")
-          sleep 10
+        site = x[:site]
+        x.delete(:site)
+        x.delete(:roles)
+        x.delete(:jobs)
+        deployment = @connection.root.sites[site.to_sym].deployments.submit(x)
+        self.deployments << deployment
+        # update links_deployments
+        update_links_deployments(deployment["uid"], x)
+      end
+      logger.info "Waiting for all the deployments to be terminated..."
+      finished = self.deployments.reduce(true){ |acc, d| acc && d["status"]!='processing'}
+      while (!finished)
+        sleep 10
+        print "."
+        self.deployments.each do |deployment|
+          deployment.reload
         end
-        print(" [#{green("OK")}]\n")
-        #update_cache
+        finished = self.deployments.reduce(true){ |acc, d| acc && d["status"]!='processing'}
       end
+      update_deployed_nodes()
+      update_cache()
+      print(" [#{green("OK")}]\n")
     end
 
     def define_job(job_hash)
       self.jobs2submit << job_hash
 
       if File.exists?(".xp_cache")
-        # Reload job
         datas = JSON.parse(File.read(".xp_cache"))
         uid = datas["jobs"].select { |x| x["name"] == job_hash[:name] }.first["uid"]
         unless uid.nil?
@@ -80,7 +93,10 @@ module XP5K
             create_roles(j, job_hash) unless job_hash[:roles].nil?
           end
         end
+        # reload last deployed nodes
+        self.deployed_nodes = datas["deployed_nodes"] 
       end
+
     end
 
     def submit
@@ -88,19 +104,21 @@ module XP5K
         job = self.job_with_name(job2submit[:name])
         if job.nil?
           job = @connection.root.sites[job2submit[:site].to_sym].jobs.submit(job2submit)
-          self.jobs << { :uid => job.properties['uid'], :name => job.properties['name'] }
+          #self.jobs << { :uid => job.properties['uid'], :name => job.properties['name'] }
           update_cache
           logger.info "Waiting for the job #{job["name"]} ##{job['uid']} to be running at #{job2submit[:site]}..."
           while job.reload["state"] != "running"
             print(".")
             sleep 3
           end
+          self.jobs << job 
           create_roles(job, job2submit) unless job2submit[:roles].nil?
           print(" [#{green("OK")}]\n")
         else
           logger.info "Job #{job["name"]} already submitted ##{job["uid"]}"
         end
       end
+      update_cache()
     end
 
     def create_roles(job, job_definition)
@@ -127,11 +145,16 @@ module XP5K
       self.roles.select { |x| x.name == name}.first
     end
 
-    def status
-      # self.jobs2submit.each do |job2submit|
-      #   job = self.job_with_name(job2submit[:name])
+    def get_deployed_nodes(job_or_role_name)
+      if deployed_nodes["jobs"].has_key?(job_or_role_name)
+        deployed_nodes["jobs"][job_or_role_name]
+      end
+      if deployed_nodes["roles"].has_key?(job_or_role_name)
+        deployed_nodes["roles"][job_or_role_name]
+      end
+    end
 
-      # end
+    def status
       self.jobs.each do |job|
         logger.info "Job #{job["name"]} ##{job["uid"]} status : #{job["state"]}"
       end
@@ -152,9 +175,53 @@ module XP5K
     def logger
       @logger
     end
+    
+    def update_links_deployments (duid, todeploy)
+      unless todeploy[:jobs].nil?
+        todeploy[:jobs].each do |job|
+          @links_deployments["jobs"][job] = duid  
+        end
+      end
+
+      unless todeploy[:roles].nil?
+        todeploy[:roles].each do |role|
+          @links_deployments["roles"][role] = duid  
+        end
+      end
+    end
+
+    def update_deployed_nodes
+      self.deployments.each do |deployment|
+        duid = deployment["uid"]
+        self.links_deployments["jobs"].select{|k,v| v == duid }.keys.each do |job_name|
+          job = job_with_name(job_name)
+          deployed_nodes["jobs"][job["name"]] = intersect_nodes_job(job, deployment)
+        end
+        self.links_deployments["roles"].select{|k,v| v == duid }.keys.each do |role_name|
+          role = role_with_name(role_name)
+          deployed_nodes["roles"][role.name] = intersect_nodes_role(role, deployment)
+        end
 
+      end
+    end
+    
+    def intersect_nodes_job (job, deployment)
+      nodes_deployed = deployment["result"].select{ |k,v| v["state"]=='OK'}.keys
+      job["assigned_nodes"] & nodes_deployed
+    end
+
+    def intersect_nodes_role (role, deployment)
+      nodes_deployed = deployment["result"].select{ |k,v| v["state"]=='OK'}.keys
+      role.servers & nodes_deployed
+    end
+    
     def update_cache
-      cache = { :jobs => self.jobs.map { |x| { :uid => x[:uid], :name => x[:name] } } }
+      cache = { 
+        :jobs               => self.jobs.collect { |x| x.properties },
+        :roles              => self.roles.map{ |x| { :name => x.name, :size => x.size, :servers => x.servers }},
+        :deployed_nodes     => self.deployed_nodes,
+        :links_deployments  => self.links_deployments
+      }
       open(".xp_cache", "w") do |f|
         f.puts cache.to_json
       end

data/xp5k.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_dependency 'restfully', '~>0.6'
+  s.add_dependency 'restfully', '>1.0.0'
   s.add_dependency 'term-ansicolor', '>= 1.0.7'
   s.add_dependency 'json', '>= 1.5.1'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xp5k
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restfully
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement