safe_pusher 0.2.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8dd851e29beb0acaa544597d36c9ba03c6ef4620
-  data.tar.gz: b87276b61f21dfe2ec419ac90f7eaff97e7eb89d
+SHA256:
+  metadata.gz: 5b35c0d67956c4dcd646f9766458d69524ca43b9fc0bfe44f316ca1e114d8b61
+  data.tar.gz: 959b5176de2e4a3fa97c449c684fc15c4e0c87bfa132efa6045b03b25a0c8ad6
 SHA512:
-  metadata.gz: ce3fff993eaffda06bcc60c6a3a71f4ff798496157b9b350201af19a9fea34296fa419f6b257c1313709cd831885b1993c34b073be00a093174fb0859b20b326
-  data.tar.gz: 2c8c6c017755eebe779459c981eceddaed229ea7c3338f03a91d79684b138e20d85942e05a35066e193f1d9ccebb895c854c50b44d81a1bcf0b84c435572d227
+  metadata.gz: ce2ca9a10f18e3a0f242fea8509c30310f2c040d8dc54ff5d91f65034ecfb9a1f28675624699285da5f1b8c9aabb03fa797d3cb8b805bf8dd27215798806baff
+  data.tar.gz: e17fcb0668567c566cff46cc8a4aff2b89c5537d2be983c27f27eb95fe11eabadaba96afaf32dbd099380555c6b3f15fd037101381d1ee1accd5890333d88fe0

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

data/.rubocop.yml

@@ -63,10 +63,11 @@ Documentation:
 # Do not verify the length of the blocks in DSLs.
 Metrics/BlockLength:
   Exclude:
-    - "**/*/spec/**/*"
+    - spec/**/*
     - lib/tasks/**/*
     - app/admin/**/*
     - config/routes.rb
+    - safe_pusher.gemspec
   ExcludedMethods:
     - included
 
@@ -136,27 +137,3 @@ Style/FormatStringToken:
 # Prefer `->` to `lambda`.
 Style/Lambda:
   EnforcedStyle: literal
-
-# Deactivate rule that makes `lambda` mandatory in defavor of `->`
-# when having blocks.
-Style/Lambda:
-  Enabled: false
-
-# Do not verify empty lines around blocks in specs
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - spec/**/*
-
-# Allow using normal test doubles, since they are useful for mocking.
-# See https://github.com/KissKissBankBank/fashion_police/pull/34
-RSpec/VerifiedDoubles:
-  Enabled: false
-
-# Enable long blocs for Gemspec files
-Metrics/BlockLength:
-  Exclude:
-    - safe_pusher.gemspec
-
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*

data/.travis.yml

@@ -1,8 +1,18 @@
 ---
+env:
+  global:
+    - CC_TEST_REPORTER_ID=5e03a69363f26aba0c9c779a841db044295bf61762f9b7d719e2c064497f24e0
 sudo: false
 language: ruby
 cache: bundler
 rvm:
   - 2.3.7
 before_install: gem install bundler -v 1.16.3
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script: bundle exec rspec spec
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 This project adheres to [Semantic Versioning](http://semver.org)
 
+## [0.4.2] - 2020-08-28
+Fix:
+ - Do not inject the locales files directly in the load path but add them instead.
+
+## [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
+
+## [0.3.0] - 2019-09-30
+Improvement:
+- Reduce RSpec runner verbosity
+- Allow configuring the base branch
+
+Fix:
+ - Add `--version` to the CLI
+
+## [0.2.2] - 2019-01-05
+Improvements:
+ - Removing thor
+ - Using custom CLI to handle multiple commands
+
 ## [0.2.1] - 2018-12-31
 Improvement:
  - Deprecating rainbow to install pronto and pronto Rubocop

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/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in safe_pusher.gemspec
 gemspec

data/README.md

@@ -1,15 +1,18 @@
-# SafePusher
-
 [![Build Status](https://travis-ci.com/williampollet/safe_pusher.svg?branch=master)](https://travis-ci.com/williampollet/safe_pusher)
+[![Maintainability](https://api.codeclimate.com/v1/badges/1aa6c275f9ce4d4c6ec3/maintainability)](https://codeclimate.com/github/williampollet/safe_pusher/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/1aa6c275f9ce4d4c6ec3/test_coverage)](https://codeclimate.com/github/williampollet/safe_pusher/test_coverage)
+
+# 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
 
-Add this line to your application's Gemfile:
+Add these lines to your application's Gemfile:
 
 ```ruby
-gem 'safe_pusher'
+# Lint and launch specs before pushing.
+gem 'safe_pusher', require: false
 ```
 
 And then execute:
@@ -20,44 +23,109 @@ Or install it yourself as:
 
     $ gem install safe_pusher
 
-
 To use the gem fully, you should install [pronto](https://github.com/prontolabs/pronto) and [rspec](https://github.com/rspec/rspec) first.
 
 ## Configuration
 
-Generate the `binstubs` for `pronto` and `rspec`:
+Generate the `binstubs` for `pronto`, `rspec` and `safepush`:
 
-    $ bundler binstubs pronto
-    $ bundler binstubs rspec-core
+    $ bundler binstubs pronto rspec-core safe_pusher
 
-create the `safe_pusher.yml` file at the root of your application
+Create the `safe_pusher.yml` file at the root of your application:
 
 ```yaml
 files_to_skip:
   - file/to/skip_1
   - file/to/skip/2
+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
 
-To run pronto checks before to push on github run:
+To run pronto checks before you push to GitHub run:
+
+    $ safepush lint push open
 
-    $ safepush ppush
+or
 
-To run specs and pronto before to push on github run:
+    $ safepush l p o
 
-    $ safepush ppushtest
+To run specs and pronto before you push to GitHub run:
+
+    $ safepush test lint push open
+
+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
+
+Setup development:
+
+```sh
+$ bin/setup
+```
+
+Open a console:
+
+```sh
+$ bin/console
+```
+
+Test the CLI:
+
+```sh
+$ ruby -Ilib exe/safepush
+```
+
+Launch specs and lint:
+
+```sh
+$ rake
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 # Rspec
 RSpec::Core::RakeTask.new(:spec)
@@ -8,4 +8,4 @@ RSpec::Core::RakeTask.new(:spec)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
-task :default => %i[spec, rubocop]
+task default: %i[spec rubocop]

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/exe/safepush

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require 'safe_pusher'
 
-SafePusher::CLI.start
+SafePusher::CLI.new(arguments: ARGV).start

data/lib/safe_pusher.rb

@@ -1,11 +1,19 @@
 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/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.config.available_locales = :en
+I18n.load_path += Dir[File.expand_path('config/locales') + '/*.yml']
 
 module SafePusher
   # Configuration setup

data/lib/safe_pusher/cli.rb

@@ -1,91 +1,74 @@
 module SafePusher
-  class CLI < Thor
-    desc 'test (t)', 'launch the test suite'
-    def test
-      puts '##########################'.yellow
-      puts '## Testing new files... ##'.yellow
-      puts '##########################'.yellow
-
-      results = SafePusher::RspecRunner.new.call
-
-      exit results unless results == 0
+  class CLI
+    def initialize(arguments:)
+      @arguments = arguments
     end
-    map 't' => :test
 
-    desc 'lint (l)', 'launch the linters'
-    def lint
-      puts '#######################'.yellow
-      puts '## Running linter... ##'.yellow
-      puts '#######################'.yellow
+    def start
+      return version if arguments.first == '--version'
 
-      results = SafePusher::ProntoRunner.new.call
+      help if commands.include?(nil)
 
-      exit results unless results == 0
+      commands.compact.each { |command| execute_command(command) }
     end
-    map 'l' => :lint
 
-    desc 'push (p)', 'push your code on github'
-    def push
-      puts '##########################'.yellow
-      puts '## Pushing to Github... ##'.yellow
-      puts '##########################'.yellow
+    private
 
-      results = SafePusher::GithubRunner.new.push
+    attr_reader :arguments
+
+    def execute_command(command)
+      explain(command) if verbose
+
+      results = SafePusher::Client
+        .const_get(services[command].capitalize)
+        .new
+        .public_send(command)
 
       exit results unless results == 0
     end
-    map 'p' => :push
 
-    desc 'open (o)', 'open a pull request on github'
-    def open
-      puts '#########################################'.yellow
-      puts '## Opening a pull request on Github... ##'.yellow
-      puts '#########################################'.yellow
+    def commands
+      @commands ||= arguments.map do |arg|
+        next unless arg =~ valid_commands_regexp
 
-      results = SafePusher::GithubRunner.new.open
+        shortcut_to_command[arg] || arg
+      end
+    end
 
-      exit results unless results == 0
+    def version
+      puts SafePusher::VERSION
     end
-    map 'o' => :open
 
-    desc 'push_and_open (po)', 'push your code on github,'\
-         ' and open a Pull Request on Github if none is openned'
-    def push_and_open
-      puts '##########################'.yellow
-      puts '## Pushing to Github... ##'.yellow
-      puts '##########################'.yellow
+    def explain(command)
+      puts I18n.t("command.#{command}.verbose").yellow
+    end
 
-      results = SafePusher::GithubRunner.new.push_and_open
+    def help
+      puts I18n.t('help')
+    end
 
-      exit results unless results == 0
+    def valid_commands_regexp
+      @valid_commands_regexp ||= /^(?!\s*$)(?:#{available_commands})$/
     end
-    map 'po' => :push_and_open
 
-    desc 'test_and_lint (tl)',
-         'launch the test suite, then the linters if it is successful'
-    def test_and_lint
-      invoke :test
-      invoke :lint
+    def available_commands
+      @available_commands ||= (
+        shortcut_to_command.keys + shortcut_to_command.values
+      ).join('|')
     end
-    map 'tl' => :test_and_lint
-
-    desc 'lint_push_and_open (lpo)',
-         'lanch the linters, then push on github and open a'\
-         ' Pull Request on Github if none is openned'
-    def lint_push_and_open
-      invoke :lint
-      invoke :push_and_open
+
+    def verbose
+      @verbose ||= SafePusher.configuration.verbose
     end
-    map 'lpo' => :lint_push_and_open
-
-    desc 'test_lint_push_and_open (tlpo)',
-         'lanch the linters, launch test suite, then push on github and open'\
-         'a Pull Request if none is openned'
-    def test_lint_push_and_open
-      invoke :test
-      invoke :lint
-      invoke :push_and_open
+
+    def services
+      @services ||= SafePusher.configuration.services
+    end
+
+    def shortcut_to_command
+      @shortcut_to_command ||= YAML
+        .load_file('config/commands.yml')
+        .reduce({}) { |o, (k, v)| o.update(v['shortcut'] => k) }
     end
-    map 'tlpo' => :test_lint_push_and_open
   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,23 +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
+                  :repo_url,
+                  :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.2.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/safe_pusher.gemspec

@@ -37,9 +37,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'colorize', '~> 0.8.1'
-  spec.add_dependency 'thor', '~> 0.19.4'
+  spec.add_dependency 'i18n', '~> 1.6.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '>= 1.16'
   spec.add_development_dependency 'fashion_police', '~> 1.2'
   spec.add_development_dependency 'pronto', '~> 0.9.5'
   spec.add_development_dependency 'pronto-rubocop', '~> 0.9.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_pusher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.2
 platform: ruby
 authors:
 - William Pollet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-31 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -25,31 +25,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.4
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -186,6 +186,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -193,19 +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/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
@@ -228,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: a small CLI that lints your code and run your tests before you push

data/lib/safe_pusher/github_runner.rb

@@ -1,44 +0,0 @@
-require 'colorize'
-require 'English'
-
-module SafePusher
-  class GithubRunner
-    def push_and_open
-      push
-
-      exit_status = $CHILD_STATUS.exitstatus
-
-      if exit_status == 128
-        puts 'Syncing with github...'.green
-
-        push_and_set_upstream
-
-        exit_status = $CHILD_STATUS.exitstatus
-
-        open if exit_status == 0
-      end
-
-      exit_status
-    end
-
-    def push
-      system('git push origin')
-    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,26 +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 master!'.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')
-    end
-  end
-end

data/lib/safe_pusher/rspec_runner.rb

@@ -1,115 +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} master) #{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)
-      puts "#{file} has been modified, searching for specs..."
-
-      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 found for #{file}, putting #{spec_path}"\
-           ' in the list of specs to run'
-      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
-  end
-end