git_cli 0.11.4 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c844000e4bc30d57687dc1e43d0fc0e46744db06376e00508c6d534be047d54
-  data.tar.gz: 54ab8c78a819454e0d037c8b73b66003757fc735e828700749bf8010504233c2
+  metadata.gz: 65d5e6d16badac8b20440fb70e3551540ea515d09da007043f6db1ae8c112d3f
+  data.tar.gz: 87ab402f4559425b7d092d175165584e1a55e087022c8c8e17a7cb7b9801487b
 SHA512:
-  metadata.gz: 20314f09b8b43ea58b8e19e7fc9f9260622b45b9c63ee84b754f0f59ebe52e89b41142c6c2df9e98480d6ec1807e9f814877c4f43344b9b6bbcd27952c4d1c12
-  data.tar.gz: 7054bf58a5bb2fb0221d5b6dbf5c28be0371e0f1a02e63ab8d47765c04a77e2a707e770da14c3ec2089844998c15ddbe0e40b05c410092ed640782a9fc88d0cd
+  metadata.gz: ab769484650486cca4441285e97085c7beba91e133e31608bf37aac39ae5fbe04c4ac5cdf74e7b93eee91c6f2fd15bcf8f78c84c903902f4ada4316f97c801d0
+  data.tar.gz: 914652362807973632c56b01a026079d9143cfc15b442eb2f8045a42b3d2d35a618cf88724bb611bad508f1c57fc1ec4592e750f2b7549e34b17de6b025fe354

data/Gemfile

@@ -6,4 +6,3 @@ gemspec
 gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
 
-#gem 'gvcs', git: 'gvcs', branch: 'master'

data/Gemfile.lock

@@ -1,44 +1,43 @@
 PATH
   remote: .
   specs:
-    git_cli (0.11.4)
-      gvcs
+    git_cli (0.13.6)
       ptools (~> 1.4.0)
-      teLogger
-      toolrack
+      teLogger (> 0.2)
+      toolrack (> 0.23)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    colorize (0.8.1)
-    devops_assist (0.3.11)
-      git_cli
-      git_cli_prompt (~> 0.3.3)
-      gvcs
-      teLogger
-      toolrack
-      tty-prompt
-    gem-release (2.2.2)
-    git_cli_prompt (0.3.4)
-      teLogger
-      toolrack
-      tty-prompt
-    gvcs (0.1.2)
-    minitest (5.18.0)
+    colorize (1.1.0)
+    diff-lcs (1.5.0)
+    minitest (5.20.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)
     rake (12.3.3)
-    release-gem (0.1.10)
+    release-gem (0.1.29)
       colorize
       git_cli
-      gvcs
       teLogger
       toolrack
       tty-command
       tty-prompt
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     teLogger (0.2.2)
-    toolrack (0.22.0)
+    toolrack (0.23.2)
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)
@@ -57,12 +56,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  devops_assist
-  gem-release
   git_cli!
   minitest (~> 5.0)
   rake (~> 12.0)
   release-gem
+  rspec
 
 BUNDLED WITH
-   2.2.28
+   2.4.19

data/README.md

@@ -11,52 +11,203 @@ This codes are tested using git version 2.25.1, Linux x86\_64
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'gvcs'
 gem 'git_cli'
 ```
 
 And then execute:
 
-    $ bundle install
+$ bundle install
 
 Or install it yourself as:
 
-    $ gem install gvcs
     $ gem install git_cli
 
 ## Usage
 
-This gem is intended to be the provider for Gvcs generic API. It is used together with [Gvcs](https://github.com/chrisliaw/gvcs).
-
 Example usage:
 
 ```ruby
-require 'gvcs'
-# require git_cli after gvcs because git_cli will initialize the gvcs classes with appropriate methods
 require 'git_cli'
 
-# Loading the provider. 
-# in this case is git_cli
-vcs = Gvcs::Vcs.new
+# vcs is encapsulation of general functions (read below)
+vcs = GitCli::Vcs.new
 vcs.init(path) # init workspace at the given path
+vcs.clone("/source/repos", "/destination/repos") # clone a project
 
-@ws = Gvcs::Workspace.new(vcs, path)
-# @ws now can invoke all supported git operations 
+workspace = GitCli::Workspace.new(vcs, "/any/git/repository")
+# workspace now can invoke all supported git operations 
 
 ```
- 
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/chrisliaw/git_cli. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/chrisliaw/git_cli/blob/master/CODE_OF_CONDUCT.md).
-
-
-## Code of Conduct
 
-Everyone interacting in the GitCli project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/chrisliaw/git_cli/blob/master/CODE_OF_CONDUCT.md).
+## Supported GIT Operation
+
+The following operations are supported on the git command line:
+- Generall functions (to make a directory become git workspace) 
+  - vcs.init("/path/to/new/workspace")
+  - vcs.clone("/source/repos","/path/to/workspace")
+- Workspace command
+  - workspace.root\_path
+    > git rev-parse --show-toplevel
+  - workspace.is\_workspace? 
+    - Call git status see if error thrown
+  - workspace.repos 
+    - Returns list of remote repositories
+  - workspace.clean?
+    - Return true if there is no new,deleted,modified and staged files
+  - workspace.add("/path/a","/path/b","/path/c/a")
+    > git add
+  - workspace.remove\_staging("/path/a","/path/b","/path/c/a") 
+    > git reset
+  - workspace.remove\_vcs("/path/a","/path/b","/path/c/a") 
+    > git rm --cached 
+  - workspace.commit("commit message", { files: ["/path/a"."/path/b"] })
+    > git commit /path/a /path/b -m "commit message"
+  - workspace.commit\_all("commit message")
+    > git commit -am 
+  - workspace.status
+    - Returns list of GitCli::Delta::VCSItem carries attributes @path, @full and @type
+    > git status 
+  - workspace.modFiles
+    - Returns modified files (GitCli::Delta::VCSItem) in an array
+    > git diff --name-only --diff-filter=M 
+  - workspace.cftFiles 
+    - Returns conflicted files (GitCli::Delta::VCSItem) in an array
+    > git diff --name-only --diff-filter=U 
+  - workspace.newFiles
+    - Returns and files (non tracked) (GitCli::Delta::VCSItem) in an array
+    > git ls-files --others --exclude-standard --directory 
+  - workspace.delFiles
+    - Returns deleted files (GitCli::Delta::VCSItem) in an array
+    > git ls-files -d 
+  - workspace.stgFiles
+    - Returns staged files (GitCli::Delta::VCSItem) in an array
+    > git diff --name-only --cached  
+  - workspace.reset\_file\_changes("/path/to/file") 
+    > git checkout --
+  - workspace.reset\_all\_changes 
+    > git reset --hard
+  - workspace.calculat\_distance("origin/HEAD","HEAD") 
+    - Returns integer value how far is it
+    > git rev-list 'origin/HEAD'..'HEAD' --count 
+  - workspace.is\_local\_ahead\_of\_remote?("origin/HEAD","branch-main") 
+    - Aggregated from calculate\_distance() with default _to_ value fixed at "HEAD" 
+    - Returns boolean
+  - workspace.is\_remote\_ahead\_of\_local?("origin/HEAD","branch-main") 
+    - aggregated from calculate\_distance() with default _from_ value fixed at "HEAD" 
+    - Returns boolean
+  - workspace.push("origin","master") 
+    > git push origin master
+  - workspace.push\_with\_tags("origin","master") 
+    > git push origin master --tags
+  - workspace.pull("origin","master") 
+    > git pull origin master
+  - workspace.current\_branch 
+    - Returns branch name
+    > git branch --show-current 
+  - workspace.local\_branches 
+    - Return local branches in an array
+    > git branch 
+  - workspace.remote\_branches 
+    - Return remote branches in an array
+    > git branch -r 
+  - workspace.all\_branches 
+    - Concate output of local\_branches and remote\_branches
+    - Returns array
+  - workspace.switch\_branch("new-branch") 
+    > git checkout new-branch
+  - workspace.create\_branch("new-branch") 
+    > git branch new-branch
+  - workspace.download\_all\_remote\_branches\_name 
+    > git fetch -all
+  - workspace.merge\_branch("development")
+    > git merge development
+  - workspace.delete\_branch("development") 
+    > git branch -d development
+  - workspace.diff 
+    > git diff
+  - workspace.diff\_file("/path/a") 
+    > git diff /path/a
+  - workspace.diff\_branch("master/HEAD","development/HEAD") 
+    > git diff master/HEAD..development/HEAD
+  - workspace.diff\_working\_with\_last\_commit 
+    > git diff HEAD^ HEAD
+  - workspace.diff\_index\_with\_last\_commit 
+    > git diff --cached
+  - workspace.ignore("/path/a","/path/b") 
+    - Append entries into .gitignore file
+  - workspace.ignore\_rules 
+    - Read the .gitignore files and returns its content in an array
+  - workspace.update\_ignore\_rules("\*.log") 
+    - Add non file entries into .gitignore
+  - workspace.show\_log(commit\_id) 
+    > git show commit\_id
+  - workspace.all\_tags 
+    - Returns array
+    > git tag 
+  - workspace.tag\_info("tagname", "%H|%ad|%an|%s") 
+    > git show tagname --format="%H|%ad|%an|%s"
+  - workspace.create\_tag(tagname) 
+    > git tag tagname
+  - workspace.create\_tag(tagname, message) 
+    > git tag -a tagname -m message
+  - workspace.create\_tag\_from\_commit(tagname, commit) 
+    > git tag -a tagname commit
+  - workspace.create\_tag\_from\_commit(tagname, commit, message) 
+    > git tag -a tagname -m message commit
+  - workspace.fetch\_tag\_to\_local  
+    > git fetch --all --tags
+  - workspace.show\_tag\_detail(tagname) 
+    > git show tagname
+  - workspace.delete\_tag(tagname) 
+    > git tag -d tagname
+  - workspace.delete\_remote\_tag("origin","tagname") 
+    > git push origin --delete tagname
+  - workspace.checkout\_tag(tagname, branch) 
+    > git checkout tags/tagname -b branch
+  - workspace.tag\_points\_at?("HEAD") 
+    - Return boolean
+    > git tag --points-at HEAD 
+  - workspace.remote\_config 
+    - Return Hash with repos name as key, points to hash with "push" or "fetch" as key
+    > git remote -vv 
+  - workspace.add\_remote(name, url) 
+    > git remote add name url
+  - workspace.remove\_remote(name) 
+    > git remote remove name
+  - workspace.stash\_changes(msg) 
+    > git stash save "msg"
+  - workspace.stash\_all\_chanegs(msg) 
+    > git stash save --include-untracked
+  - workspace.stash\_all\_chanegs(msg, true) 
+    > git stash save --include-untracked(-u) --all(-a)
+  - workspace.stash\_list 
+    - Returns boolean and hash of stash info
+    > git stash list 
+  - workspace.stash\_restore 
+    > git stash apply
+  - workspace.stash\_restore(id) 
+    > git stash apply id --> ID can be obtained from stash\_list. Something like "stash@{0}"
+  - workspace.stash\_restore\_and\_remove  
+    > git stash pop
+  - workspace.stash\_restore\_and\_remove(id)  
+    > git stash pop id --> ID can be obtained from stash\_list. Something like "stash@{0}"
+  - workspace.stash\_to\_new\_branch(branch) 
+    > git stash branch
+  - workspace.stash\_to\_new\_branch(branch, id) 
+    > git stash branch id
+  - workspace.stash\_clear 
+    > git stash clear
+  - workspace.stash\_remove 
+    > git stash drop
+  - workspace.stash\_remove(id) 
+    > git stash drop id
+
+
+
+## Return Value
+
+Unless otherwise stated, the API shall return an array, with 1st element is the boolean status value running the command line (taken from $?) and 2nd element shall be the standard output of the running command. Note though all command was run with flag '2>&1' which effectively redirected the STDERR to STDOUT which should be captured by the program.
+
+This is due to all running of command line is via the backtick (\`) method. The reason to use this is backtick allow interaction with user. If there is an input needed, backtick will actually wait user input at the prompt, although not ideal, but it is the simplest and easiest for now.
+  
+  

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-require "devops_assist"
+#require "devops_assist"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/git_cli.gemspec

@@ -28,13 +28,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   #spec.add_dependency "tlogger"
-  spec.add_dependency 'teLogger'
-  spec.add_dependency "toolrack"
-  spec.add_dependency "gvcs" 
+  spec.add_dependency 'teLogger', "> 0.2"
+  spec.add_dependency "toolrack", "> 0.23"
+  #spec.add_dependency "gvcs" 
   spec.add_dependency "ptools", "~> 1.4.0"
 
-  #spec.add_development_dependency 'devops_helper' #, ">= 0.2.0"
-  spec.add_development_dependency 'devops_assist' #, ">= 0.2.0"
-  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'rspec'
+
   spec.add_development_dependency 'release-gem'
 end

data/lib/git_cli/add_commit.rb

@@ -25,15 +25,14 @@ module GitCli
 
       raise_if_empty(paths, "Given path to add is empty", GitCliException)
 
-      paths = [paths] if not paths.is_a?(Array)
-
       cmd = []
       cmd << "cd"
       cmd << @wsPath
       cmd << "&&"
       cmd << @vcs.exe_path
       cmd << "add"
-      cmd.append(paths.join(" "))
+
+      cmd.append(GitCli::Workspace.args_to_string_array(paths).join(" "))
       cmdln = cmd.join " "
 
       log_debug "Add : #{cmdln}"
@@ -51,20 +50,19 @@ module GitCli
     alias :add :add_to_staging
     alias :add_staging :add_to_staging
 
-    def remove_from_staging(paths)
+    def remove_from_staging(*paths)
       check_vcs
 
       raise_if_empty(paths, "Given path to reset is empty", GitCliException)
 
-      paths = [paths] if not paths.is_a?(Array)
-
       cmd = []
       cmd << "cd"
       cmd << @wsPath
       cmd << "&&"
       cmd << @vcs.exe_path
       cmd << "reset"
-      cmd.append(paths)
+
+      cmd.append(GitCli::Workspace.args_to_string_array(paths))
       cmdln = cmd.join " "
 
       log_debug "reset : #{cmdln}"
@@ -76,21 +74,20 @@ module GitCli
     end # remove_from_staging
     alias :remove_staging :remove_from_staging
 
-    def remove_from_vcs(paths)
+    def remove_from_vcs(*paths)
       
       check_vcs
 
       raise_if_empty(paths, "Given path to remove from VCS is empty", GitCliException)
 
-      paths = [paths] if not paths.is_a?(Array)
-
       cmd = []
       cmd << "cd"
       cmd << @wsPath
       cmd << "&&"
       cmd << @vcs.exe_path
       cmd << "rm --cached"
-      cmd.append(paths)
+      
+      cmd.append(GitCli::Workspace.args_to_string_array(paths))
       cmdln = cmd.join " "
 
       log_debug "Remove from git version control : #{cmdln}"
@@ -100,6 +97,7 @@ module GitCli
       end
       
     end # remove_from_vcs
+    alias :remove_vcs :remove_from_vcs
 
     def commit(message, opts = { })
       check_vcs
@@ -116,7 +114,7 @@ module GitCli
       cmd << @vcs.exe_path
       cmd << "commit"
       if not_empty?(files)
-        cmd << files.join(" ")
+        cmd << GitCli::Workspace.args_to_string_array(files).join(" ")
       end
       cmd << "-m"
       cmd << "\"#{msg}\""

data/lib/git_cli/delta.rb

@@ -193,6 +193,16 @@ module GitCli
 
       end
     end # modified files
+    def modified
+      modified_files.reverse
+    end
+    def modFiles
+      modified.first
+    end
+    def has_modified_file?
+      modFiles.length > 0
+    end
+    alias_method :has_modified_files?, :has_modified_file?
 
     def conflicted_files
       
@@ -229,6 +239,16 @@ module GitCli
 
       end
     end # conflicted files
+    def conflicted
+      conflicted_files.reverse
+    end
+    def cftFiles
+      conflicted.first
+    end
+    def has_conflicted_file?
+      ctfFiles.length > 0
+    end
+    alias_method :has_conflicted_files?, :has_conflicted_file?
 
     def new_files
       
@@ -265,6 +285,13 @@ module GitCli
       end
 
     end # new_files
+    def newFiles
+      new_files.reverse.first
+    end
+    def has_new_file?
+      newFiles.length >0
+    end
+    alias_method :has_new_files?, :has_new_file?
 
     def deleted_files
       
@@ -301,6 +328,16 @@ module GitCli
       end
      
     end # deleted_files
+    def deleted
+      deleted_files.reverse
+    end
+    def delFiles
+      deleted.first
+    end
+    def has_deleted_file?
+      delFiles.length > 0
+    end
+    alias_method :has_deleted_files?, :has_deleted_file?
 
     def staged_files
       
@@ -337,6 +374,16 @@ module GitCli
       end
 
     end # staged_files
+    def staged
+      staged_files.reverse
+    end
+    def stgFiles
+      staged.first
+    end
+    def has_staged_file?
+      stgFiles.length > 0
+    end
+    alias_method :has_staged_files?, :has_staged_file?
 
     def reset_file_changes(path)
 

data/lib/git_cli/ignore.rb

@@ -32,32 +32,35 @@ module GitCli
     end
 
     def ignore_rules
-      st, root = workspace_root
+      #st, root = workspace_root
+      root = workspace_root
       root.strip!
-      if st
+      #if st
         rulesFile = File.join(root,".gitignore")
         if File.exist?(rulesFile)
           File.open(rulesFile,"r") do |f|
             @cont = f.read
           end
-          @cont
+          #@cont
+          @cont.each_line.to_a.delete_if { |l| l.strip.empty? }
         else
-          ""
+          []
         end
-      else
-        ""
-      end
+      #else
+      #  []
+      #end
     end
 
     def update_ignore_rules(rules)
-      st, root = workspace_root
+      #st, root = workspace_root
+      root = workspace_root
       root.strip!
-      if st
+      #if st
         rulesFile = File.join(root,".gitignore")
         File.open(rulesFile,"w") do |f|
           f.write rules
         end
-      end
+      #end
       log_debug ".gitignore files is updated!"
       [true,".gitignore file is updated"]
     end
@@ -66,17 +69,18 @@ module GitCli
     def with_ignore_file(mode = "a", &block)
       mode = "a" if is_empty?(mode)
       if block
-        st, root = workspace_root
+        #st, root = workspace_root
+        root = workspace_root
         root.strip!
-        if st
+        #if st
           igPath = File.join(root,".gitignore")
           FileUtils.touch(igPath) if not File.exist?(igPath)
           File.open(igPath,mode) do |f|
             block.call(f)
           end
-        else
-          raise GitCliException, "Cannot get workspace root. Probably not a GIT workspace?"
-        end
+        #else
+        #  raise GitCliException, "Cannot get workspace root. Probably not a GIT workspace?"
+        #end
       end
     end
 

data/lib/git_cli/init.rb

@@ -23,7 +23,7 @@ require_relative 'global'
 module GitCli
   module Init
 
-    def init(path)
+    def init(path, bare = false)
       # from Core module
       gpath = exe_path 
 
@@ -32,6 +32,9 @@ module GitCli
       #cmd << "&&"
       cmd << gpath
       cmd << "init"
+      if bare
+        cmd << "--bare"
+      end
       cmd << File.expand_path(path)
      
       cmdln = cmd.join(" ")

data/lib/git_cli/log.rb

@@ -64,6 +64,7 @@ module GitCli
       end
        
     end # log
+    alias_method :log, :logs
 
     def show_log(cid)
       

data/lib/git_cli/push.rb

@@ -15,11 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+require_relative 'branch'
 
 module GitCli
   module Push
+    include Branch
 
-    def push_changes(repos, branch = "master")
+    def push_changes(repos, branch = nil)
       check_vcs
       #check_repos
       raise_if_empty(repos, "Push to repository name cannot be empty", GitCliException)
@@ -33,6 +35,9 @@ module GitCli
       cmd << @vcs.exe_path
       cmd << "push"
       cmd << repos
+      if is_empty?(branch) 
+        branch = current_branch
+      end
       cmd << branch
 
       cmdln = cmd.join " "
@@ -44,7 +49,7 @@ module GitCli
     end # push_changes
     alias :push :push_changes
 
-    def push_changes_with_tags(repos, branch = "master")
+    def push_changes_with_tags(repos, branch = nil)
       check_vcs
       #check_repos
       raise_if_empty(repos, "Push to repository name cannot be empty", GitCliException)
@@ -58,6 +63,9 @@ module GitCli
       cmd << @vcs.exe_path
       cmd << "push"
       cmd << repos
+      if is_empty?(branch) 
+        branch = current_branch
+      end
       cmd << branch
       cmd << "--tags"
 

data/lib/git_cli/stash.rb

@@ -24,9 +24,10 @@ module GitCli
     # due to various reason. i.e. urgent fix, hot patch etc
    
     # 
-    # Save all the temporary changes so branch switch is possible
+    # Save all changes so branch switch is possible
+    # Excluding untracked files
     #
-    def stash_changes(msg, include_untracked = true)
+    def stash_changes(msg)
 
       check_vcs
 
@@ -44,20 +45,59 @@ module GitCli
         cmd << msg2
       end
 
-      # always include untracked since the stash condition
-      # is played using scenario under development and must
-      # switch branch for any reasons
-      if include_untracked
-        cmd << "--include-untracked"
+      cmdln = cmd.join(" ")
+      log_debug "Stash changes : #{cmdln}"
+      res = os_exec(cmdln) do |st, res|
+        [st.success?, res]
+      end
+
+    end # stash changes - changed files only
+
+    # 
+    # Save all the temporary changes so the workspace will be clean
+    # for other operation
+    #
+    # This operation only stash: modified files (already in git workspace) 
+    # and new files (not in git workspace yet)
+    #
+    # If flag includes_ignore_file is true, include ignored file too
+    #
+    def stash_all_changes(msg, includes_ignore_file = false)
+
+      check_vcs
+
+      cmd = []
+      cmd << "cd"
+      cmd << @wsPath
+      cmd << "&&"
+      cmd << @vcs.exe_path
+      cmd << "stash"
+      cmd << "save"
+
+      if not_empty?(msg)
+        # have to escape the message for command line purposes
+        msg2 = msg.gsub("\"","\\\"").gsub("\\","\\\\")
+        cmd << msg2
+      end
+
+      cmd << "--include-untracked"
+
+      if includes_ignore_file == true
+        cmd << "--all"
       end
 
       cmdln = cmd.join(" ")
-      log_debug "Stash changes : #{cmdln}"
+      if includes_ignore_file
+        log_debug "Stash all changes (including untracked and ignored files) : #{cmdln}"
+      else
+        log_debug "Stash all changes (including untracked files) : #{cmdln}"
+      end
       res = os_exec(cmdln) do |st, res|
         [st.success?, res]
       end
 
-    end # stash changes
+    end # stash all changes - including untrack files
+
 
     #
     # List all saved temporary changes
@@ -162,7 +202,7 @@ module GitCli
       cmd << @wsPath
       cmd << "&&"
       cmd << @vcs.exe_path
-      cmd << "stash branch"
+      cmd << "stash"
       cmd << branch
 
       if not is_empty?(id)

data/lib/git_cli/tags.rb

@@ -37,7 +37,7 @@ module GitCli
       res = os_exec(cmdln) do |st, res|
         
         if st.success?
-          res.strip
+          res.strip.each_line.to_a.map { |v| v.strip }
           #[true, res.strip!]
         else
           raise TagError, res
@@ -300,7 +300,10 @@ module GitCli
       cmd << @wsPath
       cmd << "&&"
       cmd << @vcs.exe_path
-      cmd << "push origin --delete"
+      cmd << "push"
+      cmd << repos
+      cmd << "--delete"
+      #cmd << "push origin --delete"
       cmd << tag
 
       cmdln = cmd.join(" ")

data/lib/git_cli/version.rb

@@ -15,5 +15,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module GitCli
-  VERSION = "0.11.4"
+  VERSION = "0.13.6"
 end

data/lib/git_cli.rb

@@ -16,7 +16,7 @@
 
 require "git_cli/version"
 
-require 'gvcs'
+#require 'gvcs'
 require 'toolrack'
 
 require_relative "git_cli/git_core"
@@ -47,7 +47,8 @@ module GitCli
 
     def os_exec(path, &block)
 
-      Gvcs::Config.instance.command_output.puts("Git command : #{path}") if Gvcs::Config.instance.is_show_vcs_command?
+      #Gvcs::Config.instance.command_output.puts("Git command : #{path}") if Gvcs::Config.instance.is_show_vcs_command?
+      log_debug("Git command : #{path}")
 
       # redirect stderr to stdout
       path = "#{path} 2>&1"
@@ -85,9 +86,12 @@ module GitCli
     def dry_run
       @dry_run.nil? ? false : @dry_run
     end
+
   end # common operations
 
-  class Gvcs::Vcs
+  #class Gvcs::Vcs
+  class Vcs
+    include TR::CondUtils
     include GitCli::Common
     include GitCli::GitCore
     include GitCli::Init
@@ -118,7 +122,9 @@ module GitCli
     end
   end # WsCommon
 
-  class Gvcs::Workspace
+  #class Gvcs::Workspace
+  class Workspace
+    include TR::CondUtils
     include GitCli::Common
     include WsCommon
     include GitCli::AddCommit
@@ -142,7 +148,7 @@ module GitCli
       raise_if_empty(path, "Workspace path cannot be empty", GitCliException)
 
       if is_empty?(vcs)
-        @vcs = Gvcs::Vcs.new
+        @vcs = GitCli::Vcs.new
       else
         @vcs = vcs
       end
@@ -214,9 +220,11 @@ module GitCli
         res = os_exec(cmdln) do |st, res|
 
           if st.success?
-            @wsRoot = [true, res.strip]
+            @wsRoot = res.strip
+            #@wsRoot = [true, res.strip]
           else
-            @wsRoot = [false, res.strip]
+            raise GitCliException, "Failure executing : #{cmdln} \nError was : #{res.strip}" 
+            #@wsRoot = [false, res.strip]
           end
         end
 
@@ -225,11 +233,14 @@ module GitCli
       @wsRoot
       
     end # workspace_root
+    #class <<self
+    alias_method :root_path, :workspace_root
+    #end
 
     def load_remote_to_repos
       conf = remote_config
       conf.each do |k,v|
-        repo = Gvcs::Repository.new(k, v.values.first)
+        repo = GitCli::Repository.new(k, v.values.first)
         repo.support_fetch if v.keys.include?("fetch")
         repo.support_push if v.keys.include?("push")
         add_repos(repo)
@@ -249,14 +260,39 @@ module GitCli
       dd, df = deleted_files
       sd, sf = staged_files
 
-      (nd.length == 0 and nf.length == 0 and md.length == 0 and mf.length == 0 and dd.length == 0 and df.length == 0 and sd.length == 0 and sf.length == 0)
+      #log_debug "New Dir : #{nd}"
+      #log_debug "Mod Dir : #{md}"
+      #log_debug "Del Dir : #{dd}"
+      #log_debug "Stg Dir : #{sd}"
+
+      #(nd.length == 0 and nf.length == 0 and md.length == 0 and mf.length == 0 and dd.length == 0 and df.length == 0 and sd.length == 0 and sf.length == 0)
+      (nf.length == 0 and mf.length == 0 and df.length == 0 and sf.length == 0)
     end
     alias_method :clean?, :is_clean?
+    alias_method :clear?, :is_clean?
+
+    def self.args_to_string_array(*args)
+      res = []
+      args.each do |e|
+        case e
+        when Delta::VCSItem
+          res << e.path
+        when Array
+          res.concat(args_to_string_array(*e))
+        when String
+          res << e
+        else
+          res << e.to_s
+        end
+      end
+      res
+    end
 
   end # Gvcs::Workspace
 
 
-  class Gvcs::Repository
+  #class Gvcs::Repository
+  class Repository
     
     attr_reader :sslVerify
     attr_reader :name, :url
@@ -294,3 +330,9 @@ module GitCli
   end # repository
 
 end
+
+# backward compatibility
+#Gvcs::Vcs = GitCli::Vcs
+#Gvcs::Workspace = GitCli::Workspace
+#Gvcs::Repository = GitCli::Repository
+

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: git_cli
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.13.6
 platform: ruby
 authors:
 - Chris Liaw
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: teLogger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: toolrack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gvcs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: ptools
   requirement: !ruby/object:Gem::Requirement
@@ -67,21 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: devops_assist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: GIT command line interface