tekkub-fugit 0.0.5 → 0.0.6

data/lib/grit/lib/grit/tag.rb

@@ -0,0 +1,66 @@
+module Grit
+
+  class Tag < Ref
+    def self.find_all(repo, options = {})
+      refs = []
+      already = {}
+
+      Dir.chdir(repo.path) do
+        files = Dir.glob(prefix + '/**/*')
+
+        files.each do |ref|
+          next if !File.file?(ref)
+
+          id = File.read(ref).chomp
+          name = ref.sub("#{prefix}/", '')
+          commit = commit_from_sha(repo, id)
+
+          if !already[name]
+            refs << self.new(name, commit)
+            already[name] = true
+          end
+        end
+
+        if File.file?('packed-refs')
+          lines = File.readlines('packed-refs')
+          lines.each_with_index do |line, i|
+            if m = /^(\w{40}) (.*?)$/.match(line)
+              next if !Regexp.new('^' + prefix).match(m[2])
+              name = m[2].sub("#{prefix}/", '')
+
+              # Annotated tags in packed-refs include a reference
+              # to the commit object on the following line.
+              next_line = lines[i+1]
+              if next_line && next_line[0] == ?^
+                commit = Commit.create(repo, :id => next_line[1..-1].chomp)
+              else
+                commit = commit_from_sha(repo, m[1])
+              end
+
+              if !already[name]
+                refs << self.new(name, commit)
+                already[name] = true
+              end
+            end
+          end
+        end
+      end
+
+      refs
+    end
+
+    def self.commit_from_sha(repo, id)
+      git_ruby_repo = GitRuby::Repository.new(repo.path)
+      object = git_ruby_repo.get_object_by_sha1(id)
+
+      if object.type == :commit
+        Commit.create(repo, :id => id)
+      elsif object.type == :tag
+        Commit.create(repo, :id => object.object)
+      else
+        raise "Unknown object type."
+      end
+    end
+  end
+
+end

data/lib/grit/lib/grit/tree.rb

@@ -0,0 +1,104 @@
+module Grit
+  
+  class Tree
+    lazy_reader :contents
+    attr_reader :id
+    attr_reader :mode
+    attr_reader :name
+    
+    # Construct the contents of the tree
+    #   +repo+ is the Repo
+    #   +treeish+ is the reference
+    #   +paths+ is an optional Array of directory paths to restrict the tree
+    #
+    # Returns Grit::Tree (baked)
+    def self.construct(repo, treeish, paths = [])
+      output = repo.git.ls_tree({}, treeish, *paths)
+      self.allocate.construct_initialize(repo, treeish, output)
+    end
+    
+    def construct_initialize(repo, id, text)
+      @repo = repo
+      @id = id
+      @contents = []
+      
+      text.split("\n").each do |line|
+        @contents << content_from_string(repo, line)
+      end
+      @contents.compact!
+
+      self
+    end
+    
+    def lazy_source
+      Tree.construct(@repo, @id, [])
+    end
+    
+    # Create an unbaked Tree containing just the specified attributes
+    #   +repo+ is the Repo
+    #   +atts+ is a Hash of instance variable data
+    #
+    # Returns Grit::Tree (unbaked)
+    def self.create(repo, atts)
+      self.allocate.create_initialize(repo, atts)
+    end
+    
+    # Initializer for Tree.create
+    #   +repo+ is the Repo
+    #   +atts+ is a Hash of instance variable data
+    #
+    # Returns Grit::Tree (unbaked)
+    def create_initialize(repo, atts)
+      @repo = repo
+      
+      atts.each do |k, v|
+        instance_variable_set("@#{k}", v)
+      end
+      self
+    end
+    
+    # Parse a content item and create the appropriate object
+    #   +repo+ is the Repo
+    #   +text+ is the single line containing the items data in `git ls-tree` format
+    #
+    # Returns Grit::Blob or Grit::Tree
+    def content_from_string(repo, text)
+      mode, type, id, name = text.split(" ", 4)
+      case type
+        when "tree"
+          Tree.create(repo, :id => id, :mode => mode, :name => name)
+        when "blob"
+          Blob.create(repo, :id => id, :mode => mode, :name => name)
+        when "link"
+          Blob.create(repo, :id => id, :mode => mode, :name => name)
+        when "commit"
+          Submodule.create(repo, :id => id, :mode => mode, :name => name)
+        else
+          raise "Invalid type: #{type}"
+      end
+    end
+    
+    # Find the named object in this tree's contents
+    #
+    # Examples
+    #   Repo.new('/path/to/grit').tree/'lib'
+    #   # => #<Grit::Tree "6cc23ee138be09ff8c28b07162720018b244e95e">
+    #   Repo.new('/path/to/grit').tree/'README.txt'
+    #   # => #<Grit::Blob "8b1e02c0fb554eed2ce2ef737a68bb369d7527df">
+    #
+    # Returns Grit::Blob or Grit::Tree or nil if not found
+    def /(file)
+      if file =~ /\//
+        file.split("/").inject(self) { |acc, x| acc/x } rescue nil
+      else
+        self.contents.find { |c| c.name == file }
+      end
+    end
+    
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Tree "#{@id}">}
+    end
+  end # Tree
+  
+end # Grit

data/lib/grit/lib/grit.rb

@@ -0,0 +1,71 @@
+$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
+
+# core
+require 'fileutils'
+require 'time'
+
+# stdlib
+require 'timeout'
+require 'logger'
+require 'digest/sha1'
+
+if defined? RUBY_ENGINE && RUBY_ENGINE == 'jruby'
+  require 'open3'
+elsif RUBY_PLATFORM =~ /mswin|mingw/
+  begin
+    require 'win32/open3'
+  rescue LoadError
+    warn "You must 'gem install win32-open3' to use grit on Windows"
+    exit 1
+  end
+else
+  require 'open3_detach'
+end
+
+# third party
+require 'rubygems'
+require 'mime/types'
+
+# internal requires
+require 'grit/lazy'
+require 'grit/errors'
+require 'grit/git-ruby'
+require 'grit/git'
+require 'grit/ref'
+require 'grit/tag'
+require 'grit/commit'
+require 'grit/commit_stats'
+require 'grit/tree'
+require 'grit/blob'
+require 'grit/actor'
+require 'grit/diff'
+require 'grit/config'
+require 'grit/repo'
+require 'grit/index'
+require 'grit/status'
+require 'grit/submodule'
+require 'grit/blame'
+require 'grit/merge'
+
+
+module Grit
+  class << self
+    # Set +debug+ to true to log all git calls and responses
+    attr_accessor :debug
+    attr_accessor :use_git_ruby
+    # The standard +logger+ for debugging git calls - this defaults to a plain STDOUT logger
+    attr_accessor :logger
+    def log(str)
+      logger.debug { str }
+    end
+  end
+  self.debug = false
+  self.use_git_ruby = true
+
+  @logger ||= ::Logger.new(STDOUT)
+
+  def self.version
+    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
+    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
+  end
+end

data/lib/grit/lib/open3_detach.rb

@@ -0,0 +1,46 @@
+module Open3
+  extend self
+
+  def popen3(*cmd)
+    pw = IO::pipe   # pipe[0] for read, pipe[1] for write
+    pr = IO::pipe
+    pe = IO::pipe
+
+    pid = fork{
+      # child
+      fork{
+        # grandchild
+        pw[1].close
+        STDIN.reopen(pw[0])
+        pw[0].close
+
+        pr[0].close
+        STDOUT.reopen(pr[1])
+        pr[1].close
+
+        pe[0].close
+        STDERR.reopen(pe[1])
+        pe[1].close
+
+        exec(*cmd)
+      }
+      exit!(0)
+    }
+
+    pw[0].close
+    pr[1].close
+    pe[1].close
+    Process.waitpid(pid)
+    pi = [pw[1], pr[0], pe[0]]
+    pw[1].sync = true
+    if defined? yield
+      begin
+        return yield(*pi)
+      ensure
+        Process.detach(pid) if pid
+        pi.each { |p| p.close unless p.closed? }
+      end
+    end
+    pi
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tekkub-fugit
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Tekkub
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: fugit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,35 +31,82 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- fugit.gemspec
-- SciTE.properties
+- Rakefile
 - VERSION.yml
 - bin/fugit
-- lib/fugit
+- lib/fugit.rb
 - lib/fugit/commit_dialog.rb
 - lib/fugit/commit_tab.rb
-- lib/fugit/commit_tab_toolbar.rb
 - lib/fugit/console.rb
+- lib/fugit/create_branch_dialog.rb
 - lib/fugit/delete_branch_dialog.rb
 - lib/fugit/diff.rb
+- lib/fugit/fetch_dialog.rb
 - lib/fugit/graph_renderer.rb
 - lib/fugit/history_list.rb
 - lib/fugit/history_tab.rb
 - lib/fugit/icon_loader.rb
 - lib/fugit/index_list.rb
 - lib/fugit/io_get_line.rb
+- lib/fugit/logged_dialog.rb
 - lib/fugit/main_frame.rb
+- lib/fugit/merge_dialog.rb
 - lib/fugit/messages.rb
 - lib/fugit/push_dialog.rb
-- lib/fugit/SciTE.properties
-- lib/fugit.rb
-- lib/icons
+- lib/fugit/revert_commit_dialog.rb
+- lib/fugit/run_command_dialog.rb
+- lib/fugit/tab_toolbar.rb
+- lib/grit/API.txt
+- lib/grit/History.txt
+- lib/grit/PURE_TODO
+- lib/grit/README.txt
+- lib/grit/Rakefile
+- lib/grit/VERSION.yml
+- lib/grit/benchmarks.rb
+- lib/grit/benchmarks.txt
+- lib/grit/examples/ex_add_commit.rb
+- lib/grit/examples/ex_index.rb
+- lib/grit/grit.gemspec
+- lib/grit/lib/grit.rb
+- lib/grit/lib/grit/actor.rb
+- lib/grit/lib/grit/blame.rb
+- lib/grit/lib/grit/blob.rb
+- lib/grit/lib/grit/commit.rb
+- lib/grit/lib/grit/commit_stats.rb
+- lib/grit/lib/grit/config.rb
+- lib/grit/lib/grit/diff.rb
+- lib/grit/lib/grit/errors.rb
+- lib/grit/lib/grit/git-ruby.rb
+- lib/grit/lib/grit/git-ruby/commit_db.rb
+- lib/grit/lib/grit/git-ruby/file_index.rb
+- lib/grit/lib/grit/git-ruby/git_object.rb
+- lib/grit/lib/grit/git-ruby/internal/loose.rb
+- lib/grit/lib/grit/git-ruby/internal/mmap.rb
+- lib/grit/lib/grit/git-ruby/internal/pack.rb
+- lib/grit/lib/grit/git-ruby/internal/raw_object.rb
+- lib/grit/lib/grit/git-ruby/object.rb
+- lib/grit/lib/grit/git-ruby/repository.rb
+- lib/grit/lib/grit/git.rb
+- lib/grit/lib/grit/index.rb
+- lib/grit/lib/grit/lazy.rb
+- lib/grit/lib/grit/merge.rb
+- lib/grit/lib/grit/ref.rb
+- lib/grit/lib/grit/repo.rb
+- lib/grit/lib/grit/status.rb
+- lib/grit/lib/grit/submodule.rb
+- lib/grit/lib/grit/tag.rb
+- lib/grit/lib/grit/tree.rb
+- lib/grit/lib/open3_detach.rb
+- lib/icons/application_go.png
 - lib/icons/arrow_divide.png
+- lib/icons/arrow_divide_add.png
 - lib/icons/arrow_divide_delete.png
 - lib/icons/arrow_join.png
+- lib/icons/arrow_refresh.png
 - lib/icons/arrow_undo.png
 - lib/icons/asterisk_yellow.png
 - lib/icons/cherry.png
+- lib/icons/cross.png
 - lib/icons/disk.png
 - lib/icons/folder_add.png
 - lib/icons/folder_delete.png
@@ -78,7 +125,6 @@ has_rdoc: true
 homepage: http://github.com/tekkub/fugit
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib

data/fugit.gemspec

@@ -1,32 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{fugit}
-  s.version = "0.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tekkub"]
-  s.date = %q{2009-02-27}
-  s.default_executable = %q{fugit}
-  s.description = %q{A cross-platform replacement for git-gui based on wxruby}
-  s.email = %q{tekkub@gmail.com}
-  s.executables = ["fugit"]
-  s.files = ["fugit.gemspec", "SciTE.properties", "VERSION.yml", "bin/fugit", "lib/fugit", "lib/fugit/commit_dialog.rb", "lib/fugit/commit_tab.rb", "lib/fugit/commit_tab_toolbar.rb", "lib/fugit/console.rb", "lib/fugit/delete_branch_dialog.rb", "lib/fugit/diff.rb", "lib/fugit/graph_renderer.rb", "lib/fugit/history_list.rb", "lib/fugit/history_tab.rb", "lib/fugit/icon_loader.rb", "lib/fugit/index_list.rb", "lib/fugit/io_get_line.rb", "lib/fugit/main_frame.rb", "lib/fugit/messages.rb", "lib/fugit/push_dialog.rb", "lib/fugit/SciTE.properties", "lib/fugit.rb", "lib/icons", "lib/icons/arrow_divide.png", "lib/icons/arrow_divide_delete.png", "lib/icons/arrow_join.png", "lib/icons/arrow_undo.png", "lib/icons/asterisk_yellow.png", "lib/icons/cherry.png", "lib/icons/disk.png", "lib/icons/folder_add.png", "lib/icons/folder_delete.png", "lib/icons/page_add.png", "lib/icons/page_delete.png", "lib/icons/page_down.gif", "lib/icons/page_up.gif", "lib/icons/plus_minus.gif", "lib/icons/script.png", "lib/icons/script_add.png", "lib/icons/script_delete.png", "lib/icons/script_edit.png", "lib/icons/text_signature.png", "lib/icons/tick.png"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/tekkub/fugit}
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{A cross-platform replacement for git-gui based on wxruby}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if current_version >= 3 then
-      s.add_runtime_dependency(%q<wxruby>, [">= 1.9.9"])
-    else
-      s.add_dependency(%q<wxruby>, [">= 1.9.9"])
-    end
-  else
-    s.add_dependency(%q<wxruby>, [">= 1.9.9"])
-  end
-end

data/lib/fugit/commit_tab_toolbar.rb

@@ -1,111 +0,0 @@
-include Wx
-include IconLoader
-
-module Fugit
-	class CommitTabToolbar < ToolBar
-		def initialize(parent)
-			super(parent, ID_ANY, nil, nil, TB_HORIZONTAL|NO_BORDER|TB_NODIVIDER)
-
-			self.set_tool_bitmap_size(Size.new(16,16))
-
-			stage_all_button = self.add_tool(ID_ANY, "Stage all", get_icon("folder_add.png"), "Stage all")
-			evt_tool(stage_all_button, :on_stage_all_clicked)
-
-			stage_button = self.add_tool(ID_ANY, "Stage", get_icon("page_add.png"), "Stage changed files")
-			evt_tool(stage_button, :on_stage_changed_clicked)
-
-			unstage_all_button = self.add_tool(ID_ANY, "Unstage all", get_icon("folder_delete.png"), "Unstage all")
-			evt_tool(unstage_all_button, :on_unstage_all_clicked)
-
-			self.add_separator
-
-			commit = self.add_tool(ID_ANY, "Commit", get_icon("disk.png"), "Commit")
-			evt_tool(commit, :on_commit_clicked)
-
-			self.add_separator
-
-			push = self.add_tool(ID_ANY, "Push", get_icon("page_up.gif"), "Push")
-			evt_tool(push, :on_push_clicked)
-
-			pull = self.add_tool(ID_ANY, "Pull", get_icon("page_down.gif"), "Pull")
-			self.enable_tool(pull.get_id, false)
-
-			self.add_separator
-
-			self.add_control(@branch = Choice.new(self, ID_ANY))
-			set_branches
-			evt_choice(@branch, :on_branch_choice)
-
-			merge_branch_button = self.add_tool(ID_ANY, "Merge branch", get_icon("arrow_join.png"), "Merge branch")
-			self.enable_tool(merge_branch_button.get_id, false)
-
-			delete_branch_button = self.add_tool(ID_ANY, "Delete branch", get_icon("arrow_divide_delete.png"), "Delete branch")
-			evt_tool(delete_branch_button, :on_delete_branch_clicked)
-
-			self.realize
-
-			register_for_message(:tab_switch, :update_tools)
-			register_for_message(:branch_deleted, :update_tools)
-			register_for_message(:refresh, :update_tools)
-			register_for_message(:save_clicked, :on_commit_clicked)
-			register_for_message(:push_clicked, :on_push_clicked)
-		end
-
-		def update_tools
-			return unless is_shown_on_screen
-			set_branches
-		end
-
-		def set_branches
-			branches = `git branch`
-			current = branches.match(/\* (.+)/).to_a.last
-			@branch.clear
-			branches.split("\n").each {|b| @branch.append(b.split(" ").last)}
-			@branch.set_string_selection(current) if current
-		end
-
-		def on_stage_all_clicked(event)
-			`git add --all 2>&1`
-			send_message(:index_changed)
-		end
-
-		def on_stage_changed_clicked(event)
-			`git add --update 2>&1`
-			send_message(:index_changed)
-		end
-
-		def on_unstage_all_clicked(event)
-			`git reset 2>&1`
-			send_message(:index_changed)
-		end
-
-		def on_commit_clicked
-			@commit_dialog ||= CommitDialog.new(self)
-			send_message(:commit_saved) if @commit_dialog.show_modal == ID_OK
-		end
-
-		def on_push_clicked
-			@push_dialog ||= PushDialog.new(self)
-			@push_dialog.show
-		end
-
-		def on_branch_choice(event)
-			branch = @branch.get_string(event.get_selection)
-			err = `git checkout #{branch} 2>&1`
-			if err =~ /Switched to branch "#{branch}"/
-				send_message(:branch_checkout)
-			else
-				MessageDialog.new(self, err, "Branch checkout error", OK|ICON_ERROR).show_modal
-				branches = `git branch`
-				current = branches.match(/\* (.+)/).to_a.last
-				@branch.set_string_selection(current) if current
-			end
-		end
-
-		def on_delete_branch_clicked
-			@delete_branch_dialog ||= DeleteBranchDialog.new(self)
-			@delete_branch_dialog.show
-		end
-
-	end
-end