cbgit 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1dd5ba4d3710ddad57600bb6c804f1ded2c652bf
+  data.tar.gz: 8c8238da1a49450cef23425fcf4f17e0ac28c913
+SHA512:
+  metadata.gz: cb3aa975e99cb5981376146b463dc003441e10e8da0798ca357cdda53a36c8ba03d59803440b38b6c604c9a979443e4025c74bc44c0716978b0cd64f40d7ba77
+  data.tar.gz: 1c0366016154d2864b8ba401729eab0b00b5b9622bc492d76f2f75c3c496a5fc7cfdf7d064376956847a95378dcd19745be4d47afe13f79bfae893812ca62d8a

data/.gitignore

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

data/Gemfile

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

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Jaime Cham
+
+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,28 @@
+# Cbgit
+
+Collection of Git/GitHub related utility scripts packaged as a Ruby Gem.
+
+- gitbuild
+- gitpullgraph
+
+## Installation
+
+In Rails, add this line to your application's Gemfile:
+
+    gem 'cbgit', git: 'https://github.com/cardinalblue/cbgit.git'
+
+To install the Ruby gem from the source:
+
+    git clone https://github.com/cardinalblue/cbgit.git
+    cd cbgit
+    rake install
+
+To install the Ruby gem directly from GitHub using the `specific_install` gem:
+
+    gem install specific_install
+    gem specific_install -l https://github.com/cardinalblue/cbgit.git
+
+## Usage
+
+Run scripts with `--help`
+

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/bin/gitbuild

@@ -0,0 +1,242 @@
+#!/usr/bin/env ruby
+
+require 'octokit'
+require 'git'
+require 'logger'
+
+require 'optparse'
+require 'pp'
+require 'json'
+
+OPTS = {
+  BUILD_NAME:       'build',
+
+  GITHUB_LOGIN:     ENV['GITHUB_LOGIN'],
+  GITHUB_PASSWORD:  ENV['GITHUB_PASSWORD'],
+
+  BASE_BRANCH:      'dev',
+  REMOTE:           'origin',
+
+  OCTOPUS_MERGE:    true,
+  DO_PUSH:          true,
+  AFTER_MERGE:      false,
+  BUILD_NUMBER:     false,
+}
+
+INFO_FILEPATH   = './config/gitbuild.txt'
+
+# --------------------------------------------------
+# Command line arguments
+
+OptionParser.new{ |op|
+  op.banner = <<-TEXT
+Creates a new build branch, merging pull requests in GitHub marked with #build.
+Usage: gitbuild [name (defaults to 'build')] [options]
+
+  TEXT
+  op.on('-l', '--login USERNAME',         'GitHub login name'                                        ) { |v|
+                                          OPTS[:GITHUB_LOGIN]     = v }
+  op.on('-p', '--password PASSWORD',      'GitHub login password'                                    ) { |v|
+                                          OPTS[:GITHUB_PASSWORD]  = v }
+  op.on('-b', '--base-branch BRANCHNAME',  "Branch to use as base (def #{OPTS[:BASE_BRANCH]})"        ) { |v|
+                                          OPTS[:BASE_BRANCH]      = v }
+  op.on('-r', '--remote REMOTENAME',      "Git remote used to find GitHub (def #{OPTS[:REMOTE]})"    ) { |v|
+                                          OPTS[:REMOTE]           = v }
+  op.on('-o', '--[no-]octopus',           "Use Git octopus merge (def #{OPTS[:OCTOPUS_MERGE]})"      ) { |v|
+                                          OPTS[:OCTOPUS_MERGE]    = v }
+  op.on('-n', '--build-number',           "Just display build number info"                           ) { |v|
+                                          OPTS[:BUILD_NUMBER]     = v }
+  op.on('--[no-]push',                    "Push results to remote (def #{OPTS[:DO_PUSH]}"            ) { |v|
+                                          OPTS[:DO_PUSH]          = v }
+  op.on('--after-merge',                  "Merge completed manually, do post (def #{OPTS[:AFTER_MERGE]}" ) { |v|
+                                          OPTS[:AFTER_MERGE]      = v }
+
+  # Help
+  op.on_tail("-h", "--help", "Show this message") do
+    puts op
+    exit
+  end
+}.parse!
+
+# Whatever is left in ARGV is the required normal arguments
+OPTS[:BUILD_NAME] = ARGV.pop unless ARGV.empty?
+
+# --------------------------------------------------
+# Setup Git client
+
+@logger = Logger.new STDOUT
+@g      = Git.open '.', log: nil  # or @logger
+
+# --------------------------------------------------
+# Setup Octokit
+
+Octokit.configure do |config|
+  config.login    = OPTS[:GITHUB_LOGIN]    or raise 'No GitHub login given'
+  config.password = OPTS[:GITHUB_PASSWORD] or raise 'No GitHub password given'
+end
+stack = Faraday::Builder.new do |builder|
+  #builder.response :post
+  builder.use Octokit::Response::RaiseError
+  builder.adapter Faraday.default_adapter
+end
+Octokit.middleware = stack
+
+# --------------------------------------------------
+# Functions
+
+def git command, *args
+  @g.lib.send :command, command, args
+end
+
+PULLS_LIMIT = 1000
+def fetch_github_pulls repo=calculate_github_repo
+  # Access pull requests
+  @logger.debug "Fetching pull requests from #{repo}"
+  pulls = Octokit.pulls(repo, state: :open, per_page: PULLS_LIMIT)
+end
+
+def calculate_github_repo
+  # Figure out the repo user/name
+  remote = @g.remote OPTS[:REMOTE]
+  repo_user, repo_name = remote.url.split(':')[1].split(/[\/\.]/)
+  @logger.info "Extracted repo user '#{repo_user}' name '#{repo_name}' from remote '#{OPTS[:REMOTE]}' (#{remote.url})"
+  return "#{repo_user}/#{repo_name}"
+end
+
+def build_prefix
+  "#{OPTS[:BUILD_NAME]}_"
+end
+
+def calculate_build_number
+  @g.branches.inject 0 do |build_number, branch|
+    if branch.name.start_with? build_prefix
+      n = /\d+/.match(branch.name[build_prefix.length..-1])[0].to_i
+      puts "Existing branch #{branch.name} (#{build_number})" if OPTS[:BUILD_NUMBER]
+      if n > build_number
+        build_number = n
+      end
+    end
+    build_number
+  end
+end
+
+def pull_tag_regex
+  /\B\##{OPTS[:BUILD_NAME]}\b/
+end
+
+# --------------------------------------------------
+# MAIN SCRIPT
+
+begin
+
+  # --------------------------------------------------------------------
+  # Figure out build number
+  build_number = calculate_build_number
+  puts "---- Current build number is #{build_number}"
+
+  # Rename current branch to it
+  buildbranch = "#{build_prefix}#{build_number + 1}"
+  if OPTS[:BUILD_NUMBER]
+    puts "---- Next build is `#{buildbranch}`"
+    exit
+  end
+
+  # --------------------------------------------------------------------
+  # Figure out branches we will merge, by looking for the magic tag
+  pulls = fetch_github_pulls
+  pulls = pulls.select{ |pull| pull.body.match pull_tag_regex }
+  raise 'No pull requests to merge!' if pulls.empty?
+  brnames = pulls.map{ |b| b.head.ref }
+  puts "---- Found Github branches to build:\n#{brnames.join "\n" }"
+
+  unless OPTS[:AFTER_MERGE]
+
+    # First, got to base branch and pull it
+    @g.checkout OPTS[:BASE_BRANCH]
+    @g.pull OPTS[:REMOTE], OPTS[:BASE_BRANCH]
+
+    # Then create a new branch and switch to it
+    branch = @g.branch("tmp_#{rand 1_000_000_000_000}")
+    branch.checkout
+
+    # --------------------------------------------------------------------
+    # Do the merge
+    if OPTS[:OCTOPUS_MERGE]
+      puts "---- Merging branches via octopus:\n#{brnames.join "\n" }"
+      git :pull, OPTS[:REMOTE], *brnames
+    else
+      brnames.each do |brname|
+        puts "---- Merging branch: #{brname}"
+        @g.merge("#{OPTS[:REMOTE]}/#{brname}")
+
+        # Check for conflicts
+        conflicts = []
+        @g.each_conflict do |file,_,_|
+          conflicts += file
+        end
+        unless conflicts.empty?
+          puts "Conflicts merging #{branch.name}, exiting:\n#{conflicts.join(', ')}"
+          exit
+        end
+      end
+    end
+
+    # Done with merge
+    puts '!!!! Merged !!!!'
+
+  end
+
+  # --------------------------------------------------------------------
+  # Create branch
+  puts "---- Creating branch #{buildbranch}"
+  git :branch, '-m', buildbranch
+
+  # --------------------------------------------------------------------
+  # Save gitbuild info, writing a config file
+  info = {
+    branch:           buildbranch,
+    time:             Time.now,
+    github_login:     OPTS[:GITHUB_LOGIN],
+    commit: {
+      sha:            @g.log.first.sha,
+    },
+    pulls:            pulls.map{ |pull|
+      [
+          "\##{pull.number}",
+          pull.title,
+          pull.head.sha,
+          pull.head.date
+      ]
+    },
+    merges:           @g.log('-merges')[0..20].map{ |commit|
+      [
+          commit.date,
+          commit.sha,
+          commit.message
+      ]
+    }
+  }
+  File.open(INFO_FILEPATH, 'w') do |f|
+    f.write JSON.pretty_generate(info)
+  end
+  @g.add INFO_FILEPATH
+  @g.commit "added #{INFO_FILEPATH}"
+
+  # --------------------------------------------------------------------
+  # Push
+  if OPTS[:DO_PUSH]
+    puts "---- Pushing branch to #{OPTS[:REMOTE]}"
+    @g.lib.send :command, 'push', [ OPTS[:REMOTE], buildbranch, '--set-upstream']
+      # Hard to set arbitrary commands using Git client gem
+  end
+
+rescue
+
+  # Oops, failed somehow, delete temporary branch
+  @g.checkout OPTS[:BASE_BRANCH]
+  branch.delete rescue nil
+  raise
+end
+
+
+

