dtk-network-client 1.0.1.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 074e87ffd8e8637cc10edf504211b68e7e964f7d
-  data.tar.gz: eace69876b3ed30670c6d12c13a3f0e1503320b5
+  metadata.gz: 6069940b8ecc824b0299134430a145129da1c280
+  data.tar.gz: 7ed0dbd9e76fe0651db5e92683078c11db7b8411
 SHA512:
-  metadata.gz: 35e47a6974977ddd171956234df8280893d353e0acd3b19c9fe0a7308c416bfb5be834fc8eb86d4c07463d077e90a1abd4e585735ac6a6e6456c196534478cad
-  data.tar.gz: a46749ebbea8af42cfe81673b1a4633e5a09f16facbb26a45c040eb5aa5c6cbd2de622760f5d07fa2c3cff9c708d81b6b65cf54003e0b6abce5136af8093df8e
+  metadata.gz: 011c0fb261444f334079b68d7330bd8a04dd84c1ae791e1db35df7584908f6d67f0ef40d7ebb5421622e92d3ab2659c866639464251e0baa7f3b92390b77e5f5
+  data.tar.gz: 64c5ec2c1516fb0e32e2b1655a4954fd1fda1ae0d9662e4d1a603a71d48874562f87628bb8d03dd1a6e425cf7a92487808a09f69bc6500863c9b2cce96b63b23

data/dtk-network-client.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   # 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.1'
+  spec.add_dependency 'dtk-common-core', '0.12.0'
 end

data/lib/client/command/install.rb

@@ -131,7 +131,7 @@ module DTK::Network::Client
       end
 
       def install_named_version(module_info, target_location = nil)
-        codecommit_uri   = construct_clone_url(module_info['codecommit_uri'])#module_info['codecommit_uri']
+        codecommit_uri   = construct_clone_url(module_info)
         install_location = target_location || "#{dtk_modules_location}/#{module_info['name']}-#{module_info['version']}"
 
         FileUtils.rm_rf(install_location) if Dir.exist?(install_location)
@@ -162,20 +162,23 @@ module DTK::Network::Client
         return [bucket, object_name]
       end
 
-      def construct_clone_url(codecommit_uri)
+      def construct_clone_url(module_info)
         require 'open-uri'
 
-        if codecommit_uri # = module_info.dig('meta', 'aws', 'codecommit', 'repository_metadata', 'codecommit_uri')
-          codecommit_data   = Session.get_codecommit_data
-          # service_user_name = codecommit_data.dig('service_specific_credential', 'service_user_name')
+        public_user_meta = module_info['public_user_meta']
+        codecommit_uri   = module_info['codecommit_uri']
+
+        if codecommit_uri
+          codecommit_data   = public_user_meta || Session.get_codecommit_data
           service_user_name = codecommit_data['service_specific_credential']['service_user_name']
-          # service_password  = codecommit_data.dig('service_specific_credential', 'service_password')
           service_password  = codecommit_data['service_specific_credential']['service_password']
           encoded_password  = URI.encode_www_form_component(service_password)
+
           url = nil
           if match = codecommit_uri.match(/^(https:\/\/)(.*)$/)
             url = "#{match[1]}#{service_user_name}:#{encoded_password}@#{match[2]}"
           end
+
           url
         else
           raise "Unable to find codecommit https url"

data/lib/client/command/publish.rb

@@ -17,7 +17,7 @@ module DTK::Network::Client
       end
 
       def publish
-        module_info  = rest_post('modules', { name: @module_ref.name, namespace: @module_ref.namespace, return_if_exists: true })
+        module_info  = rest_post('modules', { name: @module_ref.name, namespace: @module_ref.namespace, return_if_exists: true, version: @module_ref.version.str_version })
         dependencies = []
 
         if @parsed_module
@@ -99,7 +99,8 @@ module DTK::Network::Client
         require 'open-uri'
 
         if clone_url_http   = module_info['meta']['aws']['codecommit']['repository_metadata']['clone_url_http']
-          codecommit_data   = Session.get_codecommit_data
+          public_user_meta  = module_info['public_user_meta']
+          codecommit_data   = public_user_meta || Session.get_codecommit_data
           service_user_name = codecommit_data['service_specific_credential']['service_user_name']
           service_password  = codecommit_data['service_specific_credential']['service_password']
           encoded_password  = URI.encode_www_form_component(service_password)

data/lib/client/command/pull.rb

@@ -30,11 +30,10 @@ module DTK::Network::Client
       def construct_remote_url(module_info)
         require 'open-uri'
 
-        # if clone_url_http = module_info.dig('meta', 'aws', 'codecommit', 'repository_metadata', 'clone_url_http')
         if clone_url_http = module_info['meta']['aws']['codecommit']['repository_metadata']['clone_url_http']
-          codecommit_data   = Session.get_codecommit_data
-          # service_user_name = codecommit_data.dig('service_specific_credential', 'service_user_name')
-          # service_password  = codecommit_data.dig('service_specific_credential', 'service_password')
+          public_user_meta  = module_info['public_user_meta']
+          codecommit_data   = public_user_meta || Session.get_codecommit_data
+          # codecommit_data   = Session.get_codecommit_data
           service_user_name = codecommit_data['service_specific_credential']['service_user_name']
           service_password  = codecommit_data['service_specific_credential']['service_password']
           encoded_password  = URI.encode_www_form_component(service_password)

data/lib/client/command/push.rb

@@ -40,12 +40,11 @@ module DTK::Network::Client
       def construct_remote_url(module_info)
         require 'open-uri'
 
-        # if clone_url_http = module_info.dig('meta', 'aws', 'codecommit', 'repository_metadata', 'clone_url_http')
         if clone_url_http = module_info['meta']['aws']['codecommit']['repository_metadata']['clone_url_http']
-          codecommit_data   = Session.get_codecommit_data
-          # service_user_name = codecommit_data.dig('service_specific_credential', 'service_user_name')
+          public_user_meta  = module_info['public_user_meta']
+          codecommit_data   = public_user_meta || Session.get_codecommit_data
+          # codecommit_data   = Session.get_codecommit_data
           service_user_name = codecommit_data['service_specific_credential']['service_user_name']
-          # service_password  = codecommit_data.dig('service_specific_credential', 'service_password')
           service_password  = codecommit_data['service_specific_credential']['service_password']
           encoded_password  = URI.encode_www_form_component(service_password)
           url = nil

data/lib/client/version.rb

@@ -1,7 +1,7 @@
 module DTK
   module Network
     module Client
-      VERSION="1.0.1.1"
+      VERSION="1.0.2"
     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.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1.1
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1.1
+        version: 0.12.0
 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.6.11
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Library for interaction with dtk network.