dtk-client 0.5.8 → 0.5.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWFhMGY3ZWUzYzgxMjM3MjJlZmI2MDJmMTdlOTkzZjFkYmQ2ODJiMQ==
+    OGM2YzcyZjU0NTk3ZmY1MTUyYzJlZjQ3YmFkYzhjOGE5N2M4OTUxZQ==
   data.tar.gz: !binary |-
-    YWVjMmRiMGE4NWFjN2U4M2QyYTJkN2Q5YTgxNWU5NmJkN2Q2MmIxNQ==
+    YWJlMTcxYzE0OGQwYWJlZjZjM2E4NTIxNGY5YTZmZjY1ZTk2ZjM0NQ==
 SHA512:
   metadata.gz: !binary |-
-    MmNhNTcwYzllZmY5MTRhMTdlZDRhOTg0ZGQxNTNkMzU0YWMzMTdlZDUyZjg3
-    NzIwYWIwMzk0MmMzNGE1ZmExMWY1YmJiZTk5YmZlM2QzMjQ0MGE0OTRhZDE2
-    Yzg3ZGJiYWVhNTcyYjA2OWIwMTZlMTU3YTFmMjQwY2VmNGE3YTA=
+    ZWY1YmJlODNlOGEzYTU5ZGFiYzlhOTdmZDNlYTM0Y2QzNjllOTQyZDZkNjM0
+    NGQ5ZDUxZDg2YjA0MmQ2NTUwNDNkNDkwNzFjZDc3NGYyZDgxMGRhZmQyY2Rh
+    MTc4Yzc2OTJjZjRkYmM3ZjEyYzRlMjBiNGQzMGM3OTM3Njk5MGQ=
   data.tar.gz: !binary |-
-    OTczZjRiOWI4NDBkZDNiZGMzMWFhNjAyNWU3NDZmZjVmZDQ1NjM4ZTEyODIy
-    MDIyZjUxMTkwZDE3Yzg0NDBkYTUwYjAyNzljZDcxMzIwNWE2ZThiMzk3Y2I1
-    YWRlNTg5YWJiOTM0MzBkOTg1OTYxMWE5ZDE2NDUzY2NkNjZjYTc=
+    YjkxNDdhOGEwNzI0MWZhNGI4OWEzNjQ4YjM3ZWEzYzA2MWM3NGExM2Y1MGMw
+    ZWE2ZDI1NWFjYjUzODI5MDBkMDZjMTA3Y2I2ZmYyMTNiOThhOTExZWMzY2Iz
+    OTEwMWJkZDc0NDljYjY1ZDM1ZWU1MDk1ZjIwMjBkM2VmYjc0YTQ=

data/lib/command_helpers/git_repo.rb

@@ -109,7 +109,7 @@ module DTK; module Client; class CommandHelper
       Response::Ok.new()
     end
 
-    #if local clone exists remove its .git directory
+    # if local clone exists remove its .git directory
     def unlink_local_clone?(type,module_name,version=nil)
       Response.wrap_helper_actions() do
         local_repo_dir = local_repo_dir(type,module_name,version)
@@ -148,7 +148,7 @@ module DTK; module Client; class CommandHelper
       end
     end
 
-    #makes repo_dir (determined from type and module_name) into a git dir, pulls, adds, content and then pushes
+    # makes repo_dir (determined from type and module_name) into a git dir, pulls, adds, content and then pushes
     def initialize_client_clone_and_push(type,module_name,branch,repo_url,local_repo_dir,version=nil)
       # moved this part from 'check_local_dir_exists_with_content' to this method since this only deletes .git folder
       # which can cause us problems if import fails
@@ -180,7 +180,7 @@ module DTK; module Client; class CommandHelper
     end
 
    private
-    #TODO: in common expose Common::GritAdapter at less nested level
+    # TODO: in common expose Common::GritAdapter at less nested level
     class DiffSummary < ::DTK::Common::SimpleHashObject
       def self.new_version(repo)
         new(repo.new_version())
@@ -321,7 +321,7 @@ module DTK; module Client; class CommandHelper
       end
 
       # default commit in case it is needed
-      repo.commit("Commit prior to pull from remote") if repo.changed?
+      repo.stage_and_commit("Commit prior to pull from remote") if repo.changed?
 
       #check if merge needed
       merge_rel = repo.merge_relationship(:remote_branch,remote_branch_ref)

data/lib/domain/git_adapter.rb

@@ -11,13 +11,14 @@ module DTK
       end
 
       def changed?
-        (!(@git_repo.status.changed.empty? && @git_repo.status.untracked.empty? && @git_repo.status.deleted.empty?) || staged_commits?)
+        (!(changed().empty? && untracked().empty? && deleted().empty?) || staged_commits?)
       end
 
       def stage_changes()
-        @git_repo.add(@git_repo.status.untracked().keys)
-        @git_repo.add(@git_repo.status.changed().keys)
-        @git_repo.status.deleted().each do |file, status|
+        @git_repo.add(untracked())
+        @git_repo.add(added())
+        @git_repo.add(changed())
+        deleted().each do |file, status|
           # this indicates that change has not been staged
           if status.stage
             @git_repo.remove(file)
