git 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 57559d500d07f7561f8a62e21f87fb73b0759b98
-  data.tar.gz: 4946775180b583063b68a9fa2ca507bbe2f3242f
+SHA256:
+  metadata.gz: 892ebb66d9ea20f8ab3f3050b53b1b06bbfc25b732367ffc89d8b9abc0f9d960
+  data.tar.gz: a980be3464e4dcac4fed077a8fe72a120641a788f99947bedd7b4a0644255ab0
 SHA512:
-  metadata.gz: a5f355d639e30163b6f56c0aacfc0bd5bb441dbfcf961b22b838a25dc8e2775afa8528e90f021b750c3431c9fdcce5795e04fd8b6b5eb2e271d32bfdeb26e3ce
-  data.tar.gz: c49b547f7c47b6f0cc522ae4f0767c1f3a86817c45fb01f1d712bee8c9e1144075ab832e8eb863263bd55caad6a38b38b3c19c7059091abb7f7fe626fc6c92d1
+  metadata.gz: 280443c1f27cfe14b6ac5db700a28111943e76cee25ceef42d0d18fb6fa5cc536c6f5edf66057cc7b5e602c58e97c541f4f3d226306e80c004cdebad2d4448fa
+  data.tar.gz: e0824c1c2874240848147b57906c811e5f74ee3f8cfd7b5d11361cb35abc6ecf86cb33b61cacc3107ee46706c103259579bccfe68dd1eca252d4629d74871ce4

data/README.md

@@ -6,7 +6,7 @@ Library for using Git in Ruby.
 
 Git public hosting of the project source code is at:
 
-http://github.com/schacon/ruby-git
+http://github.com/ruby-git/ruby-git
 
 ## Install
 
@@ -16,10 +16,9 @@ You can install Ruby/Git like this:
 
 ## Code Status
 