data/bin/gitpullgraph

@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby
+
+require 'octokit'
+require 'git'
+require 'graph'
+require 'logger'
+
+require 'optparse'
+require 'pp'
+require 'json'
+
+OPTS = {
+    GITHUB_LOGIN:     ENV['GITHUB_LOGIN'],
+    GITHUB_PASSWORD:  ENV['GITHUB_PASSWORD'],
+
+    REMOTE:           'origin',
+}
+
+# --------------------------------------------------
+# Command line arguments
+
+OptionParser.new{ |op|
+  op.banner = "Generates graph of pull requests to `/tmp/<reponame>.svg`."
+  op.on('-l', '--login USERNAME',         'GitHub login name'                                        ) { |v|
+    OPTS[:GITHUB_LOGIN]     = v }
+  op.on('-p', '--password PASSWORD',      'GitHub login password'                                    ) { |v|
+    OPTS[:GITHUB_PASSWORD]  = v }
+  op.on('-r', '--remote REMOTENAME',      "Git remote used to find GitHub (def #{OPTS[:REMOTE]})"    ) { |v|
+    OPTS[:REMOTE]           = v }
+
+  # Help
+  op.on_tail("-h", "--help", "Show this message") do
+    puts op
+    exit
+  end
+}.parse!
+
+
+# --------------------------------------------------
+# Setup Git client
+
+@logger = Logger.new STDOUT
+@g      = Git.open '.', log: nil  # or @logger
+
+# --------------------------------------------------
+# Setup Octokit
+
+Octokit.configure do |config|
+  config.login    = OPTS[:GITHUB_LOGIN]    or raise 'No GitHub login given'
+  config.password = OPTS[:GITHUB_PASSWORD] or raise 'No GitHub password given'
+end
+stack = Faraday::Builder.new do |builder|
+  #builder.response :post
+  builder.use Octokit::Response::RaiseError
+  builder.adapter Faraday.default_adapter
+end
+Octokit.middleware = stack
+
+# --------------------------------------------------
+# Functions
+
+def git command, *args
+  @g.lib.send :command, command, args
+end
+
+def fetch_github_pulls repo=calculate_github_repo
+  # Access pull requests
+  # @logger.debug "Fetching pull requests from #{repo}"
+  pulls = Octokit.pulls(repo, 'open')
+end
+
+def calculate_github_repo
+  # Figure out the repo user/name
+  remote = @g.remote OPTS[:REMOTE]
+  repo_user, repo_name = remote.url.split(/[\/\.\:]/)[-3..-2]
+  # @logger.info "Extracted repo user '#{repo_user}' name '#{repo_name}' from remote '#{OPTS[:REMOTE]}' (#{remote.url})"
+  return "#{repo_user}/#{repo_name}"
+end
+
+# --------------------------------------------------
+# Monkeypatches
+
+# Patch graph to support adding URL and target to things
+class Graph::Thingy
+  def url v
+    attributes.reject! { |s| s =~ /^URL =/ }
+    attributes << "URL = #{Graph.escape_label v}"
+  end
+  def target v
+    attributes.reject! { |s| s =~ /^target =/ }
+    attributes << "target = #{Graph.escape_label v}"
+  end
+  def tooltip v
+    attributes.reject! { |s| s =~ /^tooltip =/ }
+    attributes << "tooltip = #{Graph.escape_label v}"
+  end
+end
+
+# -------------------------------------------------
+# MAIN SCRIPT
+
+# Figure out branches we will merge, by looking for the magic tag
+pulls = fetch_github_pulls
+raise 'No pull requests to merge!' if pulls.empty?
+brnames = pulls.map{ |b| b.head.ref }
+puts "---- Found Github branches to build:\n#{brnames.join "\n" }"
+
+# Generate graph
+repo = calculate_github_repo
+filename = "/tmp/#{ repo.gsub /\W/, '_' }"
+digraph repo do
+  orient 'LR'  # "Left Right", see http://www.graphviz.org/doc/info/attrs.html
+
+  pulls.each do |pull|
+
+    # Edge attributes
+    e = edge(pull.head.ref, pull.base.ref)
+    e.label   "##{pull.number.to_s}"
+    e.url     pull.attrs[:_links][:html][:href]
+    e.target  '_blank'
+    e.tooltip pull.body
+
+    # Node attributes
+    n = node(pull.head.ref)
+    n.attributes << filled << rectangle << rounded
+
+  end
+
+  save filename, 'svg'
+end
+
+# Open in browser
+`open -a Safari #{filename}.svg`
+
+

