flooose-gemedit 0.10.3 → 0.11.0

data/lib/gemedit.rb

@@ -1,6 +1,7 @@
-$:.unshift File.dirname(__FILE__)
+#$:.unshift File.dirname(__FILE__)
 require 'gemedit/edit_command'
+require 'gemedit/git_options'
+require 'gemedit/system_commands'
 
 module Gemedit
-  
 end

data/lib/gemedit/edit_command.rb

@@ -50,10 +50,6 @@ class Gem::Commands::EditCommand < Gem::Command
     "GEMNAME       name of gem to open in your favorite editor"
   end
 
-  def git?
-    system("which git")
-  end
-
   def defaults_str # :nodoc:
     "--version '#{OPTIONS[:version]}' --editor #{OPTIONS[:editor]} --no-dry-run"
   end
@@ -84,13 +80,20 @@ class Gem::Commands::EditCommand < Gem::Command
         paths.each do |path|
           path.gsub!(/"/, '')
           Dir.chdir("#{path}") do
-            unless File.exists?('.git')
+            if File.exists?('.git')
+              if(git_status.empty?)
+                alert(notify_of_clean_repo, "Press 'Enter' to continue")
+              else
+                alert(warn_of_unclean_repo)
+                while(carry_out_choice(choose_from_list('Which action would you like to pursue?: ', choices)))
+                  #alert_warning(warn_of_unclean_repo, "Press 'Enter' to continue")
+                end
+              end
+            else
               say "Initializing empty git repository in #{path}" if Gem.configuration.verbose
               system('git init')
               say "Creating initial commit" if Gem.configuration.verbose
               system("git add . && git commit -m 'Gemedit generated commit'")
-            else
-              say "There seems to already be a git repository for this gem. Not initializing"
             end
           end
         end

data/lib/gemedit/git_options.rb

@@ -0,0 +1,68 @@
+class Gem::Commands::EditCommand < Gem::Command
+  def git?
+    system("which git")
+  end
+
+  def git_status
+    `git status -s`
+  end
+
+  def git_status_full
+    `git status`
+  end
+
+  def git_init
+    system('git init')
+  end
+
+  def notify_of_clean_repo
+    <<-eos
+\e[32mThere seems to already be a git repository for this gem.
+Since there are no staged or unstaged comments, this just
+serves as a heads-up.\e[0m
+eos
+
+    #p method(:say)
+  end
+
+  def warn_of_unclean_repo
+    warning = <<-eos
+\e[31mThere seems to be an existing git repository for this gem
+and there are also staged and/or unstaged changes. Since
+I will not overwrite existing git repositories and since changes
+to files in this gem will be hard to track, you may want to
+consider addressing this before actually editing the gem.\e[0m
+eos
+  end
+
+  def carry_out_choice(choice)
+    case choice[0]
+      when /View status*/ then puts git_status_full; true
+      when /Permanantly remove*/ then
+        `rm -rf .git`
+        git_init
+        git_commit('Gemedit generated commit')
+        false
+      when /Perform a commit and edit gem anyway*/ then
+        git_commit
+        false
+      when /Skip commit and edit gem anyway*/ then
+        false
+      when /Get out of here*/ then
+        Process.exit!(0)
+    end
+  end
+
+  def choices
+    ['View status',
+     'Permanantly remove repository (currently is effectively the same as option 3)',
+     'Perform a commit and edit gem anyway',
+     'Skip commit and edit gem anyway',
+     'Get out of here']
+  end
+
+  protected
+    def git_commit(commit_message="Automated commit message from Gemedit")
+      `git add . && git commit -m "#{commit_message}"`
+    end
+end

data/lib/gemedit/system_commands.rb

@@ -0,0 +1,7 @@
+class Gem::Commands::EditCommand < Gem::Command
+  def cd(directory)
+  end
+
+  def which(command)
+  end
+end

data/lib/gemedit/version.rb

@@ -1,3 +1,3 @@
 module Gemedit #:nodoc:
-  VERSION = "0.10.3"
+  VERSION = "0.11.0"
 end

data/lib/rubygems_plugin.rb

@@ -1,4 +1,5 @@
 require 'rubygems/command_manager'
 
 require 'gemedit'
+
 Gem::CommandManager.instance.register_command :edit

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flooose-gemedit
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 3
-  version: 0.10.3
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - !binary |
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,8 @@ extra_rdoc_files: []
 files: 
 - lib/gemedit.rb
 - lib/gemedit/edit_command.rb
+- lib/gemedit/git_options.rb
+- lib/gemedit/system_commands.rb
 - lib/gemedit/version.rb
 - lib/rubygems_plugin.rb
 has_rdoc: true