learn-open 1.1.59 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c130640cdfeb17cf3c88ead41889edb49cc4651
-  data.tar.gz: 9aeff17f2238e87a892057aa69ccf1ab497fa0f0
+  metadata.gz: 7330aa259179cd5f2c28ba41d279ac632266ba03
+  data.tar.gz: a70cf18a1f3791570d59a3185de77a2f9b572501
 SHA512:
-  metadata.gz: ab0646d2f5ed19e082628d9dd48b1670b4734572526073d335b6bb15a413256868832bf54afbc8fd32689676cf1ac4b1fe87571b96a5abe396012335225bec2e
-  data.tar.gz: 0c66e4d2e2442579f9ad2f29aead91950701319ab6e63e30b1b53f06468872138a3bd5d0c45c5f56085f9e3f960010bc99594875997eb3ee060bb18e788a6ce6
+  metadata.gz: e3cdc0b4da3b50bb866ac3257b5ac8f6b723276eeaa1fa998342af876d9cf4bc866cfd5745a004b3f870285e7523f1c3d5af0a7cd250ebc3e9b4b9eb9c03fc8f
+  data.tar.gz: f6e7f8a06fa9feb544a8682defa64d5b139ed20d93a33c7559f87ff60ad3c171986f921b5fba666f82968f50d41281da8a533ecfac7a65eda5c82aceb4e7912e

data/learn-open.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "netrc"
   spec.add_runtime_dependency "git"
-  spec.add_runtime_dependency "learn-web", ">= 1.4.2"
+  spec.add_runtime_dependency "learn-web", ">= 1.5.0"
 end

data/lib/learn_open/opener.rb

@@ -1,15 +1,15 @@
 module LearnOpen
   class Opener
-    attr_reader   :editor, :client, :lessons_dir, :file_path, :get_next_lesson
-    attr_accessor :lesson, :repo_dir, :lesson_is_lab, :lesson_id, :later_lesson
+    attr_reader   :editor, :client, :lessons_dir, :file_path, :get_next_lesson, :token
+    attr_accessor :lesson, :repo_dir, :lesson_is_lab, :lesson_id, :later_lesson, :dot_learn
 
     def self.run(lesson:, editor_specified:, get_next_lesson:)
       new(lesson, editor_specified, get_next_lesson).run
     end
 
     def initialize(lesson, editor, get_next_lesson)
-      _login, token = Netrc.read['learn-config']
-      @client       = LearnWeb::Client.new(token: token)
+      _login, @token = Netrc.read['learn-config']
+      @client        = LearnWeb::Client.new(token: @token)
 
       @lesson          = lesson
       @editor          = editor
@@ -39,6 +39,29 @@ module LearnOpen
 
     private
 
+    def ping_fork_completion(retries=3)
+      begin
+        Timeout::timeout(15) do
+          client.submit_event(
+            event: 'fork',
+            learn_oauth_token: token,
+            repo_name: repo_dir,
+            base_org_name: lesson.split('/')[0],
+            forkee: { full_name: nil }
+          )
+        end
+      rescue Timeout::Error
+        if retries > 0
+          puts "There was a problem forking and cloning this lesson. Retrying..."
+          ping_fork_completion(retries-1)
+        else
+          puts "There is an issue connecting to Learn. Please try again."
+          File.write(file_path, 'ERROR: Error connecting to Learn')
+          exit
+        end
+      end
+    end
+
     def warn_if_necessary
       temp_args = nil
 
@@ -83,18 +106,21 @@ module LearnOpen
         self.lesson_is_lab = current_lesson.lab
         self.lesson_id     = current_lesson.id
         self.later_lesson  = false
+        self.dot_learn     = current_lesson.dot_learn
       elsif !lesson && get_next_lesson
         puts "Getting next lesson..."
         self.lesson        = get_next_lesson_forked_repo
         self.lesson_is_lab = next_lesson.lab
         self.lesson_id     = next_lesson.id
         self.later_lesson  = false
+        self.dot_learn     = next_lesson.dot_learn
       else
         puts "Looking for lesson..."
-        self.lesson        = ensure_correct_lesson.repo_slug
+        self.lesson        = ensure_correct_lesson.clone_repo
         self.lesson_is_lab = correct_lesson.lab
         self.lesson_id     = correct_lesson.lesson_id
         self.later_lesson  = correct_lesson.later_lesson
+        self.dot_learn     = correct_lesson.dot_learn
       end
 
       self.repo_dir = lesson.split('/').last
@@ -111,7 +137,7 @@ module LearnOpen
     def get_current_lesson_forked_repo(retries=3)
       begin
         Timeout::timeout(15) do
-          current_lesson.forked_repo
+          current_lesson.clone_repo
         end
       rescue Timeout::Error
         if retries > 0
@@ -128,7 +154,7 @@ module LearnOpen
     def get_next_lesson_forked_repo(retries=3)
       begin
         Timeout::timeout(15) do
-          next_lesson.forked_repo
+          next_lesson.clone_repo
         end
       rescue Timeout::Error
         if retries > 0
@@ -167,18 +193,21 @@ module LearnOpen
       if !repo_exists?
         File.write(file_path, 'Forking repository...')
         puts "Forking lesson..."
-        begin
-          Timeout::timeout(15) do
-            client.fork_repo(repo_name: repo_dir)
-          end
-        rescue Timeout::Error
-          if retries > 0
-            puts "There was a problem forking this lesson. Retrying..."
-            fork_repo(retries-1)
-          else
-            puts "There is an issue connecting to Learn. Please try again."
-            File.write(file_path, 'ERROR: Error connecting to Learn')
-            exit
+
+        if !dot_learn || dot_learn[:github] != false
+          begin
+            Timeout::timeout(15) do
+              client.fork_repo(repo_name: repo_dir)
+            end
+          rescue Timeout::Error
+            if retries > 0
+              puts "There was a problem forking this lesson. Retrying..."
+              fork_repo(retries-1)
+            else
+              puts "There is an issue connecting to Learn. Please try again."
+              File.write(file_path, 'ERROR: Error connecting to Learn')
+              exit
+            end
           end
         end
       end
@@ -213,6 +242,10 @@ module LearnOpen
           end
         end
       end
+
+      if dot_learn && dot_learn[:github] == false
+        ping_fork_completion
+      end
     end
 
     def repo_exists?
@@ -242,10 +275,10 @@ module LearnOpen
           File.write(file_path, 'ERROR: Problem parsing lesson data. Try again.')
           exit
         end
-      rescue NoMethodError => e
+      rescue NoMethodError, Errno::ENOENT => e
         if xcodeproj_file? || xcworkspace_file?
           true
-        elsif e.message.match(/for false:FalseClass/)
+        elsif e.message.match(/for false:FalseClass/) || e.message.match(/No such file or directory/)
           false
         else
           puts "Sorry, there seems to be a problem with this lesson. Please submit a bug report to bugs@learn.co and try again later."

data/lib/learn_open/version.rb

@@ -1,3 +1,3 @@
 module LearnOpen
-  VERSION = '1.1.59'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-open
 version: !ruby/object:Gem::Version
-  version: 1.1.59
+  version: 1.2.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
 description: 
 email:
 - learn@flatironschool.com