dtk-network-client 1.0.2 → 1.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6069940b8ecc824b0299134430a145129da1c280
-  data.tar.gz: 7ed0dbd9e76fe0651db5e92683078c11db7b8411
+  metadata.gz: f1ff40ca24da3d17fc294c77cbed86bb7e479e03
+  data.tar.gz: a6cd9e86c645434e2a4951927a152e709151eb2c
 SHA512:
-  metadata.gz: 011c0fb261444f334079b68d7330bd8a04dd84c1ae791e1db35df7584908f6d67f0ef40d7ebb5421622e92d3ab2659c866639464251e0baa7f3b92390b77e5f5
-  data.tar.gz: 64c5ec2c1516fb0e32e2b1655a4954fd1fda1ae0d9662e4d1a603a71d48874562f87628bb8d03dd1a6e425cf7a92487808a09f69bc6500863c9b2cce96b63b23
+  metadata.gz: 1fac71eae8b356c399112583fd573fcad603789a55437fc25156946fb8e05ab56e128ba2afeab5d8195de70d0d7c380057d7db0b63a30e7953958a9308deade1
+  data.tar.gz: d79b3d329737bdae2db3d11c0e96355f8c443b7dfb6ba8d3bdc3ed7de910060840b47d3f9f8e6fb46829903331d66cf8f2b03b48fc8fba7ce2f0154f81c879bc

data/dtk-network-client.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.files =  `git ls-files`.split("\n")
 
-  spec.add_dependency 'git', '1.2.9'
+  spec.add_dependency 'git', '1.4.0'
   spec.add_dependency 'semverly', '~> 1.0'
   spec.add_dependency 'rest-client', '~> 1.7.3'
   # spec.add_dependency 'aws-sdk', '~> 3'

data/lib/client/command/install.rb

@@ -32,7 +32,6 @@ module DTK::Network::Client
 
         (modules_info || []).each do |module_info|
           dep_module_list = module_info['module_list']
-          # credentials = module_info.dig('credentails', 'credentials')
           credentials = (module_info['credentails']||{})['credentials']
 
           raise Error.new('Unexpected that repoman did not return any credentials') unless credentials
@@ -82,7 +81,6 @@ module DTK::Network::Client
         end
 
         ModuleDir.create_file_with_content("#{module_location}/#{DependencyTree::LOCK_FILE}", YAML.dump(convert_to_module_ref_lock_format(@dependency_tree)))
-        # print "Main module installed in '#{module_location}'.\n"
       end
 
       def ret_main_module_install_info(modules_info = [])
@@ -96,7 +94,6 @@ module DTK::Network::Client
 
           if main_module_info
             module_list.delete(main_module_info)
-            # credentials = module_info.dig('credentails', 'credentials')
             credentials = (module_info['credentails']||{})['credentials']
             main_module_info.merge!('credentials' => credentials)
           end
@@ -122,7 +119,6 @@ module DTK::Network::Client
 
         FileUtils.mkdir_p(install_location)
         `tar xC #{install_location} -f #{object_location_on_disk}`
-        # ModuleDir.ungzip_and_untar(object_location_on_disk, install_location)
         FileUtils.remove_entry(object_location_on_disk)
 
         @ret << module_info.merge(location: install_location)
@@ -147,7 +143,6 @@ module DTK::Network::Client
         bucket = nil
         object_name = nil
 
-        # if meta = module_info['meta']
         if catalog_uri = module_info['uri']
           if match = catalog_uri.match(/.*amazonaws.com\/([^\/]*)\/(.*.gz)/)
             bucket = match[1]
@@ -205,7 +200,6 @@ module DTK::Network::Client
         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/command/publish.rb

@@ -41,13 +41,9 @@ module DTK::Network::Client
         module_id          = module_info['id']
         module_ref_version = @module_ref.version
         branch             = rest_post("modules/#{module_id}/branch", { version: module_ref_version.str_version, dependencies: dependencies.to_json })
-        # repo_url           = ret_codecommit_url(module_info)
-
-        # git_init_and_publish_to_remote(branch['name'], repo_url)
 
         published_response  = rest_post("modules/#{module_id}/publish", { version: module_ref_version.str_version })
         bucket, object_name = S3Helper.ret_s3_bucket_info(published_response)
-        # gz_body             = ModuleDir.create_and_ret_tar_gz(@module_directory, exclude_git: true)
 
         resource_name   = object_name.gsub('/','__')
         published_creds = published_response['publish_credentails']
@@ -61,17 +57,10 @@ module DTK::Network::Client
           session_token: published_creds['session_token']
         })
         s3 = Aws::S3::Resource.new(s3_args)
-        # storage = Storage.new(:s3, s3_args)
 
         obj = s3.bucket(bucket).object(object_name)
         obj.upload_file("/tmp/#{resource_name}")
         FileUtils.remove_entry("/tmp/#{resource_name}")
-        # upload_args = Args.new({
-          # body: gz_body,
-          # bucket: bucket,
-          # key: object_name
-        # })
-        # storage.upload(upload_args)
 
         rest_post("modules/update_status", { branch_id: branch['id'], status: 'published' })
       end

data/lib/client/command/push.rb

@@ -21,9 +21,15 @@ module DTK::Network::Client
         git_args = Args.new({
           repo_dir:   @module_directory,
           branch:     @module_ref.version.str_version,
-          remote_url: remote_url
+          remote_url: remote_url,
+          force:      @options[:force]
         })
-        GitRepo.push_to_remote(git_args)
+
+        begin
+          GitRepo.push_to_remote(git_args)
+        rescue Git::GitExecuteError => e
+          raise "Unable to do fast-forward push. You can use '--force' option to force push you changes to remote!"
+        end
 
         dependencies = []
         if @parsed_module

data/lib/client/dependency_tree.rb

@@ -53,7 +53,6 @@ module DTK::Network
       def compute
         dependencies = (ret_dependencies || []).map do |pm_ref|
           ModuleRef::Dependency.create_local_or_remote(pm_ref)
-          # ModuleRef::Dependency.new({ name: pm_ref['module'], namespace: pm_ref['namespace'], version: pm_ref['version'] })
         end
 
         activate_dependencies(dependencies)
@@ -274,7 +273,7 @@ module DTK::Network
             matches_source     = (source == top_level_dependency['source'])
 
             if yaml_dep = module_yaml_dependencies[nd_name]
-              matches_version_new = module_ref_version.satisfied_by?(yaml_dep['version'])
+              matches_version_new = module_ref_version.satisfied_by?(yaml_dep['version']) || module_ref_version.full_version == yaml_dep['version']
               matches_source_new  = (source == yaml_dep['source'])
               next if (matches_version_new && matches_source_new)
             end

data/lib/client/git_repo.rb

@@ -26,6 +26,7 @@ module DTK::Network::Client
         remote_branch = git_args[:remote_branch] || local_branch
         remote        = git_args[:remote] || 'origin'
         commit_msg    = git_args[:commit_msg] || "Push from dtkn client"
+        force         = git_args[:force]
 
         repo = git_repo.new(repo_dir, :branch => local_branch)
         create_if_missing = local_branch_exist?(repo, local_branch) ? false : git_args[:create_if_missing]
@@ -35,9 +36,9 @@ module DTK::Network::Client
         repo.commit(commit_msg, :allow_empty => true)
 
         if repo.is_there_remote?(remote)
-          push_when_there_is_remote(repo, remote, remote_url, remote_branch)
+          push_when_there_is_remote(repo, remote, remote_url, remote_branch, { force: force })
         else
-          add_remote_and_push(repo, remote, remote_url, remote_branch)
+          add_remote_and_push(repo, remote, remote_url, remote_branch, { force: force })
         end
       end
     end
@@ -83,9 +84,9 @@ module DTK::Network::Client
       repo.fetch(remote_name)
     end
 
-    def self.push_when_there_is_remote(repo, remote, remote_url, remote_branch)
+    def self.push_when_there_is_remote(repo, remote, remote_url, remote_branch, opts = {})
       repo.remove_remote(remote)
-      add_remote_and_push(repo, remote, remote_url, remote_branch)
+      add_remote_and_push(repo, remote, remote_url, remote_branch, opts)
     end
 
     def self.pull_when_there_is_remote(repo, remote, remote_url, remote_branch)
@@ -93,9 +94,9 @@ module DTK::Network::Client
       add_remote_and_pull(repo, remote, remote_url, remote_branch)
     end
 
-    def self.add_remote_and_push(repo, remote, remote_url, remote_branch)
+    def self.add_remote_and_push(repo, remote, remote_url, remote_branch, opts = {})
       repo.add_remote(remote, remote_url)
-      repo.push(remote, remote_branch)
+      repo.push(remote, remote_branch, opts)
     end
 
     def self.add_remote_and_pull(repo, remote, remote_url, remote_branch)

data/lib/client/version.rb

@@ -1,7 +1,7 @@
 module DTK
   module Network
     module Client
-      VERSION="1.0.2"
+      VERSION="1.0.2.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.2
+  version: 1.0.2.1
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: semverly
   requirement: !ruby/object:Gem::Requirement
@@ -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.