safe_pusher 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a876c76ac889ebc32081c281e6031204b65692de1bf0efda932028d14aff0afd
-  data.tar.gz: 694782b608d3fd8595f0d6c2da75ef83c3afc6cce5257a7c0491fed149b9980a
+  metadata.gz: c05663b02c0ccf6604a9e3054e8ea9456ffcb5694e25440db41edf4e087cb827
+  data.tar.gz: edf3051adc55cd6492d35ae31f17c69f5444407e2f71a91a51239dad48f85f98
 SHA512:
-  metadata.gz: bd8ef453a0adf63245ca38e5ae6cb71511adea87aa8bbc6f97dbb8da690dbe416b236683cd4cb59a7cf4b290c274d388e64edbc3f868d150fb6032cb32cd4585
-  data.tar.gz: 1354cbb01df47f12cbfad8b08fa841377902ce3620641a6dd7071598b068ac4b447a04ab29f88eacc43986687944f3072b63968213fff4cf28e574225ee4d3f3
+  metadata.gz: d93caa5d43e32f373334afc458647266be8f4d505899d9f83c9ee23bfde83274c7f799b539630508818f11d708db84ffba46bd758989b4809c12031d79cd179c
+  data.tar.gz: 88dff6746dbd6543e40152e856a5a0e6040bdf27eaaedaafe561805e435947e6d3aef472a93c64b9df7325c45c0dc85f9bd44b3d891e89c78d5a1f91279ce162

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This project adheres to [Semantic Versioning](http://semver.org)
 
+## [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

data/README.md

@@ -37,7 +37,7 @@ Create the `safe_pusher.yml` file at the root of your application:
 files_to_skip:
   - file/to/skip_1
   - file/to/skip/2
-base_branch: developement
+base_branch: developement # default master
 app_base_directory: app
 repo_url: https://github.com/williampollet/safe_pusher
 ```

data/lib/safe_pusher.rb

@@ -3,6 +3,7 @@ require 'thor'
 require 'colorize'
 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'

data/lib/safe_pusher/cli.rb

@@ -1,6 +1,16 @@
 module SafePusher
   class CLI
-    attr_reader :arguments
+    SHORTCUTS = {
+      't' => 'test',
+      'l' => 'lint',
+      'p' => 'push',
+      'o' => 'open',
+      'm' => 'amend',
+      'a' => 'add',
+      'c' => 'commit',
+    }.freeze
+
+    private_constant :SHORTCUTS
 
     def initialize(arguments:)
       @arguments = arguments
@@ -22,16 +32,13 @@ module SafePusher
 
     private
 
+    attr_reader :arguments
+
     def execute_command(command)
-      case command
-      when 'test', 't'
-        test
-      when 'lint', 'l'
-        lint
-      when 'open', 'o'
-        open
-      when 'push', 'p'
-        push
+      if SHORTCUTS[command]
+        send(SHORTCUTS[command])
+      else
+        send(command)
       end
     end
 
@@ -64,6 +71,36 @@ module SafePusher
       exit results unless results == 0
     end
 
+    def amend
+      puts '###################################'.yellow
+      puts '## Amending your last commit... ###'.yellow
+      puts '###################################'.yellow
+
+      results = SafePusher::GitRunner.new.amend
+
+      exit results unless results == 0
+    end
+
+    def add
+      puts '######################'.yellow
+      puts '## Adding files... ###'.yellow
+      puts '######################'.yellow
+
+      results = SafePusher::GitRunner.new.add
+
+      exit results unless results == 0
+    end
+
+    def commit
+      puts '################################'.yellow
+      puts '## Commiting last changes... ###'.yellow
+      puts '################################'.yellow
+
+      results = SafePusher::GitRunner.new.commit
+
+      exit results unless results == 0
+    end
+
     def open
       puts '#########################################'.yellow
       puts '## Opening a pull request on Github... ##'.yellow
@@ -75,7 +112,14 @@ module SafePusher
     end
 
     def arguments_valid?
-      arguments.join(' ') =~ /^(?!\s*$)(?:test|lint|push|open|t|l|p|o| )+$/
+      arguments.join(' ') =~ valid_commands_regexp
+    end
+
+    def valid_commands_regexp
+      valid_commands = "#{SHORTCUTS.keys.join('|')}|"\
+        "#{SHORTCUTS.values.join('|')}"
+
+      /^(?!\s*$)(?:#{valid_commands}| )+$/
     end
 
     def help
@@ -87,6 +131,9 @@ module SafePusher
       " ##########################################################\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'
     end

data/lib/safe_pusher/git_runner.rb

@@ -0,0 +1,28 @@
+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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safe_pusher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - William Pollet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -191,6 +191,7 @@ files:
 - lib/safe_pusher.rb
 - lib/safe_pusher/cli.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