dtk-client 0.7.10 → 0.8.0

data/lib/commands/common/thor/assembly_workspace.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 require 'rest_client'
 require 'json'
 require 'colorize'
@@ -1553,4 +1570,4 @@ module DTK::Client
       response = ContextRouter.routeTask(:service_module, "stage", new_context_params, @conn)
     end
   end
-end
+end

data/lib/commands/common/thor/base_command_helper.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   class BaseCommandHelper
     def initialize(command,context_params=nil)
@@ -39,4 +56,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/clone.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_common_commands('thor/common')
 module DTK::Client
   module CloneMixin
@@ -22,7 +39,7 @@ module DTK::Client
       # clone base version first if not cloned already
       clone_base_aux(module_type, module_id, "#{module_namespace}:#{module_name}") if opts[:use_latest] && version
 
-      # TODO: DTK-2358: comenyed out because causing error in this jira; see if need to put in in revisedform to avoid this error; below is checking wromg thing ( module_location is set to wromg thing to check)
+     # TODO: DTK-2358: comenyed out because causing error in this jira; see if need to put in in revisedform to avoid this error; below is checking wromg thing ( module_location is set to wromg thing to check)
       # module_location = OsUtil.module_location(module_type, "#{module_namespace}:#{module_name}", version)
       # raise DTK::Client::DtkValidationError, "#{module_type.to_s.gsub('_',' ').capitalize} '#{module_name}#{version && "-#{version}"}' already cloned!" if File.directory?(module_location) && !opts[:skip_if_exist_check]
 
@@ -62,4 +79,4 @@ module DTK::Client
       return context_params_for_module
     end
   end
-end
+end

data/lib/commands/common/thor/common.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module CommonMixin
    private
@@ -68,4 +85,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/common_base.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module Commands
     module Common
@@ -29,4 +46,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/commands/common/thor/create_target.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require('common_base')
 module DTK; module Client; module Commands::Common
   class CreateTarget < Base
@@ -50,4 +67,4 @@ module DTK; module Client; module Commands::Common
     end
 
   end
-end; end; end
+end; end; end

data/lib/commands/common/thor/edit.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_common_commands('thor/clone')
 dtk_require_common_commands('thor/push_clone_changes')
 dtk_require_common_commands('thor/pull_clone_changes')
@@ -235,5 +252,4 @@ end
         raise DtkValidationError, "Unsupported format type '#{format.to_s}'!"
       end
     end
-=end
-
+=end

data/lib/commands/common/thor/inventory_parser.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_from_base('configurator')
 module DTK::Client
   module InventoryParserMixin
@@ -78,4 +95,4 @@ module DTK::Client
     ValidOsTypes = ['ubuntu', 'centos', 'redhat', 'debian']
 
   end
-end
+end

data/lib/commands/common/thor/list_diffs.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module ListDiffsMixin
   	def list_diffs_aux(module_type,module_id,remote,version=nil)

data/lib/commands/common/thor/module/import.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_from_base("util/os_util")
 dtk_require_from_base('commands')
 dtk_require_from_base("command_helper")
@@ -195,4 +212,4 @@ module DTK::Client
 
     end
   end
-end
+end

data/lib/commands/common/thor/module.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_common_commands('thor/clone')
 dtk_require_common_commands('thor/list_diffs')
 dtk_require_common_commands('thor/puppet_forge')
@@ -617,7 +634,8 @@ module DTK::Client
 
     def clone_module_aux(context_params, internal_trigger = false)
       module_type      = get_module_type(context_params)
-      thor_options     = context_params.get_forwarded_options() || options
+      forward_options  = context_params.get_forwarded_options()
+      thor_options     = forward_options.empty? ? options : forward_options
       module_id        = context_params.retrieve_arguments([REQ_MODULE_ID], method_argument_names)
       module_name      = context_params.retrieve_arguments(["#{module_type}_name".to_sym],method_argument_names)
       version          = thor_options["version"]||options.version
@@ -977,4 +995,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/node.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module NodeMixin
     def get_node_info_for_ssh_login(node_id, context_params)
@@ -33,4 +50,4 @@ module DTK::Client
       'amazon-linux' => 'ec2-user'
     }
   end
-end
+end

data/lib/commands/common/thor/poller.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module Poller
 

data/lib/commands/common/thor/pull_clone_changes.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_common_commands('thor/common')
 module DTK::Client
   module PullCloneChangesMixin
@@ -8,5 +25,4 @@ module DTK::Client
       Helper(:git_repo).pull_changes(module_type,module_name,opts_pull)
     end
   end
-end
-
+end

data/lib/commands/common/thor/pull_from_remote.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module PullFromRemoteMixin
     def pull_from_remote_aux(module_type,module_id,opts={})
@@ -132,4 +149,4 @@ module DTK::Client
 
     end
   end
-end
+end

data/lib/commands/common/thor/puppet_forge.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module PuppetForgeMixin
 
@@ -52,6 +69,4 @@ module DTK::Client
     end
 
   end
-end
-
-
+end

data/lib/commands/common/thor/purge_clone.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module PurgeCloneMixin
     def purge_clone_aux(module_type, opts = {})
@@ -81,4 +98,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/push_clone_changes.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_common_commands('thor/common')
 dtk_require_from_base('command_helpers/service_importer')
 
@@ -142,4 +159,4 @@ module DTK::Client
       end
     end
   end
-end
+end

data/lib/commands/common/thor/push_to_remote.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 dtk_require_common_commands('thor/common')
 dtk_require("../../../domain/git_adapter")
 
@@ -74,4 +91,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/remotes.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 module DTK::Client
   module RemotesMixin

data/lib/commands/common/thor/reparse.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 require 'yaml'
 
 module DTK::Client
@@ -20,4 +37,4 @@ module DTK::Client
     end
 
   end
-end
+end

data/lib/commands/common/thor/set_required_attributes.rb

@@ -1,3 +1,20 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 module DTK::Client
   module SetRequiredParamsMixin
     def set_required_attributes_aux(id,type,subtype=nil)
@@ -26,4 +43,4 @@ module DTK::Client
       end
     end
   end
-end
+end