rugged 0.19.0 → 0.28.0

data/lib/rugged/attributes.rb

@@ -0,0 +1,46 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
+module Rugged
+  class Repository
+    def attributes(path, options = {})
+      Attributes.new(self, path, options)
+    end
+
+    class Attributes
+      include Enumerable
+
+      LOAD_PRIORITIES = {
+        [:file, :index] => 0,
+        [:index, :file] => 1,
+        [:index] => 2,
+      }
+
+      def self.parse_opts(opt)
+        flags = LOAD_PRIORITIES[opt[:priority]] || 0
+        flags |= 4 if opt[:skip_system]
+        flags
+      end
+
+      def initialize(repository, path, options = {})
+        @repository = repository
+        @path = path
+        @load_flags = Attributes.parse_opts(options)
+      end
+
+      def [](attribute)
+        @repository.fetch_attributes(@path, attribute, @load_flags)
+      end
+
+      def to_h
+        @hash ||= @repository.fetch_attributes(@path, nil, @load_flags)
+      end
+
+      def each(&block)
+        to_h.each(&block)
+      end
+    end
+  end
+end

data/lib/rugged/blob.rb

@@ -0,0 +1,33 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
+module Rugged
+  class Blob
+    class HashSignature
+      WHITESPACE_DEFAULT  = 0
+      WHITESPACE_IGNORE   = 1
+      WHITESPACE_SMART    = 2
+    end
+
+    def hashsig(options = 0)
+      @hashsig ||= HashSignature.new(self, options)
+    end
+
+    def similarity(other)
+      other_sig = case other
+      when HashSignature
+        other
+      when String
+        HashSignature.new(other)
+      when Blob
+        other.hashsig
+      else
+        raise TypeError, "Expected a Rugged::Blob, String or Rugged::Blob::HashSignature"
+      end
+
+      HashSignature.compare(self.hashsig, other_sig)
+    end
+  end
+end

data/lib/rugged/branch.rb

@@ -1,28 +1,24 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Branch < Rugged::Reference
-
-    # The object pointed at by the tip of this branch
-    def tip
-      @owner.lookup(self.resolve.target)
-    end
-
     def ==(other)
       other.instance_of?(Rugged::Branch) &&
         other.canonical_name == self.canonical_name
     end
 
-    # The full name of the branch, as a fully-qualified reference
-    # path.
+    # Get the remote the branch belongs to.
     #
-    # This is the same as calling Reference#name for the reference behind
-    # the path
-    alias_method 'canonical_name', 'name'
-
-    # The name of the branch, without a fully-qualified reference path
+    # If the branch is remote returns the remote it belongs to.
+    # In case of local branch, it returns the remote of the branch
+    # it tracks or nil if there is no tracking branch.
     #
-    # E.g. 'master' instead of 'refs/heads/master'
-    def name
-      super.gsub(%r{^(refs/heads/|refs/remotes/)}, '')
+    def remote
+      remote_name = self.remote_name
+      @owner.remotes[remote_name] if remote_name
     end
   end
 end

data/lib/rugged/commit.rb

@@ -1,3 +1,8 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Commit
 
@@ -9,6 +14,10 @@ module Rugged
       "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_oids}}>"
     end
 
+    def header_field?(field)
+      !!header_field(field)
+    end
+
     # Return a diff between this commit and its first parent or another commit or tree.
     #
     # See Rugged::Tree#diff for more details.

data/lib/rugged/console.rb

@@ -1,3 +1,8 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 # Loaded by script/console. Land helpers here.
 
 def repo

data/lib/rugged/credentials.rb

@@ -0,0 +1,48 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
+module Rugged
+  module Credentials
+    # A plain-text username and password credential object.
+    class UserPassword
+      def initialize(options)
+        @username, @password = options[:username], options[:password]
+      end
+
+      def call(url, username_from_url, allowed_types)
+        self
+      end
+    end
+
+    # A ssh key credential object that can optionally be passphrase-protected
+    class SshKey
+      def initialize(options)
+        @username, @publickey, @privatekey, @passphrase = options[:username], options[:publickey], options[:privatekey], options[:passphrase]
+      end
+
+      def call(url, username_from_url, allowed_types)
+        self
+      end
+    end
+
+    class SshKeyFromAgent
+      def initialize(options)
+        @username = options[:username]
+      end
+
+      def call(url, username_from_url, allowed_types)
+        self
+      end
+    end
+
+    # A "default" credential usable for Negotiate mechanisms like NTLM or
+    # Kerberos authentication
+    class Default
+      def call(url, username_from_url, allowed_types)
+        self
+      end
+    end
+  end
+end

data/lib/rugged/diff/delta.rb

@@ -1,8 +1,11 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Diff
     class Delta
-      include Enumerable
-
       attr_reader :owner
       alias diff owner
 
@@ -10,6 +13,7 @@ module Rugged
       attr_reader :new_file
       attr_reader :similarity
       attr_reader :status
+      attr_reader :status_char
       attr_reader :binary
 
       alias binary? binary

data/lib/rugged/diff/hunk.rb

@@ -1,17 +1,17 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Diff
     class Hunk
-      include Enumerable
-      alias each each_line
-
-      attr_reader :line_count, :header, :range, :owner
-
-      alias size line_count
-      alias count line_count
-      alias delta owner
+      def delta
+        @owner
+      end
 
       def inspect
-        "#<#{self.class.name}:#{object_id} {header: #{header.inspect}, range: #{range.inspect}>"
+        "#<#{self.class.name}:#{object_id} {header: #{header.inspect}, count: #{count.inspect}}>"
       end
 
       # Returns an Array containing all lines of the hunk.

data/lib/rugged/diff/line.rb

@@ -1,9 +1,12 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Diff
     class Line
-      attr_reader :line_origin, :content, :owner, :old_lineno, :new_lineno
-
-      alias hunk owner
+      attr_reader :line_origin, :content, :old_lineno, :new_lineno, :content_offset
 
       def context?
         @line_origin == :context
@@ -17,8 +20,28 @@ module Rugged
         @line_origin == :deletion
       end
 
-      def eof_newline?
-        @line_origin == :eof_newline
+      def eof_no_newline?
+        @line_origin == :eof_no_newline
+      end
+
+      def eof_newline_added?
+        @line_origin == :eof_newline_added
+      end
+
+      def eof_newline_removed?
+        @line_origin == :eof_newline_removed
+      end
+
+      def file_header?
+        @line_origin == :file_header
+      end
+
+      def hunk_header?
+        @line_origin == :hunk_header
+      end
+
+      def binary?
+        @line_origin == :binary
       end
 
       def inspect

data/lib/rugged/diff.rb

@@ -1,4 +1,8 @@
-require 'rugged/diff/patch'
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 require 'rugged/diff/hunk'
 require 'rugged/diff/line'
 require 'rugged/diff/delta'
@@ -8,6 +12,8 @@ module Rugged
     include Enumerable
     alias each each_patch
 
+    attr_reader :owner
+
     def patches
       each_patch.to_a
     end

data/lib/rugged/index.rb

@@ -1,7 +1,127 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Index
     include Enumerable
 
+
+    # call-seq:
+    #   index.diff([options]) -> diff
+    #   index.diff(diffable[, options]) -> diff
+    #
+    # The first form returns a diff between the index and the current working
+    # directory.
+    #
+    # The second form returns a diff between the index and the given diffable object.
+    # +diffable+ can either be a +Rugged::Commit+ or a +Rugged::Tree+.
+    #
+    # The index will be used as the "old file" side of the diff, while the working
+    # directory or the +diffable+ will be used for the "new file" side.
+    #
+    # The following options can be passed in the +options+ Hash:
+    #
+    # :paths ::
+    #   An array of paths / fnmatch patterns to constrain the diff to a specific
+    #   set of files. Also see +:disable_pathspec_match+.
+    #
+    # :max_size ::
+    #   An integer specifying the maximum byte size of a file before a it will
+    #   be treated as binary. The default value is 512MB.
+    #
+    # :context_lines ::
+    #   The number of unchanged lines that define the boundary of a hunk (and
+    #   to display before and after the actual changes). The default is 3.
+    #
+    # :interhunk_lines ::
+    #   The maximum number of unchanged lines between hunk boundaries before the hunks
+    #   will be merged into a one. The default is 0.
+    #
+    # :reverse ::
+    #   If true, the sides of the diff will be reversed.
+    #
+    # :force_text ::
+    #   If true, all files will be treated as text, disabling binary attributes & detection.
+    #
+    # :ignore_whitespace ::
+    #   If true, all whitespace will be ignored.
+    #
+    # :ignore_whitespace_change ::
+    #   If true, changes in amount of whitespace will be ignored.
+    #
+    # :ignore_whitespace_eol ::
+    #   If true, whitespace at end of line will be ignored.
+    #
+    # :ignore_submodules ::
+    #   if true, submodules will be excluded from the diff completely.
+    #
+    # :patience ::
+    #   If true, the "patience diff" algorithm will be used (currenlty unimplemented).
+    #
+    # :include_ignored ::
+    #   If true, ignored files will be included in the diff.
+    #
+    # :include_untracked ::
+    #  If true, untracked files will be included in the diff.
+    #
+    # :include_unmodified ::
+    #   If true, unmodified files will be included in the diff.
+    #
+    # :recurse_untracked_dirs ::
+    #   Even if +:include_untracked+ is true, untracked directories will only be
+    #   marked with a single entry in the diff. If this flag is set to true,
+    #   all files under ignored directories will be included in the diff, too.
+    #
+    # :disable_pathspec_match ::
+    #   If true, the given +:paths+ will be applied as exact matches, instead of
+    #   as fnmatch patterns.
+    #
+    # :deltas_are_icase ::
+    #   If true, filename comparisons will be made with case-insensitivity.
+    #
+    # :include_untracked_content ::
+    #   if true, untracked content will be contained in the the diff patch text.
+    #
+    # :skip_binary_check ::
+    #   If true, diff deltas will be generated without spending time on binary
+    #   detection. This is useful to improve performance in cases where the actual
+    #   file content difference is not needed.
+    #
+    # :include_typechange ::
+    #   If true, type changes for files will not be interpreted as deletion of
+    #   the "old file" and addition of the "new file", but will generate
+    #   typechange records.
+    #
+    # :include_typechange_trees ::
+    #   Even if +:include_typechange+ is true, blob -> tree changes will still
+    #   usually be handled as a deletion of the blob. If this flag is set to true,
+    #   blob -> tree changes will be marked as typechanges.
+    #
+    # :ignore_filemode ::
+    #   If true, file mode changes will be ignored.
+    #
+    # :recurse_ignored_dirs ::
+    #   Even if +:include_ignored+ is true, ignored directories will only be
+    #   marked with a single entry in the diff. If this flag is set to true,
+    #   all files under ignored directories will be included in the diff, too.
+    def diff(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      other   = args.shift
+
+      case other
+      when nil
+        diff_index_to_workdir options
+      when ::Rugged::Commit
+        diff_tree_to_index other.tree, options
+      when ::Rugged::Tree
+        diff_tree_to_index other, options
+      else
+        raise TypeError, "A Rugged::Commit or Rugged::Tree instance is required"
+      end
+    end
+
     def to_s
       s = "#<Rugged::Index\n"
       self.each do |entry|

data/lib/rugged/object.rb

@@ -1,3 +1,8 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Object
     def <=>(other)

data/lib/rugged/patch.rb

@@ -0,0 +1,41 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
+module Rugged
+  class Patch
+    include Enumerable
+    alias each each_hunk
+
+    alias size hunk_count
+    alias count hunk_count
+
+    attr_accessor :owner
+    alias diff owner
+
+    def inspect
+      "#<#{self.class.name}:#{object_id}>"
+    end
+
+    # Returns the number of additions in the patch.
+    def additions
+      stat[0]
+    end
+
+    # Returns the number of deletions in the patch.
+    def deletions
+      stat[1]
+    end
+
+    # Returns the number of total changes in the patch.
+    def changes
+      additions + deletions
+    end
+
+    # Returns an Array containing all hunks of the patch.
+    def hunks
+      each_hunk.to_a
+    end
+  end
+end

data/lib/rugged/reference.rb

@@ -1,9 +1,12 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Reference
-
     def inspect
-      "#<Rugged::Reference:#{object_id} {name: #{name.inspect}, target: #{target.inspect}}>"
+      "#<#{self.class}:#{object_id} {name: #{name.inspect}, target: #{target.inspect}}>"
     end
-
   end
 end

data/lib/rugged/remote.rb

@@ -1,13 +1,9 @@
+# Copyright (C) the Rugged contributors.  All rights reserved.
+#
+# This file is part of Rugged, distributed under the MIT license.
+# For full terms see the included LICENSE file.
+
 module Rugged
   class Remote
-    # Push a list of refspecs to the given remote.
-    #
-    # refspecs - A list of refspecs that should be pushed to the remote.
-    #
-    # Returns a hash containing the pushed refspecs as keys and
-    # any error messages or +nil+ as values.
-    def push(refspecs)
-      @owner.push(self, refspecs)
-    end
   end
 end