tekkub-fugit 0.0.3 → 0.0.4

data/VERSION.yml

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

data/fugit.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{fugit}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tekkub"]
-  s.date = %q{2009-02-17}
+  s.date = %q{2009-02-18}
   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.rb", "lib/fugit/commit_tab.rb", "lib/fugit/console.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/main_frame.rb", "lib/fugit/messages.rb", "lib/fugit/SciTE.properties", "lib/fugit.rb", "lib/icons", "lib/icons/asterisk_yellow.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.files = ["fugit.gemspec", "SciTE.properties", "VERSION.yml", "bin/fugit", "lib/fugit", "lib/fugit/commit.rb", "lib/fugit/commit_tab.rb", "lib/fugit/console.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/asterisk_yellow.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"]

data/lib/fugit/commit.rb

@@ -96,7 +96,8 @@ module Fugit
 		end
 
 		def on_push_clicked
-			`git push origin HEAD`
+			@push_dialog ||= PushDialog .new(self)
+			@push_dialog.show
 		end
 
 	end

data/lib/fugit/io_get_line.rb

@@ -0,0 +1,15 @@
+
+class IO
+	def get_line
+		line = nil
+		while c = self.read(1)
+			if c == "\r" || c == "\n"
+				break if line
+			else
+				line ||= ""
+				line << c
+			end
+		end
+		line
+	end
+end

data/lib/fugit/push_dialog.rb

@@ -0,0 +1,117 @@
+include Wx
+
+module Fugit
+	class PushDialog < Dialog
+		def initialize(parent)
+			super(parent, ID_ANY, "Push branches", :size => Size.new(350, 500))
+
+			@branch_list = CheckListBox.new(self, ID_ANY)
+			@log = TextCtrl.new(self, ID_ANY, :size => Size.new(20, 150), :style => TE_MULTILINE|TE_DONTWRAP|TE_READONLY)
+			@progress = Gauge.new(self, ID_ANY, 100, :size => Size.new(20, 20))
+
+			@remote = ComboBox.new(self, ID_ANY)
+
+			check_panel = Panel.new(self, ID_ANY)
+			@tag_check = CheckBox.new(check_panel, ID_ANY)
+			@force_check = CheckBox.new(check_panel, ID_ANY)
+
+			flex = FlexGridSizer.new(1,2,4,4)
+			flex.add(@tag_check, 0, EXPAND)
+			flex.add(StaticText.new(check_panel, ID_ANY, "Include tags"), 0, EXPAND)
+			flex.add(@force_check, 0, EXPAND)
+			flex.add(StaticText.new(check_panel, ID_ANY, "Force update"), 0, EXPAND)
+
+			check_panel.set_sizer(flex)
+
+			butt_sizer = create_button_sizer(OK|CANCEL)
+			butt_sizer.get_children.map {|s| s.get_window}.compact.each {|b| b.set_label(b.get_label == "OK" ? "Push" : "Close")}
+			evt_button(get_affirmative_id, :on_ok)
+
+			box = BoxSizer.new(VERTICAL)
+			box2 = BoxSizer.new(HORIZONTAL)
+
+			box2.add(@branch_list, 1, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box2.add(check_panel, 1)
+
+			box.add(StaticText.new(self, ID_ANY, "Select branches:"), 0, EXPAND|ALL, 4)
+			box.add(box2, 1, EXPAND)
+			box.add(StaticText.new(self, ID_ANY, "Push to:"), 0, EXPAND|ALL, 4)
+			box.add(@remote, 0, EXPAND|LEFT|RIGHT|BOTTOM, 4)
+			box.add(StaticText.new(self, ID_ANY, "Output:"), 0, EXPAND|ALL, 4)
+			box.add(@log, 0, EXPAND|LEFT|RIGHT, 4)
+			box.add(@progress, 0, EXPAND|ALL, 4)
+			box.add(butt_sizer, 0, EXPAND|BOTTOM, 4)
+
+			self.set_sizer(box)
+		end
+
+		def show
+			branches = `git branch`
+			remotes = `git remote`
+			@remote.clear
+			remotes.split("\n").each {|r| @remote.append(r)}
+			@remote.set_value(@remote.get_string(0))
+			current = branches.match(/\* (.+)/).to_a.last
+			branches = branches.split("\n").map {|b| b.split(" ").last}
+			@branch_list.set(branches)
+			@branch_list.check(@branch_list.find_string(current)) if current
+
+			@progress.set_value(0)
+			@log.clear
+
+			super
+		end
+
+		def on_ok
+			@progress.set_value(0)
+			failed = false
+			last_line_type = nil
+
+			branches = @branch_list.get_checked_items.map {|i| @branch_list.get_string(i)}
+			tags = @tag_check.is_checked ? "--tags " : ""
+			force = @force_check.is_checked ? "--force " : ""
+			remote = @remote.get_value
+			command = "git push #{tags}#{force}#{remote} #{branches.join(" ")}"
+			@log.append_text("#{@log.get_last_position == 0 ? "" : "\n\n"}> #{command}")
+
+			IO.popen("#{command} 2>&1") do |io|
+				while line = io.get_line
+					last_line_type = case line
+						when "Everything up-to-date"
+							@progress.set_value(100)
+							update_log(last_line_type, nil, line)
+						when /Counting objects: \d+, done./
+							@progress.set_value(10)
+							update_log(last_line_type, :counting, line)
+						when /Counting objects: \d+/
+							update_log(last_line_type, :counting, line)
+						when /Compressing objects:\s+\d+% \((\d+)\/(\d+)\)/
+							@progress.set_value(10 + (45*$1.to_f/$2.to_f).to_i)
+							update_log(last_line_type, :compressing, line)
+						when /Writing objects:\s+\d+% \((\d+)\/(\d+)\)/
+							@progress.set_value(55 + (45*$1.to_f/$2.to_f).to_i)
+							update_log(last_line_type, :writing, line)
+						when /\[rejected\]/
+							failed = true
+							@progress.set_value(100)
+							update_log(last_line_type, nil, line)
+						else
+							update_log(last_line_type, nil, line)
+						end
+				end
+			end
+
+			#~ end_modal(ID_OK) if success
+		end
+
+		def update_log(last, current, line)
+			if last == current && !last.nil?
+				@log.replace(@log.xy_to_position(0, @log.get_number_of_lines - 1), @log.get_last_position, line)
+			else
+				@log.append_text("\n" + line)
+			end
+			current
+		end
+
+	end
+end

data/lib/fugit.rb

@@ -3,6 +3,7 @@ $:.unshift File.dirname(__FILE__)
 
 require 'wx'
 
+require "fugit/io_get_line"
 require "fugit/messages"
 require "fugit/icon_loader"
 require "fugit/main_frame"
@@ -14,6 +15,7 @@ require "fugit/index_list"
 require "fugit/history_tab"
 require "fugit/graph_renderer"
 require "fugit/history_list"
+require "fugit/push_dialog"
 
 
 version = File.exist?(File.join(File.dirname(__FILE__), "..", ".git")) ? "Developer's alpha" : Gem.searcher.find("fugit").version.to_s rescue "Unknown"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tekkub-fugit
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tekkub
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-02-18 00:00:00 -08:00
 default_executable: fugit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,10 @@ files:
 - 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