rubocop_challenger 2.0.0.pre → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88964a115a552a48b7462b24e329661fe2254f14e83a0effb9ce3cdf088d3abb
-  data.tar.gz: 81dbae9e07d6c9b51bea98db1f14196431563420b7c22a61a4e98b3b10559647
+  metadata.gz: 7a16dd2ba41bc75373d730d5b92bd0e908a26a9ac8ec5e6ec3732d122f3ca946
+  data.tar.gz: ee5feeabc11854d8f5d214dadf4a476dcfd531618f073eca548ce706c82ec215
 SHA512:
-  metadata.gz: 4ba31abab9fc1f3a6446db04e6e05490896be15e6916682deb8dcf49d784c021e4e7fd72fb96f17e8f0b004a4baaf1884308e75670ebab38c2115461c17b7686
-  data.tar.gz: 20bc09b991dda4c2cb7c2868527673409baff908c4712afb505152b78dc46fb8227bde6a65814217d8b0075a24cfc0be31a836dc7987e48d7979164d5be3250f
+  metadata.gz: 33269aaa091dd13c2e7a81a57d89930d16238c494ca07a6307290c125ae57ba160fafcb6abcd84f717231e23ed031d99324570fc245e6360c78b402a9b75b457
+  data.tar.gz: d274632af2fa2cc0a9dd9f30527b0e19073d97e06c02d2701a95d8426ebab782d79efd963f8c794aa10ddc828eb5f728cb018e4957a955598a43ef6c1eb23dc3

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-03-31 02:56:49 +0900 using RuboCop version 0.66.0.
+# on 2019-04-09 22:04:02 +0900 using RuboCop version 0.67.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rubocop_challenger (2.0.0.pre)
-      octokit
+    rubocop_challenger (2.0.0.pre2)
+      pr_comet
       rubocop
       rubocop-rspec
       thor
@@ -26,9 +26,11 @@ GEM
     multipart-post (2.0.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.16.2)
