tekkub-fugit 0.0.5 → 0.0.6

data/lib/fugit/run_command_dialog.rb

@@ -0,0 +1,40 @@
+include Wx
+
+module Fugit
+	class RunCommandDialog < Dialog
+		def initialize(parent)
+			super(parent, ID_ANY, "Run command", :size => Size.new(300, 100))
+
+			@cmd = TextCtrl.new(self, ID_ANY)
+
+			butt_sizer = create_button_sizer(OK|CANCEL)
+			butt_sizer.get_children.map {|s| s.get_window}.compact.each {|b| b.set_label("Run") if b.get_label == "OK"}
+			evt_button(get_affirmative_id, :on_ok)
+
+			box = BoxSizer.new(VERTICAL)
+			box.add(StaticText.new(self, ID_ANY, "Command:"), 0, EXPAND|ALL, 4)
+			box.add(@cmd, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
+
+			self.set_sizer(box)
+		end
+
+		def show()
+			@cmd.set_value("")
+
+			super()
+			@cmd.set_focus
+		end
+
+		def on_ok
+			command = @cmd.get_value
+
+			end_modal(ID_OK)
+
+			@log_dialog ||= LoggedDialog.new(self, "Run command")
+			@log_dialog.show
+			@log_dialog.run_command(command)
+		end
+
+	end
+end

data/lib/fugit/tab_toolbar.rb

@@ -0,0 +1,145 @@
+include Wx
+include IconLoader
+
+module Fugit
+	class TabToolbar < ToolBar
+		def initialize(parent, is_commit_bar = true)
+			super(parent, ID_ANY, nil, nil, TB_HORIZONTAL|NO_BORDER|TB_NODIVIDER)
+
+			self.set_tool_bitmap_size(Size.new(16,16))
+
+			if is_commit_bar
+				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)
+			end
+
+			refresh = self.add_tool(ID_ANY, "Refresh", get_icon("arrow_refresh.png"), "Refresh")
+			evt_tool(refresh, :on_refresh_clicked)
+
+			self.add_separator
+
+			push = self.add_tool(ID_ANY, "Push", get_icon("page_up.gif"), "Push")
+			evt_tool(push, :on_push_clicked)
+
+			fetch = self.add_tool(ID_ANY, "Fetch", get_icon("page_down.gif"), "Fetch")
+			evt_tool(fetch, :on_fetch_clicked)
+
+			self.add_separator
+
+			self.add_control(@branch = Choice.new(self, ID_ANY))
+			set_branches
+			evt_choice(@branch, :on_branch_choice)
+
+			create_branch_button = self.add_tool(ID_ANY, "Create branch", get_icon("arrow_divide_add.png"), "Create branch")
+			evt_tool(create_branch_button, :on_create_branch_clicked)
+
+			merge_branch_button = self.add_tool(ID_ANY, "Merge branch", get_icon("arrow_join.png"), "Merge branch")
+			evt_tool(merge_branch_button, :on_merge_branch_clicked)
+
+			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.add_separator
+
+			run_command_button = self.add_tool(ID_ANY, "Run command", get_icon("application_go.png"), "Run command")
+			evt_tool(run_command_button, :on_run_command_clicked)
+
+			self.realize
+
+			register_for_message(:tab_switch, :update_tools)
+			register_for_message(:branch_created, :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
+			@branch.clear
+			repo.branches.each {|b| @branch.append(b.name)}
+			@branch.set_string_selection(repo.head.name)
+		end
+
+		def on_stage_all_clicked(event)
+			repo.add_all
+			send_message(:index_changed)
+		end
+
+		def on_stage_changed_clicked(event)
+			repo.add_updated
+			send_message(:index_changed)
+		end
+
+		def on_unstage_all_clicked(event)
+			repo.reset_all
+			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_refresh_clicked
+			send_message(:refresh)
+		end
+
+		def on_push_clicked
+			@push_dialog ||= PushDialog.new(self)
+			@push_dialog.show
+		end
+
+		def on_fetch_clicked
+			@fetch_dialog ||= FetchDialog.new(self)
+			@fetch_dialog.show
+		end
+
+		def on_branch_choice(event)
+			branch = @branch.get_string(event.get_selection)
+			success, err = repo.checkout(branch)
+			if success
+				send_message(:branch_checkout)
+			else
+				MessageDialog.new(self, err, "Branch checkout error", OK|ICON_ERROR).show_modal
+				@branch.set_string_selection(repo.head.name)
+			end
+		end
+
+		def on_create_branch_clicked
+			@create_branch_dialog ||= CreateBranchDialog.new(self)
+			@create_branch_dialog.show
+		end
+
+		def on_delete_branch_clicked
+			@delete_branch_dialog ||= DeleteBranchDialog.new(self)
+			@delete_branch_dialog.show
+		end
+
+		def on_merge_branch_clicked
+			@merge_branch_dialog ||= MergeDialog.new(self)
+			@merge_branch_dialog.show
+		end
+
+		def on_run_command_clicked
+			@run_command_dialog ||= RunCommandDialog.new(self)
+			@run_command_dialog.show
+		end
+
+	end
+end

data/lib/fugit.rb

@@ -1,25 +1,43 @@
 
 $:.unshift File.dirname(__FILE__)
 
+require "rubygems"
+
 require 'wx'
+require "grit/lib/grit"
 
 require "fugit/icon_loader"
 
 require "fugit/commit_dialog"
 require "fugit/commit_tab"
-require "fugit/commit_tab_toolbar"
 require "fugit/console"
+require "fugit/create_branch_dialog"
 require "fugit/delete_branch_dialog"
 require "fugit/diff"
+require "fugit/fetch_dialog"
 require "fugit/graph_renderer"
 require "fugit/history_list"
 require "fugit/history_tab"
 require "fugit/index_list"
 require "fugit/io_get_line"
+require "fugit/logged_dialog"
 require "fugit/main_frame"
+require "fugit/merge_dialog"
 require "fugit/messages"
 require "fugit/push_dialog"
+require "fugit/revert_commit_dialog"
+require "fugit/run_command_dialog"
+require "fugit/tab_toolbar"
+
 
+unless Wx::MenuItem.method_defined?("set_bitmap")
+  module Wx
+    class MenuItem
+      def set_bitmap(a=nil)
+      end
+    end
+  end
+end
 
 version = File.exist?(File.join(File.dirname(__FILE__), "..", ".git")) ? "Developer's alpha" : Gem.searcher.find("fugit").version.to_s rescue "Unknown"
 

data/lib/grit/API.txt

@@ -0,0 +1,101 @@
+== TODO ==
+
+* Add remote branch references (Grit::Remote)
+* Add status - what is modified, staged
+
+g.checkout('new_branch')
+g.checkout(g.branch('new_branch'))
+
+g.branch(name).merge(branch2)
+g.branch(branch2).merge  # merges HEAD with branch2
+
+g.branch(name).in_branch(message) { # add files }  # auto-commits
+g.merge('new_branch')
+g.merge('origin/remote_branch')
+g.merge(b.branch('master'))
+g.merge([branch1, branch2])
+
+r = g.add_remote(name, uri)  # Git::Remote
+r = g.add_remote(name, Git::Base)  # Git::Remote
+
+g.remotes  # array of Git::Remotes
+g.remote(name).fetch
+g.remote(name).remove
+g.remote(name).merge
+g.remote(name).merge(branch)
+
+g.fetch
+g.fetch(g.remotes.first)
+
+g.pull
+g.pull(Git::Repo, Git::Branch) # fetch and a merge
+
+g.add_tag('tag_name') # returns Git::Tag
+
+g.repack
+
+g.push
+g.push(g.remote('name'))
+   
+g.reset # defaults to HEAD
+g.reset_hard(Git::Commit)
+
+g.branch('new_branch') # creates new or fetches existing
+g.branch('new_branch').checkout
+g.branch('new_branch').delete
+g.branch('existing_branch').checkout
+
+
+
+
+
+require 'mojombo-grit'
+
+include Grit
+Grit.debug
+Grit.use_pure_ruby
+
+repo = Repo.new("/Users/tom/dev/grit")
+
+= Commit Log
+
+repo.commits('mybranch')
+repo.commits('40d3057d09a7a4d61059bca9dca5ae698de58cbe')
+repo.commits('v0.1')
+
+repo.log('mybranch', 100, 20)
+
+head = repo.commits.first
+head.id
+# => "e80bbd2ce67651aa18e57fb0b43618ad4baf7750"
+head.parents
+# => [#<Grit::Commit "91169e1f5fa4de2eaea3f176461f5dc784796769">]
+head.tree
+# => #<Grit::Tree "3536eb9abac69c3e4db583ad38f3d30f8db4771f">
+head.author
+# => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
+head.authored_date
+# => Wed Oct 24 22:02:31 -0700 2007
+head.committer
+# => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
+head.committed_date
+# => Wed Oct 24 22:02:31 -0700 2007
+head.message
+# => "add Actor inspect"
+contents = tree.contents
+  # => [#<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">,
+        #<Grit::Blob "81d2c27608b352814cbe979a6acd678d30219678">,
+        #<Grit::Tree "c3d07b0083f01a6e1ac969a0f32b8d06f20c62e5">,
+        #<Grit::Tree "4d00fe177a8407dbbc64a24dbfc564762c0922d8">]
+blob.id
+# => "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666"
+blob.name
+# => "README.txt"
+blob.mode
+# => "100644"
+blob.size
+# => 7726
+blob.data
+
+repo.blob("4ebc8aea50e0a67e000ba29a30809d0a7b9b2666")
+# => #<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">

data/lib/grit/History.txt

@@ -0,0 +1,28 @@
+== 1.0.3 / 2009-02-13
+  * Minor Enhancements
+    * Added Grit::Commit#to_patch for plaintext formatted patches.
+    * Fixed Grit::Tag to work with annotated tags.
+
+== 1.0.2 / 2009-02-10
+  * Minor Enhancements
+    * Implement Grit.version to use VERSION.yml file
+
+== 1.0.1 / 2009-02-10
+  * Bug Fixes
+    * Add diff-lcs as a dependency
+
+== 1.0.0 / 2009-01-27
+  * Tons of awesome in here. Also, we suck at updating the history.
+  * Let's do better at that from now on.
+
+== 0.8.3 / 2008-07-07
+  * Capture stderr and log if debug is true (rsanheim)
+  
+== 0.8.2 / 2008-06-27
+  * Allow user provided logger (rsanheim)
+  
+== 0.8.0 / 2008-04-24
+  * Lots of fixes and additions
+
+== 0.7.0 / 2008-01-07
+  * First public release!

data/lib/grit/PURE_TODO

@@ -0,0 +1,35 @@
+This is a listing of all the places I can find that Grit actually does a
+'git' system call.  My goal is to add native Ruby versions of all of them.
+
+Completed
+===========================
+** lib/grit/blob.rb:36:      @size ||= @repo.git.cat_file({:s => true}, id).chomp.to_i
+** lib/grit/blob.rb:43:      @data ||= @repo.git.cat_file({:p => true}, id)
+** lib/grit/tree.rb:16:      output = repo.git.ls_tree({}, treeish, *paths)
+
+
+
+lib/grit/commit.rb:74:      repo.git.rev_list({}, ref).strip.split("\n").size
+lib/grit/commit.rb:92:      output = repo.git.rev_list(actual_options, ref)
+lib/grit/commit.rb:94:      output = repo.git.rev_list(actual_options.merge(:all => true))
+
+
+Next to do
+===========================
+lib/grit/tag.rb:28:      output = repo.git.for_each_ref(actual_options, "refs/tags")
+lib/grit/head.rb:37:      output = repo.git.for_each_ref(actual_options, HEAD_PREFIX)
+lib/grit/head.rb:50:        self.new($1, repo.git.rev_parse(options, 'HEAD'))
+lib/grit/config.rb:9:      @repo.git.config({}, key, value)
+lib/grit/config.rb:40:        @repo.git.config(:list => true).split(/\n/)
+
+
+May not be fast enough
+=============================
+lib/grit/blob.rb:58:      data = repo.git.blame({:p => true}, commit, '--', file)
+
+
+More Difficult
+===========================
+lib/grit/commit.rb:39:      @id_abbrev ||= @repo.git.rev_parse({:short => true}, self.id).chomp
+lib/grit/commit.rb:150:      text = repo.git.diff({:full_index => true}, *paths)
+lib/grit/commit.rb:156:        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)

data/lib/grit/README.txt

@@ -0,0 +1,222 @@
+grit
+    by Tom Preston-Werner, Scott Chacon
+    http://github.com/mojombo/grit
+
+== DESCRIPTION:
+
+Grit is a Ruby library for extracting information from a git repository in an
+object oriented manner.
+
+== REQUIREMENTS:
+
+* git (http://git-scm.com) tested with 1.6.0.2
+
+== INSTALL:
+
+Easiest install is via RubyGems:
+
+  $ gem install grit
+
+or
+
+  $ gem sources -a http://gems.github.com/ (you only need to do this once)
+  $ gem install mojombo-grit
+
+The gem from GitHub will generally be available sooner than the gem from
+Rubyforge. Both sources will eventually contain the same releases.
+
+== SOURCE:
+
+Grit's git repo is available on GitHub, which can be browsed at:
+
+  http://github.com/mojombo/grit
+
+and cloned from:
+
+  git://github.com/mojombo/grit.git
+
+== USAGE:
+
+Grit gives you object model access to your git repository. Once you have
+created a repository object, you can traverse it to find parent commit(s),
+trees, blobs, etc.
+
+= Initialize a Repo object
+
+The first step is to create a Grit::Repo object to represent your repo. I
+include the Grit module so reduce typing.
+
+  require 'grit'
+  include Grit
+  repo = Repo.new("/Users/tom/dev/grit")
+  
+In the above example, the directory /Users/tom/dev/grit is my working
+repo and contains the .git directory. You can also initialize Grit with a 
+bare repo.
+
+  repo = Repo.new("/var/git/grit.git")
+  
+= Getting a list of commits
+
+From the Repo object, you can get a list of commits as an array of Commit
+objects.
+
+  repo.commits
+  # => [#<Grit::Commit "e80bbd2ce67651aa18e57fb0b43618ad4baf7750">,
+        #<Grit::Commit "91169e1f5fa4de2eaea3f176461f5dc784796769">,
+        #<Grit::Commit "038af8c329ef7c1bae4568b98bd5c58510465493">,
+        #<Grit::Commit "40d3057d09a7a4d61059bca9dca5ae698de58cbe">,
+        #<Grit::Commit "4ea50f4754937bf19461af58ce3b3d24c77311d9">]
+        
+Called without arguments, Repo#commits returns a list of up to ten commits
+reachable by the master branch (starting at the latest commit). You can ask
+for commits beginning at a different branch, commit, tag, etc.
+
+  repo.commits('mybranch')
+  repo.commits('40d3057d09a7a4d61059bca9dca5ae698de58cbe')
+  repo.commits('v0.1')
+  
+You can specify the maximum number of commits to return.
+
+  repo.commits('master', 100)
+  
+If you need paging, you can specify a number of commits to skip.
+
+  repo.commits('master', 10, 20)
+  
+The above will return commits 21-30 from the commit list.
+        
+= The Commit object
+
+Commit objects contain information about that commit.
+
+  head = repo.commits.first
+  
+  head.id
+  # => "e80bbd2ce67651aa18e57fb0b43618ad4baf7750"
+  
+  head.parents
+  # => [#<Grit::Commit "91169e1f5fa4de2eaea3f176461f5dc784796769">]
+  
+  head.tree
+  # => #<Grit::Tree "3536eb9abac69c3e4db583ad38f3d30f8db4771f">
+  
+  head.author
+  # => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
+  
+  head.authored_date
+  # => Wed Oct 24 22:02:31 -0700 2007
+  
+  head.committer
+  # => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
+  
+  head.committed_date
+  # => Wed Oct 24 22:02:31 -0700 2007
+  
+  head.message
+  # => "add Actor inspect"
+  
+You can traverse a commit's ancestry by chaining calls to #parents.
+
+  repo.commits.first.parents[0].parents[0].parents[0]
+  
+The above corresponds to master^^^ or master~3 in git parlance.
+
+= The Tree object
+
+A tree records pointers to the contents of a directory. Let's say you want
+the root tree of the latest commit on the master branch.
+
+  tree = repo.commits.first.tree
+  # => #<Grit::Tree "3536eb9abac69c3e4db583ad38f3d30f8db4771f">
+  
+  tree.id
+  # => "3536eb9abac69c3e4db583ad38f3d30f8db4771f"
+  
+Once you have a tree, you can get the contents.
+
+  contents = tree.contents
+  # => [#<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">,
+        #<Grit::Blob "81d2c27608b352814cbe979a6acd678d30219678">,
+        #<Grit::Tree "c3d07b0083f01a6e1ac969a0f32b8d06f20c62e5">,
+        #<Grit::Tree "4d00fe177a8407dbbc64a24dbfc564762c0922d8">]
+
+This tree contains two Blob objects and two Tree objects. The trees are
+subdirectories and the blobs are files. Trees below the root have additional
+attributes.
+
+  contents.last.name
+  # => "lib"
+  
+  contents.last.mode
+  # => "040000"
+  
+There is a convenience method that allows you to get a named sub-object
+from a tree.
+
+  tree/"lib"
+  # => #<Grit::Tree "e74893a3d8a25cbb1367cf241cc741bfd503c4b2">
+  
+You can also get a tree directly from the repo if you know its name.
+
+  repo.tree
+  # => #<Grit::Tree "master">
+  
+  repo.tree("91169e1f5fa4de2eaea3f176461f5dc784796769")
+  # => #<Grit::Tree "91169e1f5fa4de2eaea3f176461f5dc784796769">
+  
+= The Blob object
+
+A blob represents a file. Trees often contain blobs.
+
+  blob = tree.contents.first
+  # => #<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">
+  
+A blob has certain attributes.
+
+  blob.id
+  # => "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666"
+  
+  blob.name
+  # => "README.txt"
+  
+  blob.mode
+  # => "100644"
+  
+  blob.size
+  # => 7726
+  
+You can get the data of a blob as a string.
+
+  blob.data
+  # => "Grit is a library to ..."
+  
+You can also get a blob directly from the repo if you know its name.
+
+  repo.blob("4ebc8aea50e0a67e000ba29a30809d0a7b9b2666")
+  # => #<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2007 Tom Preston-Werner
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/grit/Rakefile

@@ -0,0 +1,54 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "grit"
+    s.rubyforge_project = "grit"
+    s.summary = "Grit is a Ruby library for extracting information from a git repository in an object oriented manner."
+    s.email = "tom@mojombo.com"
+    s.homepage = "http://github.com/mojombo/grit"
+    s.description = "Grit is a Ruby library for extracting information from a git repository in an object oriented manner."
+    s.authors = ["Tom Preston-Werner", "Scott Chacon"]
+    s.add_dependency('mime-types', '>= 1.15')
+    s.add_dependency('diff-lcs', '>= 1.1.2')
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = false
+end
+
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'grit'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+task :default => :test
+
+# custom
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/grit.rb"
+end
+
+task :coverage do
+  system("rm -fr coverage")
+  system("rcov test/test_*.rb")
+  system("open coverage/index.html")
+end
+
+desc "Upload site to Rubyforge"
+task :site do
+  sh "scp -r doc/* mojombo@grit.rubyforge.org:/var/www/gforge-projects/grit"
+end

data/lib/grit/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 1
+:minor: 0
+:patch: 2