git_dj 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fdac17b76b21db309841f2008d1bc7c39a00add4
+  data.tar.gz: d50296970fe580efe74393fadcd3366f5f3dcf9f
+SHA512:
+  metadata.gz: ae22867a3becaa342817a622bfba5372784b9c8f639930f97f614b348d936b3bc51452f2261344648ae62ce2686a6f19f51718372f04c465eac429366eccd995
+  data.tar.gz: bbe2348ce6c1a31f9c6d22ad95dde266b0b0caf2df95e80e4afa8416d226b785bc7f7d81e1531107aa71d3f62e40784afe443ec3e711a7c2da6a175663f3b50b

data/lib/git_dj/version.rb

@@ -1,3 +1,3 @@
 class GitDj
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/git_dj.rb

@@ -13,6 +13,8 @@ class GitDj
     case ARGV[0]
     when 'integrate'
       integrate_current_branch
+    when 'integrate2'
+      integrate_current_branch2
     when 'release'
       release_current_branch
     when 'get'
@@ -29,18 +31,27 @@ class GitDj
   end
 
   def integrate_current_branch
+    send_branch_to_integration('')
+  end
+
+  def integrate_current_branch2
+    send_branch_to_integration('2')
+  end
+
+  def send_branch_to_integration(staging_ver = '')
     drop_commands_cache
     cur_branch = current_branch_name
+    integration_branch = INTEGRATION_BRANCH + staging_ver
     if has_uncommited_changes
       puts red_color("Failed to integrate #{cur_branch}: you have uncommited changes")
-    elsif cur_branch == INTEGRATION_BRANCH
-      puts red_color("Can not integrate #{INTEGRATION_BRANCH} into #{INTEGRATION_BRANCH}")
+    elsif cur_branch == integration_branch
+      puts red_color("Can not integrate #{integration_branch} into #{integration_branch}")
     else
       run_cmds [
-        "git checkout #{INTEGRATION_BRANCH}",
+        "git checkout #{integration_branch}",
+        "git pull origin #{integration_branch}",
         "git merge #{cur_branch}",
-        "git pull origin #{INTEGRATION_BRANCH}",
-        "git push origin #{INTEGRATION_BRANCH}",
+        "git push origin #{integration_branch}",
         "git checkout #{cur_branch}"
       ]
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_dj
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Mikhail Tabunov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies: []
 description: A simple and lightweight alternative to git flow
 email:
@@ -30,26 +29,25 @@ files:
 - lib/git_dj/version.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Git dj<D-d>
 test_files: []