git-si 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c77dbf792e64c63bff1a45af38b1554db4d32d0d
-  data.tar.gz: 45647e4d3e817d743fda2559d11fc52e84ac8588
+  metadata.gz: 7bf20760b268eea61a8be1559cbb9021308312f1
+  data.tar.gz: 5b3e9643cdd6c24bb1fb4c400b06bc4845068b16
 SHA512:
-  metadata.gz: d2ce1a14dbaa857ccdbfa81b06b8ab117a76cf6f060779a848bec3f4f540bef6a74b0b965d04aa1eda7747145501c1dad9ff4ace08fae315931c3709c00d2649
-  data.tar.gz: e6c9b056273c3592539963724ed417f0206641fbfea819386f5ffafe92381b422066b8882865cfc972248668ee4009db4a2dddc8f7c0e09603d7cdb63d8161e9
+  metadata.gz: 9d65955697dd0fc1e1b4b25421143cff2a690ba6d29b65ce39d699621a09d9963e8a4d231f77f2cbbb5768c06611634717cba9acb7d01f45c21532944f2b7ddc
+  data.tar.gz: d65170ca5833a3da1507c587d8e14d8a9f54a511dc54480bd7c8fa474d01718ee57ede7830db06103bdace19a61953fdfb7a36a9e8639971e3a5760e579066b4

data/lib/git/si.rb

@@ -124,7 +124,7 @@ use the commands below.
           updated_files.each_line do |line|
             say line
             case line.strip!
-            when /^\w\s+(\S.+)/
+            when /^A\s+(\S.+)/, /^Restored '(.+)'\s*$/
               files_to_add << '"' + $1 + '"'
             end
           end
@@ -134,7 +134,8 @@ use the commands below.
             files_to_add.each do |filename|
               say "Updating file in git: #{filename}"
             end
-            system("git add " + files_to_add.join(' '))
+            notice_message "Adding all those files"
+            system("git add --all " + files_to_add.join(' '))
           end
           run_command("git commit --allow-empty -am 'svn update to version #{get_svn_version}'")
         end
@@ -333,6 +334,13 @@ continue, it's wise to reset the master branch afterward."
         return nil
       end
 
+      def get_svn_root
+        svn_info = `svn info`
+        results = svn_info.match(/Root Path:\s+(.+)/)
+        return results[1] if results
+        return nil
+      end
+
       def get_local_branch
         git_branches = `git branch`
         results = git_branches.match(/^\*\s+(\S+)/)
@@ -341,9 +349,20 @@ continue, it's wise to reset the master branch afterward."
         return local_branch
       end
 
+      def in_svn_root(&block)
+        root_dir = get_svn_root
+        raise SvnError.new("Could not find the svn root directory.") unless root_dir
+        notice_message "Changing directory to svn root: #{root_dir}"
+        Dir.chdir(root_dir) do
+          yield
+        end
+      end
+
       def on_local_branch(&block)
         begin
-          yield
+          in_svn_root do
+            yield
+          end
         rescue GitSiError => err
           error_message err
           exit false
@@ -354,7 +373,9 @@ continue, it's wise to reset the master branch afterward."
         local_branch = get_local_branch()
         run_command("git checkout #{@@mirror_branch}")
         begin
-          yield
+          in_svn_root do
+            yield
+          end
         rescue GitSiError => err
           error_message err
           exit false

data/lib/git/si/version.rb

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

metadata

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