livebuzz-gitx 0.1.1 → 0.1.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livebuzz-gitx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
-- LiveBuzz, forked from code by Ryan Sonnek
+- LiveBuzz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -229,8 +201,6 @@ executables:
 - git-integrate
 - git-nuke
 - git-release
-- git-review
-- git-reviewrequest
 - git-share
 - git-start
 - git-track
@@ -245,7 +215,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Guardfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/git-buildtag
@@ -253,8 +223,6 @@ files:
 - bin/git-integrate
 - bin/git-nuke
 - bin/git-release
-- bin/git-review
-- bin/git-reviewrequest
 - bin/git-share
 - bin/git-start
 - bin/git-track
@@ -266,7 +234,6 @@ files:
 - lib/livebuzz/gitx/cli/integrate_command.rb
 - lib/livebuzz/gitx/cli/nuke_command.rb
 - lib/livebuzz/gitx/cli/release_command.rb
-- lib/livebuzz/gitx/cli/review_command.rb
 - lib/livebuzz/gitx/cli/share_command.rb
 - lib/livebuzz/gitx/cli/start_command.rb
 - lib/livebuzz/gitx/cli/track_command.rb
@@ -274,19 +241,14 @@ files:
 - lib/livebuzz/gitx/configuration.rb
 - lib/livebuzz/gitx/extensions/string.rb
 - lib/livebuzz/gitx/extensions/thor.rb
-- lib/livebuzz/gitx/github.rb
 - lib/livebuzz/gitx/version.rb
 - livebuzz-gitx.gemspec
-- spec/fixtures/vcr_cassettes/pull_request_does_exist_with_failure_status.yml
-- spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status.yml
-- spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml
 - spec/livebuzz/gitx/cli/base_command_spec.rb
 - spec/livebuzz/gitx/cli/buildtag_command_spec.rb
 - spec/livebuzz/gitx/cli/cleanup_command_spec.rb
 - spec/livebuzz/gitx/cli/integrate_command_spec.rb
 - spec/livebuzz/gitx/cli/nuke_command_spec.rb
 - spec/livebuzz/gitx/cli/release_command_spec.rb
-- spec/livebuzz/gitx/cli/review_command_spec.rb
 - spec/livebuzz/gitx/cli/share_command_spec.rb
 - spec/livebuzz/gitx/cli/start_command_spec.rb
 - spec/livebuzz/gitx/cli/track_command_spec.rb
@@ -298,7 +260,6 @@ files:
 - spec/support/pry.rb
 - spec/support/stub_execution.rb
 - spec/support/timecop.rb
-- spec/support/vcr.rb
 - spec/support/webmock.rb
 homepage: ''
 licenses:
@@ -325,16 +286,12 @@ signing_key:
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations
 test_files:
-- spec/fixtures/vcr_cassettes/pull_request_does_exist_with_failure_status.yml
-- spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status.yml
-- spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml
 - spec/livebuzz/gitx/cli/base_command_spec.rb
 - spec/livebuzz/gitx/cli/buildtag_command_spec.rb
 - spec/livebuzz/gitx/cli/cleanup_command_spec.rb
 - spec/livebuzz/gitx/cli/integrate_command_spec.rb
 - spec/livebuzz/gitx/cli/nuke_command_spec.rb
 - spec/livebuzz/gitx/cli/release_command_spec.rb
-- spec/livebuzz/gitx/cli/review_command_spec.rb
 - spec/livebuzz/gitx/cli/share_command_spec.rb
 - spec/livebuzz/gitx/cli/start_command_spec.rb
 - spec/livebuzz/gitx/cli/track_command_spec.rb
@@ -346,5 +303,4 @@ test_files:
 - spec/support/pry.rb
 - spec/support/stub_execution.rb
 - spec/support/timecop.rb
-- spec/support/vcr.rb
 - spec/support/webmock.rb

data/bin/git-review

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'livebuzz/gitx/cli/review_command'
-args = ARGV.dup.unshift('review')
-LiveBuzz::Gitx::Cli::ReviewCommand.start(args)

data/bin/git-reviewrequest

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-puts 'WARNING: git reviewrequest has been deprecated.  use `git review` instead'
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'livebuzz/gitx/cli/review_command'
-args = ARGV.dup.unshift('review')
-LiveBuzz::Gitx::Cli::ReviewCommand.start(args)

data/lib/livebuzz/gitx/cli/review_command.rb

