learn-open 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b905fb5b63cd3300320ce1bfe26ee55d41e0e1f5
-  data.tar.gz: ce5f7440a90510f44c42390b71a1dc63790508e5
+  metadata.gz: 069ee8a90603867e8bb20af71a1ac6ba25d6ad41
+  data.tar.gz: aae6a5eb1ece18870d5e5abc3c4317261eaa001a
 SHA512:
-  metadata.gz: 65f9eae1a2f1c6c72d6ec80687175492ee0d4c23feb4f69f0eeed5c9162e092f214bf95c208b50462db59d8e1b65f7b7539849a318de3ed8b55b18fd5d2bdad6
-  data.tar.gz: e13ce0aef3e66eb2fef830311f834cb20f621838f018c8e48e73c9be303588d957b191c6e91ab5f6fbb833ea23de67cf94087a4dc7a583b5c7d5dcc63102685d
+  metadata.gz: e463a05d8fb609afed614cf4ced00d4b6c73aa534f3d79730971b0dc28871283864cd4aa1efc136b32f51c01bf93fe8f5f666e1ade76fe37d9ed4a8e1384fbe0
+  data.tar.gz: 7fd09c77afcd23dd52f5004d6a15cecb0a54e811c6ea875abf22484228f265639797468d413899299a6783f5a0a37cde2a18d979e6b147ed518a0e83376c9bc4

data/bin/learn-open

@@ -2,6 +2,6 @@
 
 require 'learn_open'
 
-lesson, editor_specified = LearnOpen::ArgumentParser.new(ARGV).execute
+lesson, editor_specified, next_lesson = LearnOpen::ArgumentParser.new(ARGV).execute
 
-LearnOpen::Opener.run(lesson: lesson, editor_specified: editor_specified)
+LearnOpen::Opener.run(lesson: lesson, editor_specified: editor_specified, get_next_lesson: next_lesson)

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.0.0"
+  spec.add_runtime_dependency "learn-web", ">= 1.0.1"
 end

data/lib/learn_open/argument_parser.rb

@@ -14,20 +14,23 @@ module LearnOpen
       end
 
       lesson = nil
+      next_lesson = false
 
       configured_editor = !(editor_data.empty? || editor_data.nil?) ? editor_data : nil
       editor_specified = ARGV.detect {|arg| arg.start_with?('--editor=')}.match(/\-\-editor=(.+)/) || configured_editor
       open_after = !!editor_specified
 
-      if !ARGV[0].start_with?('--editor=')
+      if !ARGV[0].start_with?('--editor=') && !ARGV[0].start_with?('--next')
         lesson = ARGV[0]
+      elsif ARGV[0].start_with?('--next')
+        next_lesson = true
       end
 
       if open_after
         editor_specified = editor_specified.is_a?(String) ? editor_specified : editor_specified[1]
       end
 
-      [lesson, editor_specified]
+      [lesson, editor_specified, next_lesson]
     end
   end
 end

data/lib/learn_open/opener.rb

@@ -1,20 +1,21 @@
 module LearnOpen
   class Opener
-    attr_reader   :editor, :client, :lessons_dir, :file_path
+    attr_reader   :editor, :client, :lessons_dir, :file_path, :get_next_lesson
     attr_accessor :lesson, :repo_dir, :lesson_is_lab, :lesson_id
 
-    def self.run(lesson:, editor_specified:)
-      new(lesson, editor_specified).run
+    def self.run(lesson:, editor_specified:, get_next_lesson:)
+      new(lesson, editor_specified, get_next_lesson).run
     end
 
-    def initialize(lesson, editor)
+    def initialize(lesson, editor, get_next_lesson)
       _login, token = Netrc.read['learn-config']
       @client       = LearnWeb::Client.new(token: token)
 
-      @lesson       = lesson
-      @editor       = editor
-      @lessons_dir  = YAML.load(File.read(File.expand_path('~/.learn-config')))[:learn_directory]
-      @file_path    = File.expand_path('~/.learn-open-tmp')
+      @lesson          = lesson
+      @editor          = editor
+      @get_next_lesson = get_next_lesson
+      @lessons_dir     = YAML.load(File.read(File.expand_path('~/.learn-config')))[:learn_directory]
+      @file_path       = File.expand_path('~/.learn-open-tmp')
     end
 
     def run
@@ -47,11 +48,16 @@ module LearnOpen
     def set_lesson
       File.write(file_path, 'Getting lesson...')
 
-      if !lesson
+      if !lesson && !get_next_lesson
         puts "Getting current lesson..."
         self.lesson        = get_current_lesson_forked_repo
         self.lesson_is_lab = current_lesson.lab
         self.lesson_id     = current_lesson.id
+      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
       else
         puts "Looking for lesson..."
         self.lesson        = ensure_correct_lesson.repo_slug
@@ -66,6 +72,10 @@ module LearnOpen
       @current_lesson ||= client.current_lesson
     end
 
+    def next_lesson
+      @next_lesson ||= client.next_lesson
+    end
+
     def get_current_lesson_forked_repo(retries=3)
       begin
         Timeout::timeout(15) do
@@ -82,6 +92,22 @@ module LearnOpen
       end
     end
 
+    def get_next_lesson_forked_repo(retries=3)
+      begin
+        Timeout::timeout(15) do
+          next_lesson.forked_repo
+        end
+      rescue Timeout::Error
+        if retries > 0
+          puts "There was a problem getting your next lesson from Learn. Retrying..."
+          get_next_lesson_forked_repo(retries-1)
+        else
+          puts "There seems to be a problem connecting to Learn. Please try again."
+          exit
+        end
+      end
+    end
+
     def ensure_correct_lesson
       correct_lesson
     end
@@ -155,10 +181,19 @@ module LearnOpen
     end
 
     def ios_lesson?
-      languages   = YAML.load(File.read("#{lessons_dir}/#{repo_dir}/.learn"))['languages']
-      ios_lang    = languages.any? {|l| ['objc', 'swift'].include?(l)}
+      begin
+        languages   = YAML.load(File.read("#{lessons_dir}/#{repo_dir}/.learn"))['languages']
+        ios_lang    = languages.any? {|l| ['objc', 'swift'].include?(l)}
 
-      ios_lang || xcodeproj_file? || xcworkspace_file?
+        ios_lang || xcodeproj_file? || xcworkspace_file?
+      rescue Psych::SyntaxError
+        if xcodeproj_file? || xcworkspace_file?
+          true
+        else
+          puts "There seems to be a problem with this lesson. Please submit a bug report to bugs@learn.co. If you'd like to work on your next lesson, type: learn next"
+          exit
+        end
+      end
     end
 
     def open_ios_lesson

data/lib/learn_open/version.rb

@@ -1,3 +1,3 @@
 module LearnOpen
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: learn-open
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Flatiron School
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 description: 
 email:
 - learn@flatironschool.com