safe_pusher 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05663b02c0ccf6604a9e3054e8ea9456ffcb5694e25440db41edf4e087cb827
-  data.tar.gz: edf3051adc55cd6492d35ae31f17c69f5444407e2f71a91a51239dad48f85f98
+  metadata.gz: ab33cda1facd75afc5f638e376520008a5ccd78ccfb12737d7518b4dbd65daf0
+  data.tar.gz: f654b9f9dbd1e5f1985f1c3d8e1f8ec40067f452bd88d9cc88fa2e3268fc7672
 SHA512:
-  metadata.gz: d93caa5d43e32f373334afc458647266be8f4d505899d9f83c9ee23bfde83274c7f799b539630508818f11d708db84ffba46bd758989b4809c12031d79cd179c
-  data.tar.gz: 88dff6746dbd6543e40152e856a5a0e6040bdf27eaaedaafe561805e435947e6d3aef472a93c64b9df7325c45c0dc85f9bd44b3d891e89c78d5a1f91279ce162
+  metadata.gz: c4f90a3d8ae6a56f485c041226b86127577465808d032fce4618cde458b9caf12e24341fb2b5010259841d89a6d8286493fe69afc9cd7fe5fa7cea9e9cdae61f
+  data.tar.gz: 7e1bfedcb25c89df9207752f1f9007d49facf1052d5b050ae5503dd924f838ad98ec27aeca46e8ec8eb88c63257f36e78a5582cb316329098e3833ca33e50948

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This project adheres to [Semantic Versioning](http://semver.org)
 
+## [0.4.1] - 2019-12-04
+Improvement:
+- Generate the folder of a spec, if not already existing
+
 ## [0.4.0] - 2019-11-29
 Features:
  - Add `add`, `commit` and `amend` commands to the cli

data/CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contributing
+
+You can easily add a new client, or a new command.
+
+## To add a client
+- create the client api under lib/safe_pusher/client/***.rb
+- require it in lib/safe_pusher.rb
+- write the specs for your client, then submit a PR
+
+You will be able to specify in which command to use it, via the configuration !
+
+## To add a command
+- configure your command and its client in config/commands.yml
+- create your safepusher client api, as detailed above (if necessary)
+- include your command's description in the help, in config/en.yml
+
+# Guidelines
+
+Bug reports and pull requests are welcome on GitHub at williampollet/safe_pusher. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the Contributor Covenant code of conduct.
+
+# Development
+Setup development:
+`$ bin/setup`
+
+Open a console:
+`$ bin/console`
+
+Test the CLI:
+`$ ruby -Ilib exe/safepush`
+
+Launch specs and lint:
+
+`$ rake`

data/README.md

@@ -4,7 +4,7 @@
 
 # SafePusher
 
-Run your favorite linters and specs on the files you touched, before pushing your branch.
+Run your favorite linters and specs on the files you touched, before committing and pushing your branch.
 
 ## Installation
 
@@ -40,10 +40,18 @@ files_to_skip:
 base_branch: developement # default master
 app_base_directory: app
 repo_url: https://github.com/williampollet/safe_pusher
+services:
+  test: rspec
+  lint: pronto
+  push: github
+  open: github
+  add: git
+  amend: git
+  commit: git
+verbose: true
 ```
 
 ## Usage
-
 To see the commands available, type:
 
     $ safepush
@@ -64,8 +72,32 @@ or
 
     $ safepush t l p o
 
+### Available commands so far
+ - `test` (runs the tests only on the files you touched)
+ - `lint` (runs a linter only on the files you touched)
+ - `commit` (commit your changes)
+ - `add` (track your changes)
+ - `amend` (amend your tracked changes to your last commit)
+ - `push` (push and set upstream your local branch on github)
+ - `open` (open a pull request on github)
+
 ## Contributing
 
+You can easily add a new client, or a new command. 
+
+### To add a client 
+ - create the client api under `lib/safe_pusher/client/***.rb`
+ - require it in `lib/safe_pusher.rb`
+ - write the specs for your client, then submit a PR
+ - You will be able to specify in which command to use it, via the configuration ! 
+
+### To add a command
+ - configure your command and its client in `config/commands.yml`
+ - create your safepusher client api, as detailed above (if necessary)
+ - include your command's description in the help, in `config/en.yml`
+
+### Guidelines
+
 Bug reports and pull requests are welcome on GitHub at https://github.com/williampollet/safe_pusher. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## Development

data/config/commands.yml

@@ -0,0 +1,21 @@
+test:
+  shortcut: t
+  default_client: rspec
+lint:
+  shortcut: l
+  default_client: pronto
+push:
+  shortcut: p
+  default_client: github
+open:
+  shortcut: o
+  default_client: github
+add:
+  shortcut: a
+  default_client: git
+amend:
+  shortcut: m
+  default_client: git
+commit:
+  shortcut: c
+  default_client: git

data/config/locales/en.yml

@@ -0,0 +1,37 @@
+en:
+  help: |
+    Usage:
+    help (h) # show this usage message
+    --version # print SafePusher version
+    ##########################################################
+    # you can use any combination of theese commands
+    ##########################################################
+    test (t) # run the test suite
+    lint (l) # run the linters
+    amend (m) # amend your last commit
+    add (a) # add changes to be committed
+    commit (c) # commit your staged changes
+    push (p) # push on distant repository
+    open (o) # open a pull request on the distant repository
+  command:
+    add:
+      verbose: Testing new files...
+    commit:
+      verbose: Commiting last changes...
+    amend:
+      verbose: Amending last commit...
+    push:
+      verbose: Pushing to Github...
+    open:
+      verbose: Opening a pull request on Github...
+    lint:
+      verbose: Linting tracked changes...
+    test:
+      verbose: 'Testing new files...'
+      test_skipped: 'Alright, skipping the test for now!'
+      no_spec_found_for_file: 'No spec found for file %{file_matched}, would you like to add %{spec_path}? (Yn)'
+      spec_needs_to_be_written: 'A spec needs to be written!'
+      no_spec_analyzed: 'No spec found, going to the next step'
+      file_put_in_test_list: '%{file} modified, putting it in the list of specs to run'
+      spec_failing_or_missing: 'Oops, a spec seems to be red or empty, be sure to complete it before you push'
+      every_spec_operational: 'Every spec operational, going to the next step!'

data/lib/safe_pusher.rb

@@ -1,12 +1,18 @@
 require 'safe_pusher/configuration'
 require 'thor'
 require 'colorize'
+require 'English'
+require 'i18n'
+require 'yaml'
+require 'fileutils'
 require 'safe_pusher/cli'
 require 'safe_pusher/version'
-require 'safe_pusher/git_runner'
-require 'safe_pusher/rspec_runner'
-require 'safe_pusher/pronto_runner'
-require 'safe_pusher/github_runner'
+require 'safe_pusher/client/git'
+require 'safe_pusher/client/rspec'
+require 'safe_pusher/client/pronto'
+require 'safe_pusher/client/github'
+
+I18n.load_path << Dir[File.expand_path('config/locales/*.yml')]
 
 module SafePusher
   # Configuration setup

data/lib/safe_pusher/cli.rb

@@ -1,17 +1,5 @@
 module SafePusher
   class CLI
-    SHORTCUTS = {
-      't' => 'test',
-      'l' => 'lint',
-      'p' => 'push',
-      'o' => 'open',
-      'm' => 'amend',
-      'a' => 'add',
-      'c' => 'commit',
-    }.freeze
-
-    private_constant :SHORTCUTS
-
     def initialize(arguments:)
       @arguments = arguments
     end
@@ -19,15 +7,9 @@ module SafePusher
     def start
       return version if arguments.first == '--version'
 
-      unless arguments_valid?
-        help
-
-        return
-      end
+      help if commands.include?(nil)
 
-      arguments.each do |command|
-        execute_command(command)
-      end
+      commands.compact.each { |command| execute_command(command) }
     end
 
     private
@@ -35,111 +17,58 @@ module SafePusher
     attr_reader :arguments
 
     def execute_command(command)
-      if SHORTCUTS[command]
-        send(SHORTCUTS[command])
-      else
-        send(command)
-      end
-    end
-
-    def test
-      puts '##########################'.yellow
-      puts '## Testing new files... ##'.yellow
-      puts '##########################'.yellow
-      results = SafePusher::RspecRunner.new.call
-
-      exit results unless results == 0
-    end
-
-    def lint
-      puts '#######################'.yellow
-      puts '## Running linter... ##'.yellow
-      puts '#######################'.yellow
+      explain(command) if verbose
 
-      results = SafePusher::ProntoRunner.new.call
+      results = SafePusher::Client
+        .const_get(services[command].capitalize)
+        .new
+        .public_send(command)
 
       exit results unless results == 0
     end
 
-    def push
-      puts '##########################'.yellow
-      puts '## Pushing to Github... ##'.yellow
-      puts '##########################'.yellow
-
-      results = SafePusher::GithubRunner.new.push
+    def commands
+      @commands ||= arguments.map do |arg|
+        next unless arg =~ valid_commands_regexp
 
-      exit results unless results == 0
+        shortcut_to_command[arg] || arg
+      end
     end
 
-    def amend
-      puts '###################################'.yellow
-      puts '## Amending your last commit... ###'.yellow
-      puts '###################################'.yellow
-
-      results = SafePusher::GitRunner.new.amend
-
-      exit results unless results == 0
+    def version
+      puts SafePusher::VERSION
     end
 
-    def add
-      puts '######################'.yellow
-      puts '## Adding files... ###'.yellow
-      puts '######################'.yellow
-
-      results = SafePusher::GitRunner.new.add
-
-      exit results unless results == 0
+    def explain(command)
+      puts I18n.t("command.#{command}.verbose").yellow
     end
 
-    def commit
-      puts '################################'.yellow
-      puts '## Commiting last changes... ###'.yellow
-      puts '################################'.yellow
-
-      results = SafePusher::GitRunner.new.commit
-
-      exit results unless results == 0
+    def help
+      puts I18n.t('help')
     end
 
-    def open
-      puts '#########################################'.yellow
-      puts '## Opening a pull request on Github... ##'.yellow
-      puts '#########################################'.yellow
-
-      results = SafePusher::GithubRunner.new.open
-
-      exit results unless results == 0
+    def valid_commands_regexp
+      @valid_commands_regexp ||= /^(?!\s*$)(?:#{available_commands})$/
     end
 
-    def arguments_valid?
-      arguments.join(' ') =~ valid_commands_regexp
+    def available_commands
+      @available_commands ||= (
+        shortcut_to_command.keys + shortcut_to_command.values
+      ).join('|')
     end
 
-    def valid_commands_regexp
-      valid_commands = "#{SHORTCUTS.keys.join('|')}|"\
-        "#{SHORTCUTS.values.join('|')}"
-
-      /^(?!\s*$)(?:#{valid_commands}| )+$/
+    def verbose
+      @verbose ||= SafePusher.configuration.verbose
     end
 
-    def help
-      puts "Usage:\n"\
-      " help (h) # show this usage message\n"\
-      " --version # print SafePusher version\n"\
-      " ##########################################################\n"\
-      " # you can use any combination of theese commands \n"\
-      " ##########################################################\n"\
-      " test (t) # run the test suite\n"\
-      " lint (l) # run the linters\n"\
-      " amend (m) # amend your last commit \n"\
-      " add (a) # add changes to be committed \n"\
-      " commit (c) # commit your staged changes \n"\
-      " push (p) # push on distant repository\n"\
-      ' open (o) # open a pull request on the distant repository'
+    def services
+      @services ||= SafePusher.configuration.services
     end
 
-    def version
-      puts SafePusher::VERSION
+    def shortcut_to_command
+      @shortcut_to_command ||= YAML
+        .load_file('config/commands.yml')
+        .reduce({}) { |o, (k, v)| o.update(v['shortcut'] => k) }
     end
   end
 end

data/lib/safe_pusher/client/git.rb

@@ -0,0 +1,27 @@
+module SafePusher
+  module Client
+    class Git
+      def amend
+        system('git commit --amend')
+
+        $CHILD_STATUS.exitstatus
+      end
+
+      def add
+        system('git add --interactive')
+
+        $CHILD_STATUS.exitstatus
+      end
+
+      def commit
+        puts 'Enter a message for your commit:'
+
+        result = STDIN.gets.chomp
+
+        system("git commit -m '#{result}'")
+
+        $CHILD_STATUS.exitstatus
+      end
+    end
+  end
+end

data/lib/safe_pusher/client/github.rb

@@ -0,0 +1,37 @@
+module SafePusher
+  module Client
+    class Github
+      def push
+        system('git push origin')
+
+        exit_status = $CHILD_STATUS.exitstatus
+
+        if exit_status == 128
+          puts 'Syncing with github...'.green
+
+          push_and_set_upstream
+
+          exit_status = $CHILD_STATUS.exitstatus
+        end
+
+        exit_status
+      end
+
+      def open
+        system(
+          "open '#{SafePusher.configuration.repo_url}/pull/new/#{branch}'",
+        )
+      end
+
+      private
+
+      def push_and_set_upstream
+        system("git push --set-upstream origin #{branch}")
+      end
+
+      def branch
+        `git rev-parse --symbolic-full-name --abbrev-ref HEAD`.delete("\n")
+      end
+    end
+  end
+end

data/lib/safe_pusher/client/pronto.rb

@@ -0,0 +1,29 @@
+module SafePusher
+  module Client
+    class Pronto
+      def lint
+        run_pronto
+        exit_status = $CHILD_STATUS.exitstatus
+
+        if exit_status != 0
+          warn 'Pronto found somme errors… ' \
+               'Fix them before pushing to GitHub!'.red
+        else
+          puts 'No errors found by pronto, go for next step!'.green
+        end
+
+        exit_status
+      end
+
+      private
+
+      def run_pronto
+        system("bin/pronto run --exit-code -c #{base_branch}")
+      end
+
+      def base_branch
+        SafePusher.configuration.base_branch
+      end
+    end
+  end
+end

data/lib/safe_pusher/client/rspec.rb

@@ -0,0 +1,136 @@
+module SafePusher
+  module Client
+    class Rspec
+      def initialize
+        @specs_to_execute = []
+      end
+
+      def test
+        return 1 if list_files_to_execute == 1
+
+        run_specs
+      end
+
+      private
+
+      attr_reader :specs_to_execute
+
+      def list_files_to_execute
+        modified_files.map do |f|
+          return 1 if analyze_file(f) == 1
+        end.compact
+      end
+
+      def modified_files
+        diff = 'git diff --diff-filter=A --diff-filter=M --name-only'
+
+        `#{diff} $(git merge-base #{branch} #{base_branch}) #{branch}`
+          .split("\n")
+          .uniq
+      end
+
+      def analyze_file(file)
+        if file.match(app_base_directory) &&
+           !file.match(files_to_skip)
+          search_or_create_spec(file)
+        elsif file.match(/spec/) &&
+              !specs_to_execute.include?(file) &&
+              !file.match(files_to_skip)
+          index_file(file)
+        end
+      end
+
+      def search_or_create_spec(file)
+        spec_path = file.gsub(
+          "#{SafePusher.configuration.app_base_directory}/",
+          'spec/',
+        ).gsub('.rb', '_spec.rb')
+
+        return create_new_spec(spec_path, file) unless File.exist?(spec_path)
+
+        puts spec_path
+
+        specs_to_execute << spec_path
+      end
+
+      def index_file(file)
+        puts I18n.t('command.test.file_put_in_test_list', file: file)
+        specs_to_execute << file
+      end
+
+      def files_to_skip
+        Regexp.new(
+          SafePusher.configuration.files_to_skip.join('|').gsub('/', '\/'),
+        )
+      end
+
+      def run_specs
+        if specs_to_execute.empty?
+          puts I18n.t('command.test.no_spec_analyzed').green
+          return 0
+        end
+
+        system("bin/rspec #{specs_to_execute.join(' ')}")
+
+        exit_status = $CHILD_STATUS.exitstatus
+
+        if exit_status != 0
+          puts spec_failing_or_missing
+        else
+          puts every_spec_operational
+        end
+
+        exit_status
+      end
+
+      def create_new_spec(spec_path, file_matched)
+        puts I18n.t(
+          'command.test.no_spec_found_for_file',
+          file_matched: file_matched,
+          spec_path: spec_path,
+        )
+
+        result = STDIN.gets.chomp
+
+        if result.casecmp('n') == 0
+          puts I18n.t('command.test.test_skipped')
+
+          0
+        else
+          create_new_file(spec_path)
+
+          warn I18n.t('command.test.spec_needs_to_be_written').red
+
+          1
+        end
+      end
+
+      def branch
+        `git rev-parse --abbrev-ref HEAD`.delete("\n")
+      end
+
+      def create_new_file(path)
+        parent_directory = File.dirname(path)
+
+        FileUtils.mkdir_p(parent_directory) unless File.exist?(parent_directory)
+        FileUtils.touch(path)
+      end
+
+      def app_base_directory
+        %r{#{SafePusher.configuration.app_base_directory}\/.*\.rb$}
+      end
+
+      def base_branch
+        SafePusher.configuration.base_branch
+      end
+
+      def spec_failing_or_missing
+        I18n.t('command.test.spec_failing_or_missing').red
+      end
+
+      def every_spec_operational
+        I18n.t('command.test.every_spec_operational').green
+      end
+    end
+  end
+end

data/lib/safe_pusher/configuration.rb

@@ -1,25 +1,34 @@
-require 'yaml'
-# Configuration variables and defaults
 module SafePusher
   class Configuration
-    # The configuration singleton
     attr_accessor :files_to_skip,
                   :app_base_directory,
                   :repo_url,
-                  :base_branch
+                  :base_branch,
+                  :verbose,
+                  :services
 
     def initialize
-      application_config =
-        if File.exist?('safe_pusher.yml')
-          YAML.load_file('safe_pusher.yml')
-        else
-          {}
-        end
-
+      @verbose = application_config['verbose'] || true
       @base_branch = application_config['base_branch'] || 'master'
       @files_to_skip = application_config['files_to_skip'] || []
       @app_base_directory = application_config['app_base_directory']
       @repo_url = application_config['repo_url']
+      @services = load_services
+    end
+
+    private
+
+    def load_services
+      YAML
+        .load_file('config/commands.yml')
+        .reduce({}) { |o, (k, v)| o.update(k => v['default_client']) }
+        .merge(application_config['services'] || {})
+    end
+
+    def application_config
+      return YAML.load_file('safe_pusher.yml') if File.exist?('safe_pusher.yml')
+
+      {}
     end
   end
 end

data/lib/safe_pusher/version.rb

@@ -1,3 +1,3 @@
 module SafePusher
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/safe_pusher.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'colorize', '~> 0.8.1'
+  spec.add_dependency 'i18n', '~> 1.6.0'
 
   spec.add_development_dependency 'bundler', '>= 1.16'
   spec.add_development_dependency 'fashion_police', '~> 1.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_pusher
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - William Pollet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -181,20 +195,23 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- config/commands.yml
+- config/locales/en.yml
 - exe/safepush
 - lib/safe_pusher.rb
 - lib/safe_pusher/cli.rb
+- lib/safe_pusher/client/git.rb
+- lib/safe_pusher/client/github.rb
+- lib/safe_pusher/client/pronto.rb
+- lib/safe_pusher/client/rspec.rb
 - lib/safe_pusher/configuration.rb
-- lib/safe_pusher/git_runner.rb
-- lib/safe_pusher/github_runner.rb
-- lib/safe_pusher/pronto_runner.rb
-- lib/safe_pusher/rspec_runner.rb
 - lib/safe_pusher/version.rb
 - safe_pusher.gemspec
 homepage: https://github.com/williampollet/safe_pusher
@@ -217,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: a small CLI that lints your code and run your tests before you push

data/lib/safe_pusher/git_runner.rb

@@ -1,28 +0,0 @@
-require 'colorize'
-require 'English'
-
-module SafePusher
-  class GitRunner
-    def amend
-      system('git commit --amend')
-
-      $CHILD_STATUS.exitstatus
-    end
-
-    def add
-      system('git add --interactive')
-
-      $CHILD_STATUS.exitstatus
-    end
-
-    def commit
-      puts 'Enter a message for your commit:'
-
-      result = STDIN.gets.chomp
-
-      system("git commit -m '#{result}'")
-
-      $CHILD_STATUS.exitstatus
-    end
-  end
-end

data/lib/safe_pusher/github_runner.rb

@@ -1,38 +0,0 @@
-require 'colorize'
-require 'English'
-
-module SafePusher
-  class GithubRunner
-    def push
-      system('git push origin')
-
-      exit_status = $CHILD_STATUS.exitstatus
-
-      if exit_status == 128
-        puts 'Syncing with github...'.green
-
-        push_and_set_upstream
-
-        exit_status = $CHILD_STATUS.exitstatus
-      end
-
-      exit_status
-    end
-
-    def open
-      system(
-        "open '#{SafePusher.configuration.repo_url}/pull/new/#{branch}'",
-      )
-    end
-
-    private
-
-    def push_and_set_upstream
-      system("git push --set-upstream origin #{branch}")
-    end
-
-    def branch
-      `git rev-parse --symbolic-full-name --abbrev-ref HEAD`.delete("\n")
-    end
-  end
-end

data/lib/safe_pusher/pronto_runner.rb

@@ -1,30 +0,0 @@
-require 'colorize'
-require 'English'
-
-module SafePusher
-  class ProntoRunner
-    def call
-      run_pronto
-      exit_status = $CHILD_STATUS.exitstatus
-
-      if exit_status != 0
-        warn 'Pronto found somme errors… ' \
-             'Fix them before pushing to GitHub!'.red
-      else
-        puts 'No errors found by pronto, go for next step!'.green
-      end
-
-      exit_status
-    end
-
-    private
-
-    def run_pronto
-      system("bin/pronto run --exit-code -c #{base_branch}")
-    end
-
-    def base_branch
-      SafePusher.configuration.base_branch
-    end
-  end
-end

data/lib/safe_pusher/rspec_runner.rb

@@ -1,117 +0,0 @@
-require 'colorize'
-require 'English'
-
-module SafePusher
-  class RspecRunner
-    def initialize
-      @specs_to_execute = []
-    end
-
-    def call
-      return 1 if list_files_to_execute == 1
-
-      run_specs
-    end
-
-    private
-
-    attr_reader :specs_to_execute
-
-    def list_files_to_execute
-      modified_files.map do |f|
-        return 1 if analyze_file(f) == 1
-      end.compact
-    end
-
-    def modified_files
-      diff = 'git diff --diff-filter=A --diff-filter=M --name-only'
-
-      `#{diff} $(git merge-base #{branch} #{base_branch}) #{branch}`
-        .split("\n")
-        .uniq
-    end
-
-    def analyze_file(file)
-      if file.match(app_base_directory) &&
-         !file.match(files_to_skip)
-        search_or_create_spec(file)
-      elsif file.match(/spec/) &&
-            !specs_to_execute.include?(file) &&
-            !file.match(files_to_skip)
-        index_file(file)
-      end
-    end
-
-    def search_or_create_spec(file)
-      spec_path = file.gsub(
-        "#{SafePusher.configuration.app_base_directory}/",
-        'spec/',
-      ).gsub('.rb', '_spec.rb')
-
-      return create_new_spec(spec_path, file) unless File.exist?(spec_path)
-
-      puts spec_path
-
-      specs_to_execute << spec_path
-    end
-
-    def index_file(file)
-      puts "#{file} modified, putting it in the list of specs to run"
-      specs_to_execute << file
-    end
-
-    def files_to_skip
-      Regexp.new(
-        SafePusher.configuration.files_to_skip.join('|').gsub('/', '\/'),
-      )
-    end
-
-    def run_specs
-      if specs_to_execute.empty?
-        puts 'no spec analyzed, passing to the next step'.green
-        return 0
-      end
-
-      system("bin/rspec #{specs_to_execute.join(' ')}")
-
-      exit_status = $CHILD_STATUS.exitstatus
-
-      if exit_status != 0
-        puts 'Oops, a spec seems to be red or empty, '\
-             'be sure to complete it before you push'.red
-      else
-        puts 'Every spec operational, '\
-             'passing to the next step!'.green
-      end
-
-      exit_status
-    end
-
-    def create_new_spec(spec_path, file_matched)
-      puts "no spec found for file #{file_matched},"\
-           " would you like to add #{spec_path}? (Yn)"
-      result = STDIN.gets.chomp
-
-      if result.casecmp('n') == 0
-        puts 'Alright, skipping the test for now!'
-        return 0
-      else
-        File.open(spec_path, 'w') {}
-        warn 'A spec needs to be written!'.red
-        return 1
-      end
-    end
-
-    def branch
-      `git rev-parse --abbrev-ref HEAD`.delete("\n")
-    end
-
-    def app_base_directory
-      %r{#{SafePusher.configuration.app_base_directory}\/.*\.rb$}
-    end
-
-    def base_branch
-      SafePusher.configuration.base_branch
-    end
-  end
-end