gitcopier 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 27eb1556d77e6fbeb8dfe8fe61e3a3c325f7a5e3
+  data.tar.gz: ad00ef820966f47b9b354ea2888ad128b7796c94
+SHA512:
+  metadata.gz: a56a7d322cc9d5833d5b8f65ef2c211c173a0760fbb7457ba390619ff03e6dd98dd5d337d9b3ae0fea9082391c42f96f5d618ce3b847dd624564079fc4cc9f1a
+  data.tar.gz: e40649d95ef607704cc08e9cd5a07e9d42b1b53c1f3007cc048350c44f2929681891e6fb8ce7fb34b2e163d1801884bfcdd003ed95c056afc479688c33da3b7f

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2015 Victor Tran
+
+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 @@
+# Gitcopier
+  Sometime, you work for a Rails project but its front end is adopted from other repositories (such as separated repository from a front end developer who is not familiar with Rails) and you need to integrate front end changes to the project. You need to see what files were changed, copy them accordingly. This gem will help you do the job really fast.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'gitcopier'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install gitcopier
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/tranvictor/gitcopier/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

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

data/bin/gitcopier

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'gitcopier'
+
+options = {}
+
+begin
+  OptionParser.new do |opts|
+    opts.banner = "Usage: gitcopier [options]"
+    opts.on('--from [path]', 'Absolute path to your local repository that you want to copy from. This option must go with --to.') do |path|
+      options[:command] = "integrate"
+      options[:from] = path
+    end
+    opts.on('--to [path]', 'Absolute path to your local repository that you want to copy to. This option must go with --from.') do |path|
+      options[:command] = "integrate"
+      options[:to] = path
+    end
+    opts.on('-v', '--version') do
+      puts "Gitcopier v#{Gitcopier::VERSION}"; exit(0)
+    end
+    opts.on('--showall', 'Show all integration information. This option ignore any other options.') do
+      options[:command] = "showall"
+    end
+  end.parse!
+rescue OptionParser::InvalidOption
+  puts "Invalid Option. Exit nicely."
+  exit(0)
+end
+
+Gitcopier::CommandLine.execute(options)

data/lib/gitcopier/command_line.rb

@@ -0,0 +1,119 @@
+require 'json'
+require 'fileutils'
+require 'colorize'
+
+module Gitcopier
+  class CommandLine
+    def self.showall(options)
+      integrations = load_integration
+      puts "You have #{integrations.size} integration.".colorize(:yellow)
+      integrations.each do |int|
+        source = int['source'].colorize(:green)
+        des = int['des'].colorize(:green)
+        puts "Integration from #{source} to #{des}"
+      end
+    end
+
+    def self.integrate(options)
+      integrations = load_integration
+      return unless validated_options = validate(options)
+      if integration_exist?(integrations, validated_options)
+        puts "You already have this integration.".colorize(:yellow)
+        return
+      end
+      integrations << {
+        source: validated_options[:from],
+        des: validated_options[:to]
+      }
+      generate_git_callback(
+        validated_options[:from],
+        validated_options[:to])
+    ensure
+      save_integrations(integrations)
+    end
+
+    def self.integration_exist?(integrations, options)
+      integrations.find_index do |integration|
+        (integration['source'] == options[:from] &&
+         integration['des'] == options[:to])
+      end != nil
+    end
+
+    def self.generate_git_callback(from, to)
+      des = File.join from, ".git", "hooks", "post-merge"
+      puts "Generating script to #{des}.".colorize(:green)
+      script = <<-SCRIPT
+#!/usr/bin/env ruby
+#
+# This script will ask to copy changed file after the merge
+#
+# User's decisions on coping the files will be recorded to not to ask next time
+# User can reconfigure the decision later by modifing the record
+# User can apply a decision on the whole directory
+#
+
+require 'gitcopier'
+
+integrator = Gitcopier::Integrator.new(
+  "#{to}", "#{from}")
+integrator.integrate_all_changes
+      SCRIPT
+      File.write(des, script)
+      FileUtils.chmod "+x", des
+      puts "Done."
+    end
+
+    # --from and --to options must be both specified
+    # --from must be an existing directory and is under git control
+    # --to must be an exising directory
+    # remove trailing / from --from and --to
+    def self.validate(opt)
+      options = opt.clone
+      if options[:from].nil? || options[:to].nil?
+        puts "--from and --to options must be both specified".colorize(:red)
+        return nil
+      end
+      if !under_git_control?(options[:from])
+        puts "--from option must be under git control".colorize(:red)
+        return nil
+      end
+      if !exist?(options[:to])
+        puts "--to option must be an existing directory".colorize(:red)
+      end
+      options[:from] = options[:from][0..-2] if options[:from][-1] == "/"
+      options[:to] = options[:to][0..-2] if options[:to][-1] == "/"
+      return options
+    end
+
+    def self.exist?(path)
+      File.directory? path
+    end
+
+    def self.under_git_control?(path)
+      return false unless self.exist?(path)
+      pwd = Dir.pwd
+      Dir.chdir(path)
+      git = IO.popen(['git', 'rev-parse', '--is-inside-work-tree']).read.chomp
+      Dir.chdir(pwd)
+      return git == "true"
+    end
+
+    def self.load_integration
+      file_path = File.join(Dir.home, Gitcopier::INTEGRATION_FILE_NAME)
+      JSON.parse(File.read(file_path)) rescue []
+    end
+
+    def self.save_integrations(integrations)
+      file_path = File.join(Dir.home, Gitcopier::INTEGRATION_FILE_NAME)
+      File.write(file_path, JSON.pretty_generate(integrations))
+    end
+
+    def self.execute(options)
+      if options[:command].nil?
+        puts "No command specified.".colorize(:red)
+        exit(0)
+      end
+      send(options[:command], options)
+    end
+  end
+end

data/lib/gitcopier/decision.rb

@@ -0,0 +1,30 @@
+module Gitcopier
+  class Decision
+    attr_accessor :source, :des
+    def initialize(decision, source, des)
+      @decision = decision
+      @source = source
+      @des = des
+    end
+
+    def is_copy?
+      @decision == 'y'
+    end
+
+    def is_follow?
+      @decision != 'y' && @decision != 'n'
+    end
+
+    def is_not_copy?
+      @decision == 'n'
+    end
+
+    def to_json(*a)
+      {
+        decision: @decision,
+        source: @source,
+        des: @des
+      }.to_json(*a)
+    end
+  end
+end

data/lib/gitcopier/decisions/decisions.json

@@ -0,0 +1,62 @@
+{
+  "/": {
+    "decision": "",
+    "source": "/",
+    "des": ""
+  },
+  "/clicklion/": {
+    "decision": "",
+    "source": "/clicklion/",
+    "des": ""
+  },
+  "/clicklion/src/": {
+    "decision": "",
+    "source": "/clicklion/src/",
+    "des": ""
+  },
+  "/clicklion/src/assets/": {
+    "decision": "",
+    "source": "/clicklion/src/assets/",
+    "des": ""
+  },
+  "/clicklion/src/assets/css/": {
+    "decision": "n",
+    "source": "/clicklion/src/assets/css/",
+    "des": ""
+  },
+  "/clicklion/src/assets/data/": {
+    "decision": "n",
+    "source": "/clicklion/src/assets/data/",
+    "des": ""
+  },
+  "/clicklion/src/assets/js/": {
+    "decision": "",
+    "source": "/clicklion/src/assets/js/",
+    "des": ""
+  },
+  "/clicklion/src/assets/js/dashboard/": {
+    "decision": "y",
+    "source": "/clicklion/src/assets/js/dashboard/",
+    "des": "/app/assets/javascripts/dashboards/"
+  },
+  "/clicklion/src/assets/js/libs/": {
+    "decision": "y",
+    "source": "/clicklion/src/assets/js/libs/",
+    "des": "/app/assets/javascripts/libs/"
+  },
+  "/clicklion/src/dashboard/": {
+    "decision": "n",
+    "source": "/clicklion/src/dashboard/",
+    "des": ""
+  },
+  "/clicklion/src/img/": {
+    "decision": "n",
+    "source": "/clicklion/src/img/",
+    "des": ""
+  },
+  "/clicklion/src/pages/": {
+    "decision": "n",
+    "source": "/clicklion/src/pages/",
+    "des": ""
+  }
+}

data/lib/gitcopier/decisions.rb

@@ -0,0 +1,76 @@
+require 'json'
+require 'readline'
+require 'gitcopier/decision'
+
+module Gitcopier
+  class Decisions
+    DECISION_FILE = File.dirname(__FILE__) + '/' + 'decisions/decisions.json'
+
+    def initialize(source_root, des_root)
+      @source_root = source_root
+      @des_root = des_root
+    end
+
+    def load
+      @data = JSON.parse(get_data_from_file)
+      @decisions = Hash[@data.map do |pair|
+        source = pair[0]
+
+        decision = Decision.new(
+          pair[1]['decision'], pair[1]['source'], pair[1]['des'])
+
+        [source, decision]
+      end]
+    end
+
+    def save
+      File.write(DECISION_FILE, JSON.pretty_generate(@decisions))
+    end
+
+    def get(changed_file)
+      @decisions[changed_file]
+    end
+
+    def get_data_from_file
+      File.read(DECISION_FILE)
+    end
+
+    def prompt_decision(changed_file)
+      while true do
+        print "Where do you want to copy #{(@source_root + changed_file).colorize(:green)}? (type h for instruction): "
+        user_input = Readline.readline("", true).strip
+        if user_input == "h"
+          puts "      #{'h'.colorize(:green)}: For instructions"
+          puts "      #{'n'.colorize(:green)}: For not copy the file or directory recursively"
+          puts "#{'<enter>'.colorize(:green)}: If it's a file, it will ignore the file. If it's a directory, it will prompt you to decide on files/directories inside recursively"
+          puts " #{'<path>'.colorize(:green)}: It will copy the file or directory's content to the path."
+        elsif user_input == "n"
+          decision = Decision.new("n", changed_file, "")
+          @decisions[changed_file] = decision
+          return decision
+        elsif user_input == ""
+          decision = Decision.new("", changed_file, "")
+          @decisions[changed_file] = decision
+          return decision
+        else
+          unless is_valid?(user_input)
+            next
+          end
+          destination = user_input[@des_root.size..user_input.size]
+          decision = Decision.new("y", changed_file, destination)
+          @decisions[changed_file] = decision
+          return decision
+        end
+      end
+    end
+
+    def is_valid?(des_string)
+      if !des_string.start_with? @des_root
+        puts "Your path must be inside #{@des_root}".colorize(:red)
+        # TODO: support user to reconfigure destination root
+        return false
+      end
+      true
+    end
+  end
+end

data/lib/gitcopier/dir_tree.rb

@@ -0,0 +1,66 @@
+module Gitcopier
+  class DirTree
+    def initialize(root_path, files)
+      @root = DirTreeNode.new "/"
+      files.each do |line|
+        _, file = line.split("\t")
+        add_file(file)
+      end
+    end
+
+    def travel(&block)
+      raise ArgumentError if !block_given?
+      visit(@root, block)
+    end
+
+    def visit(node, block)
+      instruction = block.call(node.path)
+      if instruction.nil?
+        node.children.each do |name, child|
+          visit(child, block)
+        end
+      end
+    end
+
+    private
+    def add_file(file)
+      is_dir = file.end_with? '/'
+      parts = file.split('/')
+      current_node = @root
+      part_size = parts.size
+      parts.each_with_index do |part, index|
+        child = current_node.get_child(part)
+        path = current_node.path + part
+        # unless the part is the last part and the file is not a dir
+        unless index + 1 == part_size && !is_dir
+          path = path + '/'
+        end
+        unless child
+          child = current_node.add_child(part, path)
+        end
+        current_node = child
+      end
+    end
+  end
+
+  class DirTreeNode
+    attr_accessor :path, :type, :children
+
+    def initialize(path)
+      @path = path
+      @type = path.end_with?('/') ? 'dir' : 'file'
+      @children = {}
+    end
+
+    def get_child(name)
+      @children[name]
+    end
+
+    # add or replace a child with given name and path
+    def add_child(name, path)
+      child = DirTreeNode.new(path)
+      @children[name] = child
+      return child
+    end
+  end
+end

data/lib/gitcopier/version.rb

