git-si 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4685908b89dbddc4f3109c5151d448f404671e4d
-  data.tar.gz: 625f88967c58c4d7eb7b58763ab7c9d42b42ea76
+  metadata.gz: c77dbf792e64c63bff1a45af38b1554db4d32d0d
+  data.tar.gz: 45647e4d3e817d743fda2559d11fc52e84ac8588
 SHA512:
-  metadata.gz: 5e8de12a928e493f16d6028bbd474963a3ea75dfc8e12f039a4be0140d91503a6814d4787fcac9ed2a892dc47a38fb8e5f1d2ed55737aa9194c00100edfa251d
-  data.tar.gz: fc4199a2c41eac79973432f8e5fe8313cdd7d7b27fead45007ce3e81957412c580f9335eed413a1043fe36ac2f13f34a1fad0e535ce9e76914df7da8a1955181
+  metadata.gz: d2ce1a14dbaa857ccdbfa81b06b8ab117a76cf6f060779a848bec3f4f540bef6a74b0b965d04aa1eda7747145501c1dad9ff4ace08fae315931c3709c00d2649
+  data.tar.gz: e6c9b056273c3592539963724ed417f0206641fbfea819386f5ffafe92381b422066b8882865cfc972248668ee4009db4a2dddc8f7c0e09603d7cdb63d8161e9

data/lib/git/si.rb

@@ -119,9 +119,23 @@ use the commands below.
         end
         on_mirror_branch do
           notice_message "Fetching remote data from svn"
-          run_command("svn up --accept theirs-full --ignore-externals")
+          updated_files = `svn up --accept theirs-full --ignore-externals`
+          files_to_add = []
+          updated_files.each_line do |line|
+            say line
+            case line.strip!
+            when /^\w\s+(\S.+)/
+              files_to_add << '"' + $1 + '"'
+            end
+          end
+          notice_message "Reverting any local changes in mirror branch"
           run_command("svn revert -R ./")
-          system("git add .")
+          unless files_to_add.empty?
+            files_to_add.each do |filename|
+              say "Updating file in git: #{filename}"
+            end
+            system("git add " + files_to_add.join(' '))
+          end
           run_command("git commit --allow-empty -am 'svn update to version #{get_svn_version}'")
         end
         success_message "fetch complete!"
@@ -168,12 +182,21 @@ continue, it's wise to reset the master branch afterward."
 
           run_command("svn commit")
           success_message "commit complete!"
-          if yes? "Do you want to update the mirror branch to the latest commit? [y/N] ", :green
-            on_mirror_branch do
-              fetch
-              mirror_is_updated = true
+
+          files_unchanged = true
+          git_status = `git status --porcelain`
+          files_unchanged = false if git_status.match(/^[^\?]/)
+          unless files_unchanged
+            if yes? "Some files were added or modified during the commit; should I revert them? [y/N] ", :yellow
+              run_command("git reset --hard HEAD")
+              files_unchanged = true
             end
           end
+
+          if files_unchanged and yes? "Do you want to update the mirror branch to the latest commit? [y/N] ", :green
+            fetch
+            mirror_is_updated = true
+          end
         end
 
         if mirror_is_updated

data/lib/git/si/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Si
-    VERSION = "0.2.4"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-si
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Payton Swick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler