git-bundle 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0dd685911b226352aa32543af4105bae31803a7e
+  data.tar.gz: 398ca4bd1490964051abf510a06ad09eb94707c9
+SHA512:
+  metadata.gz: 01b515763ab53d4e7b7daa3b99be699e65a990881cdba28787fbffa29dd75af8bc6b94363c926a6a8e317aa172f72118640b12817b8b66bbc2b7deb994989e45
+  data.tar.gz: 5158116901d34f851a00a376b412ebe71ee0e8765b9b4fbe746f38217684ada7dfb2a3cceab3717f22bbcef81d9c207e49f0f65e9ab4a4513b427783566bc08e

data/.gitignore

@@ -0,0 +1,3 @@
+=======
+*.gem
+/.idea/

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.0
+before_install: gem install bundler -v 1.12.5

data/Gemfile

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

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Pierre Pretorius
+
+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,41 @@
+# Git::Bundle
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/git/bundle`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+TODO: Delete this and the text above, and describe your gem
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'git-bundle'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git-bundle
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/git-bundle.
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+

data/bin/gitb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$:.push File.expand_path('../lib', __dir__)
+
+require 'git_bundle'
+
+cli = GitBundle::CLI.new
+cli.invoke(ARGV)

data/git-bundle.gemspec

@@ -0,0 +1,22 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git_bundle/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'git-bundle'
+  spec.version       = GitBundle::VERSION
+  spec.authors       = ['Pierre Pretorius']
+  spec.email         = ['pierre@labs.epiuse.com']
+
+  spec.summary       = %q{Makes life easier when working with git and local overrides of bundled gems.}
+  spec.description   = %q{If you are using Bundler and local overrides of gems or Rails engines this gem might be for you.}
+  spec.homepage      = 'https://github.com/EPI-USE-Labs/git-bundle'
+  spec.license       = 'MIT'
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = 'gitb'
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'bundler', '~> 1.12'
+end

data/lib/git_bundle.rb

@@ -0,0 +1,6 @@
+require 'bundler'
+require 'git_bundle/version'
+require 'git_bundle/console'
+require 'git_bundle/cli'
+require 'git_bundle/repository'
+require 'git_bundle/push'

data/lib/git_bundle/cli.rb

@@ -0,0 +1,53 @@
+module GitBundle
+  class CLI
+    include GitBundle::Console
+
+    def initialize
+      @errors = []
+      load_repositories
+    end
+
+    def invoke(args)
+      case args[0]
+        when nil, '--help', 'help'
+          puts `git #{args.join(' ')}`.gsub('git', 'gitb')
+        when 'push'
+          push = GitBundle::Push.new(@repositories, args[1..-1])
+          push.invoke if push.prompt_confirm
+        else
+          exec_all(args)
+      end
+
+      puts_error @errors.join('\n') unless @errors.empty?
+    end
+
+    def exec_all(*argv)
+      exec_errors = []
+      @repositories.each do |repo|
+        puts_repo_heading(repo)
+        puts repo.execute_git(argv.join(' '))
+        exec_errors << repo.name unless $?.exitstatus == 0
+      end
+
+      @errors << "Command failed in #{exec_errors.join(', ')}." unless exec_errors.empty?
+    end
+
+    private
+    def load_repositories
+      @repositories = []
+      begin
+        lockfile_content = Bundler.read_file(Bundler.default_lockfile)
+        all_specs = Bundler::LockfileParser.new(lockfile_content).specs
+        Bundler.settings.local_overrides.each do |name, path|
+          spec = all_specs.find { |s| s.name == name }
+          @repositories << GitBundle::Repository.new_dependant(spec.name, path, spec.source.branch, spec.source.revision) if spec
+        end
+
+      rescue Bundler::LockfileError
+        @errors << "Error reading #{Bundler.default_lockfile}: \n\t#{error.message}."
+      end
+
+      @repositories << GitBundle::Repository.new_main(File.basename(Dir.getwd), Dir.getwd)
+    end
+  end
+end

data/lib/git_bundle/console.rb

@@ -0,0 +1,34 @@
+module GitBundle
+  module Console
+    COLORS = {std: 0,
+              error: 31,
+              attention: 32,
+              prompt: 33,
+              heading: 36}
+
+    def puts_repo_heading(repo)
+      puts_heading "#{repo.name} (#{repo.branch})"
+    end
+
+    def puts_heading(text)
+      puts colorize("\n=== #{text}", COLORS[:heading])
+    end
+
+    def puts_attention(text)
+      puts colorize(text, COLORS[:attention])
+    end
+
+    def puts_prompt(text)
+      puts colorize(text, COLORS[:prompt])
+    end
+
+    def puts_error(text)
+      puts colorize(text, COLORS[:error])
+    end
+
+    private
+    def colorize(text, color_code)
+      "\e[#{color_code}m#{text}\e[0m"
+    end
+  end
+end

data/lib/git_bundle/push.rb