data/cbgit.gemspec

@@ -0,0 +1,38 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'cbgit/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "cbgit"
+  spec.version       = Cbgit::VERSION
+  spec.authors       = ["Jaime Cham"]
+  spec.email         = ["jaime.cham@cardinalblue.com"]
+  spec.summary       = %q{Git and GitHub related utilities.}
+  spec.description   = <<-DESCRIPTION
+  - gitbuild         Build Pull Requests marked with #build
+  - gitpullgraph     Generate /tmp/gitpullgraph.svg diagram of Pull Requests
+  DESCRIPTION
+  
+  spec.homepage      = ""
+  spec.license       = "PROPRIETARY"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+
+  # General
+  spec.add_runtime_dependency     "json"
+  spec.add_runtime_dependency     "logger"
+  
+  # Git
+  spec.add_runtime_dependency     "octokit"
+  spec.add_runtime_dependency     "git"
+  
+  # Utility
+  spec.add_runtime_dependency     "graph"
+  
+end

data/lib/cbgit.rb

@@ -0,0 +1,5 @@
+require "cbgit/version"
+
+module Cbgit
+  # Your code goes here...
+end

data/lib/cbgit/version.rb

@@ -0,0 +1,3 @@
+module Cbgit
+  VERSION = "0.0.3"
+end

metadata

@@ -0,0 +1,142 @@
+--- !ruby/object:Gem::Specification
+name: cbgit
+version: !ruby/object:Gem::Version
+  version: 0.0.3
+platform: ruby
+authors:
+- Jaime Cham
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2014-07-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: graph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+    - gitbuild         Build Pull Requests marked with #build
+    - gitpullgraph     Generate /tmp/gitpullgraph.svg diagram of Pull Requests
+email:
+- jaime.cham@cardinalblue.com
+executables:
+- gitbuild
+- gitpullgraph
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/gitbuild
+- bin/gitpullgraph
+- cbgit.gemspec
+- lib/cbgit.rb
+- lib/cbgit/version.rb
+homepage: ''
+licenses:
+- PROPRIETARY
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
+summary: Git and GitHub related utilities.
+test_files: []