github_fastforward 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba79be9af2157f4b870aaf7e8b4ec59dbb66d4fb
-  data.tar.gz: 3b87ea4b7980c5076d0f02eb5f9ed8c7113b84c0
+  metadata.gz: 2806b0fbf58698021f000fbe99a41a8845b222ee
+  data.tar.gz: 562b156730cbc39fab0314903e4aebe5f4c28c82
 SHA512:
-  metadata.gz: a297c5d81180428ae91377b535d847f8e7fb86aec014cfda3331c749e0a36da89e1148d5deefd74955cbebf7ac4b18222a67a7e97634832b66cad1714d2d20d5
-  data.tar.gz: 9b950b2d7b087f4851df6886494046f1b54ad116d1e06d3cc9c42bdd038e485db75deab82b8e29cff77a31c6e9819d51d5f3ad567d33359752b05aa78e54569f
+  metadata.gz: 374f6dde51a195c6c68b86afb4455f71ebd1f15df4b0ee23d654c05556da5e0c17075bc18d5823a8279cba7f8ff14e3ce6219ef85193a09b3c0d352d34dbfe9c
+  data.tar.gz: a1d19fe821d5db2a08a01d4ebad6675bea8d369389ab3e38352240ae9db9356f3ea006000ff21acb45e6dae45086e86fc28588abe1c383b8dfcb11dea50679fb

data/bin/github_fastforward

@@ -1,50 +1,50 @@
 #!/usr/bin/env ruby
 
-require "octokit"
+require 'octokit'
 
-parent = "upstream"
+parent = 'upstream'
 
-if ARGV[0] == "-a"
-    print "Username: "
-    uname = STDIN.gets.chomp
-    print "Password: "
-    pword = STDIN.gets.chomp
+if ARGV[0] == '-a'
+  print 'Username: '
+  uname = STDIN.gets.chomp
+  print 'Password: '
+  pword = STDIN.gets.chomp
 end
 
-if ARGV[0] == "-u" && ARGV[2] == "-p"
-    uname = ARGV[1]
-    pword = ARGV[3]
+if ARGV[0] == '-u' && ARGV[2] == '-p'
+  uname = ARGV[1]
+  pword = ARGV[3]
 end
 
-if uname != nil && pword != nil
-    Octokit.configure do |conf|
-        conf.login = uname
-        conf.password = pword
-    end
+unless uname.nil? || pword.nil?
+  Octokit.configure do |conf|
+    conf.login = uname
+    conf.password = pword
+  end
 end
 
-unless system "git rev-parse --git-dir > /dev/null 2>&1"
-    puts "Not in a git repo!"
-    exit
+unless system 'git rev-parse --git-dir > /dev/null 2>&1'
+  puts 'Not in a git repo!'
+  exit
 end
 
 repo = `git config --get remote.origin.url`.sub('https://github.com/', '').chomp
 
 unless `git remote`.include? parent
 
-    puts "Adding remote #{parent}..."
+  puts "Adding remote #{parent}..."
 
-    begin
-        url = Octokit.repo(repo)[:parent][:html_url]
-    rescue NoMethodError
-        puts "Not a fork!"
-        exit
-    rescue StandardError
-        puts "Could not find repo!"
-        exit
-    end
+  begin
+    url = Octokit.repo(repo)[:parent][:html_url]
+  rescue NoMethodError
+    puts 'Not a fork!'
+    exit
+  rescue StandardError
+    puts 'Could not find repo!'
+    exit
+  end
 
-    `git remote add #{parent} #{url}`
+  `git remote add #{parent} #{url}`
 end
 
 branch = `git rev-parse --abbrev-ref HEAD`.chomp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github_fastforward
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Caleb Smith
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement