committer-tools 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f27491ec9dd9013f8a904670616d75b24104ed0
-  data.tar.gz: 0abe91d59fad9d7bf04198a39a89bdaa9ad612b7
+  metadata.gz: baeeea1ac89f7a3b0800b9efbbb0d04676cb58a7
+  data.tar.gz: 52c6f3bfcaca868db6934ee022b86ef893bcfe27
 SHA512:
-  metadata.gz: a2d65c2d115afcb9b730523dee35d2b5abc2683c06efa9499097b12a4f2bf519392cd58623117e7531b838085c7d8217a64a3d41271c69b9cc43b1ae523dd94d
-  data.tar.gz: 8c19598e5de009b554f6cf655e76954e85f4a8c1a6cf58155f61292cde40827cf8187d0027ba7152d0ca07df8c254845a32849942c729f0580590923854ab743
+  metadata.gz: 976ad1e3c7a8e839f3aa2e3d80951f2af7bbecfb9997674051d53a50d0a0767223b4cdd2bfbf778f0304c27ca6b350c2bc238085fba8538a7bf81610edd118b2
+  data.tar.gz: 579389cdec2c8ea71bb73e48df0c8d6c94f8eeeab45b5b27f583a8809cc530fd82f4830e9b7dd09645295e239d3d09df3751e6a6ff228060da1736ae778c2314

data/README.md

@@ -19,8 +19,9 @@ gem install committer-tools
   - get pr from github api
   - put together metadata for commit
   - do a few checks, make sure ok to land
+  - pauses, lets you squash, make any edits necessary
   - add metadata to commit message
-  - make sure final commit message ok
+  - one final round of commit message validation
 - What this does not automates:
   - pushing the actual commit
 

data/committer-tools.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'committer-tools'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = 'Jon Moss'
   spec.email         = 'me@jonathanmoss.me'
 

data/exe/committer-tools

@@ -5,10 +5,35 @@ require 'committer-tools'
 
 trap("SIGINT") { exit 0 }
 
-if ARGV.shift == 'land'
-  Preparer.new.run
-else
-  puts "Welcome to committer-tools!"
-  puts "Currently the only command is 'land', which will ready a Node.js Foundation pull request to be landed."
-  exit 0
+class Commander
+  COMMANDS = {
+    'land' => "Ready a Node.js Foundation pull request to be landed"
+  }
+
+  def run(command)
+    if COMMANDS.keys.include?(command)
+      run_command(command)
+    else
+      run_usage
+    end
+  end
+
+  private
+
+  def run_command(command)
+    github_pr = Preparer.new.run
+
+    if command == 'land'
+      LandCommand.new.run(github_pr)
+    end
+  end
+
+  def run_usage
+    puts "Welcome to committer-tools!"
+
+    puts "Available commands:\n"
+    COMMANDS.each { |k, v| puts "--> #{k}: #{v}" }
+  end
 end
+
+Commander.new.run(ARGV.shift)

data/lib/committer-tools.rb

@@ -12,9 +12,9 @@ class HTTPHelper
 end
 
 class Lander
-  def run(pr, github_pr, metadata)
+  def run(github_pr, metadata)
     check_to_land(github_pr, metadata)
-    introduce_commit(pr, metadata)
+    introduce_commit(github_pr, metadata)
 
     puts "[\u{2714}] Commit(s) applied locally. Please update to your liking, and then type 'continue'."
     continue = gets.strip!
@@ -56,7 +56,7 @@ class Lander
     end
   end
 
-  def introduce_commit(pr, metadata)
+  def introduce_commit(github_pr, metadata)
     # Clear current status
     `git am --abort`
     `git rebase --abort`
@@ -67,7 +67,7 @@ class Lander
     `git merge --ff-only upstream/master`
 
     # Download and apply patch
-    `curl -L https://github.com/#{pr[:org]}/#{pr[:repo]}/pull/#{pr[:id]}.patch | git am --whitespace=fix`
+    `curl -L https://github.com/#{github_pr['base']['user']['login']}/#{github_pr['base']['repo']['name']}/pull/#{github_pr['number']}.patch | git am --whitespace=fix`
   end
 
   def validate_commit
@@ -133,10 +133,7 @@ end
 class Preparer
   def run
     pr = get_pr()
-    github_pr = get_github_pr(pr)
-    metadata = get_metadata(github_pr)
-
-    Lander.new.run(pr, github_pr, metadata)
+    get_github_pr(pr)
   end
 
   private
@@ -147,10 +144,6 @@ class Preparer
     )
   end
 
-  def get_metadata(github_pr)
-    MetadataCollector.new.collect(github_pr)
-  end
-
   def get_pr
     puts "Please enter PR ID:"
     pr_id = gets.strip!
@@ -164,3 +157,10 @@ class Preparer
     end
   end
 end
+
+class LandCommand
+  def run(github_pr)
+    metadata = MetadataCollector.new.collect(github_pr)
+    Lander.new.run(github_pr, metadata)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: committer-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jon Moss
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Node.js collaborator CLI utility.