dtk-client 0.10.6 → 0.10.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGU5NTUzYWM4NzlhOTJiNWFmN2NhNjQwNjE1N2FkN2YwMzc4ZThkYQ==
+    Y2M4YzBhNDk4N2Q5NDM2ZTI5ZGY1NDNlN2VmYWFiMjU1MTRlMzc1Yg==
   data.tar.gz: !binary |-
-    YjZkZDk4ODA4ZTliNDkyZjdiYjMwMWFiMGRmOWFlYzFjYzJhNzVjNA==
+    MzliN2I5MzNjMTFkM2Y0OWRhNjM4ZmE3MTYwZWMyMzUzMTNhMzFmMA==
 SHA512:
   metadata.gz: !binary |-
-    OTRhOWY0NTkwZTFlNTRlZWVhNDRmNGRjZTc3NmVlMzIzNjU5N2UzZDI1M2I1
-    ZGRjZTQ4MDMxOGFkOGNkNGUyYzBlZDdhOWQzOWJiNmYzNDEzNmE0YjZkNDNk
-    ZTVkYTZkMjdlZTVkMmI3YTk4MGY5YmU0Y2EzY2IxY2QyZDVjN2Q=
+    MjZmZDgzY2E0ODJhNGM1NTE0YzQ4M2Q0ZTVlNGRlZDVlY2VlZmU0ODllNWJj
+    MDgwNjY3MDE1MzM5NGM5YjBkZGViMTNmZDYyOWE2ZWVhMjQ2ZTk3YjdiNzky
+    YzU1OWU3NmExYjA0NmY5MzRjNDZmMjhiM2MzMWY2OWYzMTY4Y2U=
   data.tar.gz: !binary |-
-    ZDVlYTQxM2Y0M2YwOGE1NjgwMWYzZTY4ZTBjOGEzNGMyYTA1OTE4NTlhZmVj
-    ZmVhMmE0M2I4NjA3ZGVlNWUzN2NiZjVhNzk0ZTY5ODVmOGVhZWRhZTgwMjgy
-    N2VlOWNhY2IyNWJjNjE0OGVlMTlmYjk0YWQ0NzY2MDc3MTdmMWE=
+    NWUxNzQ4MWU4NDNiOWQyMDk2NTZkNjE0M2FhYWY2NmE2YjdhOTJhZDA0OGY2
+    YzlhN2E1M2IxYTc3ZDNmM2ViOTVkYWVjY2Y0M2I5ZjBmMzFlMmRlNjU2ZmZj
+    ODc5ZmYyY2RlOTYxM2VlNDFmNmY2ZGRlNzRmYjFlY2U0YzZjNTQ=

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.10.6"
+      VERSION="0.10.7"
     end
   end
 end

data/lib/client/git_repo/adapter/git_gem.rb

@@ -297,8 +297,10 @@ module DTK::Client
         deletions = 0
         insertions = 0
         changes[0].each do |item|
-          deletions += diff[item][:deletions]
-          insertions += diff[item][:insertions]  
+          if diff_item = diff[item]
+            deletions  += (diff_item||{})[:deletions]
+            insertions += (diff_item||{})[:insertions]
+          end
           puts "\t#{item} | #{insertions + deletions} " + "+".colorize(:green) * insertions + "-".colorize(:red) * deletions
         end
         puts "\t#{file_changed} file changed, #{deletions} deletions(-), #{insertions} insertions(+)"

data/lib/client/operation/module/install.rb

@@ -64,8 +64,12 @@ module DTK::Client
         end
 
         unless dependent_modules.empty?
-          begin 
-            DependentModules.install(@base_module_ref, dependent_modules, :skip_prompt => opts[:skip_prompt])
+          begin
+            if @has_remote_repo
+              DependentModules.install(@base_module_ref, dependent_modules, :skip_prompt => opts[:skip_prompt])
+            else
+              DependentModules.install_with_local(@base_module_ref, dependent_modules, :skip_prompt => opts[:skip_prompt])
+            end
           rescue TerminateInstall
             @print_helper.print_terminated_installation
             return nil

data/lib/client/operation/module/install/dependent_modules.rb

@@ -21,6 +21,8 @@ module DTK::Client
       require_relative('dependent_modules/prompt_helper')
       require_relative('dependent_modules/component_dependency_tree')
       require_relative('dependent_modules/component_module')
+      require_relative('dependent_modules/local_dependencies')
+      require_relative('dependent_modules/remote_dependencies')
 
       BaseRoute  = "modules"
       # opts can have keys:
@@ -41,6 +43,18 @@ module DTK::Client
         new(*args).install
       end
 
+      def self.install_with_local(*args)
+        new(*args).install_with_local
+      end
+
+      def self.resolved
+        @resolved ||= []
+      end
+
+      def self.add_to_resolved(module_name)
+        resolved << module_name
+      end
+
       def install
         @print_helper.print_getting_dependencies
         unified_module_refs = get_unified_dependent_module_refs
@@ -58,12 +72,86 @@ module DTK::Client
         end
       end
 
+      def install_with_local
+        @component_module_refs.each do |component_module_ref|
+          unless self.class.resolved.include?("#{component_module_ref.namespace}:#{component_module_ref.module_name}")
+            self.class.add_to_resolved("#{component_module_ref.namespace}:#{component_module_ref.module_name}")
+            if component_module_ref.is_master_version?
+              server_response = self.class.get_server_dependencies(component_module_ref)
+              if module_info = server_response.data(:module_info)
+                if module_info['has_remote']
+                  new_print_helper  = PrintHelper.new(:module_ref => component_module_ref, :source => :remote)
+                  if @prompt_helper.pull_module_update?(new_print_helper)
+                    ComponentModule.install_or_pull_new?(component_module_ref, @prompt_helper, new_print_helper) unless component_module_ref.is_base_module?
+                    RemoteDependencies.install_or_pull?(component_module_ref, @prompt_helper, new_print_helper)
+                  else
+                    new_print_helper.print_using_installed_dependent_module
+                    LocalDependencies.install_or_pull?(server_response, @prompt_helper, new_print_helper)
+                  end
+                else
+                  # does not have remote but exist locally
+                  new_print_helper = PrintHelper.new(:module_ref => component_module_ref, :source => :remote)
+                  new_print_helper.print_using_installed_dependent_module
+
+                  LocalDependencies.install_or_pull?(server_response, @prompt_helper, new_print_helper)
+                end
+              else
+                remote_response  = nil
+                new_print_helper = PrintHelper.new(:module_ref => component_module_ref, :source => :remote)
+                cmp              = ComponentModule.new(component_module_ref, @prompt_helper, new_print_helper)
+                if component_module_ref.module_installed?(cmp)
+                  if @prompt_helper.pull_module_update?(new_print_helper)
+                    ComponentModule.install_or_pull_new?(component_module_ref, @prompt_helper, new_print_helper) unless component_module_ref.is_base_module?
+                  else
+                    new_print_helper.print_using_installed_dependent_module
+                  end
+                else
+                  ComponentModule.install_or_pull_new?(component_module_ref, @prompt_helper, new_print_helper) unless component_module_ref.is_base_module?
+                end
+              end
+            else
+              new_print_helper = PrintHelper.new(:module_ref => component_module_ref, :source => :remote)
+              new_print_helper.print_using_installed_dependent_module
+              cmp = ComponentModule.new(component_module_ref, @prompt_helper, new_print_helper)
+              unless component_module_ref.module_installed?(cmp)
+                ComponentModule.install_or_pull_new?(component_module_ref, @prompt_helper, new_print_helper)
+              end
+
+              server_response = self.class.get_server_dependencies(component_module_ref)
+              LocalDependencies.install_or_pull?(server_response, @prompt_helper, new_print_helper)
+            end
+          end
+        end
+      end
+
+      def self.create_module_ref(ref_hash, opts = {})
+        module_ref_hash = {
+          :namespace => ref_hash['namespace'], 
+          :module_name => ref_hash['name'], 
+          :version => ref_hash['version']
+        }
+        Install::ModuleRef.new(module_ref_hash)
+      end
+
       def get_unified_dependent_module_refs
         component_dependency_tree = ComponentDependencyTree.create(@base_module_ref, @component_module_refs, @print_helper)
         # returns an array of module_refs that have been unified so only one version and namespace per module name
         component_dependency_tree.resolve_conflicts_and_versions
       end
 
+      def get_local_modules_info
+        component_dependency_tree = ComponentDependencyTree.create(@base_module_ref, @component_module_refs, @print_helper, 'local')
+        component_dependency_tree.resolve_conflicts_and_versions
+      end
+
+      def self.get_server_dependencies(component_module_ref)
+        hash = {
+          :module_name => component_module_ref.module_name,
+          :namespace   => component_module_ref.namespace,
+          :version?    => component_module_ref.version
+        }
+        rest_get "#{BaseRoute}/module_info_with_local_dependencies", QueryStringHash.new(hash)
+      end
     end
   end
 end

data/lib/client/operation/module/install/dependent_modules/component_module.rb

@@ -31,6 +31,10 @@ module DTK::Client; class Operation::Module
       def self.install_or_pull?(module_ref, prompt_helper, print_helper)
         new(module_ref, prompt_helper, print_helper).install_or_pull?
       end
+
+      def self.install_or_pull_new?(module_ref, prompt_helper, print_helper)
+        new(module_ref, prompt_helper, print_helper).install_or_pull_new?
+      end
       
       def install_or_pull?
         if @module_ref.module_installed?(self)
@@ -44,6 +48,18 @@ module DTK::Client; class Operation::Module
         end
       end
 
+      def install_or_pull_new?
+        if @module_ref.module_installed?(self)
+          if @module_ref.is_master_version?
+            pull_module_update_new?
+          else
+            @print_helper.print_using_installed_dependent_module
+          end
+        else
+          install_module
+        end
+      end
+
       def query_if_component_module_is_installed?
         # TODO: :type => :component_module is for legacy; once we get past having legacy can change to :common_module
         module_version_exists?(@module_ref, :type => :component_module)
@@ -51,6 +67,27 @@ module DTK::Client; class Operation::Module
 
       private
 
+      def pull_module_update_new?
+        # return unless @prompt_helper.pull_module_update?(@print_helper)
+        @print_helper.print_continuation_pulling_dependency_update
+
+        post_body = {
+          :module_name => module_name,
+          :namespace   => namespace,
+          :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+          :version?    => version,
+          :force       => true # TODO: hardwired
+        }
+        response = rest_post "#{BaseRoute}/pull_component_info_from_remote", PostBody.new(post_body)
+
+        if (response.data(:diffs) || {}).empty?
+#          OsUtil.print("No changes to pull from remote.", :yellow) unless response['errors']
+          OsUtil.print("No changes to pull from remote.", :yellow) 
+        else
+          OsUtil.print("Changes pulled from remote", :green)
+        end
+      end
+
       def pull_module_update?
         return unless @prompt_helper.pull_module_update?(@print_helper)
         @print_helper.print_continuation_pulling_dependency_update

data/lib/client/operation/module/install/dependent_modules/local_dependencies.rb

@@ -0,0 +1,53 @@
+#
+# 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 Operation::Module
+  class Install::DependentModules
+    class LocalDependencies < Operation::Module
+      include Install::Mixin
+      BaseRoute  = "modules"
+
+      def initialize(module_ref, prompt_helper, print_helper)
+        @module_ref    = module_ref
+        @prompt_helper = prompt_helper
+        @print_helper  = print_helper.set_module_ref!(module_ref)
+      end
+      private :initialize
+
+      def self.install_or_pull?(server_response, prompt_helper, print_helper)
+        if dependencies = (server_response.data(:dependencies)||{})['required_modules']
+          dependencies.each do |dep|
+            unless Install::DependentModules.resolved.include?("#{dep['namespace']}:#{dep['name']}")
+              Install::DependentModules.add_to_resolved("#{dep['namespace']}:#{dep['name']}")
+              dep_module_ref = Install::DependentModules.create_module_ref(dep, opts = {})
+              if dep_ref_info = module_version_exists?(dep_module_ref, :type => :component_module, :remote_info => true, :rsa_pub_key => SSHUtil.rsa_pub_key_content)
+                new_print_helper = Install::PrintHelper.new(:module_ref => dep_module_ref, :source => :remote)
+                if dep_ref_info.data(:has_remote) && !prompt_helper.update_none
+                  ComponentModule.install_or_pull?(dep_module_ref, prompt_helper, new_print_helper) unless dep_module_ref.is_base_module?
+                else
+                  new_print_helper.print_using_installed_dependent_module
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end; end
+
+

data/lib/client/operation/module/install/dependent_modules/remote_dependencies.rb

@@ -0,0 +1,67 @@
+#
+# 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 Operation::Module
+  class Install::DependentModules
+    class RemoteDependencies < Operation::Module
+      include Install::Mixin
+      BaseRoute  = "modules"
+
+      def initialize(module_ref, prompt_helper, print_helper)
+        @module_ref    = module_ref
+        @prompt_helper = prompt_helper
+        @print_helper  = print_helper.set_module_ref!(module_ref)
+      end
+      private :initialize
+
+      def self.install_or_pull?(component_module_ref, prompt_helper, print_helper)
+        remote_response = nil
+        begin
+          hash = {
+            :module_name => component_module_ref.module_name,
+            :namespace   => component_module_ref.namespace,
+            :rsa_pub_key => SSHUtil.rsa_pub_key_content,
+            :version?    => component_module_ref.version
+          }
+          remote_response = rest_get "#{BaseRoute}/module_dependencies", QueryStringHash.new(hash)
+        rescue Error::ServerNotOkResponse => e
+          # temp fix for issue when dependent module is imported from puppet forge
+          if errors = e.response && e.response['errors']
+            remote_response = nil if errors.first.include?('not found')
+          else
+            raise e
+          end
+        end
+
+        if remote_required = remote_response.data(:required_modules)
+          remote_required.each do |req_module|
+            unless Install::DependentModules.resolved.include?("#{req_module['namespace']}:#{req_module['name']}")
+              Install::DependentModules.add_to_resolved("#{req_module['namespace']}:#{req_module['name']}")
+              req_ref = Install::DependentModules.create_module_ref(req_module)
+              new_print_helper = Install::PrintHelper.new(:module_ref => req_ref, :source => :remote)
+              if prompt_helper.pull_module_update?(new_print_helper)
+                ComponentModule.install_or_pull_new?(req_ref, prompt_helper, new_print_helper) unless req_ref.is_base_module?
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end; end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core
@@ -259,7 +259,9 @@ files:
 - lib/client/operation/module/install/dependent_modules/component_dependency_tree/cache.rb
 - lib/client/operation/module/install/dependent_modules/component_dependency_tree/resolve_modules.rb
 - lib/client/operation/module/install/dependent_modules/component_module.rb
+- lib/client/operation/module/install/dependent_modules/local_dependencies.rb
 - lib/client/operation/module/install/dependent_modules/prompt_helper.rb
+- lib/client/operation/module/install/dependent_modules/remote_dependencies.rb
 - lib/client/operation/module/install/mixin.rb
 - lib/client/operation/module/install/module_ref.rb
 - lib/client/operation/module/install/print_helper.rb
@@ -385,7 +387,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.