From c1e4c9e38c41f8c8eda7c0e48c4eb5d0f1e408fa Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 18 Nov 2015 17:30:14 +0300 Subject: [PATCH 1/3] show help message for deploy client command --- devops-client/lib/devops-client/handler/deploy.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devops-client/lib/devops-client/handler/deploy.rb b/devops-client/lib/devops-client/handler/deploy.rb index 6213bc2..f5c06ed 100644 --- a/devops-client/lib/devops-client/handler/deploy.rb +++ b/devops-client/lib/devops-client/handler/deploy.rb @@ -14,6 +14,8 @@ class Deploy < Handler if ARGV.size > 1 self.options = @options_parser.deploy_options deploy_handler @options_parser.args + else + @options_parser.invalid_command end end From 52afa139180de1bcfbedd635c9b481f720142caa Mon Sep 17 00:00:00 2001 From: amartynov Date: Wed, 25 Nov 2015 12:39:01 +0300 Subject: [PATCH 2/3] #899: fixed --- devops-service/db/mongo/models/project.rb | 28 ++++++----------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/devops-service/db/mongo/models/project.rb b/devops-service/db/mongo/models/project.rb index d6cc327..6a0b71a 100644 --- a/devops-service/db/mongo/models/project.rb +++ b/devops-service/db/mongo/models/project.rb @@ -39,7 +39,7 @@ module Devops def initialize p={} self.id = p["name"] - #raise InvalidRecord.new "No deploy envirenments for project #{self.id}" if p["deploy_envs"].nil? or p["deploy_envs"].empty? + #raise InvalidRecord.new "No deploy environments for project #{self.id}" if p["deploy_envs"].nil? or p["deploy_envs"].empty? self.type = p["type"] || Devops::GenericType.name self.description = p["description"] self.archived = p["archived"] || false @@ -73,34 +73,20 @@ module Devops def add_authorized_user user, env=nil return if user.nil? new_users = ( user.is_a?(Array) ? user : [ user ] ) - if env.nil? - self.deploy_envs.each do |e| - return unless e.users.is_a?(Array) - e.add_users new_users - Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) - end - else - e = self.deploy_env(env) - return unless e.users.is_a?(Array) + environments = env.nil? ? self.deploy_envs : [ self.deploy_env(env) ] + environments .each do |e| e.add_users new_users - Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) + Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, {users: e.users}) end end def remove_authorized_user user, env=nil return if user.nil? users = ( user.is_a?(Array) ? user : [ user ] ) - if env.nil? - self.deploy_envs.each do |e| - return unless e.users.is_a?(Array) - e.users = e.users - users - Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) - end - else - e = self.deploy_env(env) - return unless e.users.is_a?(Array) + environments = env.nil? ? self.deploy_envs : [ self.deploy_env(env) ] + environments.each do |e| e.users = e.users - users - Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) + Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, {users: e.users}) end end From ce5b72c897471b3174a145f5e2cd1c5b7c5615a6 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 25 Nov 2015 18:07:06 +0300 Subject: [PATCH 3/3] don't try to create create role messages if roles is nil --- devops-service/db/mongo/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops-service/db/mongo/models/project.rb b/devops-service/db/mongo/models/project.rb index d6cc327..3e68952 100644 --- a/devops-service/db/mongo/models/project.rb +++ b/devops-service/db/mongo/models/project.rb @@ -211,7 +211,7 @@ module Devops end def self.create_roles_response roles - if roles.is_a?(String) + if !roles || roles.is_a?(String) roles else info = ""