@@ -0,0 +1,3 @@
+module Gitcopier
+  VERSION = "0.1.6"
+end

data/lib/gitcopier.rb

@@ -0,0 +1,86 @@
+require 'colorize'
+require "gitcopier/version"
+require "gitcopier/decision"
+require "gitcopier/decisions"
+require "gitcopier/dir_tree"
+require "gitcopier/command_line"
+
+module Gitcopier
+
+  INTEGRATION_FILE_NAME = '.gitcopier'
+
+  class Integrator
+    def initialize(integrate_path, root_path)
+      @root_path = root_path
+      @integrate_path = integrate_path
+      @decisions = Decisions.new(@root_path, @integrate_path)
+      @decisions.load
+    end
+
+    # This method get relative path of all changed files to git root
+    def changed_files
+      commit_log.split("\n").select do |line|
+        line.match(/[ACDMRTUXB*]+\t.+/)
+      end.map(&:strip)
+    end
+
+    def commit_log
+      @commit_log ||= raw_git_commit_log
+    end
+
+    def copy(source, des)
+      # source is a directory, copy its content
+      if source.end_with? '/'
+        puts "Copy #{(source + '*').colorize(:green)} to #{des.colorize(:green)}."
+        FileUtils.cp_r(Dir["#{source}*"], des)
+      else # source is a file, copy it to destination
+        puts "Copy #{source.colorize(:green)} to #{des.colorize(:green)}."
+        FileUtils.cp_r(source, des)
+      end
+    end
+
+    def print_integration_info
+      puts "====================================================="
+      puts "          Integrating changes to #{@integrate_path}".colorize(:yellow)
+      puts "====================================================="
+      commit, author, date = commit_log.split("\n")[0..2]
+      _, h = commit.split(' ')
+      print "Commit: ", h.colorize(:yellow)
+      _, a = author.split(': ')
+      print "\nAuthor: ", a.colorize(:yellow)
+      _, d = date.split(': ')
+      print "\nDate: ", d.colorize(:yellow), "\n"
+      puts "====================================================="
+    end
+
+    def integrate_all_changes
+      print_integration_info
+      dir_tree = DirTree.new(@root_path, changed_files)
+      dir_tree.travel do |changed_file|
+        decision = @decisions.get(changed_file)
+        just_decided = decision.nil?
+        unless decision
+          decision = @decisions.prompt_decision(changed_file) unless decision
+        end
+        if decision.is_copy?
+          print "Follow previous decision: " unless just_decided
+          copy(@root_path + decision.source, @integrate_path + decision.des)
+          next true
+        elsif decision.is_follow?
+          next nil
+        else
+          next false
+        end
+      end
+    ensure
+      print "\nSaving decisions for later usage...".colorize(:green)
+      @decisions.save
+      puts "Done.".colorize(:green)
+    end
+
+    private
+    def raw_git_commit_log
+      IO.popen(['git', 'log', '--name-status', '-1']).read
+    end
+  end
+end

metadata

@@ -0,0 +1,103 @@
+--- !ruby/object:Gem::Specification
+name: gitcopier
+version: !ruby/object:Gem::Version
+  version: 0.1.6
+platform: ruby
+authors:
+- Victor Tran
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2015-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+description: Sometime, you work for a Rails project but its front end is adopted from
+  other repositories (such as separated repository from a front end developer who
+  is not familiar with Rails) and you need to integrate front end changes to the project.
+  You need to see what files were changed, copy them accordingly. This gem will help
+  you do the job really fast.
+email:
+- vu.tran54@gmail.com
+executables:
+- gitcopier
+extensions: []
+extra_rdoc_files: []
+files:
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/gitcopier
+- lib/gitcopier.rb
+- lib/gitcopier/command_line.rb
+- lib/gitcopier/decision.rb
+- lib/gitcopier/decisions.rb
+- lib/gitcopier/decisions/decisions.json
+- lib/gitcopier/dir_tree.rb
+- lib/gitcopier/version.rb
+homepage: https://github.com/tranvictor/integrator
+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.2.2
+signing_key: 
+specification_version: 4
+summary: Help developers to integrate between multiple repositories
+test_files: []
+has_rdoc: