learn-submit 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aa61bac053388e71aa1e001c0003092963f31f6
-  data.tar.gz: 9731f01ba108bd80ed61889d69160484f2e06544
+  metadata.gz: 17df7ba067b579399ee3f9d6168e1111f88ddbea
+  data.tar.gz: 1bd750a9d75686516ac797618ce5a87426f82ce3
 SHA512:
-  metadata.gz: fbb4ab3eb97378fa924032471ce81bc175c83422f658e3aef22ca0f6c22ae888e7b9c3f25ada8771b033a6f87294e858ea586890b1925937d4fded74eac1e877
-  data.tar.gz: 6808c5bcdab2521f45c3019a25c0f58e40495ebcc29bcccacf0f6269695e4bc38e4c45349535e2b66fbfe1144e14c540270c6725f58b7eb963bd9b1705f5e272
+  metadata.gz: 5703136126606a185b4e6ce9bdab04c36db10172e4b62e31ac0f2ee989cec2330eec95644ee21a051de14a4c849a185c083bea170e85716e6bb0f5fbdb798370
+  data.tar.gz: 8c645027fc36df28a87644302aae767a098dd48a2dcca00931ed45bc671c28a901eb5d9bb31d12d04c1bfa6f7ac0b4ae40edf7ea714d46e684f4f612872654e1

data/bin/learn-submit

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'learn_submit'
+
+# To prevent weird errors when random command line args are passed in
+KNOWN_COMMANDS = []
+
+message = ARGV[0] ? ARGV.join(' ') : nil
+
+ARGV.map! do |arg|
+  KNOWN_COMMANDS.include?(arg) ? arg : nil
+end.compact!
+
+LearnSubmit::Submission.create(message: message)

data/learn-submit.gemspec

@@ -19,4 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_runtime_dependency "netrc"
+  spec.add_runtime_dependency "git", "~> 1.2"
+  spec.add_runtime_dependency "learn-web", ">= 1.0.0"
 end

data/lib/learn_submit.rb

@@ -1,5 +1,12 @@
-require "learn_submit/version"
+require 'timeout'
+require 'netrc'
+require 'git'
+require 'learn_web'
 
-module Learn::Submit
-  # Your code goes here...
+require 'learn_submit/version'
+require 'learn_submit/submission'
+require 'learn_submit/submission/git_interactor'
+
+
+module LearnSubmit
 end

data/lib/learn_submit/submission.rb

@@ -0,0 +1,70 @@
+module LearnSubmit
+  class Submission
+    attr_reader :git, :client
+
+    def self.create(message: nil)
+      new(message: message).create
+    end
+
+    def initialize(message:)
+      _login, token = Netrc.read['learn-config']
+
+      @client  = LearnWeb::Client.new(token: token)
+      @git     = LearnSubmit::Submission::GitInteractor.new(username: user.username, message: message)
+    end
+
+    def create
+      commit_and_push!
+      submit!
+    end
+
+    def user
+      @user ||= client.me
+    end
+
+    private
+
+    def commit_and_push!
+      git.commit_and_push
+
+      # Just to give GitHub a second to register the repo changes
+      sleep(1)
+    end
+
+    def submit!(retries=3)
+      puts 'Submitting lesson...'
+      repo_name   = git.repo_name
+      branch_name = git.branch_name
+
+      begin
+        pr_response = Timeout::timeout(15) do
+          client.issue_pull_request(repo_name: repo_name, branch_name: branch_name)
+        end
+      rescue Timeout::Error
+        if retries > 0
+          puts "It seems like there's a problem connecting to Learn. Trying again..."
+          submit!(retries-1)
+        else
+          puts "Sorry, there's a problem reaching Learn right now. Please try again."
+          exit
+        end
+      end
+
+      case pr_response.status
+      when 200
+        puts "Done."
+        exit
+      when 404
+        puts 'Sorry, it seems like there was a problem connecting with Learn. Please try again.'
+        exit
+      else
+        puts pr_response.message
+
+        if retries > 0
+          puts "Trying again..."
+          submit!(retries-1)
+        end
+      end
+    end
+  end
+end