-    parser (2.6.2.0)
+    parallel (1.17.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
+    pr_comet (0.1.1)
+      octokit
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -54,7 +56,7 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.66.0)
+    rubocop (0.67.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -75,7 +77,7 @@ GEM
     simplecov-html (0.10.2)
     thor (0.20.3)
     unicode-display_width (1.5.0)
-    yard (0.9.18)
+    yard (0.9.19)
 
 PLATFORMS
   ruby
@@ -90,4 +92,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/bin/{create_release_pr → release}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# usage: bin/create_release_pr VERSION
+# usage: bin/release VERSION
 
 require 'bundler/setup'
 require 'rubocop_challenger'
@@ -9,17 +9,14 @@ require 'rubocop_challenger'
 VERSION_FORMAT = /\A\d+\.\d+\.\d+(\.(pre|beta|rc)\d?)?\z/.freeze
 version = ARGV[0]
 rubocop = RubocopChallenger::Rubocop::Command.new
-pr_creater =
-  RubocopChallenger::Github::PrCreater.new(
-    base: 'master', branch: "update/v#{version}"
-  )
+pr_comet = PrComet.new(base: 'master', branch: "update/v#{version}")
 
 # Verifying
-abort 'usage: bin/create_release_pr VERSION' if version.nil?
+abort 'usage: bin/release VERSION' if version.nil?
 abort 'A version must be like a `1.2.3`' unless version =~ VERSION_FORMAT
 
 # Modify a version file
-pr_creater.commit 'Update version' do
+pr_comet.commit 'Update version' do
   File.write('lib/rubocop_challenger/version.rb', <<~VERSION)
     # frozen_string_literal: true
 
@@ -30,14 +27,14 @@ pr_creater.commit 'Update version' do
 end
 
 # Bundle Update
-pr_creater.commit 'Run $ bundle update' do
+pr_comet.commit 'Run $ bundle update' do
   `bundle update`
 end
 
 # Regenerate .rubocop_todo.yml
-pr_creater.commit 'Regenerate .rubocop_todo.yml' do
+pr_comet.commit 'Regenerate .rubocop_todo.yml' do
   rubocop.auto_gen_config
 end
 
-# Create PR
-pr_creater.create_pr(title: "Update v#{version}", body: '')
+# Create a pull request
+pr_comet.create!(title: "Update v#{version}", body: '')

data/challenger.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'octokit'
+  spec.add_runtime_dependency 'pr_comet'
   spec.add_runtime_dependency 'rubocop'
   spec.add_runtime_dependency 'rubocop-rspec'
   spec.add_runtime_dependency 'thor'

data/lib/rubocop_challenger/bundler/command.rb

@@ -4,7 +4,7 @@ module RubocopChallenger
   module Bundler
     # To execute bundler command
     class Command
-      include CommandLine
+      include PrComet::CommandLine
 
       def update(*gem_names)
         run('update', *gem_names)

data/lib/rubocop_challenger/cli.rb

@@ -5,7 +5,7 @@ require 'thor'
 module RubocopChallenger
   # To define CLI commands
   class CLI < Thor
-    include CommandLine
+    include PrComet::CommandLine
 
     desc 'go', 'Run `$ rubocop --auto-correct` and create a PR to GitHub repo'
     option :email,
@@ -44,9 +44,9 @@ module RubocopChallenger
     def go
       Go.new(options).exec
     rescue Errors::NoAutoCorrectableRule => e
-      color_puts e.message, CommandLine::YELLOW
+      color_puts e.message, PrComet::CommandLine::YELLOW
     rescue StandardError => e
-      color_puts e.message, CommandLine::RED
+      color_puts e.message, PrComet::CommandLine::RED
       exit_process!
     end
 

data/lib/rubocop_challenger/errors.rb

@@ -2,8 +2,6 @@
 
 module RubocopChallenger
   module Errors
-    class ExistUncommittedModify < StandardError; end
-
     # Raise if no auto-correctable rule in the `.rubocop_todo.yml`.
     class NoAutoCorrectableRule < StandardError
       def initialize

data/lib/rubocop_challenger/go.rb

@@ -3,7 +3,7 @@
 module RubocopChallenger
   # Executes Rubocop Challenge flow
   class Go
-    include CommandLine
+    include PrComet::CommandLine
 
     # @param options [Hash] describe_options_here
     def initialize(options)
@@ -126,7 +126,8 @@ module RubocopChallenger
         config_editor.add_ignore(rule)
         config_editor.save
       end
-      color_puts DESCRIPTION_THAT_CHALLENGE_IS_INCOMPLETE, CommandLine::YELLOW
+      color_puts DESCRIPTION_THAT_CHALLENGE_IS_INCOMPLETE,
+                 PrComet::CommandLine::YELLOW
     end
 
     # Checks the challenge result. If the challenge is successed, the rule

data/lib/rubocop_challenger/pull_request.rb

@@ -12,7 +12,7 @@ module RubocopChallenger
     # @param dry_run [Boolean]
     #   Does not create a pull request when given `true`
     def initialize(user_name, user_email, labels, dry_run = false)
-      @pr_creater = Github::PrCreater.new(
+      @pr_comet = PrComet.new(
         base: 'master',
         branch: "rubocop-challenge/#{timestamp}",
         user_name: user_name,
@@ -28,7 +28,7 @@ module RubocopChallenger
     # @yield Some commands where modify local files
     # @return [Object] Return result of yield if you use &block
     def commit!(message, &block)
-      pr_creater.commit message, &block
+      pr_comet.commit message, &block
     end
 
     # Creates a pull request for the Rubocop Challenge
@@ -68,11 +68,11 @@ module RubocopChallenger
 
     private
 
-    attr_reader :pr_creater, :labels, :dry_run
+    attr_reader :pr_comet, :labels, :dry_run
 
     # Create a PR with description of what modification were made.
-    def create_pull_request!(pr_creater_options)
-      pr_creater.create_pr(pr_creater_options) unless dry_run
+    def create_pull_request!(pr_comet_options)
+      pr_comet.create!(pr_comet_options) unless dry_run
     end
 
     def generate_pull_request_body(before_version, after_version)

data/lib/rubocop_challenger/rubocop/command.rb

@@ -4,7 +4,7 @@ module RubocopChallenger
   module Rubocop
     # To execute rubocop gem command (Mainly for mock when testing)
     class Command
-      include CommandLine
+      include PrComet::CommandLine
 
       def auto_correct
         run('--auto-correct')

data/lib/rubocop_challenger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubocopChallenger
-  VERSION = '2.0.0.pre'
+  VERSION = '2.0.0.pre2'
 end

data/lib/rubocop_challenger.rb

@@ -2,12 +2,11 @@
 
 require 'erb'
 require 'yard'
-require 'octokit'
+require 'pr_comet'
 require 'rubocop'
 require 'rubocop-rspec'
 require 'rubocop_challenger/errors'
 require 'rubocop_challenger/version'
-require 'rubocop_challenger/command_line'
 require 'rubocop_challenger/rubocop/rule'
 require 'rubocop_challenger/rubocop/config_editor'
 require 'rubocop_challenger/rubocop/todo_reader'
@@ -19,7 +18,4 @@ require 'rubocop_challenger/pull_request'
 require 'rubocop_challenger/go'
 require 'rubocop_challenger/cli'
 require 'rubocop_challenger/bundler/command'
-require 'rubocop_challenger/git/command'
-require 'rubocop_challenger/github/client'
 require 'rubocop_challenger/github/pr_template'
-require 'rubocop_challenger/github/pr_creater'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_challenger
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - ryosuke_sato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: pr_comet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,8 +185,8 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/create_release_pr
 - bin/jailbreak
+- bin/release
 - bin/setup
 - challenger.gemspec
 - exe/rubocop_challenger
@@ -196,11 +196,7 @@ files:
 - lib/rubocop_challenger.rb
 - lib/rubocop_challenger/bundler/command.rb
 - lib/rubocop_challenger/cli.rb
-- lib/rubocop_challenger/command_line.rb
 - lib/rubocop_challenger/errors.rb
-- lib/rubocop_challenger/git/command.rb
-- lib/rubocop_challenger/github/client.rb
-- lib/rubocop_challenger/github/pr_creater.rb
 - lib/rubocop_challenger/github/pr_template.rb
 - lib/rubocop_challenger/go.rb
 - lib/rubocop_challenger/pull_request.rb

data/lib/rubocop_challenger/command_line.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module RubocopChallenger
-  # To execute command line. You should inherit this class to use.
-  module CommandLine
-    private
-
-    # Execute a command
-    #
-    # @param command [String] The command you want to execute
-    # @return [String] The result in the execution
-    def execute(command)
-      puts "$ #{command}"
-      `#{command}`.chomp.tap do |result|
-        color_code = $CHILD_STATUS.success? ? GREEN : RED
-        color_puts(result, color_code)
-      end
-    end
-
-    RED = 31
-    GREEN = 32
-    YELLOW = 33
-    BLUE = 34
-    PING = 35
-
-    def color_puts(string, color_code)
-      puts "\e[#{color_code}m#{string}\e[0m"
-    end
-  end
-end

data/lib/rubocop_challenger/git/command.rb

@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-module RubocopChallenger
-  module Git
-    # To execute git command
-    class Command
-      include CommandLine
-
-      def initialize(user_name: nil, user_email: nil)
-        @user_name = user_name
-        @user_email = user_email
-      end
-
-      def user_name
-        @user_name ||= config('user.name')
-      end
-
-      def user_email
-        @user_email ||= config('user.email')
-      end
-
-      def exist_uncommitted_modify?
-        execute('git add -n .; git diff --name-only') != ''
-      end
-
-      def checkout(branch)
-        run('checkout', branch)
-      end
-
-      def checkout_with(new_branch)
-        run('checkout', '-b', new_branch)
-      end
-
-      def add(*files)
-        run('add', *files)
-      end
-
-      def commit(message)
-        run_with_environments('commit', '-m', "\"#{message}\"")
-      end
-
-      # Execute git push command
-      #
-      # @note For security, this command add a quiet option automatically.
-      # @param remote [String] The remote repository name.
-      # @param branch [String] The target branch. default: `#current_branch`
-      # @return [String] The command's standard output.
-      def push(remote, branch = current_branch)
-        run('push', '-q', remote, branch)
-      end
-
-      def current_sha1
-        run('rev-parse', 'HEAD')
-      end
-
-      def current_sha1?(sha1)
-        current_sha1 == sha1.to_s
-      end
-
-      def current_branch
-        run('rev-parse', '--abbrev-ref', 'HEAD')
-      end
-
-      def current_branch?(branch)
-        current_branch == branch.to_s
-      end
-
-      def remote_url(remote)
-        config("--get remote.#{remote}.url")
-      end
-
-      private
-
-      def run(*subcommands)
-        command = "git #{subcommands.join(' ')}"
-        execute(command)
-      end
-
-      def run_with_environments(*subcommands)
-        command = "#{environments} git #{subcommands.join(' ')}"
-        execute(command)
-      end
-
-      def config(key)
-        run('config', key)
-      end
-
-      def environments
-        @environments ||= [
-          "GIT_AUTHOR_NAME=\"#{user_name}\"",
-          "GIT_AUTHOR_EMAIL=\"#{user_email}\"",
-          "GIT_COMMITTER_NAME=\"#{user_name}\"",
-          "GIT_COMMITTER_EMAIL=\"#{user_email}\""
-        ].join(' ')
-      end
-    end
-  end
-end

data/lib/rubocop_challenger/github/client.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module RubocopChallenger
-  module Github
-    # GitHub API Client
-    class Client
-      attr_reader :repository
-
-      def initialize(access_token, remote_url)
-        @client = Octokit::Client.new(access_token: access_token)
-        @repository = remote_url.match(REPOSITORY_MATCHER)[:repository]
-      end
-
-      # Create a pull request
-      #
-      # @param base [String] The branch you want your changes pulled into
-      # @param head [String] The branch where your changes are implemented
-      # @param title [String] Title for the pull request
-      # @param body [String] The body for the pull request
-      # @return [Integer] Created pull request number
-      def create_pull_request(base:, head:, title:, body:)
-        response =
-          client.create_pull_request(repository, base, head, title, body)
-        response.number
-      end
-
-      # Description of #add_labels
-      #
-      # @param issue_number [Integer] Number ID of the issue (or pull request)
-      # @param labels [Array<String>] An array of labels to apply to this Issue
-      def add_labels(issue_number, *labels)
-        client.add_labels_to_an_issue(repository, issue_number, labels)
-      end
-
-      private
-
-      REPOSITORY_MATCHER = %r{github\.com[:/](?<repository>.+)\.git}.freeze
-
-      attr_reader :client
-    end
-  end
-end

data/lib/rubocop_challenger/github/pr_creater.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-module RubocopChallenger
-  module Github
-    # To create Pull Request
-    class PrCreater
-      # Returns a new instance of Github::PrCreater
-      #
-      # @note You have to set ENV['GITHUB_ACCESS_TOKEN']
-      # @param base [String] The branch you want your changes pulled into
-      # @param branch [String] The branch where your changes are going to
-      #                        implement.
-      # @param user_name [String] The username to use for committer and author
-      # @param user_email [String] The email to use for committer and author
-      def initialize(base:, branch:, user_name: nil, user_email: nil)
-        raise "You have to set ENV['GITHUB_ACCESS_TOKEN']" if access_token.nil?
-
-        @base_branch = base
-        @topic_branch = branch
-        @git = Git::Command.new(user_name: user_name, user_email: user_email)
-        @github = Github::Client.new(access_token, git.remote_url('origin'))
-        @initial_sha1 = git.current_sha1
-      end
-
-      # Add and commit local files to this branch
-      #
-      # @param message [String] The commit message
-      # @yield Some commands where modify local files
-      # @return [Object] Return result of yield if you use &block
-      # @raise [RubocopChallenger::Errors::ExistUncommittedModify]
-      #        Raise error if you use &block and exists someuncommitted files
-      def commit(message, &block)
-        git.checkout_with(topic_branch) unless git.current_branch?(topic_branch)
-        result = modify_files(&block) if block_given?
-        git.add('.')
-        git.commit(message)
-        result
-      end
-
-      # Create a pull request
-      # You should call #commit before calling this method
-      #
-      # @param title [String] Title for the pull request
-      # @param body [String] The body for the pull request
-      # @param labels [Array<String>] An array of labels to apply to this PR
-      # @return [Boolean] Return true if its successed
-      def create_pr(title:, body:, labels: nil)
-        return false unless git_condition_valid?
-
-        git.push(github_token_url, topic_branch)
-        pr_number = github.create_pull_request(
-          base: base_branch, head: topic_branch, title: title, body: body
-        )
-        github.add_labels(pr_number, *labels) unless labels.nil?
-        true
-      end
-
-      private
-
-      attr_reader :git, :github, :base_branch, :topic_branch, :initial_sha1
-
-      def git_condition_valid?
-        !git.current_sha1?(initial_sha1) && git.current_branch?(topic_branch)
-      end
-
-      def modify_files
-        raise Errors::ExistUncommittedModify if git.exist_uncommitted_modify?
-
-        yield
-      end
-
-      def access_token
-        ENV['GITHUB_ACCESS_TOKEN']
-      end
-
-      # @note You *MUST NOT* use `#access_token` in the URL because this string
-      #       will be output STDOUT via `RubocopChallenger::CommandLine` module.
-      def github_token_url
-        "https://${GITHUB_ACCESS_TOKEN}@github.com/#{github.repository}"
-      end
-    end
-  end
-end