dtk-client 0.11.8 → 0.11.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce23832ed682975a0727ee818e047fd5cfd5d381
-  data.tar.gz: b9c6efe83f37a372cd2528f2adc3b7eecc2b5617
+  metadata.gz: 3c1243437980492193969d331349b58e87d20f6c
+  data.tar.gz: '08e0afe0380f0d2eee56edf002005fb098850c94'
 SHA512:
-  metadata.gz: 82e0ddd1c3f426bb9f6220754eb82ea4923b6c71be157117b3f7b5c8aa4932dfa70130f8a73cfba955d67e61e2c7dd1a979947980edf383593b8cdccb48f88b2
-  data.tar.gz: c222153161e27520a0da7e28926c83c6ba3a37d51774944efcbcd734b3aedada908954b8940db8e5018c43b0abd12e9b23032b6d115ae4f830c98c3b9a359454
+  metadata.gz: 1b23957da3a9aa6347e43ed156956fc51773a9deb15b6b8bd45b57c6a4504740a4e0a6afc80e999dbf0a307b40cf5ee9952e9065f0fe4a53186854d879938d3f
+  data.tar.gz: 8dbbc1ebfba62af5cf4d85815cf62e7c926152ba27eca693d625c858508fd51cc24451ddf258847d8d9d8d6cb6dc2bae1247117dbda4e8d5bdef68315bc06ce3

data/dtk-client.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
-  spec.add_dependency 'dtk-common-core','0.11.1'
+  spec.add_dependency 'dtk-common-core','0.11.1.1'
   spec.add_dependency 'gli', '2.13.4'
   spec.add_dependency 'highline', '1.7.8'
   spec.add_dependency 'colorize', '0.7.7'
   spec.add_dependency 'git', '1.2.9'
   spec.add_dependency 'hirb', '0.7.3'
   spec.add_dependency 'mime-types', '~> 2.99.3'
-  spec.add_dependency 'dtk-dsl', '~> 1.1.0'
-  spec.add_dependency 'dtk-network-client', '~> 1.0.0'
+  spec.add_dependency 'dtk-dsl', '1.1.3'
+  spec.add_dependency 'dtk-network-client', '1.0.1.1'
 end

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.11.8"
+      VERSION="0.11.8.1"
     end
   end
 end

data/lib/client/operation/client_module_dir/git_repo/internal.rb

@@ -95,6 +95,22 @@ module DTK::Client
           repo.head_commit_sha
         end
 
+        def self.commit_and_push_to_nested_module_repo(args)
+          target_repo_dir = args.required(:target_repo_dir)
+          repo            = git_repo.new(target_repo_dir)
+          branch          = args[:branch] || repo.current_branch
+          remote_branch   = args[:remote_branch] || branch
+
+          if repo.changed?
+            repo.stage_and_commit
+            dtk_server_remote = 'origin'
+            repo.push(dtk_server_remote, branch)
+            return repo.head_commit_sha
+          end
+
+          nil
+        end
+
         def self.clone(repo_url, target_repo_dir,  branch)
           begin
             git_repo.clone(repo_url, target_repo_dir,  branch)
@@ -162,13 +178,14 @@ module DTK::Client
         # For this and other methods in Internal that use Dtk_Server::GIT_REMOTE
         # put a version in Internal taht takes remote_name as param and then have 
         # method with same name in Dtk, that calss this with appropriate remote name
-        def self.init_and_push_from_existing_repo(repo_dir, repo_url, remote_branch)
+        def self.init_and_push_from_existing_repo(repo_dir, repo_url, remote_branch, opts = {})
           repo = git_repo.new(repo_dir)
+          remote = opts[:remote] || Dtk_Server::GIT_REMOTE
           
-          if repo.is_there_remote?(Dtk_Server::GIT_REMOTE)
-            push_when_there_is_dtk_remote(repo, repo_dir, repo_url, remote_branch)
+          if repo.is_there_remote?(remote)
+            push_when_there_is_dtk_remote(repo, repo_dir, repo_url, remote_branch, opts)
           else
-            add_remote_and_push(repo, repo_url, remote_branch)
+            add_remote_and_push(repo, repo_url, remote_branch, opts)
           end
           
           repo.head_commit_sha
@@ -197,15 +214,16 @@ module DTK::Client
           repo
         end
 
-        def self.push_when_there_is_dtk_remote(repo, repo_dir, repo_url, remote_branch)
+        def self.push_when_there_is_dtk_remote(repo, repo_dir, repo_url, remote_branch, opts = {})
           # if there is only one remote and it is dtk-server; remove .git and initialize and push as new repo to dtk-server remote
           # else if multiple remotes and dtk-server being one of them; remove dtk-server; add new dtk-server remote and push
           if repo.remotes.size == 1
             git_repo.unlink_local_clone?(repo_dir)
             create_repo_from_remote_and_push(repo_dir, repo_url, remote_branch)
           else
-            repo.remove_remote(Dtk_Server::GIT_REMOTE)
-            add_remote_and_push(repo, repo_url, remote_branch)
+            remote = opts[:remote] || Dtk_Server::GIT_REMOTE
+            repo.remove_remote(remote)
+            add_remote_and_push(repo, repo_url, remote_branch, opts)
           end
         end
 
@@ -226,10 +244,11 @@ module DTK::Client
           repo.head_commit_sha
         end
         
-        def self.add_remote_and_push(repo, repo_url, remote_branch)
-          repo.add_remote(Dtk_Server::GIT_REMOTE, repo_url)
+        def self.add_remote_and_push(repo, repo_url, remote_branch, opts = {})
+          remote = opts[:remote] || Dtk_Server::GIT_REMOTE
+          repo.add_remote(remote, repo_url)
           repo.stage_and_commit
-          repo.push(Dtk_Server::GIT_REMOTE, remote_branch, { :force => true })
+          repo.push(remote, remote_branch, { :force => true })
         end
 
         def self.add_service_repo_file(args)

data/lib/client/operation/client_module_dir/git_repo.rb

@@ -27,6 +27,12 @@ module DTK::Client
         end
       end
 
+      def self.commit_and_push_to_nested_module_repo(args)
+        wrap_operation(args) do |args|
+          response_data_hash(:head_sha => Internal.commit_and_push_to_nested_module_repo(args))
+        end
+      end
+
       def self.clone_exists?(args)
         wrap_operation(args) do |args|
           type = args.required(:type)

data/lib/client/operation/client_module_dir/service_instance/internal.rb

@@ -41,7 +41,26 @@ module DTK::Client
           self.nested_modules.each { |nested_module| clone_nested_module(nested_module) }
           self.target_repo_dir
         end
-          
+
+        def self.commit_and_push_nested_modules(args)
+          service_instance     = args[:service_instance]
+          service_instance_dir = args[:service_instance_dir] || ret_base_path(:service, service_instance)
+
+          nested_modules_dir = find_nested_modules_dir(service_instance_dir)
+          nested_modules     = Dir.glob("#{nested_modules_dir}/*")
+
+          nested_modules_with_sha = []
+          nested_modules.each do |nested_module|
+            nested_module_name = nested_module.split('/').last
+            response = ClientModuleDir::GitRepo.commit_and_push_to_nested_module_repo({target_repo_dir: nested_module})
+            if head_sha = response.data(:head_sha)
+              nested_modules_with_sha << { nested_module_name => head_sha }
+            end
+          end
+
+          nested_modules_with_sha
+        end
+
         protected
 
         attr_reader :base_module, :nested_modules, :service_instance, :remove_existing, :repo_dir
@@ -85,6 +104,10 @@ module DTK::Client
           dirs.map { |dir| "#{self.target_repo_dir}/#{dir}" }.find { |full_path| ! File.exists?(full_path) }
         end
 
+        def self.find_nested_modules_dir(service_instance_dir)
+          self.possible_nested_module_base_dirs.map { |dir| "#{service_instance_dir}/#{dir}" }.find { |full_path| File.exists?(full_path) }
+        end
+
         def clone_repo(module_info, target_repo_dir)
           clone_args = {
             :repo_url        => module_info.repo_url,

data/lib/client/operation/client_module_dir/service_instance.rb

@@ -25,6 +25,12 @@ module DTK::Client
           response_data_hash(:target_repo_dir => Internal.clone(args))
         end
       end
+
+      def self.commit_and_push_nested_modules(args)
+        wrap_operation(args) do |args|
+          response_data_hash(:nested_modules => Internal.commit_and_push_nested_modules(args))
+        end
+      end
     end
   end
 end

data/lib/client/operation/service/clone_service.rb

@@ -23,27 +23,22 @@ module DTK::Client
           service_ref       = args.required(:service_ref)
           service_name      = args.required(:service_name)
           target_directory = args[:target_directory]
+
           unless service_info = service_exists?(service_ref)
             raise Error::Usage, "DTK service '#{service_ref}' does not exist on server."
           end
 
-          pp service_info
-          fail "TODO: DTK-3366: update to use ClientModuleDir::ServiceInstance.clone"
-
-          branch    = service_info.required(:branch, :name)
-          repo_url  = service_info.required(:repo, :url)
-          repo_name = service_info.required(:repo, :name)
-
+          service_instance = service_info.required(:service, :name)
           clone_args = {
-            :repo_url    => service_info.required(:repo, :url),
-            :branch      => service_info.required(:branch, :name),
-            :service_instance => service_name,
-            #:service_name => service_name,
-            :repo_dir    => target_directory || ClientModuleDir.ret_path_with_current_dir(service_name)
+            :base_module      => service_info.required(:base_module),
+            :nested_modules   => service_info.required(:nested_modules),
+            :service_instance => service_instance,
+            :repo_dir         => target_directory
           }
+          message = ClientModuleDir::ServiceInstance.clone(clone_args)
+          target_dir = message.data(:target_repo_dir)
 
-          ret = ClientModuleDir::GitRepo.clone_service_repo(clone_args)
-          OsUtil.print_info("DTK service '#{service_ref}' has been successfully cloned into '#{ret.required(:target_repo_dir)}'")
+          OsUtil.print_info("DTK service '#{service_instance}' has been successfully cloned into '#{target_dir}'")
         end
       end
     end

data/lib/client/operation/service/commit_and_push.rb

@@ -25,18 +25,39 @@ module DTK::Client
           
           response = rest_get("#{BaseRoute}/#{service_instance}/repo_info")
 
-          repo_info_args = Args.new(
-            :service_instance => service_instance,
-            :commit_message   => args[:commit_message] || default_commit_message(service_instance),
-            :branch           => response.required(:branch, :name),
-            :repo_url         => response.required(:repo, :url),
+          nested_module_args = Args.new(
+            :service_instance     => service_instance,
+            :base_module          => nil,
+            :nested_modules       => nil,
             :service_instance_dir => args[:service_instance_dir]
           )
+          nested_modules_response = ClientModuleDir::ServiceInstance.commit_and_push_nested_modules(nested_module_args)
+          updated_nested_modules  = nested_modules_response.data(:nested_modules)
+
+          unless updated_nested_modules.empty?
+            repo_dir = (args[:service_instance_dir] || ClientModuleDir.ret_base_path(:service, service_instance))
+            empty_commit_args = Args.new(
+              :repo_dir   => repo_dir,
+              :commit_msg => "Nested modules changed"
+            )
+            ClientModuleDir::GitRepo.create_repo_with_empty_commit(empty_commit_args)
+
+            # this is used to pick up changes made in nested modules
+            Dir.glob("#{repo_dir}/.nested_modules_changed_*").each { |file| File.delete(file)}
+            Operation::ClientModuleDir.create_file_with_content("#{repo_dir}/.nested_modules_changed_#{Time.now.to_i}", Time.now.to_i)
+          end
 
+          repo_info_args = Args.new(
+            :service_instance     => service_instance,
+            :commit_message       => args[:commit_message] || default_commit_message(service_instance),
+            :branch               => response.required(:branch, :name),
+            :repo_url             => response.required(:repo, :url),
+            :service_instance_dir => args[:service_instance_dir]
+          )
           response = ClientModuleDir::GitRepo.commit_and_push_to_service_repo(repo_info_args)
           commit_sha = response.required(:head_sha)
 
-          response = rest_post("#{BaseRoute}/#{service_instance}/update_from_repo", :commit_sha => commit_sha)
+          response = rest_post("#{BaseRoute}/#{service_instance}/update_from_repo", { :commit_sha => commit_sha, :updated_nested_modules => updated_nested_modules })
           print_msgs_of_type(:error_msgs, response)
           print_msgs_of_type(:warning_msgs, response)
           print_msgs_of_type(:info_msgs, response)

data/lib/client/operation/service.rb

@@ -57,7 +57,7 @@ module DTK::Client
       private
 
       def self.service_exists?(service_ref, opts = {})
-        response = rest_get("#{BaseRoute}/#{service_ref}/repo_info")
+        response = rest_get("#{BaseRoute}/#{service_ref}/base_and_nested_repo_info")
         response.data.empty? ? nil : response
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.8.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.1.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -112,30 +112,30 @@ dependencies:
   name: dtk-dsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: dtk-network-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1.1
 description: Command line tool to interact with a DTK Server and DTK Service Catalog.
 email: support@reactor8.com
 executables:
@@ -423,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: DTK CLI client for DTK server interaction.