data/lib/learn_submit/submission/git_interactor.rb

@@ -0,0 +1,124 @@
+module LearnSubmit
+  class Submission
+    class GitInteractor
+      attr_reader   :username, :git, :message
+      attr_accessor :remote_name, :old_remote_name, :old_url
+
+      LEARN_ORG_NAMES = [
+        'learn-co',
+        'learn-co-curriculum',
+        'learn-co-students'
+      ]
+
+      def initialize(username:, message:)
+        @username = username
+        @message  = message || 'Done.'
+        @git      = set_git
+      end
+
+      def commit_and_push
+        check_remote
+        add_changes
+        commit_changes
+
+        push!
+      end
+
+      def repo_name
+        url = git.remote(remote_name).url
+        url.match(/^.+\w+\/(.*?)(?:\.git)?$/)[1]
+      end
+
+      def branch_name
+        git.branch.name
+      end
+
+      private
+
+      def set_git
+        begin
+          Git.open(FileUtils.pwd)
+        rescue ArgumentError => e
+          if e.message.match(/path does not exist/)
+            puts "It doesn't look like you're in a lesson directory."
+            puts 'Please cd into an appropriate directory and try again.'
+
+            exit
+          else
+            puts 'Sorry, something went wrong. Please try again.'
+            exit
+          end
+        end
+      end
+
+      def check_remote
+        self.remote_name = if git.remote.url.match(/#{username}/).nil?
+          fix_remote!
+        else
+          git.remote.name
+        end
+      end
+
+      def fix_remote!
+        self.old_remote_name = git.remote.name
+        self.old_url         = git.remote.url
+
+        add_backup_remote
+        remove_old_remote
+        add_correct_remote
+      end
+
+      def add_backup_remote
+        git.add_remote("#{old_remote_name}-bak", old_url)
+      end
+
+      def remove_old_remote
+        git.remote(old_remote_name).remove
+      end
+
+      def add_correct_remote
+        new_url = old_url.gsub(/#{LEARN_ORG_NAMES.join('|').gsub('-','\-')}/, username)
+        git.add_remote(old_remote_name, new_url)
+
+        old_remote_name
+      end
+
+      def add_changes
+        puts 'Adding changes...'
+        git.add(all: true)
+      end
+
+      def commit_changes
+        puts 'Committing changes...'
+        begin
+          git.commit(message)
+        rescue Git::GitExecuteError => e
+          if e.message.match(/nothing to commit/)
+            puts "It looks like you have no changes to commit. Will still try updating your submission..."
+          else
+            puts 'Sorry, something went wrong. Please try again.'
+            exit
+          end
+        end
+      end
+
+      def push!(retries=3)
+        puts 'Pushing changes to GitHub...'
+        push_remote = git.remote(self.remote_name)
+        begin
+          Timeout::timeout(15) do
+            git.push(push_remote)
+          end
+        rescue Timeout::Error
+          if retries > 0
+            puts "Seems there was an error pushing to GitHub. Trying again..."
+            puts!(retries-1)
+          else
+            puts "Can't reach GitHub right now. Please try again."
+            exit
+          end
+        end
+      end
+    end
+  end
+end

data/lib/learn_submit/version.rb

@@ -1,3 +1,3 @@
 module LearnSubmit
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-submit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: learn-web
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: 
 email:
 - learn@flatironschool.com
@@ -54,6 +96,8 @@ files:
 - bin/learn-submit
 - learn-submit.gemspec
 - lib/learn_submit.rb
+- lib/learn_submit/submission.rb
+- lib/learn_submit/submission/git_interactor.rb
 - lib/learn_submit/version.rb
 homepage: https://learn.co
 licenses: