learn-open 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8eefb801c37c1a63235d568a07042a6991a276b
-  data.tar.gz: a71612e54d72db7c25ec6f71d99d37e5432dac73
+  metadata.gz: f71edf24bcdfc6d39ee8206c8ce1a2a5f666794f
+  data.tar.gz: 6c5defd9ef8d38ecd71c96f58c456baaa6e0a44d
 SHA512:
-  metadata.gz: 806ca91e2f01aa4240d1dc42374705e78a7caa00ed9c95ff0b905debd0db7e427e3959bb4ed68290279c35903eaf794ede8592bdb807cc629c69a5bf65f06860
-  data.tar.gz: 39ad9ac85c6257441b7821236fc1f78e547f75b70f6fb64ac6bdcac0e815fa67cfd8309e7cd5d1eabfcdfcbea249f0fd81f5b3711b4b0ae1f1e27ce712a62f24
+  metadata.gz: ee19d9ab4a82fdb889cffc99445d235aa0148daf84d02a3a7d3db3a13caec99104a5b6bce623486913e9d7819951f9caca128563481dd7e1df9855154248143f
+  data.tar.gz: 2ee07524eb58e33c98424a409aa132734be207debbf483f034fd3bf58e6c2e65dfd5a043556cb2fd47b7df3839c01cd5d4d176e80db553331aa6d354c89a37ee

data/lib/learn_open/opener.rb

@@ -29,30 +29,15 @@ module LearnOpen
       if lesson_is_readme?
         open_readme
       else
-        fork_repo
-        clone_repo
-        bundle_install
-        npm_install
-        open_with_editor
-        cd_to_lesson
+        git_tasks
+        file_tasks
+        dependency_tasks
+        completion_tasks
       end
     end
 
     def repo_exists?
-      cloned_labs = "#{HOME_DIR}/.cloned_labs"
-      if File.exists?(cloned_labs)
-        puts "Loading..."
-        syncing_done = "#{HOME_DIR}/.syncing_started"
-        sleep 1 until File.exists?(syncing_done)
-        if File.readlines(cloned_labs).grep(/#{repo_dir}/).any?
-          sleep 1 until File.exists?("#{lessons_dir}/#{repo_dir}")
-          true
-        else
-          false
-        end
-      else
-        File.exists?("#{lessons_dir}/#{repo_dir}")
-      end
+      File.exists?("#{lessons_dir}/#{repo_dir}/.git")
     end
 
     private
@@ -270,7 +255,7 @@ module LearnOpen
       if ios_lesson?
         open_ios_lesson
       elsif editor
-        system("cd #{lessons_dir}/#{repo_dir} && #{editor} .")
+        system("#{editor} .")
       end
     end
 
@@ -335,15 +320,12 @@ module LearnOpen
     def cd_to_lesson
       puts "Opening lesson..."
       Dir.chdir("#{lessons_dir}/#{repo_dir}")
-      cleanup_tmp_file
-      puts "Done."
-      exec("#{ENV['SHELL']} -l")
     end
 
     def bundle_install
       if !ios_lesson? && File.exists?("#{lessons_dir}/#{repo_dir}/Gemfile")
         puts "Bundling..."
-        system("cd #{lessons_dir}/#{repo_dir} && bundle install > /dev/null 2>&1")
+        system("bundle install > /dev/null 2>&1")
       end
     end
 
@@ -352,9 +334,9 @@ module LearnOpen
         puts 'Installing dependencies...'
 
         if ide_environment?
-          system("cd #{lessons_dir}/#{repo_dir} && yarn install --no-lockfile")
+          system("yarn install --no-lockfile")
         else
-          system("cd #{lessons_dir}/#{repo_dir} && npm install")
+          system("npm install")
         end
       end
     end
@@ -404,5 +386,26 @@ module LearnOpen
     def ide_environment?
       ENV['IDE_CONTAINER'] == "true"
     end
+
+    def git_tasks
+      fork_repo
+      clone_repo
+    end
+
+    def file_tasks
+      cd_to_lesson
+      open_with_editor
+    end
+
+    def dependency_tasks
+      bundle_install
+      npm_install
+    end
+
+    def completion_tasks
+      cleanup_tmp_file
+      puts "Done."
+      exec("#{ENV['SHELL']} -l")
+    end
   end
 end

data/lib/learn_open/version.rb

@@ -1,3 +1,3 @@
 module LearnOpen
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

data/spec/learn_open/opener_spec.rb

@@ -10,65 +10,16 @@ describe LearnOpen::Opener do
       FileUtils.rm_rf(path)
     end
 
-    context "with .cloned_labs file" do
-      after do
-        cloned_labs = "#{LearnOpen::Opener::HOME_DIR}/.cloned_labs"
-        FileUtils.rm(cloned_labs) if File.exists?(cloned_labs)
+    it "returns true if .git directory for lab exists" do
+      expect(opener).to receive(:repo_dir).and_return("js-rubber-duck-wrangling")
+      FileUtils.mkdir_p("#{opener.lessons_dir}/js-rubber-duck-wrangling/.git")
 
-        syncing_started = "#{LearnOpen::Opener::HOME_DIR}/.syncing_started"
-        FileUtils.rm(syncing_started) if File.exists?(syncing_started)
-      end
-
-      it "returns true if lab is in the .cloned_labs file" do
-        expect(opener).to receive(:repo_dir).at_least(:once).and_return("js-rubber-duck-wrangling")
-
-        File.open("#{LearnOpen::Opener::HOME_DIR}/.cloned_labs", "w+") do |f|
-          f.puts("js-rubber-duck-wrangling")
-        end
-
-        File.open("#{LearnOpen::Opener::HOME_DIR}/.syncing_started", "w+") do |f|
-          f.puts("done")
-        end
-
-        FileUtils.mkdir_p("#{opener.lessons_dir}/js-rubber-duck-wrangling")
-
-        expect(opener.repo_exists?).to be_truthy
-      end
-
-      it "returns false if lab is not in the .cloned_labs file" do
-        File.open("#{LearnOpen::Opener::HOME_DIR}/.syncing_started", "w+") do |f|
-          f.puts("done")
-        end
-        expect(opener).to receive(:repo_dir).and_return("js-rubber-duck-wrangling")
-        expect(opener.repo_exists?).to be_falsy
-      end
-
-      context "before filesyncing starts" do
-        it "waits for .syncing_started " do
-          File.open("#{LearnOpen::Opener::HOME_DIR}/.cloned_labs", "w+") do |f|
-            f.puts("js-rubber-duck-wrangling")
-          end
-
-          FileUtils.mkdir_p("#{opener.lessons_dir}/js-rubber-duck-wrangling")
-          expect do
-            Timeout::timeout(2) { opener.repo_exists? }
-          end.to raise_error(Timeout::Error)
-        end
-      end
+      expect(opener.repo_exists?).to be_truthy
     end
 
-    context "without .cloned_labs file" do
-      it "returns true if directory for lab exists" do
-        expect(opener).to receive(:repo_dir).and_return("js-rubber-duck-wrangling")
-        FileUtils.mkdir_p("#{opener.lessons_dir}/js-rubber-duck-wrangling")
-
-        expect(opener.repo_exists?).to be_truthy
-      end
-
-      it "returns false if directory for lab doesn't exists" do
-        expect(opener).to receive(:repo_dir).and_return("js-rubber-duck-wrangling")
-        expect(opener.repo_exists?).to be_falsy
-      end
+    it "returns false if directory for lab doesn't exists" do
+      expect(opener).to receive(:repo_dir).and_return("js-rubber-duck-wrangling")
+      expect(opener.repo_exists?).to be_falsy
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-open
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Open Learn lessons locally