dtk-network-client 1.0.2.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1ff40ca24da3d17fc294c77cbed86bb7e479e03
-  data.tar.gz: a6cd9e86c645434e2a4951927a152e709151eb2c
+SHA256:
+  metadata.gz: 60294cb4242addf43fe09d861d20279bbbc8d1fe504dfd8579c2f26ac802ee4a
+  data.tar.gz: 66d4697096d8741052f8a9987b60cb92f32165d804b9e6c5f507edc84d0fc48e
 SHA512:
-  metadata.gz: 1fac71eae8b356c399112583fd573fcad603789a55437fc25156946fb8e05ab56e128ba2afeab5d8195de70d0d7c380057d7db0b63a30e7953958a9308deade1
-  data.tar.gz: d79b3d329737bdae2db3d11c0e96355f8c443b7dfb6ba8d3bdc3ed7de910060840b47d3f9f8e6fb46829903331d66cf8f2b03b48fc8fba7ce2f0154f81c879bc
+  metadata.gz: 5e868d8514a0c56abf2067eae5d80d1ba29080eb749ed6f17266557b7cdbe12bca875d07f4cf61067713be83eb295a3b7fe745ef04355d64857afea2e48aa163
+  data.tar.gz: 03752513e6b7da71a876e2e896edff23054a8f9446c0765a4685bfdc8c480616de565f075db6aace4a723bbb0c31ba420c86fb9c88793101c8670f603b3ad00b

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.4.0'
+  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/pull.rb

@@ -21,7 +21,8 @@ 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.pull_from_remote(git_args)
       end

data/lib/client/command/push.rb

@@ -24,10 +24,11 @@ module DTK::Network::Client
           remote_url: remote_url,
           force:      @options[:force]
         })
-
+        
         begin
-          GitRepo.push_to_remote(git_args)
+          diffs = GitRepo.push_to_remote(git_args)
         rescue Git::GitExecuteError => e
+          raise e.message if @options[:force]
           raise "Unable to do fast-forward push. You can use '--force' option to force push you changes to remote!"
         end
 
@@ -39,7 +40,7 @@ module DTK::Network::Client
         end
 
         rest_post("modules/#{module_info['id']}/dependencies", { version: @module_ref.version.str_version, dependencies: dependencies.to_json })
-        nil
+        diffs
       end
 
       # TODO: move construct_remote_url to helper or mixin and use for all commands when needed

data/lib/client/git_repo.rb

@@ -34,12 +34,14 @@ module DTK::Network::Client
         repo.checkout(local_branch, new_branch: create_if_missing)
         repo.add_all
         repo.commit(commit_msg, :allow_empty => true)
+        diffs = repo.diff_name_status("#{remote}/#{remote_branch}")
 
         if repo.is_there_remote?(remote)
           push_when_there_is_remote(repo, remote, remote_url, remote_branch, { force: force })
         else
           add_remote_and_push(repo, remote, remote_url, remote_branch, { force: force })
         end
+        diffs
       end
     end
 
@@ -50,14 +52,15 @@ module DTK::Network::Client
         local_branch  = git_args[:branch] || 'master'
         remote_branch = git_args[:remote_branch] || local_branch
         remote        = git_args[:remote] || 'origin'
+        force         = git_args[:force]
 
         repo = git_repo.new(repo_dir, :branch => local_branch)
         repo.checkout(local_branch)
 
         if repo.is_there_remote?(remote)
-          pull_when_there_is_remote(repo, remote, remote_url, remote_branch)
+          pull_when_there_is_remote(repo, remote, remote_url, local_branch, remote_branch, { force: force })
         else
-          add_remote_and_pull(repo, remote, remote_url, remote_branch)
+          add_remote_and_pull(repo, remote, remote_url, local_branch, remote_branch, { force: force })
         end
       end
     end
@@ -89,9 +92,9 @@ module DTK::Network::Client
       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)
+    def self.pull_when_there_is_remote(repo, remote, remote_url, local_branch, remote_branch, opts = {})
       repo.remove_remote(remote)
-      add_remote_and_pull(repo, remote, remote_url, remote_branch)
+      add_remote_and_pull(repo, remote, remote_url, local_branch, remote_branch, opts)
     end
 
     def self.add_remote_and_push(repo, remote, remote_url, remote_branch, opts = {})
@@ -99,9 +102,14 @@ module DTK::Network::Client
       repo.push(remote, remote_branch, opts)
     end
 
-    def self.add_remote_and_pull(repo, remote, remote_url, remote_branch)
+    def self.add_remote_and_pull(repo, remote, remote_url, local_branch, remote_branch, opts = {})
       repo.add_remote(remote, remote_url)
-      repo.pull(remote, remote_branch)
+      opts[:force] ? force_pull(repo, remote, remote_branch) : reset_if_error(repo, local_branch) { repo.pull(remote, remote_branch) }
+    end
+
+    def self.force_pull(repo, remote, remote_branch)
+      repo.fetch(remote)
+      repo.reset_hard("#{remote}/#{remote_branch}")
     end
 
     def self.local_branch_exist?(repo, branch)
@@ -217,6 +225,20 @@ module DTK::Network::Client
       repo.head_commit_sha
     end
 
+    def self.reset_if_error(repo, branch, &block)
+      ret = nil
+      begin
+        sha_before_operations =  repo.revparse(branch)
+        ret = yield
+      rescue => e
+        # reset to enable checkout of another branch
+        repo.add_all
+        repo.reset_hard(sha_before_operations)
+        raise e
+      end
+      ret
+    end
+
   end
 end
 

data/lib/client/version.rb

@@ -1,7 +1,7 @@
 module DTK
   module Network
     module Client
-      VERSION="1.0.2.1"
+      VERSION="1.0.3"
     end
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dtk-network-client
 version: !ruby/object:Gem::Version
-  version: 1.0.2.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Library for interaction with dtk network.