gh-diff 0.0.1

data/Rakefile

@@ -0,0 +1,7 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+

data/bin/gh-diff

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'gh-diff'
+
+GhDiff::CLI.start(ARGV)

data/gh-diff.gemspec

@@ -0,0 +1,35 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gh-diff/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "gh-diff"
+  spec.version       = GhDiff::VERSION
+  spec.authors       = ["kyoendo"]
+  spec.email         = ["postagie@gmail.com"]
+  spec.summary       = %q{Take diffs between local and a github repository files.}
+  spec.description   = %q{Take diffs between local and a github repository files.}
+  spec.homepage      = "https://github.com/melborne/gh-diff"
+  spec.license       = "MIT"
+
+  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.required_ruby_version = ">= 2.0.0"
+
+  spec.add_dependency "togglate", ">= 0.1.2"
+  spec.add_dependency "octokit"
+  spec.add_dependency "dotenv"
+  spec.add_dependency "thor"
+  spec.add_dependency "diffy"
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "tildoc", ">= 0.0.2"
+end

data/lib/gh-diff.rb

@@ -0,0 +1,96 @@
+require "gh-diff/version"
+require "gh-diff/cli"
+require "gh-diff/option"
+require "gh-diff/auth"
+
+require "base64"
+require "octokit"
+require "diffy"
+require "togglate"
+
+module GhDiff
+  class Diff
+    attr_accessor :repo, :revision, :dir
+    def initialize(repo, revision:'master', dir:nil)
+      @repo = repo
+      @revision = revision
+      @dir = dir
+    end
+
+    def get(file, repo:@repo, revision:@revision, dir:@dir, **opts)
+      path = build_path(dir, file)
+      f = get_contents(repo, path, revision)
+      Base64.decode64(f.content)
+    end
+
+    def diff(file1, file2=file1, commentout:false,
+                                 comment_tag:'original', **opts)
+      opts = {context:3}.merge(opts)
+      is_dir = File.directory?(file1)
+
+      file_pairs = build_file_pairs(file1, file2, dir:is_dir)
+      diffs = parallel(file_pairs) { |file1, file2|
+                _diff(file1, file2, commentout, comment_tag, opts) }
+      diffs
+    end
+
+    def dir_diff(directory, repo:@repo, revision:@revision, dir:@dir)
+      local_files = Dir.glob("#{directory}/*").map { |f| File.basename f }
+      remote_path = build_path(dir, directory)
+      remote_files = get_contents(repo, remote_path, revision).map(&:name)
+      added = remote_files - local_files
+      removed = local_files - remote_files
+      [added, removed]
+    end
+
+    def ref(ref='master', repo:@repo)
+      type = ref.match(/^v\d/) ? :tags : :heads
+      get_ref(repo, "#{type}/#{ref}")
+    rescue Octokit::NotFound
+      {ref:'', object:{sha:ref}}
+    end
+
+    private
+    def build_path(dir, file)
+      (dir.nil? || dir.empty?) ? file : File.join(dir, file)
+    end
+
+    def _diff(file1, file2, commentout, comment_tag, opts)
+      local = File.read(file1)
+      local = Togglate.commentout(local, tag:comment_tag)[0] if commentout
+      remote = get(file2, opts)
+      Diffy::Diff.new(local, remote, opts)
+    rescue Errno::ENOENT
+      :LocalNotFound
+    rescue Octokit::NotFound
+      :RemoteNotFound
+    end
+
+    def get_contents(repo, path, ref)
+      Octokit.contents(repo, path:path, ref:ref)
+    end
+
+    def get_ref(repo, ref)
+      Octokit.ref(repo, ref)
+    end
+
+    def build_file_pairs(file1, file2, dir:false)
+      if dir
+        fs = Dir.glob("#{file1}/*").select { |f| File.file? f }
+        fs.zip(fs)
+      else
+        [[file1, file2]]
+      end
+    end
+
+    def parallel(items)
+      result = {}
+      items.map do |item1, item2|
+        Thread.new(item1, item2) do |_item1, _item2|
+          result[[_item1, _item2]] = yield(_item1, _item2)
+        end
+      end.each(&:join)
+      result
+    end
+  end
+end

data/lib/gh-diff/auth.rb

@@ -0,0 +1,25 @@
+module GhDiff
+  class Auth
+    def self.[](opts={})
+      new(username:opts[:username],
+          password:opts[:password],
+          token:opts[:token]).login
+    end
+
+    def initialize(username:nil, password:nil, token:nil)
+      @username = username
+      @password = password
+      @token = token
+      @@login = nil
+    end
+
+    def login
+      if @token
+        Octokit.configure { |c| c.access_token = @token }
+      else
+        Octokit.configure { |c| c.login = @username; c.password = @password }
+      end
+      @@login = Octokit.user
+    end
+  end
+end

data/lib/gh-diff/cli.rb

@@ -0,0 +1,165 @@
+require "thor"
+
+module GhDiff
+  class CLI < Thor
+    class_option :repo,
+                  aliases:'-g',
+                  desc:'target repository'
+    class_option :revision,
+                  aliases:'-r',
+                  default:'master',
+                  desc:'target revision'
+    class_option :dir,
+                  aliases:'-p',
+                  desc:'target remote directory'
+    class_option :username,
+                  desc:'github username'
+    class_option :password,
+                  desc:'github password'
+    class_option :token,
+                  desc:'github API access token'
+
+    desc "get FILE", "Get FILE content from github repository"
+    def get(file)
+      opts = Option.new(options).with_env
+      github_auth(opts[:username], opts[:password], opts[:token])
+
+      gh = Diff.new(opts[:repo], revision:opts[:revision], dir:opts[:dir])
+      print gh.get(file)
+    rescue ::Octokit::NotFound
+      path = (dir=opts[:dir]) ? "#{dir}/#{file}" : file
+      puts "File not found at remote: '#{path}'"
+      exit(1)
+    rescue => e
+      puts "something go wrong: #{e}"
+      exit(1)
+    end
+
+    desc "diff LOCAL_FILE [REMOTE_FILE]", "Compare FILE(s) between local and remote repository. LOCAL_FILE can be DIRECTORY."
+    option :commentout,
+            aliases:'-c',
+            default:false,
+            type: :boolean,
+            desc:"compare html-commented texts in local file(s) with the remote"
+    option :comment_tag,
+            aliases:'-t',
+            default:'original'
+    option :format,
+            aliases:'-f',
+            default:'color',
+            desc:"output format: any of text, color, html or html_simple"
+    option :save,
+            aliases:'-s',
+            default:false,
+            type: :boolean
+    option :save_dir,
+            default:'diff',
+            desc:'save directory'
+    option :name_only,
+            default:true,
+            type: :boolean
+    def diff(file1, file2=file1)
+      opts = Option.new(options).with_env
+      github_auth(opts[:username], opts[:password], opts[:token])
+
+      gh = Diff.new(opts[:repo], revision:opts[:revision], dir:opts[:dir])
+      diffs = gh.diff(file1, file2, commentout:opts[:commentout],
+                                    comment_tag:opts[:comment_tag])
+
+      ref = gh.ref(opts[:revision], repo:opts[:repo])
+
+      diffs.each do |(f1, f2), diff|
+        next if file_not_found?(f1, f2, diff)
+        header = <<-EOS
+Base revision: #{ref[:object][:sha]}[#{ref[:ref]}]
+--- #{f1}
++++ #{f2}
+
+        EOS
+        diff_form = "#{f1} <-> #{f2} [%s:%s]" %
+                    [ref[:object][:sha][0,7], ref[:ref].match(/\w+$/).to_s]
+
+        if opts[:save]
+          format = opts[:format]=='color' ? :text : opts[:format]
+          content = diff.to_s(format)
+          unless content.empty?
+            save(header + content, opts[:save_dir], f1)
+          else
+            print "\e[32mno Diff on\e[0m #{diff_form}\n"
+          end
+        else
+          content = diff.to_s(:text)
+          unless content.empty?
+            if opts[:name_only]
+              printf "\e[31mDiff found on\e[0m #{diff_form}\n"
+            else
+              print header
+              print diff.to_s(opts[:format])
+            end
+          else
+            print "\e[32mno Diff on\e[0m #{diff_form}\n"
+          end
+        end
+      end
+    end
+
+    desc "dir_diff DIRECTORY", "Print added and removed files in remote repository"
+    def dir_diff(dir)
+      opts = Option.new(options).with_env
+      github_auth(opts[:username], opts[:password], opts[:token])
+
+      gh = Diff.new(opts[:repo], revision:opts[:revision], dir:opts[:dir])
+      added, removed = gh.dir_diff(dir)
+      if [added, removed].all?(&:empty?)
+        puts "\e[33mNothing changed\e[0m"
+      else
+        if added.any?
+          puts "\e[33mNew files:\e[0m"
+          puts added.map { |f| "  \e[32m" + f + "\e[0m" }
+        end
+        if removed.any?
+          puts "\e[33mRemoved files:\e[0m"
+          puts removed.map { |f| "  \e[31m" + f + "\e[0m" }
+        end
+      end
+    end
+
+    @@login = nil
+    no_tasks do
+      def github_auth(username, password, token)
+        return true if @@login
+        return false unless token || [username, password].all?
+
+        @@login = Auth[username:username, password:password, token:token]
+      rescue ::Octokit::Unauthorized
+        puts "Bad Credentials"
+        exit(1)
+      end
+
+      def mkdir(dir)
+        FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+      end
+
+      def save(content, save_dir, file)
+        file = File.join(File.dirname(file), (File.basename(file, '.*') + '.diff'))
+        path = File.join(save_dir, file)
+        mkdir(File.dirname path)
+        File.write(path, content)
+        print "\e[32mDiff saved at '#{path}'\e[0m\n"
+      end
+
+      def file_not_found?(f1, f2, content)
+        case content
+        when :RemoteNotFound
+          print "\e[31m#{f2} not found on remote\e[0m\n"
+          true
+        when :LocalNotFound
+          print "\e[31m#{f1} not found on local\e[0m\n"
+          true
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/gh-diff/option.rb

@@ -0,0 +1,40 @@
+require "dotenv"
+
+module GhDiff
+  class Option
+    attr_reader :opts
+    def initialize(opts)
+      @opts = down_symbolize_key(opts)
+    end
+
+    def update(opts)
+      @opts.update(down_symbolize_key opts)
+    end
+
+    def dotenv
+      @dotenv ||= down_symbolize_key(Dotenv.load)
+    end
+
+    # returns: ENV variables prefixed with 'GH_'(default)
+    #          and variables defined in dotenv file.
+    def env(prefix='GH_')
+      @envs ||= begin
+        envs = ENV.select { |env| env.start_with? prefix }
+                  .map { |k, v| [k.sub(/^#{prefix}/, ''), v] }
+        down_symbolize_key(envs)
+      end
+      @envs.merge(dotenv)
+    end
+
+    def with_env(prefix='GH_')
+      env(prefix).merge(@opts)
+    end
+
+    private
+    def down_symbolize_key(opts)
+      opts.inject({}) do |h, (k, v)|
+        h[k.to_s.downcase.intern] = v; h
+      end
+    end
+  end
+end

data/lib/gh-diff/version.rb

@@ -0,0 +1,3 @@
+module GhDiff
+  VERSION = "0.0.1"
+end

data/spec/cassettes/auth.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://aaa:xxx@api.github.com/user
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.1.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Thu, 26 Jun 2014 14:59:19 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '57'
+      X-Ratelimit-Reset:
+      - '1403798098'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Content-Length:
+      - '83'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Github-Request-Id:
+      - 3C2F1730:6288:1EAD8FC4:53AC3546
+      Strict-Transport-Security:
+      - max-age=31536000
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Thu, 26 Jun 2014 14:59:19 GMT
+recorded_with: VCR 2.9.2