git-si 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d8b981e514fb17acde6931c0b798d36a28d0544
-  data.tar.gz: 0cad14a2f7c3a24f52439f731bec169132f42b02
+  metadata.gz: 2885ccf96954518937e9ec898c075081f098655c
+  data.tar.gz: 4853b379d09f6360f1b4582e589f75a9d95e43b6
 SHA512:
-  metadata.gz: bba2942db8d9ce95ce755e9eba06f8c437ddf4c4a729e460cfe90f7b207ea95ebef9846baa23b3a315d491df9c5b9477caa1d2ac20c4c7169af389989b82ffc8
-  data.tar.gz: 1f5325dd2baeb1cb95b8d853f78d9de3d53c09cfe29157facef891fe7f95d1021c39e0eefda8d28f9c9f8b9ab3cf7576b344c05d7c28e08b22977e05744e2529
+  metadata.gz: c77d7b7a5b4ae1efce186b13b016b4362fc7d77a0f82c7754fca2f596a4b99db3a3f4e6966c22c15e85ba23f37bc05884f904b3a0027f2c4b27b32ed28703827
+  data.tar.gz: ce7c31528eca1fb2ab5c7db72423ba6e5d531ec26b68be2dde507aa0aea2cda8566806668834b364ed2b9351e9c3e1d6c089c3f60dabb1fc7a3406b26f964a4f

data/README.md

@@ -29,17 +29,19 @@ This will take you into your favorite editor to enter a commit message.
 
 All commands:
 
-    git si add [FILES]     # Perform an svn and a git add on the files.
-    git si blame <FILE>    # Alias for svn blame.
-    git si commit          # Perform an svn commit and update the mirror branch.
-    git si diff [FILES]    # Perform an svn diff piped through a colorizer. Also tests to be sure a rebase is not needed.
-    git si fetch           # Updates mirror branch to latest svn commit.
-    git si help [COMMAND]  # Describe available commands or one specific command
-    git si init            # Initializes git-si in this directory with a gitignore and creates a special mirror branch.
-    git si pull            # Fetch the latest svn commit and rebase the current branch.
-    git si rebase          # Rebases current branch to mirror branch.
-    git si status [FILES]  # Perform an svn status.
-    git si usage           # How does this thing work?
+    git-si add [FILES]     # Perform an svn and a git add on the files.
+    git-si blame <FILE>    # Alias for svn blame.
+    git-si commit          # Perform an svn commit and update the mirror branch.
+    git-si diff [FILES]    # Perform an svn diff piped through a colorizer. Also tests to be sure a rebase is not needed.
+    git-si fetch           # Updates mirror branch to latest svn commit.
+    git-si help [COMMAND]  # Describe available commands or one specific command
+    git-si init            # Initializes git-si in this directory with a gitignore and creates a special mirror branch.
+    git-si pull            # Fetch the latest svn commit and rebase the current branch.
+    git-si readd           # Add files to svn that have been added to git.
+    git-si rebase          # Rebases current branch to mirror branch.
+    git-si status [FILES]  # Perform an svn status.
+    git-si usage           # How does this thing work?
+    git-si version         # Print the version.
 
 
 ## Contributing

data/git-si.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["payton@foolord.com"]
   spec.description   = %q{Git Svn Interface: a simple git extention to use git locally with a remote svn repo.}
   spec.summary       = %q{It's like a simple version of git-svn which doesn't keep track of history locally.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/sirbrillig/git-si"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/git/si/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Si
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/git/si.rb

@@ -29,6 +29,11 @@ module Git
 
       @@mirror_branch = 'MIRRORBRANCH'
 
+      desc "version", "Print the version."
+      def version
+        say "git-si version #{Git::Si::VERSION}"
+      end
+
       desc "usage", "How does this thing work?"
       def usage
         say "git-si #{Git::Si::VERSION}
@@ -77,6 +82,9 @@ use the commands below.
             notice_message "Could not determine last version information. This may be fine if you haven't used git-si before."
           end
 
+          notice_message "Adding any files that are not already in svn to ensure an accurate diff."
+          readd()
+
           command = "svn diff " + args.join(' ')
           notice_message "Running #{command}"
           results = `#{command}`
@@ -146,6 +154,10 @@ continue, it's wise to reset the master branch afterward."
 
           git_status = `git status --porcelain`
           raise GitError.new("There are local changes; please commit them before continuing.") if git_status.match(/^[^\?]/)
+
+          notice_message "Adding any files that are not already in svn to ensure changes are committed."
+          readd()
+
           svn_diff = `svn diff`
           raise SvnError.new("Failed to get the svn diff. I'm not sure why. Check for any errors above.") if ! $?.success?
           raise SvnError.new("There are no changes to commit.") if svn_diff.strip.empty?
@@ -180,6 +192,36 @@ continue, it's wise to reset the master branch afterward."
         end
       end
 
+      desc "readd", "Add files to svn that have been added to git."
+      def readd()
+        on_local_branch do
+          command = "svn status --ignore-externals"
+          svn_status = `#{command}`
+          raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?
+          files_to_add = []
+          svn_status.each_line do |line|
+            case line.strip!
+            when /^X/, /\.git/, /\.swp$/
+            when /^\?\s+(\S.+)/
+              filename = $1
+              file_in_git = `git ls-files #{filename}`
+              raise GitError.new("Failed to list git files. I'm not sure why. Check for any errors above.") unless $?.success?
+              files_to_add << filename if file_in_git
+              say filename
+            end
+          end
+          if files_to_add.empty?
+            notice_message "There are no files to add."
+            return
+          end
+          if yes? "Do you want to add the above files to svn? [y/N] ", :green
+            command = "svn add " + files_to_add.join(' ')
+            run_command(command)
+            success_message "Added files to svn that had been added to git."
+          end
+        end
+      end
+
       desc "blame <FILE>", "Alias for svn blame."
       def blame(*args)
         on_local_branch do
@@ -207,7 +249,7 @@ continue, it's wise to reset the master branch afterward."
           end
 
           # check for existing .gitingore
-          gitignore = [".svn", "*.swp", ".config", "*.err", "*.pid", "*.log"]
+          gitignore = [".svn", "*.sw?", ".config", "*.err", "*.pid", "*.log", "svn-commit.*"]
           command = "svn status --ignore-externals "
           svn_status = `#{command}`
           raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-si
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Payton Swick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ files:
 - lib/git-si.rb
 - lib/git/si.rb
 - lib/git/si/version.rb
-homepage: ''
+homepage: https://github.com/sirbrillig/git-si
 licenses:
 - MIT
 metadata: {}