git_dj 0.0.1

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git-dj.gemspec
+gemspec

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Mikhail Tabunov
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+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.

data/README.md

@@ -0,0 +1,30 @@
+# Git::Dj
+# Git Dj - is an simple lightweight alternative for git flow. See, how it works:
+
+**gdj integrate** – merges current branch into staging branch, executes git push origin staging and switches back to current branch
+**gdj release** merges current branch into master branch, pushes changes and switches back to current branch
+
+If you want to start new feature:
+
+    git checkout master
+    git checkout -b my_super_cool_feature_branch
+    
+If you want deploy it into staging use:
+
+    gdj integrate
+    cap staging deploy
+
+If you want to finish feature:
+
+    gdj release
+    cap production deploy
+
+Keep your workflow simple.
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/bin/gdj

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require File.expand_path('lib/git_dj.rb')
+gdj = GitDj.new
+gdj.perform
+

data/git_dj.gemspec

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/git_dj/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Mikhail Tabunov"]
+  gem.email         = ["mikhail@tabunov.ru"]
+  gem.description   = %q{A simple and lightweight alternative to git flow}
+  gem.summary       = %q{Git dj<D-d>}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "git_dj"
+  gem.require_paths = ["lib"]
+  gem.version       = GitDj::VERSION
+end

data/lib/git_dj/version.rb

@@ -0,0 +1,3 @@
+class GitDj
+  VERSION = "0.0.1"
+end

data/lib/git_dj.rb

@@ -0,0 +1,99 @@
+class GitDj
+  require 'git_dj/version'
+  INTEGRATION_BRANCH = 'staging'
+  RELEASE_BRANCH = 'master'
+
+  def initialize
+  end
+
+  def perform
+    case ARGV[0]
+    when 'integrate'
+      integrate_current_branch
+    when 'release'
+      release_current_branch
+    when 'help'
+      print_help
+    else
+      print_help
+    end
+  end
+
+  def integrate_current_branch
+    cur_branch = current_branch_name
+    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}")
+    else
+      run_cmds [
+        "git checkout #{INTEGRATION_BRANCH}",
+        "git merge #{cur_branch}",
+        "git push origin #{INTEGRATION_BRANCH}",
+        "git checkout #{cur_branch}"
+      ]
+
+      puts green_color("Successfully integrated #{cur_branch}")
+    end
+  end
+
+  def release_current_branch
+    cur_branch = current_branch_name
+    if has_uncommited_changes
+      puts red_color("Failed to release #{cur_branch}: you have uncommited changes")
+    elsif cur_branch == RELEASE_BRANCH || cur_branch == INTEGRATION_BRANCH
+      puts red_color("Can not integrate #{cur_branch} into #{RELEASE_BRANCH}")
+    else
+      run_cmds [
+        "git checkout #{RELEASE_BRANCH}",
+        "git merge #{cur_branch}",
+        "git push origin #{RELEASE_BRANCH}",
+        "git checkout #{cur_branch}"
+      ]
+
+      puts green_color("Successfully released #{cur_branch}")
+    end
+  end
+
+  def current_branch_name
+    out = %x[git branch]
+    branch_string = out.split("\n").detect do |str|
+      str.index('*') == 0
+    end
+
+
+    branch_string.gsub!(/^\*/, '')
+    branch_string.chomp.strip
+  end
+
+  def print_help
+    puts %Q{Git DJ #{VERSION}
+
+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
+
+}
+  end
+
+private
+  def has_uncommited_changes
+    %x[git diff].chomp.strip != ''
+  end
+
+  def run_cmds(cmds)
+    cmds.each do |cmd|
+      system(cmd)
+    end
+  end
+
+  def red_color(str)
+    "\e[0;31m#{str}\e[m"
+  end
+
+  def green_color(str)
+    "\e[0;32m#{str}\e[m"
+  end
+
+end
+

metadata

@@ -0,0 +1,55 @@
+--- !ruby/object:Gem::Specification
+name: git_dj
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Mikhail Tabunov
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-09-09 00:00:00.000000000 Z
+dependencies: []
+description: A simple and lightweight alternative to git flow
+email:
+- mikhail@tabunov.ru
+executables:
+- gdj
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/gdj
+- git_dj.gemspec
+- lib/git_dj.rb
+- lib/git_dj/version.rb
+homepage: ''
+licenses: []
+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
+signing_key: 
+specification_version: 3
+summary: Git dj<D-d>
+test_files: []