learn-test 2.3.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b86bdac0ef9eef67c3c46c1639d72917aaf19e6
-  data.tar.gz: 52f358796c2d48094a2c29de4fd417e707783021
+  metadata.gz: befbe9633e983c7302c3aa5955778b8fc38970dd
+  data.tar.gz: 5b84c70e6b27fc2c2cd5c2584328a613b1d5564e
 SHA512:
-  metadata.gz: 9532e8a6730a64f43f91af741ac08229d9b8c0dbf95ab3a8694e0b8bfca97c5a1e6e7fc5659bb8b75d95d148255fccd4cc7410ec6fc4602dccff8bb6b802485e
-  data.tar.gz: 59ee606f3370b3f39c14bbcd0c01681db9d570a09fe694291b0fd756f3681f0c5c1d5f666526d33d4417986e1eb6cadc3939872314f19756b258fd6683d36a60
+  metadata.gz: b820e01ce5acd8d3cc8371c6937418931a6443a891ff79c18f6fc031d41c3258d9132e9f58e7d669b33f91a6dd0f257806af53c29c4824002a5af060bbfd7b19
+  data.tar.gz: 658d425794585202a49bd4a7dd42282ae4e0b93b3cc80f5380e4671eb1aa551694788133cd7a0931bcff4788c5ad2a167204118ba573aba28e3356a9435d8446

data/lib/learn_test.rb

@@ -8,6 +8,7 @@ require_relative 'learn_test/netrc_interactor'
 require_relative 'learn_test/github_interactor'
 require_relative 'learn_test/user_id_parser'
 require_relative 'learn_test/username_parser'
+require_relative 'learn_test/learn_oauth_token_parser'
 require_relative 'learn_test/repo_parser'
 require_relative 'learn_test/file_finder'
 require_relative 'learn_test/runner'

data/lib/learn_test/learn_oauth_token_parser.rb

@@ -0,0 +1,8 @@
+module LearnTest
+  class LearnOauthTokenParser
+    def self.get_learn_oauth_token
+      parser = LearnTest::NetrcInteractor.new(machine: 'learn-config')
+      parser.user_id
+    end
+  end
+end

data/lib/learn_test/netrc_interactor.rb

@@ -2,15 +2,16 @@ require 'netrc'
 
 module LearnTest
   class NetrcInteractor
-    attr_reader :username, :user_id, :netrc
+    attr_reader :username, :user_id, :netrc, :machine
 
-    def initialize
+    def initialize(machine: 'flatiron-push')
+      @machine = machine
       @netrc = Netrc.read
-      @username, @user_id = netrc["flatiron-push"]
+      @username, @user_id = netrc[machine]
     end
 
     def write(username, user_id)
-      netrc["flatiron-push"] = username, user_id
+      netrc[machine] = username, user_id
       netrc.save
     end
   end

data/lib/learn_test/runner.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module LearnTest
   class Runner
     attr_reader :repo, :options
@@ -33,6 +35,16 @@ module LearnTest
 
     private
 
+    def augment_results!(results)
+      if File.exist?("#{FileUtils.pwd}/.learn")
+        dot_learn = YAML.load(File.read("#{FileUtils.pwd}/.learn"))
+
+        if !dot_learn['github'].nil?
+          results[:github] = dot_learn['github']
+        end
+      end
+    end
+
     def connection
       @connection ||= Faraday.new(url: SERVICE_URL) do |faraday|
         faraday.adapter  Faraday.default_adapter
@@ -53,11 +65,14 @@ module LearnTest
     end
 
     def push_results(strategy)
+      results = strategy.results
+      augment_results!(results)
+
       begin
         connection.post do |req|
           req.url(strategy.service_endpoint)
           req.headers['Content-Type'] = 'application/json'
-          req.body = Oj.dump(strategy.results, mode: :compat)
+          req.body = Oj.dump(results, mode: :compat)
         end
       rescue Faraday::ConnectionFailed
         puts 'There was a problem connecting to Learn. Not pushing test results.'.red

data/lib/learn_test/strategies/jasmine.rb

@@ -34,6 +34,7 @@ module LearnTest
         @results ||= {
           username: username,
           github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
           repo_name: runner.repo,
           build: {
             test_suite: [{
@@ -68,6 +69,10 @@ module LearnTest
         options[:skip] ? "none" : super
       end
 
+      def learn_oauth_token
+        options[:skip] ? nil : super
+      end
+
       private
 
       def set_up_runner

data/lib/learn_test/strategies/java_junit.rb

@@ -27,6 +27,7 @@ module LearnTest
         @results ||= {
           username: username,
           github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
           repo_name: runner.repo,
           build: {
             test_suite: [{

data/lib/learn_test/strategies/karma.rb

@@ -31,6 +31,7 @@ module LearnTest
         @results ||= {
           username: username,
           github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
           repo_name: runner.repo,
           build: {
             test_suite: [{

data/lib/learn_test/strategies/mocha.rb

@@ -40,6 +40,7 @@ module LearnTest
         @results ||= {
           username: username,
           github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
           repo_name: runner.repo,
           build: {
             test_suite: [{

data/lib/learn_test/strategies/protractor.rb

@@ -65,6 +65,7 @@ module LearnTest
         @results ||= {
           username: username,
           github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
           repo_name: runner.repo,
           build: {
             test_suite: [{

data/lib/learn_test/strategies/python_unittest.rb

@@ -29,6 +29,7 @@ module LearnTest
         {
           username: username,
           github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
           repo_name: runner.repo,
           build: {
             test_suite: [{

data/lib/learn_test/strategies/rspec.rb

@@ -44,6 +44,7 @@ module LearnTest
         {
           username: username,
           github_user_id: user_id,
+          learn_oauth_token: learn_oauth_token,
           repo_name: runner.repo,
           build: {
             test_suite: [{

data/lib/learn_test/strategy.rb

@@ -44,6 +44,10 @@ module LearnTest
       @user_id ||= LearnTest::UserIdParser.get_user_id
     end
 
+    def learn_oauth_token
+      @learn_oauth_token ||= LearnTest::LearnOauthTokenParser.get_learn_oauth_token
+    end
+
     def argv
       options[:argv]
     end

data/lib/learn_test/username_parser.rb

@@ -5,7 +5,7 @@ module LearnTest
       username = parser.username
       user_id = parser.user_id
 
-      if !username || user_id == 'none'
+      if !LearnTest::LearnOauthTokenParser.get_learn_oauth_token && (!username || user_id == 'none')
         print "Enter your github username: "
         username = gets.strip
         user_id = LearnTest::GithubInteractor.get_user_id_for(username)

data/lib/learn_test/version.rb

@@ -1,3 +1,3 @@
 module LearnTest
-  VERSION = '2.3.3'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -222,6 +222,7 @@ files:
 - lib/learn_test/dependency.rb
 - lib/learn_test/file_finder.rb
 - lib/learn_test/github_interactor.rb
+- lib/learn_test/learn_oauth_token_parser.rb
 - lib/learn_test/netrc_interactor.rb
 - lib/learn_test/repo_parser.rb
 - lib/learn_test/runner.rb