@@ -26,7 +27,7 @@ module DTK
       end
 
       def print_status()
-        changes = [@git_repo.status.changed().keys, @git_repo.status.untracked().keys, @git_repo.status.deleted().keys]
+        changes = [changed(), untracked(), deleted()]
         puts "\nModified files:\n".colorize(:green) unless changes[0].empty?
         changes[0].each { |item| puts "\t#{item}" }
         puts "\nAdded files:\n".colorize(:yellow) unless changes[1].empty?
@@ -55,9 +56,9 @@ module DTK
 
       def local_summary()
         {
-          :files_added => (@git_repo.status.untracked().keys + @git_repo.status.added().keys).collect { |file| { :path => file }},
-          :files_modified => @git_repo.status.changed().keys.collect { |file| { :path => file }},
-          :files_deleted => @git_repo.status.deleted().keys.collect { |file| { :path => file }}
+          :files_added => (untracked() + added()).collect { |file| { :path => file }},
+          :files_modified => changed().collect { |file| { :path => file }},
+          :files_deleted => deleted().collect { |file| { :path => file }}
         }
       end
 
@@ -65,6 +66,11 @@ module DTK
         return local_summary()
       end
 
+      def stage_and_commit(commit_msg = "")
+        stage_changes()
+        commit(commit_msg)
+      end
+
       def commit(commit_msg = "")
         @git_repo.commit(commit_msg)
       end
@@ -190,8 +196,51 @@ module DTK
         @git_repo.branches.local.find { |b| b.current }
       end
 
+      TEMP_BRANCH = "temp_branch"
+
+      def merge_theirs(remote_branch_ref)
+        branch = current_branch_name
+
+        # Git is not agile enoguh to work with following commands so we are using native commands to achive this
+        Dir.chdir(repo_dir) do
+          OsUtil.suspend_output do
+            puts `git checkout -b #{TEMP_BRANCH} #{remote_branch_ref}`
+            puts `git merge #{branch} -s ours`
+            puts `git checkout #{branch}`
+            puts `git reset #{TEMP_BRANCH} --hard`
+            puts `git branch -D #{TEMP_BRANCH}`
+          end
+        end
+      end
+
     private
 
+      # Method bellow show different behavior when working with 1.8.7
+      # so based on Hash response we know it it is:
+      # Hash  => 1.9.3 +
+      # Array => 1.8.7
+      #
+
+      def changed
+        status.is_a?(Hash) ? status.changed().keys : status.changed().collect { |file| file.first }
+      end
+
+      def untracked
+        status.is_a?(Hash) ? status.untracked().keys : status.untracked().collect { |file| file.first }
+      end
+
+      def deleted
+        status.is_a?(Hash) ? status.deleted().keys : status.deleted().collect { |file| file.first }
+      end
+
+      def added
+        status.is_a?(Hash) ? status.added().keys : status.added().collect { |file| file.first }
+      end
+
+      def status
+        @git_repo.status
+      end
+
       def is_there_remote?(remote_name)
         @git_repo.remotes.find { |r| r.name == remote_name }
       end

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.8"
+  VERSION="0.5.9"
 end

data/lib/shell/context.rb

@@ -185,7 +185,7 @@ module DTK
             extended_context = extended_context[:context]
             extended_context.reject!{|k,v| k.to_s!=line_buffer}
 
-            new_context = extended_context[line_buffer.to_sym] unless line_buffer.nil?
+            new_context = extended_context[line_buffer.to_sym] unless line_buffer.nil? || line_buffer.empty?
             active_context_copy.push_new_context(new_context, new_context) unless new_context.nil?
           end
         end
@@ -693,7 +693,7 @@ module DTK
             valid_all_children    = (root_clazz != command_clazz) ? (root_clazz.all_children() + root_clazz.valid_children()) : []
             n_level_ac_candidates = command_clazz.respond_to?(:valid_children) ? command_clazz.valid_children.map { |e| e.to_s } : []
 
-            n_level_ac_candidates.keep_if{|v| valid_all_children.include?(v.to_sym)} unless valid_all_children.empty?
+            n_level_ac_candidates.select {|v| valid_all_children.include?(v.to_sym)} unless valid_all_children.empty?
             invisible_context = command_clazz.respond_to?(:invisible_context) ? command_clazz.invisible_context.map { |e| e.to_s } : []
             
             unless invisible_context.empty?

data/lib/util/os_util.rb

@@ -221,6 +221,8 @@ module DTK
             load File.expand_path('../../lib/util/os_util.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/help_monkey_patch.rb', File.dirname(__FILE__))
             load File.expand_path('../../lib/shell/domain.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/domain/git_adapter.rb', File.dirname(__FILE__))
+            load File.expand_path('../../lib/command_helpers/git_repo.rb', File.dirname(__FILE__))
             path = File.expand_path('../../lib/commands/thor/*.rb', File.dirname(__FILE__))
             Dir[path].each do |thor_class_file|
               load thor_class_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler