dtk-client 0.5.14 → 0.5.15

data/lib/util/os_util.rb

@@ -28,7 +28,6 @@ module DTK
           is_windows? ? genv(:temp) : '/tmp'
         end
 
-
         def pop_readline_history(number_of_last_commands)
           number_of_last_commands.downto(1) do
             Readline::HISTORY.pop
@@ -98,13 +97,13 @@ module DTK
 
           system("#{editor} #{file}")
         end
-        
+
         def module_location(module_type,module_name,version=nil,opts={})
-          #compact used because module_name can be nil
+          # compact used because module_name can be nil
           module_location_parts(module_type,module_name,version,opts).compact.join('/')
         end
-        
-        #if module location is /a/b/d/mod it returns ['/a/b/d','mod']
+
+        # if module location is /a/b/d/mod it returns ['/a/b/d','mod']
         def module_location_parts(module_type,module_name,version=nil,opts={})
           base_path = clone_base_path(opts[:assembly_module] ? :assembly_module : module_type)
           if assembly_module = opts[:assembly_module]
@@ -141,7 +140,7 @@ module DTK
 
         def clone_base_path(module_type)
 
-          path = 
+          path =
             case module_type
               when :service_module then Config[:service_location]
               when :component_module then Config[:module_location]
@@ -174,12 +173,12 @@ module DTK
           component_module_dir = module_clone_location()
           Dir.entries(component_module_dir).select {|entry| File.directory? File.join(component_module_dir,entry) and !(entry =='.' || entry == '..') }
         end
-        
+
         # Public method will convert given string, to string with colorize output
         #
         # message - String to be colorized
         # color   - Symbol describing color to be used
-        # 
+        #
         # Returns String with colorize output
         def colorize(message, color)
           # at the moment we do not support colors in windows
@@ -200,15 +199,15 @@ module DTK
         #
         # Example
         # suspend_output do
-        #   # some calls 
+        #   # some calls
         # end
         def suspend_output
           if is_windows?
             retval = yield
           else
+            orig_stderr = $stderr.clone
+            orig_stdout = $stdout.clone
             begin
-              orig_stderr = $stderr.clone
-              orig_stdout = $stdout.clone
               $stderr.reopen File.new('/dev/null', 'w')
               $stdout.reopen File.new('/dev/null', 'w')
               retval = yield
@@ -239,6 +238,7 @@ module DTK
           suspend_output do
             load File.expand_path('../../lib/util/os_util.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/util/ssh_util.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/util/remote_dependency_util.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/help_monkey_patch.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/domain.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/domain/git_adapter.rb', File.dirname(__FILE__))
@@ -291,7 +291,7 @@ module DTK
         end
 
         private
-        
+
         def seperator
           return (is_windows? ? "\\" : "/")
         end

data/lib/util/remote_dependency_util.rb

@@ -0,0 +1,36 @@
+#
+# Managment of remote dependencies detection (print warning) or providing data from local resources
+#
+module DTK
+  module Client
+    module RemoteDependencyUtil
+
+      MODULE_REF_FILE = 'module_refs.yaml'
+
+      class << self
+
+        def print_dependency_warnings(response, success_msg=nil)
+          return if response.nil? || response.data.nil?
+          warnings = response.data['dependency_warnings']
+          if warnings && !warnings.empty?
+            print_out "Following warnings have been detected for current module by Repo Manager:\n"
+            warnings.each { |w| print_out("  - #{w}") }
+            puts
+          end
+          print_out success_msg, :green if success_msg
+        end
+
+        def module_ref_content(location)
+          abs_location = File.join(location, MODULE_REF_FILE)
+          File.exists?(abs_location) ? File.read(abs_location) : nil
+        end
+
+        private
+
+        def print_out(message, color=:yellow)
+          DTK::Client::OsUtil.print(message, color)
+        end
+      end
+    end
+  end
+end

data/lib/util/ssh_util.rb

@@ -48,7 +48,7 @@ module DTK
     private
 
       def self.ssh_base_dir()
-        "#{ENV['HOME']}/.ssh" #TODO: very brittle
+        "#{OsUtil.dtk_home_dir}/.ssh"
       end
       
       def self.ssh_known_hosts_path()
@@ -66,6 +66,7 @@ module DTK
       end
 
       def self.is_ssh_key_content_valid?(rsa_pub_key)
+        # checking know ssh rsa pub key content
         if(rsa_pub_key.empty? || !rsa_pub_key.include?("AAAAB3NzaC1yc2EA"))
           raise DtkError, "[ERROR] SSH public key (#{path_to_key}) does not have valid content. Please check your key and try again."
         end

data/spec/component_module_spec.rb

@@ -0,0 +1,34 @@
+require 'lib/spec_thor'
+require File.expand_path('../lib/require_first', File.dirname(__FILE__))
+require File.expand_path('../lib/commands/thor/component_module', File.dirname(__FILE__))
+
+include SpecThor
+
+describe DTK::Client::ComponentModule do
+  $component_module_id = nil
+
+  context '#list' do
+    $component_module_list = run_from_dtk_shell('component-module list')
+
+    it "should have component module listing" do
+      $component_module_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
+    end
+
+    unless $component_module_list.nil?
+      unless $component_module_list['data'].nil?
+        $component_module_id = $component_module_list['data'].first['id'] unless $component_module_list['data'].empty?
+      end
+    end
+  end
+
+  context "#list/command" do
+    unless $component_module_id.nil?
+      output = run_from_dtk_shell("component-module #{$component_module_id} list-components")
+
+      it "should list all components for component module with id #{$component_module_id}" do
+        $component_module_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
+      end
+    end
+  end
+
+end

data/spec/dtk_spec.rb

@@ -13,7 +13,7 @@ describe DTK::Client::Dtk do
     f = IO.popen('dtk')
     output = f.readlines.join('')
 
-    it "should have assembly listing" do
+    it "should have service listing" do
       output.should match(/(dtk|service|ok|status|empty|INFO|WARNING)/)
     end
 

data/spec/node_template_spec.rb

@@ -7,7 +7,6 @@ include SpecThor
 describe DTK::Client::NodeTemplate do
   $node_template_id = nil
 
-  #list all assemblies and take one assembly_id
   context '#list' do
     $node_template_list = run_from_dtk_shell('node-template list')
 

data/spec/service_module_spec.rb

@@ -0,0 +1,38 @@
+require 'lib/spec_thor'
+require File.expand_path('../lib/require_first', File.dirname(__FILE__))
+require File.expand_path('../lib/commands/thor/service_module', File.dirname(__FILE__))
+
+include SpecThor
+
+describe DTK::Client::ServiceModule do
+  $about       = ['assemblies']
+  $service_module_id = nil
+
+  context '#list' do
+    $service_module_list = run_from_dtk_shell('service-module list')
+
+    it "should have service modules listing" do
+      $service_module_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
+    end
+
+    unless $service_module_list.nil?
+      unless $service_module_list['data'].nil?
+        $service_module_id = $service_module_list['data'].first['id'] unless $service_module_list['data'].empty?
+      end
+    end
+  end
+
+  context "#list/command" do
+    unless $service_module_id.nil?
+      $about.each do |type|
+        output = run_from_dtk_shell("service-module #{$service_module_id} list #{type}")
+
+        it "should list all #{type} for service module with id #{$service_module_id}" do
+          output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
+        end
+      end
+    end
+  end
+
+end
+

data/spec/service_spec.rb

@@ -1,22 +1,21 @@
 require 'lib/spec_thor'
 require File.expand_path('../lib/require_first', File.dirname(__FILE__))
-require File.expand_path('../lib/commands/thor/service_module', File.dirname(__FILE__))
+require File.expand_path('../lib/commands/thor/assembly', File.dirname(__FILE__))
 
 include SpecThor
 
-describe DTK::Client::ServiceModule do
-  $about       = ['assemblies']
+describe DTK::Client::Assembly do
+  $about       = ['nodes', 'components', 'attributes','tasks']
   $service_id = nil
 
-
-  #list all assemblies and take one assembly_id
-  context '#list' do
-    $service_list = run_from_dtk_shell('service-module list')
+  #list all services and take one service_id
+  context "#list" do
+    $service_list = run_from_dtk_shell('service list')
 
     it "should have service listing" do
       $service_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
     end
-
+    
     unless $service_list.nil?
       unless $service_list['data'].nil?
         $service_id = $service_list['data'].first['id'] unless $service_list['data'].empty?
@@ -24,11 +23,11 @@ describe DTK::Client::ServiceModule do
     end
   end
 
-
+  # for previously taken service_id, do list nodes|components|tasks
   context "#list/command" do
     unless $service_id.nil?
       $about.each do |type|
-        output = run_from_dtk_shell("service-module #{$service_id} list #{type}")
+        output = run_from_dtk_shell("service #{$service_id} list #{type}")
 
         it "should list all #{type} for service with id #{$service_id}" do
           output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
@@ -37,5 +36,15 @@ describe DTK::Client::ServiceModule do
     end
   end
 
-end
+  # for previously taken service_id, do info
+  context "#info" do
+    unless $service_id.nil?
+      output = run_from_dtk_shell("service #{$service_id} info")
 
+      it "should show information about service with id #{$service_id}" do
+        output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
+      end
+    end
+  end
+
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
@@ -210,6 +210,7 @@ files:
 - lib/commands/common/thor/clone.rb
 - lib/commands/common/thor/common.rb
 - lib/commands/common/thor/edit.rb
+- lib/commands/common/thor/inventory_parser.rb
 - lib/commands/common/thor/list_diffs.rb
 - lib/commands/common/thor/pull_clone_changes.rb
 - lib/commands/common/thor/pull_from_remote.rb
@@ -277,6 +278,7 @@ files:
 - lib/util/dtk_puppet.rb
 - lib/util/os_util.rb
 - lib/util/permission_util.rb
+- lib/util/remote_dependency_util.rb
 - lib/util/ssh_util.rb
 - lib/view_processor.rb
 - lib/view_processor/augmented_simple_list.rb
@@ -289,20 +291,17 @@ files:
 - puppet/templates/bash_profile.erb
 - puppet/templates/client.conf.erb
 - puppet/templates/dtkclient.erb
-- spec/assembly_spec.rb
-- spec/assembly_template_spec.rb
-- spec/component_template_spec.rb
+- spec/component_module_spec.rb
 - spec/dependency_spec.rb
 - spec/dtk_shell_spec.rb
 - spec/dtk_spec.rb
 - spec/lib/spec_helper.rb
 - spec/lib/spec_thor.rb
-- spec/module_spec.rb
-- spec/node_spec.rb
 - spec/node_template_spec.rb
 - spec/project_spec.rb
 - spec/repo_spec.rb
 - spec/response_spec.rb
+- spec/service_module_spec.rb
 - spec/service_spec.rb
 - spec/state_change_spec.rb
 - spec/table_print_spec.rb
@@ -321,12 +320,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -336,20 +335,17 @@ signing_key:
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.
 test_files:
-- spec/assembly_spec.rb
-- spec/assembly_template_spec.rb
-- spec/component_template_spec.rb
+- spec/component_module_spec.rb
 - spec/dependency_spec.rb
 - spec/dtk_shell_spec.rb
 - spec/dtk_spec.rb
 - spec/lib/spec_helper.rb
 - spec/lib/spec_thor.rb
-- spec/module_spec.rb
-- spec/node_spec.rb
 - spec/node_template_spec.rb
 - spec/project_spec.rb
 - spec/repo_spec.rb
 - spec/response_spec.rb
+- spec/service_module_spec.rb
 - spec/service_spec.rb
 - spec/state_change_spec.rb
 - spec/table_print_spec.rb

data/spec/assembly_spec.rb

@@ -1,50 +0,0 @@
-require 'lib/spec_thor'
-require File.expand_path('../lib/require_first', File.dirname(__FILE__))
-require File.expand_path('../lib/commands/thor/assembly', File.dirname(__FILE__))
-
-include SpecThor
-
-describe DTK::Client::Assembly do
-  $about       = ['nodes', 'components', 'attributes','tasks']
-  $assembly_id = nil
-
-  #list all assemblies and take one assembly_id
-  context "#list" do
-    $assembly_list = run_from_dtk_shell('service list')
-
-    it "should have assembly listing" do
-      $assembly_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-    end
-    
-    unless $assembly_list.nil?
-      unless $assembly_list['data'].nil?
-        $assembly_id = $assembly_list['data'].first['id'] unless $assembly_list['data'].empty?
-      end
-    end
-  end
-
-  # for previously taken assembly_id, do list nodes|components|tasks
-  context "#list/command" do
-    unless $assembly_id.nil?
-      $about.each do |type|
-        output = run_from_dtk_shell("service #{$assembly_id} list #{type}")
-
-        it "should list all #{type} for assembly with id #{$assembly_id}" do
-          output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-        end
-      end
-    end
-  end
-
-  # for previously taken assembly_id, do info
-  context "#info" do
-    unless $assembly_id.nil?
-      output = run_from_dtk_shell("service #{$assembly_id} info")
-
-      it "should show information about assembly with id #{$assembly_id}" do
-        output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-      end
-    end
-  end
-
-end

data/spec/assembly_template_spec.rb

@@ -1,51 +0,0 @@
-require 'lib/spec_thor'
-require File.expand_path('../lib/require_first', File.dirname(__FILE__))
-require File.expand_path('../lib/commands/thor/assembly', File.dirname(__FILE__))
-
-include SpecThor
-
-#Currently disabled because this context does not exist anymore
-=begin
-describe DTK::Client::AssemblyTemplate do
-  $about                = ['nodes', 'components']
-  $assembly_template_id = nil
-
-  context '#list' do
-    $assembly_template_list = run_from_dtk_shell('assembly-template list')
-
-    it "should have assembly-template listing" do
-      $assembly_template_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id|Missing)/)
-    end
-
-    unless $assembly_template_list.nil?
-      unless $assembly_template_list['data'].nil?
-        puts $assembly_template_list['data']
-	$assembly_template_id = $assembly_template_list['data'].first['id'] unless $assembly_template_list['data'].empty?
-      end
-    end
-  end
-
-  context "#list/command" do
-    unless $assembly_template_id.nil?
-      $about.each do |type|
-        output = run_from_dtk_shell("assembly-template #{$assembly_template_id} list #{type}")
-
-        it "should list all #{type} for assembly-template with id #{$assembly_template_id}" do
-          output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-        end
-      end
-    end
-  end
-
-  context "#info" do
-    unless $assembly_template_id.nil?
-      output = run_from_dtk_shell("assembly-template #{$assembly_template_id} info")
-
-      it "should show information about assembly-template with id #{$assembly_template_id}" do
-        output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-      end
-    end
-  end
-end
-
-=end

data/spec/component_template_spec.rb

@@ -1,40 +0,0 @@
-require 'lib/spec_thor'
-require File.expand_path('../lib/require_first', File.dirname(__FILE__))
-require File.expand_path('../lib/commands/thor/component_template', File.dirname(__FILE__))
-
-include SpecThor
-
-#Currently disabled because this context does not exist anymore
-=begin
-describe DTK::Client::ComponentTemplate do
-  $about                 = ['none', 'nodes']
-  $component_template_id = nil
-
-  context '#list' do
-    $component_template_list = run_from_dtk_shell('component-template list')
-
-    it "should have assembly listing" do
-      $component_template_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-    end
-
-    unless $component_template_list.nil?
-      unless $component_template_list['data'].nil?
-        $component_template_id = $component_template_list['data'].first['id'] unless $component_template_list['data'].empty?
-      end
-    end
-  end
-
-  context "#list/command" do
-    unless $component_template_id.nil?
-      $about.each do |type|
-        output = run_from_dtk_shell("component-template #{$component_template_id} list #{type}")
-
-        it "should list all #{type} for component-template with id #{$component_template_id}" do
-          output.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-        end
-      end
-    end
-  end
-
-end
-=end

data/spec/module_spec.rb

@@ -1,35 +0,0 @@
-require 'lib/spec_thor'
-require File.expand_path('../lib/require_first', File.dirname(__FILE__))
-require File.expand_path('../lib/commands/thor/component_module', File.dirname(__FILE__))
-
-include SpecThor
-
-describe DTK::Client::ComponentModule do
-  $module_id = nil
-
-  #list all assemblies and take one assembly_id
-  context '#list' do
-    $module_list = run_from_dtk_shell('component-module list')
-
-    it "should have module listing" do
-      $module_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-    end
-
-    unless $module_list.nil?
-      unless $module_list['data'].nil?
-        $module_id = $module_list['data'].first['id'] unless $module_list['data'].empty?
-      end
-    end
-  end
-
-  context "#list/command" do
-    unless $module_id.nil?
-      output = run_from_dtk_shell("component-module #{$module_id} list-components")
-
-      it "should list all components for module with id #{$module_id}" do
-        $module_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-      end
-    end
-  end
-
-end

data/spec/node_spec.rb

@@ -1,43 +0,0 @@
-require 'lib/spec_thor'
-require File.expand_path('../lib/require_first', File.dirname(__FILE__))
-require File.expand_path('../lib/commands/thor/node', File.dirname(__FILE__))
-
-include SpecThor
-
-#Currently disabled because this context does not exist anymore
-=begin
-describe DTK::Client::Node do
-	$about   = ['components', 'attributes']
-  $node_id = nil
-
-  #list all assemblies and take one assembly_id
-  context '#list' do
-    $node_list = run_from_dtk_shell('node list')
-
-    it "should list all nodes" do
-      $node_list.to_s.should match(/(ok|status|empty|INFO|WARNING|name|id)/)
-    end
-
-    unless $node_list.nil?
-      unless $node_list['data'].nil?
-        $node_id = $node_list['data'].first['id'] unless $node_list['data'].empty?
-      end
-    end
-  end
-
-  #current dtk-client code for this test is not implemented
-  
-  # context "#list/command" do
-  #   unless $node_id.nil?
-  #     $about.each do |type|
-  #       output = run_from_dtk_shell("node #{$node_id} list #{type}")
-
-  #       it "should list all #{type} for node with id #{$node_id}" do
-  #         output.to_s.should match(/(ok|status|id|name|empty|error|WARNING)/)
-  #       end
-  #     end
-  #   end
-  # end
-
-end
-=end