git-si 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f699eab35b01983b28c6a305f4f052bff51c877b
-  data.tar.gz: 66757783cb35d72353a1aea64c982148114771d5
+  metadata.gz: 1b1e502869a3891f7b2d1d78f10c705c40c87782
+  data.tar.gz: d206a05181f60625df74ed1f3090e8deceaa0409
 SHA512:
-  metadata.gz: 7f47abf1fc81a97582940b27708e1e362c30d0947fb3d19017c7a91a07243704742d837d47eaf67b6273ad06209ebd570edeaa5781818b3f4f936494f75c54af
-  data.tar.gz: df346172fd8e64b4ef85cbcf106fa9d8952b8005fdf91ecfdf228d29b87bc60c76e6310b1d462372df3bb743c43fa35ea134c39b038cbd6bf542fbcd61d7cd2d
+  metadata.gz: e47124cfdaf0bda009d8f9df510d8f87599f0b51ccf88a87204f48750a967c5b2be355fe6fa3b1f092524853e2466aec9a72009efc6846c058890df64d91cf81
+  data.tar.gz: f7f744750518a4088e4b924b69c86ebee568239840c5b3598f4abc603ed31afb7c2a3bd8e1b4658770ed9539a080bb6d5a957ec9d4626c259263b01ac8aea7f6

data/lib/git/si.rb

@@ -113,6 +113,15 @@ use the commands below.
         do_commit_action
       end
 
+      ################
+      # Action: atune
+      ################
+      desc "atune", "Commit files to mirror branch that have been modified."
+      def atune
+        configure
+        do_atune_action
+      end
+
       ################
       # Action: readd
       ################

data/lib/git/si/actions.rb

@@ -147,6 +147,17 @@ module Git
         end
       end
 
+      def do_atune_action
+        notice_message "Atuning mirror branch with current svn state"
+        on_mirror_branch do
+          add_all_svn_files
+          run_command( Git::Si::GitControl.commit_all_command )
+        end
+        on_local_branch do
+          run_command( Git::Si::GitControl.rebase_command( get_mirror_branch ) )
+        end
+      end
+
     end
   end
 end

data/lib/git/si/git-control.rb

@@ -45,6 +45,11 @@ module Git
         "#{@@git_binary} commit --allow-empty -am 'git-si #{version} svn update to version #{revision}'"
       end
 
+      def self.commit_all_command
+        version = Git::Si::Version.version
+        "#{@@git_binary} commit --allow-empty -am 'git-si #{version} atuned to current svn state'"
+      end
+
       def self.stash_command
         "#{@@git_binary} stash"
       end
@@ -102,7 +107,7 @@ module Git
 
       def self.delete_command(filename)
         raise GitSiError.new("Remove file command requires filename") if filename.empty?
-        "#{@@git_binary} rm #{filename}"
+        "#{@@git_binary} rm -r #{filename}"
       end
 
     end

data/lib/git/si/version.rb

@@ -1,6 +1,6 @@
 module Git
   module Si
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
 
     class Version
       def self.version

data/spec/actions_spec.rb

@@ -143,6 +143,29 @@ M something else"
     end
   end
 
+  describe "#do_atune_action" do
+    it "calls git commit all" do
+      expect( runner_spy ).to receive( :run_command ).with( /git commit.*-a/, any_args )
+      subject.do_atune_action
+    end
+
+    it "operates in the mirror branch" do
+      expect( subject ).to receive( :on_mirror_branch ).once
+      subject.do_atune_action
+    end
+
+    it "calls add_all_svn_files" do
+      expect( subject ).to receive( :add_all_svn_files ).once
+      subject.do_atune_action
+    end
+
+    it "calls rebase command with the mirror branch" do
+      allow( subject ).to receive( :get_mirror_branch ).and_return( 'testbranch' )
+      expect( runner_spy ).to receive( :run_command ).with( /git rebase .+testbranch/, any_args )
+      subject.do_atune_action
+    end
+  end
+
   describe "#do_fetch_action" do
     it "calls stash_local_changes" do
       expect( subject ).to receive( :stash_local_changes ).once

data/spec/git-control_spec.rb

@@ -138,6 +138,13 @@ git-si 0.3.0 svn update to version 1014
     end
   end
 
+  describe ".commit_all_command" do
+    it "returns the correct command" do
+      version = Git::Si::Version.version
+      expect( Git::Si::GitControl.commit_all_command ).to eq( "git commit --allow-empty -am 'git-si #{version} atuned to current svn state'" )
+    end
+  end
+
   describe ".stash_command" do
     it "returns the correct command" do
       expect(Git::Si::GitControl.stash_command).to eq( "git stash" )
@@ -248,7 +255,7 @@ git-si 0.3.0 svn update to version 1014
     end
 
     it "returns the correct command" do
-      expect(Git::Si::GitControl.delete_command('foobar')).to eq( "git rm foobar" )
+      expect(Git::Si::GitControl.delete_command('foobar')).to eq( "git rm -r foobar" )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-si
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Payton Swick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler