git_reflow 0.3.5 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6033d9ac0481348f75d715588d5ae35f451b53e8
+  data.tar.gz: 6865bb6dfdad09ada836eb0e5cb08a2f8bc7b29f
+SHA512:
+  metadata.gz: 1054c1140b333a61c70030757b5a713b2d23a876c2912d6d18887c4d946e7e8b8e92f4277529bf8075ed9112e6b701ed79a2102fe51759d7a415229b5414d189
+  data.tar.gz: 9720ebbd2a3ee378cc830940de30170b58ed1fe970264f45807fad418f03413d40faf8099ff947bfd9bf7e2f77d436eaa0b6dc554c6d83cc4d0be58e331231bb

data/.gitignore

@@ -1 +1,3 @@
 pkg/*
+**/.DS_Store
+.rspec

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.3.5)
+    git_reflow (0.4.0)
       colorize (= 0.6.0)
-      github_api (= 0.10.2)
-      gli (= 2.8.1)
+      github_api (= 0.12.1)
+      gli (= 2.12.2)
       highline
       httpclient
       json_pure
@@ -13,48 +13,78 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
+    coderay (1.1.0)
     colorize (0.6.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.5)
-    github_api (0.10.2)
-      addressable
-      faraday (~> 0.8.7)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.6.0)
+    columnize (0.8.9)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    debugger-linecache (1.2.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    github_api (0.12.1)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    gli (2.8.1)
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    httpclient (2.3.4.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
+    gli (2.12.2)
+    hashie (3.3.1)
+    highline (1.6.21)
+    httpclient (2.4.0)
     json (1.7.5)
     json_pure (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    mini_portile (0.5.1)
-    multi_json (1.8.4)
+    jwt (1.0.0)
+    method_source (0.8.2)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
+      pry (~> 0.10)
     rack (1.5.2)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    safe_yaml (1.0.1)
+    slop (3.6.0)
+    thread_safe (0.3.4)
+    webmock (1.17.4)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -62,6 +92,8 @@ PLATFORMS
 DEPENDENCIES
   bundler
   git_reflow!
-  jeweler
+  pry-byebug
   rake
   rdoc
+  rspec (~> 3.0.0)
+  webmock

data/Rakefile

@@ -1,2 +1,10 @@
+#!/usr/bin/env rake
 require 'rake'
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+ 
+Dir[File.join(File.dirname(__FILE__),'lib/tasks/*.rake')].each { |f| load f }
+
+RSpec::Core::RakeTask.new(:spec)
+ 
+task :default => [:spec]

data/git_reflow.gemspec

@@ -16,21 +16,22 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc         = true
   s.extra_rdoc_files = ['README.rdoc']
   s.bindir           = 'bin'
-
   s.require_paths    << 'lib'
   s.rdoc_options     << '--title' << 'git_reflow' << '--main' << 'README.rdoc' << '-ri'
 
   s.add_development_dependency('bundler')
+  s.add_development_dependency('pry-byebug')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('jeweler')
+  s.add_development_dependency('rspec', '~> 3.0.0')
+  s.add_development_dependency('webmock')
 
   s.add_dependency('colorize', '0.6.0')
-  s.add_dependency('gli', '2.8.1')
+  s.add_dependency('gli', '2.12.2')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
   s.add_dependency('json_pure')
-  s.add_dependency('github_api', '0.10.2')
+  s.add_dependency('github_api', '0.12.1')
 
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"
 end

data/lib/git_reflow/commands/setup.rb

@@ -4,6 +4,13 @@ command :setup do |c|
   c.switch [:l, :local], default_value: false, desc: 'setup GitReflow for the current project only'
   c.switch [:e, :enterprise], default_value: false, desc: 'setup GitReflow with a Github Enterprise account'
   c.action do |global_options, options, args|
-    GitReflow.setup({ project_only: options[:local], enterprise: options[:enterprise] })
+    reflow_options = { project_only: options[:local], enterprise: options[:enterprise] }
+    choose do |menu|
+      menu.header = "Available remote Git Server services:"
+      menu.prompt = "Which service would you like to use for this project?  "
+
+      menu.choice('GitHub')    { GitReflow::GitServer.connect reflow_options.merge({ provider: 'GitHub', silent: false }) }
+      menu.choice('BitBucket') { say("Coming soon...") }
+    end
   end
 end

data/lib/git_reflow/commands/start.rb

@@ -2,7 +2,7 @@ desc 'Start will create a new feature branch and setup remote tracking'
 long_desc <<LONGTIME
   Performs the following:\n
   \t$ git pull origin <current_branch>\n
-  \t$ git push origin master:refs/heads/[new_feature_branch]\n
+  \t$ git push origin <current_branch>:refs/heads/[new_feature_branch]\n
   \t$ git checkout --track -b [new_feature_branch] origin/[new_feature_branch]\n
 LONGTIME
 arg_name '[new-feature-branch-name] - name of the new feature branch'
@@ -18,7 +18,7 @@ command :start do |c|
       raise "usage: git-reflow start [new-branch-name]"
     else
       `git pull origin #{GitReflow.current_branch}`
-      `git push origin master:refs/heads/#{args[0]}`
+      `git push origin #{GitReflow.current_branch}:refs/heads/#{args[0]}`
       `git checkout --track -b #{args[0]} origin/#{args[0]}`
     end
   end

data/lib/git_reflow/config.rb

@@ -0,0 +1,23 @@
+module GitReflow
+  module Config
+    extend self
+
+    def get(key)
+      if cached_key_value = instance_variable_get(:"@#{key.tr('.-', '_')}")
+        cached_key_value
+      else
+        new_value = GitReflow::Sandbox.run "git config --get #{key}", loud: false
+        instance_variable_set(:"@#{key.tr('.-', '_')}", new_value)
+      end
+    end
+
+    def set(key, value, options = { local: false })
+      value = value.strip
+      if options.delete(:local)
+        GitReflow::Sandbox.run "git config --replace-all #{key} \"#{value}\"", loud: false
+      else
+        GitReflow::Sandbox.run "git config --global --replace-all #{key} \"#{value}\"", loud: false
+      end
+    end
+  end
+end

data/lib/git_reflow/git_helpers.rb

@@ -0,0 +1,65 @@
+require 'git_reflow/config'
+require 'git_reflow/sandbox'
+
+module GitReflow
+  module GitHelpers
+    include Sandbox
+
+    def remote_user
+      return "" unless "#{GitReflow::Config.get('remote.origin.url')}".length > 0
+      GitReflow::Config.get('remote.origin.url')[/[\/:](\w|-|\.)+/i][1..-1]
+    end
+
+    def remote_repo_name
+      return "" unless "#{GitReflow::Config.get('remote.origin.url')}".length > 0
+      GitReflow::Config.get('remote.origin.url')[/\/(\w|-|\.)+$/i][1..-5]
+    end
+
+    def current_branch
+      run("git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'", loud: false).strip
+    end
+
+    def get_first_commit_message
+      run('git log --pretty=format:"%s" --no-merges -n 1', loud: false).strip
+    end
+
+    def push_current_branch
+      run_command_with_label "git push origin #{current_branch}"
+    end
+
+    def fetch_destination(destination_branch)
+      run_command_with_label "git fetch origin #{destination_branch}"
+    end
+
+    def update_destination(destination_branch)
+      origin_branch = current_branch
+      run_command_with_label "git checkout #{destination_branch}"
+      run_command_with_label "git pull origin #{destination_branch}"
+      run_command_with_label "git checkout #{origin_branch}"
+    end
+
+    def merge_feature_branch(feature_branch_name, options = {})
+      options[:destination_branch] ||= 'master'
+
+      message = "#{options[:message]}"
+
+      if "#{options[:pull_request_number]}".length > 0
+        message << "\nCloses ##{options[:pull_request_number]}\n"
+      end
+
+      if lgtm_authors = Array(options[:lgtm_authors]) and lgtm_authors.any?
+        message << "\nLGTM given by: @#{lgtm_authors.join(', @')}\n"
+      end
+
+      run_command_with_label "git checkout #{options[:destination_branch]}"
+      run_command_with_label "git merge --squash #{feature_branch_name}"
+
+      append_to_squashed_commit_message(message) if message.length > 0
+    end
+
+    def append_to_squashed_commit_message(message = '')
+      run "echo \"#{message}\" | cat - .git/SQUASH_MSG > ./tmp_squash_msg"
+      run 'mv ./tmp_squash_msg .git/SQUASH_MSG'
+    end
+  end
+end

data/lib/git_reflow/git_server/base.rb

@@ -0,0 +1,88 @@
+require 'git_reflow/config'
+
+module GitReflow
+  class GitServer::Base
+    @@connection       = nil
+    @@project_only     = false
+
+    def initialize(options)
+      @@project_only = !!options.delete(:project_only)
+
+      site_url     = self.class.site_url
+      api_endpoint = self.class.api_endpoint
+
+      self.class.site_url     = site_url
+      self.class.api_endpoint = api_endpoint
+
+      authenticate
+    end
+
+    def authenticate
+      raise "#{self.class.to_s}#authenticate method must be implemented"
+    end
+
+    def find_pull_request(options)
+      raise "#{self.class.to_s}#find_pull_request(options) method must be implemented"
+    end
+
+    def self.connection
+      raise "#{self.class.to_s}.connection method must be implemented"
+    end
+
+    def self.user
+      raise "#{self.class.to_s}.user method must be implemented"
+    end
+
+    def self.oauth_token
+      raise "#{self.class.to_s}.oauth_token method must be implemented"
+    end
+
+    def self.oauth_token=(oauth_token)
+      raise "#{self.class.to_s}.oauth_token= method must be implemented"
+    end
+
+    def self.api_endpoint
+      raise "#{self.class.to_s}.api_endpoint method must be implemented"
+    end
+
+    def self.api_endpoint=(api_endpoint, options = {local: false})
+      raise "#{self.class.to_s}.api_endpoint= method must be implemented"
+    end
+
+    def self.site_url
+      raise "#{self.class.to_s}.site_url method must be implemented"
+    end
+
+    def self.site_url=(site_url, options = {local: false})
+      raise "#{self.class.to_s}.site_url= method must be implemented"
+    end
+
+    def connection
+      @connection ||= self.class.connection
+    end
+
+    def pull_request_comments(pull_request)
+      raise "#{self.class.to_s}#pull_request_comments(pull_request) method must be implemented"
+    end
+
+    def has_pull_request_comments?(pull_request)
+      pull_request_comments(pull_request).count > 0
+    end
+
+    def get_build_status sha
+      raise "#{self.class.to_s}#get_build_status(sha) method must be implemented"
+    end
+
+    def colorized_build_description status
+      raise "#{self.class.to_s}#colorized_build_description(status) method must be implemented"
+    end
+
+    def find_authors_of_open_pull_request_comments(pull_request)
+      raise "#{self.class.to_s}#find_authors_of_open_pull_request_comments(pull_request) method must be implemented"
+    end
+
+    def get_commited_time(commit_sha)
+      raise "#{self.class.to_s}#get_commited_time(commit_sha) method must be implemented"
+    end
+  end
+end

data/lib/git_reflow/git_server/git_hub.rb

@@ -0,0 +1,184 @@
+require 'github_api'
+require 'git_reflow/git_helpers'
+
+module GitReflow
+  module GitServer
+    class GitHub < Base
+      include GitHelpers
+
+      attr_accessor :connection
+
+      @@project_only     = false
+      @@using_enterprise = false
+
+      def initialize(config_options = {})
+        @@project_only     = !!config_options.delete(:project_only)
+        @@using_enterprise = !!config_options.delete(:enterprise)
+
+        gh_site_url     = self.class.site_url
+        gh_api_endpoint = self.class.api_endpoint
+        
+        if @@using_enterprise
+          gh_site_url     = ask("Please enter your Enterprise site URL (e.g. https://github.company.com):")
+          gh_api_endpoint = ask("Please enter your Enterprise API endpoint (e.g. https://github.company.com/api/v3):")
+        end
+
+        self.class.site_url     = gh_site_url
+        self.class.api_endpoint = gh_api_endpoint
+
+        if @@project_only
+          GitReflow::Config.set('reflow.git-server', 'GitHub', local: true)
+        else
+          GitReflow::Config.set('reflow.git-server', 'GitHub')
+        end
+      end
+
+      def authenticate(options = {silent: false})
+        if connection
+          unless options[:silent]
+            puts "Your GitHub account was already setup with: "
+            puts "\tUser Name: #{self.class.user}"
+            puts "\tEndpoint: #{self.class.api_endpoint}"
+          end
+        else
+          begin
+            gh_user     = ask("Please enter your GitHub username: ")
+            gh_password = ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
+
+            @connection = ::Github.new do |config|
+              config.basic_auth = "#{gh_user}:#{gh_password}"
+              config.endpoint   = GitServer::GitHub.api_endpoint
+              config.site       = GitServer::GitHub.site_url
+              config.adapter    = :net_http
+              config.ssl        = {:verify => false}
+            end
+
+            previous_authorizations = @connection.oauth.all.select {|auth| auth.note == "git-reflow (#{run('hostname', loud: false).strip})" }
+            if previous_authorizations.any?
+              authorization = previous_authorizations.last
+            else
+              authorization = @connection.oauth.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
+            end
+
+            oauth_token   = authorization.token
+
+            self.class.oauth_token = oauth_token
+            puts "\nYour GitHub account was successfully setup!"
+
+          rescue StandardError => e
+            puts "\nInvalid username or password: #{e.inspect}"
+          else
+            puts "\nYour GitHub account was successfully setup!"
+          end
+        end
+
+        @connection
+      end
+
+      def create_pull_request(options = {})
+        pull_request = connection.pull_requests.create(remote_user, remote_repo_name,
+                                                       title: options[:title],
+                                                       body:  options[:body],
+                                                       head:  "#{remote_user}:#{current_branch}",
+                                                       base:  options[:base])
+      end
+
+      def find_pull_request(options = {})
+        connection.pull_requests.all(remote_user, remote_repo_name, base: options[:to], head: "#{remote_user}:#{options[:from]}", :state => 'open').first
+      end
+
+      def self.connection
+        if self.oauth_token.length > 0
+          @connection ||= ::Github.new do |config|
+            config.oauth_token = GitServer::GitHub.oauth_token
+            config.endpoint    = GitServer::GitHub.api_endpoint
+            config.site        = GitServer::GitHub.site_url
+          end
+        end
+      end
+
+      def self.user
+        GitReflow::Config.get('github.user')
+      end
+
+      def self.oauth_token
+        GitReflow::Config.get('github.oauth-token')
+      end
+
+      def self.oauth_token=(oauth_token, options = {})
+        GitReflow::Config.set('github.oauth-token', oauth_token, local: @@project_only)
+        oauth_token
+      end
+
+      def self.api_endpoint
+        endpoint         = GitReflow::Config.get('github.endpoint')
+        (endpoint.length > 0) ? endpoint : ::Github::Configuration.new.endpoint
+      end
+
+      def self.api_endpoint=(api_endpoint)
+        GitReflow::Config.set("github.endpoint", api_endpoint, local: @@project_only)
+        api_endpoint
+      end
+
+      def self.site_url
+        site_url     = GitReflow::Config.get('github.site')
+        (site_url.length > 0) ? site_url : ::Github::Configuration.new.site
+      end
+
+      def self.site_url=(site_url)
+        GitReflow::Config.set("github.site", site_url, local: @@project_only)
+        site_url
+      end
+
+      def connection
+        @connection ||= self.class.connection
+      end
+
+      def pull_request_comments(pull_request)
+        comments        = connection.issues.comments.all        remote_user, remote_repo_name, number: pull_request.number
+        review_comments = connection.pull_requests.comments.all remote_user, remote_repo_name, number: pull_request.number
+
+        review_comments.to_a + comments.to_a
+      end
+
+      def get_build_status sha
+        connection.repos.statuses.all(remote_user, remote_repo_name, sha).first
+      end
+
+      def colorized_build_description status
+        colorized_statuses = { pending: :yellow, success: :green, error: :red, failure: :red }
+        status.description.colorize( colorized_statuses[status.state.to_sym] )
+      end
+
+      def find_authors_of_open_pull_request_comments(pull_request)
+        # first we'll gather all the authors that have commented on the pull request
+        pull_last_committed_at = get_commited_time(pull_request.head.sha)
+        comment_authors        = comment_authors_for_pull_request(pull_request)
+        lgtm_authors           = comment_authors_for_pull_request(pull_request, :with => LGTM, :after => pull_last_committed_at)
+
+        comment_authors - lgtm_authors
+      end
+
+      def comment_authors_for_pull_request(pull_request, options = {})
+        all_comments    = pull_request_comments(pull_request)
+        comment_authors = []
+
+        all_comments.each do |comment|
+          next if options[:after] and Time.parse(comment.created_at) < options[:after]
+          if (options[:with].nil? or comment[:body] =~ options[:with])
+            comment_authors |= [comment.user.login]
+          end
+        end
+
+        # remove the current user from the list to check
+        comment_authors -= [self.class.user]
+      end
+
+      def get_commited_time(commit_sha)
+        last_commit = connection.repos.commits.find remote_user, remote_repo_name, commit_sha
+        Time.parse last_commit.commit.author[:date]
+      end
+
+    end
+  end
+end

data/lib/git_reflow/git_server.rb

@@ -0,0 +1,52 @@
+module GitReflow
+  module GitServer
+    autoload :Base,   'git_reflow/git_server/base'
+    autoload :GitHub, 'git_reflow/git_server/git_hub'
+
+    extend self
+
+    class ConnectionError < StandardError; end
+
+    def connect(options = nil)
+      options ||= { provider: 'GitHub' }
+      begin
+        provider_name = options[:provider]
+        provider = provider_class_for(options.delete(:provider)).new(options)
+        provider.authenticate(options.keep_if {|key, value| key == :silent })
+        provider
+      rescue ConnectionError => e
+        puts "Error connecting to #{provider_name}: #{e.message}"
+      end
+    end
+
+    def connection
+      return nil unless current_provider
+      current_provider.connection
+    end
+
+    def current_provider
+      if (provider = GitReflow::Config.get('reflow.git-server')) and provider.length > 0
+        begin
+          provider_class_for(provider)
+        rescue ConnectionError => e
+          puts e.message
+          nil
+        end
+      else
+        puts "[notice] Reflow hasn't been setup yet.  Run 'git reflow setup' to continue"
+        nil
+      end
+    end
+
+    def can_connect_to?(provider)
+      GitReflow::GitServer.const_defined?(provider)
+    end
+
+    private
+
+    def provider_class_for(provider)
+      raise ConnectionError, "GitServer not setup for \"#{provider}\"" unless self.can_connect_to?(provider)
+      GitReflow::GitServer.const_get(provider)
+    end
+  end
+end

data/lib/git_reflow/sandbox.rb

@@ -0,0 +1,39 @@
+module GitReflow
+  module Sandbox
+    extend self
+
+    def run(command, options = {})
+      options = { loud: true }.merge(options)
+
+      if options[:with_system] == true
+        system(command)
+      elsif options[:loud] == true
+        puts `#{command}`
+      else
+        `#{command}`
+      end
+    end
+
+    def run_command_with_label(command, options = {})
+      label_color = options.delete(:color) || :green
+      puts command.colorize(label_color)
+      run(command, options)
+    end
+
+    # WARNING: this currently only supports OS X and UBUNTU
+    def ask_to_open_in_browser(url)
+      if RUBY_PLATFORM =~ /darwin|linux/i
+        open_in_browser = ask "Would you like to open it in your browser? "
+        if open_in_browser =~ /^y/i
+          if RUBY_PLATFORM =~ /darwin/i
+            # OS X
+            run "open #{url}"
+          else
+            # Ubuntu
+            run "xdg-open #{url}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end