rubocop_challenger 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9701abf6328e9334c2880ad0583f405c770b364a5b00d1e651e39d7518bbd1
-  data.tar.gz: ab3a7266b6e803a624d58994ac9261011de5d4580136ffe56124fe59483c3ca8
+  metadata.gz: 2b73e8abe85be6a6a8673f84a8d35b4cc664e012c471bfeea3beb8b45d74366d
+  data.tar.gz: ab2c10f577db034299059b197558a675a19e3d69bb497b6cc17be250134dce65
 SHA512:
-  metadata.gz: 6ad342a14f5a57cb096a701f4861937350af646b705038fcdb00d756bc09c25f3067daf73e0f2bca7ca94e4774eda19b67cf09b871930f4887b2cd11f2cb9493
-  data.tar.gz: 4da482b7bbcb9f87a6f867179230ffc382d6e535b1bda83940f0a703a902f8d7904ca1910d12624617447b022f3b045e396900137f5d7e174e5d06d2fd5df9af
+  metadata.gz: b60e84618d97800b225baf93de7a65d7ff9f94e8ef1f2084686891e46f571df2e29dfe02b08233f377da8c039b7286e07b601d7763136a20e781ee5d184daef2
+  data.tar.gz: 70c231673f5c34dbc1fcf37b6a9fe3c9740b48e05801bf2bdac4ccfc8c706208412376de0db5aac9dbced8dc450f5fd37ede28c4b0deedd739b3ce0bc6c4a509

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-11-15 18:29:11 +0900 using RuboCop version 0.60.0.
+# on 2018-11-17 00:50:17 +0900 using RuboCop version 0.60.0.
 # 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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop_challenger (1.0.0.pre2)
+    rubocop_challenger (1.0.0.pre3)
       octokit
       rubocop
       rubocop-rspec

data/bin/create_release_pr

@@ -15,10 +15,7 @@ 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(
-    access_token: ENV['GITHUB_ACCESS_TOKEN'],
-    branch: "update/v#{version}"
-  )
+  RubocopChallenger::Github::PrCreater.new(branch: "update/v#{version}")
 
 # Verifying
 exit_process 'usage: bin/create_release_pr VERSION' if version.nil?

data/lib/rubocop_challenger/cli.rb

@@ -5,15 +5,17 @@ require 'thor'
 module RubocopChallenger
   # To define CLI commands
   class CLI < Thor
-    desc 'go', 'Run `$ rubocop --auto-correct` and create PR to GitHub repo'
+    include CommandLine
+
+    desc 'go', 'Run `$ rubocop --auto-correct` and create a PR to GitHub repo'
     option :email,
            required: true,
            type: :string,
-           desc: 'Pull Request committer email'
+           desc: 'The Pull Request committer email'
     option :name,
            required: true,
            type: :string,
-           desc: 'Pull Request committer name'
+           desc: 'The Pull Request committer name'
     option :file_path,
            type: :string,
            default: '.rubocop_todo.yml',
@@ -22,15 +24,14 @@ module RubocopChallenger
     option :template,
            type: :string,
            aliases: :t,
-           desc: 'Pull Request template `erb` file path.' \
+           desc: 'A Pull Request template `erb` file path.' \
                  'You can use variable that `title`, `rubydoc_url`, ' \
                  '`description` and `examples` into the erb file.'
     option :mode,
            type: :string,
            default: 'most_occurrence',
-           desc: 'Mode to select deletion target. ' \
-                 'You can choice "most_occurrence", "least_occurrence", ' \
-                 'or "random"'
+           desc: 'Mode to select deletion target. You can choice ' \
+                 '"most_occurrence", "least_occurrence", or "random"'
     option :base,
            type: :string,
            default: 'master',
@@ -53,8 +54,8 @@ module RubocopChallenger
       regenerate_rubocop_todo
       create_pull_request(target_rule)
     rescue StandardError => e
-      puts e.message
-      exit!
+      color_puts e.message, CommandLine::RED
+      exit_process!
     end
 
     desc 'version', 'Show current version'
@@ -74,7 +75,6 @@ module RubocopChallenger
 
     def pr_creater
       @pr_creater ||= Github::PrCreater.new(
-        access_token: ENV['GITHUB_ACCESS_TOKEN'],
         branch: "rubocop-challenge/#{timestamp}",
         user_name: options[:name],
         user_email: options[:email]
@@ -120,5 +120,10 @@ module RubocopChallenger
     def timestamp
       @timestamp ||= Time.now.strftime('%Y%m%d%H%M%S')
     end
+
+    # Exit process (Mainly for mock when testing)
+    def exit_process!
+      exit!
+    end
   end
 end

data/lib/rubocop_challenger/command_line.rb

@@ -2,16 +2,29 @@
 
 module RubocopChallenger
   # To execute command line. You should inherit this class to use.
-  class CommandLine
+  module CommandLine
     private
 
     # Execute a command
     #
     # @param command [String] The command you want to execute
-    # @return [String] Execution result
+    # @return [String] The result in the execution
     def execute(command)
       puts "$ #{command}"
-      `#{command}`.chomp
+      `#{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

@@ -3,7 +3,9 @@
 module RubocopChallenger
   module Git
     # To execute git command
-    class Command < CommandLine
+    class Command
+      include CommandLine
+
       def initialize(user_name: nil, user_email: nil)
         @user_name = user_name
         @user_email = user_email

data/lib/rubocop_challenger/github/pr_creater.rb

@@ -6,13 +6,14 @@ module RubocopChallenger
     class PrCreater
       # Returns a new instance of Github::PrCreater
       #
-      # @param access_token [String] The GitHub access token
+      # @note You have to set ENV['GITHUB_ACCESS_TOKEN']
       # @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(access_token:, branch:, user_name: nil, user_email: nil)
-        @access_token = access_token
+      def initialize(branch:, user_name: nil, user_email: nil)
+        raise "You have to set ENV['GITHUB_ACCESS_TOKEN']" if access_token.nil?
+
         @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'))
@@ -55,7 +56,7 @@ module RubocopChallenger
 
       private
 
-      attr_reader :access_token, :git, :github, :topic_branch, :initial_sha1
+      attr_reader :git, :github, :topic_branch, :initial_sha1
 
       def git_condition_valid?
         !git.current_sha1?(initial_sha1) && git.current_branch?(topic_branch)
@@ -67,8 +68,14 @@ module RubocopChallenger
         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://#{access_token}@github.com/#{github.repository}"
+        "https://${GITHUB_ACCESS_TOKEN}@github.com/#{github.repository}"
       end
     end
   end

data/lib/rubocop_challenger/rubocop/command.rb

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

data/lib/rubocop_challenger/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_challenger
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors:
 - ryosuke_sato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit