right_develop 1.2.2 → 2.0.1

data/lib/right_develop/git/branch.rb

@@ -1,74 +0,0 @@
-module RightDevelop::Git
-  # A branch in a Git repository. Has some proxy methods that make it act a bit like
-  # a string, whose value is the name of the branch. This allows branches to be sorted,
-  # matched against Regexp, and certain other string-y operations.
-  class Branch
-    BRANCH_NAME     = '[#A-Za-z0-9._\/-]+'
-    BRANCH_INFO     = /(\* |  )?(#{BRANCH_NAME})( -> )?(#{BRANCH_NAME})?/
-    BRANCH_FULLNAME = /(remotes\/)?(#{BRANCH_NAME})/
-
-    def initialize(repo, line)
-      match = BRANCH_INFO.match(line)
-      if match && (fullname = match[2])
-        match = BRANCH_FULLNAME.match(fullname)
-        if match
-          @fullname = match[2]
-          @remote = !!match[1]
-          @repo = repo
-        else
-          raise FormatError, "Unrecognized branch name '#{line}'"
-        end
-      else
-        raise FormatError, "Unrecognized branch info '#{line}'"
-      end
-    end
-
-    def to_s
-      @fullname
-    end
-    alias inspect to_s
-
-    def =~(other)
-      @fullname =~ other
-    end
-
-    def ==(other)
-      self.to_s == other.to_s
-    end
-
-    def <=>(other)
-      self.to_s <=> other.to_s
-    end
-
-    def remote?
-      @remote
-    end
-
-    def name
-      if remote?
-        #remove the initial remote-name in the branch (origin/master --> master)
-        bits = @fullname.split('/')
-        bits.shift
-        bits.join('/')
-      else
-        @fullname
-      end
-    end
-
-    def display(width=40)
-      if @fullname.length >= width
-        (@fullname[0..(width-5)] + "...").ljust(width)
-      else
-        @fullname.ljust(width)
-      end
-    end
-
-    def delete
-      if self.remote?
-        @repo.shell("git push origin :#{self.name}")
-      else
-        @repo.shell("git branch -D #{@fullname}")
-      end
-    end
-  end
-end

data/lib/right_develop/git/branch_collection.rb

@@ -1,72 +0,0 @@
-module RightDevelop::Git
-  # A collection of Git branches. Acts a bit like an Array, allowing it to be mapped,
-  # sorted and compared as such.
-  class BranchCollection
-    def initialize(repo, *args)
-      @repo = repo
-      @branches = args
-    end
-
-    def to_s
-      @branches.inspect
-    end
-    alias inspect to_s
-
-    def local
-      local = BranchCollection.new(@repo)
-      @branches.each do |branch|
-        local << branch unless branch.remote?
-      end
-      local
-    end
-
-    def remote
-      remote = BranchCollection.new(@repo)
-      @branches.each do |branch|
-        remote << branch if branch.remote?
-      end
-      remote
-    end
-
-    def merged(target)
-      merged = BranchCollection.new(@repo)
-
-      all_merged = shell("git branch -r --merged #{target}").map do |line|
-        Branch.new(@repo, line)
-      end
-
-      @branches.each do |candidate|
-        # For some reason Set#include? does not play nice with our overridden comparison operators
-        # for branches, so we need to do this the hard way :(
-        merged << candidate if all_merged.detect { |b| candidate == b }
-      end
-
-      merged
-    end
-
-    # Accessor that acts like either a Hash or Array accessor
-    def [](argument)
-      case argument
-      when String
-        target = Branch.new(@repo, argument)
-        @branches.detect { |b| b == target }
-      else
-        @branches.__send__(:[], argument)
-      end
-    end
-
-    def method_missing(meth, *args, &block)
-      result = @branches.__send__(meth, *args, &block)
-
-      if result.is_a?(Array)
-        BranchCollection.new(@repo, *result)
-      else
-        result
-      end
-    end
-
-    def shell(cmd, *args)
-      @repo.shell(cmd, *args)
-    end
-  end
-end

data/lib/right_develop/git/commit.rb

@@ -1,30 +0,0 @@
-module RightDevelop::Git
-  # A commit within a Git repository.
-  class Commit
-    COMMIT_INFO     = /([0-9A-Fa-f]+) ([0-9]+) (.*)/
-
-    def initialize(repo, line)
-      @repo = repo
-      match = COMMIT_INFO.match(line)
-      raise FormatError, "Unrecognized commit summary '#{line}'" unless match && match.length >= 3
-      @info = [ match[1], match[2], match[3] ]
-    end
-
-    def to_s
-      @info.join(' ')
-    end
-
-    def hash
-      # This overrides String#hash on purpose
-      @info[0]
-    end
-
-    def timestamp
-      Time.at(@info[1].to_i)
-    end
-
-    def author
-      @info[2]
-    end
-  end
-end

data/lib/right_develop/git/repository.rb

@@ -1,57 +0,0 @@
-module RightDevelop::Git
-  # An entire Git repository. Mostly acts as a factory for Branch,
-  # BranchCollection and Commit objects.
-  class Repository
-    DEFAULT_LOG_OPTIONS = {
-      :tail=>1_000
-    }
-
-    def initialize(dir)
-      @dir = dir
-    end
-
-    def fetch
-      shell('git fetch -q')
-    end
-
-    def branches()
-      lines = shell('git branch -a')
-      branches = BranchCollection.new(self)
-      lines.each do |line|
-        branch = Branch.new(self, line)
-        branches << branch if branch
-      end
-      branches
-    end
-
-    def log(branch_spec='master', options={})
-      options = DEFAULT_LOG_OPTIONS.merge(options)
-
-      args = [
-        "-n#{options[:tail]}",
-        "--format='%h %at %aE'"
-      ]
-      if options[:no_merges]
-        args << "--no-merges"
-      end
-
-      lines = shell("git log #{args.join(' ')} #{branch_spec}")
-      lines.map do |line|
-        Commit.new(self, line)
-      end.compact
-    end
-
-    def shell(cmd, *args)
-      Dir.chdir(@dir) do
-
-        full_cmd="#{cmd} #{args.join ' '}"
-        output = `#{full_cmd}`
-        if $?.success?
-          return output.split("\n").map { |l| l.strip }
-        else
-          raise CommandError, "#{full_cmd} --> #{output}"
-        end
-      end
-    end
-  end
-end