@@ -1,101 +0,0 @@
-require 'thor'
-require 'livebuzz/gitx'
-require 'livebuzz/gitx/cli/base_command'
-require 'livebuzz/gitx/cli/update_command'
-require 'livebuzz/gitx/github'
-
-module LiveBuzz
-  module Gitx
-    module Cli
-      class ReviewCommand < BaseCommand
-        include LiveBuzz::Gitx::Github
-
-        BUMP_COMMENT_PREFIX = '[gitx] review bump :tada:'
-        BUMP_COMMENT_FOOTER = <<-EOS.dedent
-          # Bump comments should include:
-          # * summary of what changed
-          #
-          # This footer will automatically be stripped from the created comment
-        EOS
-        APPROVAL_COMMENT_PREFIX  = '[gitx] review approved :shipit:'
-        APPROVAL_COMMENT_FOOTER = <<-EOS.dedent
-          # Approval comments can include:
-          # * feedback
-          # * post-release follow-up items
-          #
-          # This footer will automatically be stripped from the created comment
-        EOS
-        REJECTION_COMMENT_PREFIX = '[gitx] review rejected'
-        REJECTION_COMMENT_FOOTER = <<-EOS.dedent
-          # Rejection comments should include:
-          # * feedback for fixes required before approved
-          #
-          # This footer will automatically be stripped from the created comment
-        EOS
-
-        desc "review", "Create or update a pull request on github"
-        method_option :description, :type => :string, :aliases => '-d', :desc => 'pull request description'
-        method_option :assignee, :type => :string, :aliases => '-a', :desc => 'pull request assignee'
-        method_option :open, :type => :boolean, :aliases => '-o', :desc => 'open the pull request in a web browser'
-        method_option :bump, :type => :boolean, :aliases => '-b', :desc => 'bump an existing pull request by posting a comment to re-review new changes'
-        method_option :approve, :type => :boolean, :desc => 'approve the pull request an post comment on pull request'
-        method_option :reject, :type => :boolean, :desc => 'reject the pull request an post comment on pull request'
-        # @see http://developer.github.com/v3/pulls/
-        def review
-          fail 'Github authorization token not found' unless authorization_token
-
-          branch = current_branch.name
-          pull_request = find_or_create_pull_request(branch)
-          bump_pull_request(pull_request) if options[:bump]
-          approve_pull_request(pull_request) if options[:approve]
-          reject_pull_request(pull_request) if options[:reject]
-          assign_pull_request(pull_request) if options[:assignee]
-
-          run_cmd "open #{pull_request.html_url}" if options[:open]
-        end
-
-        private
-
-        def assign_pull_request(pull_request)
-          assignee = options[:assignee]
-          say "Assigning pull request to "
-          say assignee, :green
-
-          title = pull_request.title
-          body = pull_request.body
-          options = {
-            assignee: assignee
-          }
-          github_client.update_issue(github_slug, pull_request.number, title, body, options)
-        end
-
-        def bump_pull_request(pull_request)
-          comment = comment_from_template(pull_request, BUMP_COMMENT_PREFIX, BUMP_COMMENT_FOOTER)
-          set_review_status('pending', 'Peer review in progress')
-        end
-
-        def reject_pull_request(pull_request)
-          comment = comment_from_template(pull_request, REJECTION_COMMENT_PREFIX, REJECTION_COMMENT_FOOTER)
-          set_review_status('failure', 'Peer review rejected')
-        end
-
-        def approve_pull_request(pull_request)
-          comment = comment_from_template(pull_request, APPROVAL_COMMENT_PREFIX, APPROVAL_COMMENT_FOOTER)
-          set_review_status('success', 'Peer review approved')
-        end
-
-        def comment_from_template(pull_request, prefix, footer)
-          text = ask_editor("\n\n#{footer}", repo.config['core.editor'])
-          comment = [prefix, text].join("\n\n")
-          comment = comment.gsub(footer, '').chomp.strip
-          github_client.add_comment(github_slug, pull_request.number, comment)
-        end
-
-        def set_review_status(state, description)
-          latest_commit = repo.head.target_id
-          update_review_status(latest_commit, state, description)
-        end
-      end
-    end
-  end
-end

data/lib/livebuzz/gitx/github.rb

@@ -1,177 +0,0 @@
-require 'octokit'
-require 'fileutils'
-require 'yaml'
-
-module LiveBuzz
-  module Gitx
-    module Github
-      GLOBAL_CONFIG_FILE = '~/.config/gitx/github.yml'
-      REVIEW_CONTEXT = 'peer_review'
-      CLIENT_URL = 'https://github.com/livebuzzevents/livebuzz-gitx'
-      PULL_REQUEST_FOOTER = <<-EOS.dedent
-        # Pull Request Protips(tm):
-        # * Include description of how this change accomplishes the task at hand.
-        # * Use GitHub flavored Markdown http://github.github.com/github-flavored-markdown/
-        # * Review CONTRIBUTING.md for recommendations of artifacts, links, images, screencasts, etc.
-        #
-        # This footer will automatically be stripped from the pull request description
-      EOS
-
-      def find_or_create_pull_request(branch)
-        pull_request = find_pull_request(branch)
-        pull_request ||= begin
-          execute_command(LiveBuzz::Gitx::Cli::UpdateCommand, :update)
-          pull_request = create_pull_request(branch)
-          say 'Created pull request: '
-          say pull_request.html_url, :green
-
-          pull_request
-        end
-        pull_request
-      end
-
-      # @return [Sawyer::Resource] data structure of pull request info if found
-      # @return nil if no pull request found
-      def find_pull_request(branch)
-        head_reference = "#{github_organization}:#{branch}"
-        params = {
-          head: head_reference,
-          state: 'open'
-        }
-        pull_requests = github_client.pull_requests(github_slug, params)
-        pull_requests.first
-      end
-
-      # Get the current commit status of a branch
-      # @see https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
-      def branch_status(branch)
-        response = github_client.status(github_slug, branch)
-        response.state
-      end
-
-      # Update build status with peer review status
-      def update_review_status(commit_sha, state, description)
-        github_client.create_status(github_slug, commit_sha, state, context: REVIEW_CONTEXT, description: description)
-      end
-
-      # @see http://developer.github.com/v3/pulls/
-      def create_pull_request(branch)
-        say "Creating pull request for "
-        say "#{branch} ", :green
-        say "against "
-        say "#{LiveBuzz::Gitx::BASE_BRANCH} ", :green
-        say "in "
-        say github_slug, :green
-
-        title = branch
-        body = pull_request_body(branch)
-        github_client.create_pull_request(github_slug, LiveBuzz::Gitx::BASE_BRANCH, branch, title, body)
-      end
-
-      def pull_request_body(branch)
-        changelog = run_cmd("git log #{LiveBuzz::Gitx::BASE_BRANCH}...#{branch} --reverse --no-merges --pretty=format:'* %s%n%b'")
-        description = options[:description]
-
-        description_template = []
-        description_template << "#{description}\n" if description
-        description_template << '### Changelog'
-        description_template << changelog
-        description_template << PULL_REQUEST_FOOTER
-
-        body = ask_editor(description_template.join("\n"), repo.config['core.editor'])
-        body.gsub(PULL_REQUEST_FOOTER, '').chomp.strip
-      end
-
-      # authorization token used for github API calls
-      # the token is cached on the filesystem for future use
-      # @return [String] auth token stored in git (current repo, user config or installed global settings)
-      # @see http://developer.github.com/v3/oauth/#scopes
-      # @see http://developer.github.com/v3/#user-agent-required
-      def authorization_token
-        auth_token = global_config['token']
-        auth_token ||= begin
-          new_token = create_authorization
-          save_global_config('token' => new_token)
-          new_token
-        end
-        auth_token
-      end
-
-      def create_authorization
-        password = ask_without_echo("Github password for #{username}: ")
-        client = Octokit::Client.new(login: username, password: password)
-        options = {
-          :scopes => ['repo'],
-          :note => github_client_name,
-          :note_url => CLIENT_URL
-        }
-        two_factor_auth_token = ask_without_echo("Github two factor authorization token (if enabled): ")
-        options[:headers] = {'X-GitHub-OTP' => two_factor_auth_token} if two_factor_auth_token
-        response = client.create_authorization(options)
-        response.token
-      rescue Octokit::ClientError => e
-        say "Error creating authorization: #{e.message}", :red
-        retry
-      end
-
-      def github_client_name
-        timestamp = Time.now.utc.strftime('%FT%R:%S%z')
-        client_name = "The Garage Git eXtensions #{timestamp}"
-      end
-
-      def github_client
-        @client ||= Octokit::Client.new(:access_token => authorization_token)
-      end
-
-      # @return [String] github username (ex: 'wireframe') of the current github.user
-      # @raise error if github.user is not configured
-      def username
-        username = repo.config['github.user']
-        fail "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" unless username
-        username
-      end
-
-      # @return the github slug for the current repository's remote origin url.
-      # @example
-      #   git@github.com:socialcast/livebuzz/gitx.git #=> livebuzz/gitx
-      # @example
-      #   https://github.com/socialcast/livebuzz/gitx.git #=> livebuzz/gitx
-      def github_slug
-        remote = repo.config['remote.origin.url']
-        remote.to_s.gsub(/\.git$/,'').split(/[:\/]/).last(2).join('/')
-      end
-
-      def github_organization
-        github_slug.split('/').first
-      end
-
-      def global_config_file
-        File.expand_path(GLOBAL_CONFIG_FILE)
-      end
-
-      def global_config
-        @config ||= begin
-          File.exists?(global_config_file) ? YAML.load_file(global_config_file) : {}
-        end
-      end
-
-      def save_global_config(options)
-        config_dir = File.dirname(global_config_file)
-        ::FileUtils.mkdir_p(config_dir, mode: 0700) unless File.exists?(config_dir)
-
-        @config = global_config.merge(options)
-        File.open(global_config_file, "a+") do |file|
-          file.truncate(0)
-          file.write(@config.to_yaml)
-        end
-        File.chmod(0600, global_config_file)
-      end
-
-      def ask_without_echo(message)
-        value = ask(message, echo: false)
-        say ''
-        value
-      end
-    end
-  end
-end