-* [![Build Status](https://api.travis-ci.org/schacon/ruby-git.png)](https://travis-ci.org/schacon/ruby-git)
-* [![Code Climate](https://codeclimate.com/github/schacon/ruby-git.png)](https://codeclimate.com/github/schacon/ruby-git)
+* [![Build Status](https://travis-ci.org/ruby-git/ruby-git.svg?branch=master)](https://travis-ci.org/ruby-git/ruby-git)
+* [![Code Climate](https://codeclimate.com/github/ruby-git/ruby-git.png)](https://codeclimate.com/github/ruby-git/ruby-git)
 * [![Gem Version](https://badge.fury.io/rb/git.png)](http://badge.fury.io/rb/git)
-* [![Dependencies](https://gemnasium.com/schacon/ruby-git.png?travis)](https://gemnasium.com/schacon/ruby-git)
 
 ## Major Objects
 
@@ -155,7 +154,7 @@ Here are the operations that need read permission only.
     g.show('HEAD')
     g.show('v2.8', 'README.md')
 
-    Git.ls_remote('https://github.com/schacon/ruby-git.git') # returns a hash containing the available references of the repo.
+    Git.ls_remote('https://github.com/ruby-git/ruby-git.git') # returns a hash containing the available references of the repo.
     Git.ls_remote('/path/to/local/repo')
     Git.ls_remote() # same as Git.ls_remote('.')
 

data/lib/git/base.rb

@@ -372,6 +372,17 @@ module Git
       Git::Remote.new(self, name)
     end
 
+    # sets the url for a remote
+    # url can be a git url or a Git::Base object if it's a local reference
+    #
+    #  @git.set_remote_url('scotts_git', 'git://repo.or.cz/rubygit.git')
+    #
+    def set_remote_url(name, url)
+      url = url.repo.path if url.is_a?(Git::Base)
+      self.lib.remote_set_url(name, url)
+      Git::Remote.new(self, name)
+    end
+
     # removes a remote from this repository
     #
     # @git.remove_remote('scott_git')

data/lib/git/lib.rb

@@ -67,6 +67,7 @@ module Git
       arr_opts << '--config' << opts[:config] if opts[:config]
       arr_opts << '--origin' << opts[:remote] || opts[:origin] if opts[:remote] || opts[:origin]
       arr_opts << '--recursive' if opts[:recursive]
+      arr_opts << "--mirror" if opts[:mirror]
 
       arr_opts << '--'
 
@@ -75,7 +76,7 @@ module Git
 
       command('clone', arr_opts)
 
-      opts[:bare] ? {:repository => clone_dir} : {:working_directory => clone_dir}
+      (opts[:bare] or opts[:mirror]) ? {:repository => clone_dir} : {:working_directory => clone_dir}
     end
 
 
@@ -396,6 +397,7 @@ module Git
     end
 
     def ls_files(location=nil)
+      location ||= '.'
       hsh = {}
       command_lines('ls-files', ['--stage', location]).each do |line|
         (info, file) = line.split("\t")
@@ -688,6 +690,14 @@ module Git
       command('remote', arr_opts)
     end
 
+    def remote_set_url(name, url)
+      arr_opts = ['set-url']
+      arr_opts << name
+      arr_opts << url
+
+      command('remote', arr_opts)
+    end
+
     def remote_remove(name)
       command('remote', ['rm', name])
     end
@@ -736,11 +746,16 @@ module Git
       opts = {:tags => opts} if [true, false].include?(opts)
 
       arr_opts = []
+      arr_opts << '--mirror'  if opts[:mirror]
       arr_opts << '--force'  if opts[:force] || opts[:f]
       arr_opts << remote
 
-      command('push', arr_opts + [branch])
-      command('push', ['--tags'] + arr_opts) if opts[:tags]
+      if opts[:mirror]
+          command('push', arr_opts)
+      else
+          command('push', arr_opts + [branch])
+          command('push', ['--tags'] + arr_opts) if opts[:tags]
+      end
     end
 
     def pull(remote='origin', branch='master')
@@ -859,10 +874,14 @@ module Git
 
     def command_lines(cmd, opts = [], chdir = true, redirect = '')
       cmd_op = command(cmd, opts, chdir)
-      op = cmd_op.encode("UTF-8", "binary", {
-	  	:invalid => :replace,
-		:undef => :replace
-	  })
+      if cmd_op.encoding.name != "UTF-8"
+        op = cmd_op.encode("UTF-8", "binary", {
+          :invalid => :replace,
+          :undef => :replace
+        })
+      else
+        op = cmd_op
+      end
       op.split("\n")
     end
 

data/lib/git/status.rb

@@ -1,32 +1,102 @@
 module Git
-  
+  #
+  # A class for git status
+  #
   class Status
     include Enumerable
-    
+
     def initialize(base)
       @base = base
       construct_status
     end
-    
+
+    #
+    # Returns an Enumerable containing files that have changed from the
+    # git base directory
+    #
+    # @return [Enumerable]
     def changed
-      @files.select { |k, f| f.type == 'M' }
+      @files.select { |_k, f| f.type == 'M' }
     end
-    
+
+    #
+    # Determines whether the given file has been changed.
+    # File path starts at git base directory
+    #
+    # @param file [String] The name of the file.
+    # @example Check if lib/git.rb has changed.
+    #     changed?('lib/git.rb')
+    # @return [Boolean]
+    def changed?(file)
+      changed.member?(file)
+    end
+
+    #
+    # Returns an Enumerable containing files that have been added.
+    # File path starts at git base directory
+    #
+    # @return [Enumerable]
     def added
-      @files.select { |k, f| f.type == 'A' }
+      @files.select { |_k, f| f.type == 'A' }
     end
 
+    #
+    # Determines whether the given file has been added to the repository
+    # File path starts at git base directory
+    #
+    # @param file [String] The name of the file.
+    # @example Check if lib/git.rb is added.
+    #     added?('lib/git.rb')
+    # @return [Boolean]
+    def added?(file)
+      added.member?(file)
+    end
+
+    #
+    # Returns an Enumerable containing files that have been deleted.
+    # File path starts at git base directory
+    #
+    # @return [Enumerable]
     def deleted
-      @files.select { |k, f| f.type == 'D' }
+      @files.select { |_k, f| f.type == 'D' }
     end
-    
+
+    #
+    # Determines whether the given file has been deleted from the repository
+    # File path starts at git base directory
+    #
+    # @param file [String] The name of the file.
+    # @example Check if lib/git.rb is deleted.
+    #     deleted?('lib/git.rb')
+    # @return [Boolean]
+    def deleted?(file)
+      deleted.member?(file)
+    end
+
+    #
+    # Returns an Enumerable containing files that are not tracked in git.
+    # File path starts at git base directory
+    #
+    # @return [Enumerable]
     def untracked
-      @files.select { |k, f| f.untracked }
+      @files.select { |_k, f| f.untracked }
     end
-    
+
+    #
+    # Determines whether the given file has is tracked by git.
+    # File path starts at git base directory
+    #
+    # @param file [String] The name of the file.
+    # @example Check if lib/git.rb is an untracked file.
+    #     untracked?('lib/git.rb')
+    # @return [Boolean]
+    def untracked?(file)
+      untracked.member?(file)
+    end
+
     def pretty
       out = ''
-      self.each do |file|
+      each do |file|
         out << pretty_file(file)
       end
       out << "\n"
@@ -34,26 +104,27 @@ module Git
     end
 
     def pretty_file(file)
-      <<FILE
-#{file.path}
-\tsha(r) #{file.sha_repo.to_s} #{file.mode_repo.to_s}
-\tsha(i) #{file.sha_index.to_s} #{file.mode_index.to_s}
-\ttype   #{file.type.to_s}
-\tstage  #{file.stage.to_s}
-\tuntrac #{file.untracked.to_s}
-FILE
-    end
-    
+      <<-FILE.strip_heredoc
+        #{file.path}
+        \tsha(r) #{file.sha_repo} #{file.mode_repo}
+        \tsha(i) #{file.sha_index} #{file.mode_index}
+        \ttype   #{file.type}
+        \tstage  #{file.stage}
+        \tuntrac #{file.untracked}
+      FILE
+    end
+
     # enumerable method
-    
+
     def [](file)
       @files[file]
     end
-    
+
     def each(&block)
       @files.values.each(&block)
     end
-    
+
+    # subclass that does heavy lifting
     class StatusFile
       attr_accessor :path, :type, :stage, :untracked
       attr_accessor :mode_index, :mode_repo
@@ -70,48 +141,59 @@ FILE
         @sha_repo = hash[:sha_repo]
         @untracked = hash[:untracked]
       end
-      
+
       def blob(type = :index)
         if type == :repo
           @base.object(@sha_repo)
         else
-          @base.object(@sha_index) rescue @base.object(@sha_repo)
+          begin
+            @base.object(@sha_index)
+          rescue
+            @base.object(@sha_repo)
+          end
         end
       end
-      
-      
     end
-    
+
     private
-    
-      def construct_status
-        @files = @base.lib.ls_files
-        ignore = @base.lib.ignored_files
-        
-        # find untracked in working dir
-        Dir.chdir(@base.dir.path) do
-          Dir.glob('**/*', File::FNM_DOTMATCH) do |file|
-            next if @files[file] || File.directory?(file) || ignore.include?(file) || file =~ /^.git\/.+/
-
-            @files[file] = {:path => file, :untracked => true}
-          end
-        end
-        
-        # find modified in tree
-        @base.lib.diff_files.each do |path, data|
-          @files[path] ? @files[path].merge!(data) : @files[path] = data
-        end
-        
-        # find added but not committed - new files
-        @base.lib.diff_index('HEAD').each do |path, data|
-          @files[path] ? @files[path].merge!(data) : @files[path] = data
-        end
-        
-        @files.each do |k, file_hash|
-          @files[k] = StatusFile.new(@base, file_hash)
+
+    def construct_status
+      @files = @base.lib.ls_files
+
+      fetch_untracked
+      fetch_modified
+      fetch_added
+
+      @files.each do |k, file_hash|
+        @files[k] = StatusFile.new(@base, file_hash)
+      end
+    end
+
+    def fetch_untracked
+      ignore = @base.lib.ignored_files
+
+      Dir.chdir(@base.dir.path) do
+        Dir.glob('**/*', File::FNM_DOTMATCH) do |file|
+          next if @files[file] || File.directory?(file) ||
+                  ignore.include?(file) || file =~ %r{^.git\/.+}
+
+          @files[file] = { path: file, untracked: true }
         end
       end
-      
+    end
+
+    def fetch_modified
+      # find modified in tree
+      @base.lib.diff_files.each do |path, data|
+        @files[path] ? @files[path].merge!(data) : @files[path] = data
+      end
+    end
+
+    def fetch_added
+      # find added but not committed - new files
+      @base.lib.diff_index('HEAD').each do |path, data|
+        @files[path] ? @files[path].merge!(data) : @files[path] = data
+      end
+    end
   end
-  
 end

data/lib/git/version.rb

@@ -1,7 +1,5 @@
 module Git
-
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.3.0'
-
+  VERSION='1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
-- Scott Chacon
+- Scott Chacon and others
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -89,7 +89,7 @@ files:
 - lib/git/status.rb
 - lib/git/version.rb
 - lib/git/working_directory.rb
-homepage: http://github.com/schacon/ruby-git
+homepage: http://github.com/ruby-git/ruby-git
 licenses:
 - MIT
 metadata: {}
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - git 1.6.0.0, or greater
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby/Git is a Ruby library that can be used to create, read and manipulate