@@ -0,0 +1,80 @@
+module GitBundle
+  class Push
+    include GitBundle::Console
+
+    def initialize(repositories, args)
+      @repositories = repositories
+      @args = args
+    end
+
+    def prompt_confirm
+      commits_to_push = false
+
+      @repositories.each do |repo|
+        commits = repo.commits_not_pushed
+        puts_repo_heading(repo)
+
+        if commits.empty?
+          puts 'No changes.'
+        else
+          commits_to_push = true
+          puts commits
+        end
+      end
+
+      if commits_to_push
+        puts_prompt("\nAre you sure you want to push these changes? (Y/N)")
+        STDIN.getch.upcase == 'Y'
+
+      elsif main_repository.file_changed?('Gemfile.lock')
+        puts_prompt("\nAlthough you don't have any commits to push, your Gemfile.lock needs to be rebuilt, committed and pushed.")
+        puts_prompt('Do you want to continue? (Y/N)')
+        STDIN.getch.upcase == 'Y'
+      end
+    end
+
+    def invoke
+      @repositories.each do |repo|
+        if repo.locked_branch != repo.branch
+          puts_error "\nThe git revisions of #{repo.name} does not match.  Are you running the correct branch?"
+          puts_error "You are running #{repo.name} branch: #{repo.branch}"
+          puts_error "Gemfile.lock references: #{repo.locked_branch}"
+          return
+        end
+      end
+
+      message = @repositories.map { |repo| repo.commit_messages_not_pushed }.uniq.join("\n\n")
+      @repositories.reject { |repo| repo.main || repo.commits_not_pushed.empty? }.each do |repo|
+        puts_repo_heading(repo)
+        unless repo.push(@args)
+          puts_error "Failed to push changes of #{repo.name}.  Try pulling the latest changes or resolve conflicts first."
+          return
+        end
+      end
+
+      puts_repo_heading(main_repository)
+      repo_changes = @repositories.any? { |repo| repo.revision == repo.locked_revision }
+
+      build_gemfile_lock if repo_changes
+      if main_repository.file_changed?('Gemfile.lock')
+        main_repository.add_file('Gemfile.lock')
+        main_repository.commit("Updated Gemfile.lock to include changes: #{commit_message}", 'Gemfile.lock')
+      end
+
+      main_repository.push(@args)
+    end
+
+    private
+    def main_repository
+      @repositories.find { |repo| repo.main }
+    end
+
+    def build_gemfile_lock
+      puts 'Local gems were updated. Building new Gemfile.lock with bundle install.'
+      Dir.chdir(main_repository.path) do
+        puts `bundle install --quiet`
+        $?.exitstatus == 0
+      end
+    end
+  end
+end

data/lib/git_bundle/repository.rb

@@ -0,0 +1,72 @@
+module GitBundle
+  class Repository
+    attr_reader :name,
+                :path,
+                :main
+
+    def self.new_main(name, path)
+      GitBundle::Repository.new(name, path, true, nil, nil)
+    end
+
+    def self.new_dependant(name, path, locked_branch, locked_revision)
+      GitBundle::Repository.new(name, path, false, locked_branch, locked_revision)
+    end
+
+    def initialize(name, path, main_repository, locked_branch, locked_revision)
+      @name = name
+      @path = path
+      @main = main_repository
+      @locked_branch = locked_branch
+      @locked_revision = locked_revision
+    end
+
+    def branch
+      @branch ||= execute_git('rev-parse --abbrev-ref HEAD')
+    end
+
+    def locked_branch
+      @locked_branch || branch
+    end
+
+    def revision
+      @revision ||= execute_git('rev-parse --verify HEAD').gsub("\n", '')
+    end
+
+    def locked_revision
+      @locked_revision || revision
+    end
+
+    def commits_not_pushed
+      execute_git("log #{branch} --not --remotes")
+    end
+
+    def commit_messages_not_pushed
+      count = execute_git("rev-list #{branch} --count --not --remotes").to_i
+      count.times.map { |num| execute_git("log #{branch} --not --remotes --skip=#{num} --max-count=1 --pretty=format:'%B'").strip }
+    end
+
+    def push(args)
+      puts execute_git("push #{args.join(' ')}")
+      $?.exitstatus == 0
+    end
+
+    def file_changed?(filename)
+      !execute_git("diff --name-only #{filename}").empty?
+    end
+
+    def add_file(filename)
+      execute_git("add #{filename}")
+    end
+
+    def commit(message, *files)
+      execute_git("commit -m '#{message}' #{files.join(' ')}")
+    end
+
+    private
+    def execute_git(command)
+      full_command = "git -C #{@path} #{command}"
+      puts full_command if ENV['DEBUG'] == 'true'
+      `#{full_command}`.strip
+    end
+  end
+end

data/lib/git_bundle/version.rb

@@ -0,0 +1,3 @@
+module GitBundle
+  VERSION = '1.0.0'
+end

metadata

@@ -0,0 +1,73 @@
+--- !ruby/object:Gem::Specification
+name: git-bundle
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+platform: ruby
+authors:
+- Pierre Pretorius
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2016-06-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+description: If you are using Bundler and local overrides of gems or Rails engines
+  this gem might be for you.
+email:
+- pierre@labs.epiuse.com
+executables:
+- gitb
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".travis.yml"
+- Gemfile
+- LICENSE.txt
+- README.md
+- bin/gitb
+- git-bundle.gemspec
+- lib/git_bundle.rb
+- lib/git_bundle/cli.rb
+- lib/git_bundle/console.rb
+- lib/git_bundle/push.rb
+- lib/git_bundle/repository.rb
+- lib/git_bundle/version.rb
+homepage: https://github.com/EPI-USE-Labs/git-bundle
+licenses:
+- MIT
+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.5.1
+signing_key: 
+specification_version: 4
+summary: Makes life easier when working with git and local overrides of bundled gems.
+test_files: []