data/spec/fixtures/vcr_cassettes/pull_request_does_exist_with_failure_status.yml

@@ -1,135 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://api.github.com/repos/livebuzzevents/livebuzz-gitx/pulls?head=livebuzz:feature-branch&state=open
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - application/vnd.github.v3+json
-      User-Agent:
-      - Octokit Ruby Gem 3.4.0
-      Content-Type:
-      - application/json
-      Authorization:
-      - token 123123
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - GitHub.com
-      Date:
-      - Wed, 10 Dec 2014 19:14:11 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Status:
-      - 200 OK
-      X-Github-Media-Type:
-      - github.v3; format=json
-      X-Ratelimit-Limit:
-      - '60'
-      X-Ratelimit-Remaining:
-      - '58'
-      X-Ratelimit-Reset:
-      - '1418242282'
-      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:
-      - C6CBAFAF:141F:450BDAC:54889B83
-      Strict-Transport-Security:
-      - max-age=31536000; includeSubdomains; preload
-      X-Content-Type-Options:
-      - nosniff
-    body:
-      encoding: UTF-8
-      string: '[{"html_url":"https://path/to/html/pull/request","issue_url":"https://api/path/to/issue/url","number":10,"head":{"ref":"branch_name"}}]'
-    http_version:
-  recorded_at: Wed, 10 Dec 2014 19:14:11 GMT
-- request:
-    method: get
-    uri: https://api.github.com/repos/livebuzzevents/livebuzz-gitx/commits/feature-branch/status
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - application/vnd.github.v3+json
-      User-Agent:
-      - Octokit Ruby Gem 3.4.0
-      Content-Type:
-      - application/json
-      Authorization:
-      - token 123123
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - GitHub.com
-      Date:
-      - Wed, 10 Dec 2014 19:01:27 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Transfer-Encoding:
-      - chunked
-      Status:
-      - 200 OK
-      X-Ratelimit-Limit:
-      - '5000'
-      X-Ratelimit-Remaining:
-      - '4993'
-      X-Ratelimit-Reset:
-      - '1418241620'
-      X-Oauth-Scopes:
-      - repo
-      X-Accepted-Oauth-Scopes:
-      - repo, repo:status
-      X-Github-Media-Type:
-      - github.v3; format=json
-      X-Xss-Protection:
-      - 1; mode=block
-      X-Frame-Options:
-      - deny
-      Content-Security-Policy:
-      - default-src 'none'
-      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:
-      - C6CBAFAF:141D:2F27072:54889887
-      Strict-Transport-Security:
-      - max-age=31536000; includeSubdomains; preload
-      X-Content-Type-Options:
-      - nosniff
-    body:
-      encoding: UTF-8
-      string: '{"state":"failure"}'
-    http_version:
-  recorded_at: Wed, 10 Dec 2014 19:14:11 GMT
-recorded_with: VCR 2.9.2