dtk-network-client 1.0.1 → 1.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 790e661e619abee39cf53c93876f93a66304dfa6
-  data.tar.gz: 4856080f6ff5d8c3f2c35669a09068d264ee8fb1
+  metadata.gz: 074e87ffd8e8637cc10edf504211b68e7e964f7d
+  data.tar.gz: eace69876b3ed30670c6d12c13a3f0e1503320b5
 SHA512:
-  metadata.gz: 21dd2947adaad7a5b131d1cc0c7b3f4006d10c048866f0ab8cfcfba8111a24b0bd3d3e61640c514e8c6a84f3440fae37b799f3c834460223ffbcdf9047d10060
-  data.tar.gz: fe0dcfedf7264f57d3cf98be24b2928b0641b316e03b9f64bcf56c2bde3382c94d13ac7ce01c79a6e6c3cae23e5e2ced7bb115511dd24f247185e17afbc2caf0
+  metadata.gz: 35e47a6974977ddd171956234df8280893d353e0acd3b19c9fe0a7308c416bfb5be834fc8eb86d4c07463d077e90a1abd4e585735ac6a6e6456c196534478cad
+  data.tar.gz: a46749ebbea8af42cfe81673b1a4633e5a09f16facbb26a45c040eb5aa5c6cbd2de622760f5d07fa2c3cff9c708d81b6b65cf54003e0b6abce5136af8093df8e

data/dtk-network-client.gemspec

@@ -15,11 +15,10 @@ Gem::Specification.new do |spec|
   spec.files =  `git ls-files`.split("\n")
 
   spec.add_dependency 'git', '1.2.9'
-  # spec.add_dependency 'dtk-common-core', '0.11.0'
   spec.add_dependency 'semverly', '~> 1.0'
-  spec.add_dependency 'rest-client', '1.6.7'
+  spec.add_dependency 'rest-client', '~> 1.7.3'
   # spec.add_dependency 'aws-sdk', '~> 3'
   spec.add_dependency 'aws-sdk-s3', '~> 1.8'
   spec.add_dependency 'dtk-dsl', '~> 1.1.0'
-  spec.add_dependency 'dtk-common-core', '0.11.1'
+  spec.add_dependency 'dtk-common-core', '0.11.1.1'
 end

data/lib/client/command/install.rb

@@ -183,7 +183,26 @@ module DTK::Network::Client
       end
 
       def convert_to_module_ref_lock_format(dep_tree)
-        dep_tree.inject({}) { |h, dep| h.merge!({ "#{dep[:namespace]}/#{dep[:name]}" => { 'version' => (dep[:version] || dep['version']) }})}
+        lock_format = {}
+
+        dep_tree.each do |dep|
+          dep_name = "#{dep[:namespace]}/#{dep[:name]}"
+
+          full_dep = { dep_name => {} }
+
+          if version = (dep[:version] || dep['version'])
+            full_dep[dep_name].merge!({ 'version' => version })
+          end
+
+          if modules = (dep[:modules] || dep['modules'])
+            full_dep[dep_name].merge!({ 'modules' => modules })
+          end
+
+          lock_format.merge!(full_dep)
+        end
+
+        lock_format
+        # dep_tree.inject({}) { |h, dep| h.merge!({ "#{dep[:namespace]}/#{dep[:name]}" => { 'version' => (dep[:version] || dep['version']), 'modules' => (dep[:modules] || dep['modules']) }})}
       end
     end
   end

data/lib/client/conn.rb

@@ -54,21 +54,30 @@ module DTK::Network
 
         response = rest_method_func.call
 
-        # response
-
-        # if Response::ErrorHandler.check_for_session_expiried(response)
-        #   # re-logging user and repeating request
-        #   OsUtil.print_warning("Session expired: re-establishing session & re-trying request ...")
-        #   @cookies = Session.re_initialize
-        #   response = rest_method_func.call
-        # end
+        if check_for_session_expiried(response)
+          3.times do
+            sleep 2
+            print "Session expired: re-establishing session & re-trying request ..."
+            @cookies = Session.re_initialize
+            response = rest_method_func.call
+            return response unless check_for_session_expiried(response)
+          end
+        end
 
+        response
+      end
 
-        # response_obj = Response.new(response)
+      def check_for_session_expiried(response)
+        if response && response.is_a?(Hash)
+          if errors = response['errors']
+            if errors.is_a?(Array)
+              error = errors.first
+              return true if error.eql?('You need to sign in or sign up before continuing.')
+            end
+          end
+        end
 
-        # queue messages from server to be displayed later
-        #TODO: DTK-2554: put in processing of messages Shell::MessageQueue.process_response(response_obj)
-        # response_obj
+        false
       end
 
       def login

data/lib/client/dependency_tree.rb

@@ -58,6 +58,8 @@ module DTK::Network
 
         activate_dependencies(dependencies)
         @activated
+
+        sort_activated_dependencies(@activated)
       end
 
       private
@@ -144,6 +146,19 @@ module DTK::Network
         end
       end
 
+      def sort_activated_dependencies(activated_deps)
+        ret_hash = {}
+
+        activated_deps.each do |k, activated_dep|
+          ret_hash.merge!({ k => activated_dep })
+          if modules = (activated_dep[:modules] || activated_dep['modules'])
+            modules.each { |name, _content| ret_hash = {name => activated_deps[name]}.merge(ret_hash) }
+          end
+        end
+
+        ret_hash
+      end
+
       def self.ret_as_module_refs(dep_modules)
         dep_modules.map { |k,v| create_module_ref(k, v) }
       end
@@ -167,6 +182,10 @@ module DTK::Network
           ret.merge!(source: source)
         end
 
+        if modules = version_hash[:modules] || version_hash['modules']
+          ret.merge!(modules: modules)
+        end
+
         ret
       end
 
@@ -257,7 +276,7 @@ module DTK::Network
             if yaml_dep = module_yaml_dependencies[nd_name]
               matches_version_new = module_ref_version.satisfied_by?(yaml_dep['version'])
               matches_source_new  = (source == yaml_dep['source'])
-              next unless (matches_version_new && matches_source_new)
+              next if (matches_version_new && matches_source_new)
             end
 
             top_level_dependencies.delete(nd_name) if (matches_version && matches_source)

data/lib/client/git_repo.rb

@@ -151,14 +151,14 @@ module DTK::Network::Client
     #   repo.head_commit_sha
     # end
 
-    def self.pull_from_remote(args)
-      repo_url       = args.required(:repo_url)
-      remote_branch  = args.required(:branch)
-      repo_dir       = args.required(:repo_dir)
+    # def self.pull_from_remote(args)
+    #   repo_url       = args.required(:repo_url)
+    #   remote_branch  = args.required(:branch)
+    #   repo_dir       = args.required(:repo_dir)
 
-      repo = git_repo.new(repo_dir, :branch => remote_branch)
-      repo.pull(repo.remotes.first, remote_branch)
-    end
+    #   repo = git_repo.new(repo_dir, :branch => remote_branch)
+    #   repo.pull(repo.remotes.first, remote_branch)
+    # end
 
     # def self.push_when_there_is_dtk_remote(repo, repo_dir, repo_url, remote_branch)
     #   # if there is only one remote and it is dtk-server; remove .git and initialize and push as new repo to dtk-server remote

data/lib/client/version.rb

@@ -1,7 +1,7 @@
 module DTK
   module Network
     module Client
-      VERSION = "1.0.1"
+      VERSION="1.0.1.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-network-client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.1.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -42,16 +42,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,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
 description: Library for interaction with dtk network.
 email: support@reactor8.com
 executables: []
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Library for interaction with dtk network.