git_dj 0.0.3 → 0.0.4

data/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2012 Mikhail Tabunov
+blablabla
 
 MIT License
 
@@ -19,4 +20,5 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+blblblblbl

data/README.md

@@ -19,6 +19,31 @@ If you want to finish feature:
     gdj release
     cap production deploy
 
+Integrate and Release should fail, if git merge failes. In this case,
+resolve conflits and type:
+
+    gdj continue
+
+
+This will proceed all previous commands.
+
+If you want to push to remote branch:
+
+    gdj put
+
+And this will execute:
+
+    git pull origin [branch_name]
+    git push origin [branch_name]
+
+If you want to pull remote branche, run:
+
+    gdj get
+
+And this will execute:
+
+    git pull origin [branch_name]
+
 Keep your workflow simple.
 
 ## Contributing

data/lib/git_dj/version.rb

@@ -1,3 +1,3 @@
 class GitDj
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/git_dj.rb

@@ -2,6 +2,9 @@ class GitDj
   require 'git_dj/version'
   INTEGRATION_BRANCH = 'staging'
   RELEASE_BRANCH = 'master'
+  LOG_FILE_NAME = '/tmp/gdj_activity'
+
+  class CommandFailedError < StandardError; end;
 
   def initialize
   end
@@ -12,6 +15,12 @@ class GitDj
       integrate_current_branch
     when 'release'
       release_current_branch
+    when 'get'
+      get_updates_from_origin
+    when 'put'
+      push_updates_to_origin
+    when 'continue'
+      continue_prev_commands
     when 'help'
       print_help
     else
@@ -20,6 +29,7 @@ class GitDj
   end
 
   def integrate_current_branch
+    drop_commands_cache
     cur_branch = current_branch_name
     if has_uncommited_changes
       puts red_color("Failed to integrate #{cur_branch}: you have uncommited changes")
@@ -38,6 +48,7 @@ class GitDj
   end
 
   def release_current_branch
+    drop_commands_cache
     cur_branch = current_branch_name
     if has_uncommited_changes
       puts red_color("Failed to release #{cur_branch}: you have uncommited changes")
@@ -55,6 +66,26 @@ class GitDj
     end
   end
 
+  def continue_prev_commands
+    cmds = File.read(LOG_FILE_NAME).chomp.strip.split("\n")
+    run_cmds(cmds)
+  end
+
+  def get_updates_from_origin
+    drop_commands_cache
+    cur_branch = current_branch_name
+    run_cmds [ "git pull origin #{cur_branch}" ]
+  end
+
+  def push_updates_to_origin
+    drop_commands_cache
+    cur_branch = current_branch_name
+    run_cmds [
+      "git pull origin #{cur_branch}",
+      "git push origin #{cur_branch}"
+    ]
+  end
+
   def current_branch_name
     out = %x[git branch]
     branch_string = out.split("\n").detect do |str|
@@ -72,18 +103,44 @@ class GitDj
 Usage:
 #{green_color('gdj integrate')} - merge current branch in staging branch, and switch back
 #{green_color('gdj release')} - merge current branch into master, and switch back
+#{green_color('gdj get')} - pull changes from origin to local
+#{green_color('gdj put')} - pull, then push changes from origin to local
+#{green_color('gdj continue')} - continue previous failed command (after merge, etc)
 
 }
   end
 
 private
+
+  def drop_commands_cache
+    if File.exists?(LOG_FILE_NAME)
+      FileUtils.rm(LOG_FILE_NAME)
+    end
+  end
+
   def has_uncommited_changes
     %x[git diff].chomp.strip != ''
   end
 
   def run_cmds(cmds)
+    to_do = cmds.dup
     cmds.each do |cmd|
-      system(cmd)
+      if system(cmd)
+        to_do.delete(cmd)
+        dump_cmds_to_disk(to_do)
+      else
+        puts red_color("Command failed: #{cmd}.")
+        puts red_color("Fix it and run gdj continue")
+        raise CommandFailedError.new
+      end
+    end
+  end
+
+  def dump_cmds_to_disk(cmds)
+    if cmds.any?
+      File.open(LOG_FILE_NAME, 'w') {|f| f.write(cmds.join("\n")) }
+    else
+      drop_commands_cache
     end
   end
 
@@ -97,3 +154,4 @@ private
 
 end
 
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_dj
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies: []
 description: A simple and lightweight alternative to git flow
 email: