lense 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eadd08f9d1e0606d63936551162eccf4c29c2849
-  data.tar.gz: 3eacf0f096032253a0b69939e59c939ba3af8b15
+  metadata.gz: 9a915a6a7faec49f962b8c6662d4fd17e499e32f
+  data.tar.gz: d36577185dc9bcee082af20a468e0ee8ec746300
 SHA512:
-  metadata.gz: a862ca67cacf9fe5e8c735f0b81fad29269f1a029aee4708dbdf2a720fe1e815344060cfa4e1884b2cf3d7741aae0623921469b509ea44fa3ca82929a4e0e48f
-  data.tar.gz: 754b219133e7e15f16c660396ddd9897041cb4e3d17e8407e6a24f549ab612d27a283136dfeba090353690e95bde9e6a179a9fa17ef790e5b5640a15967232e7
+  metadata.gz: 8373c25125c9dc51fe0efc74430a1e1c2cea955ac662e62a1acb1aa2c4ce5f517e6e2052da458aaca4dfa2928637989466ae3cce87a531bb04f4dbf456b9845c
+  data.tar.gz: 58a9688495471fc3abd4dc3ee4424abe9a3c0fd68ed0964d906357337caea00fcf17e29540756aa26ff738b7de62d995166961e1cb7d446b8ecd95caa91b5b2e

data/lib/lense.rb

@@ -7,7 +7,7 @@ require 'base64'
 class LENSE
   attr_reader :config, :current_course, :lense_file_hash
 
-  VERSION             = '0.2.5'
+  VERSION             = '0.2.6'
   LENSE_DIR           = File.join(ENV['HOME'],'.lense')
   COURSES_DIR         = File.join(LENSE_DIR,'courses')
   CURRENT_COURSE_FILE = File.join(LENSE_DIR,'current_course')
@@ -265,14 +265,18 @@ class LENSE
 
   def clone(repo)
     exit_now!("Invalid repo name.") unless repo =~ /\A\w+\/\w+\Z/
+    username, project_name = repo.split '/'
+
     say "making rest call"
     response = RestClient.get "#{API_BASE}/#{repo}/pull", { params: { format: 'json' } }
     repository = JSON.parse(response)
+
+    # reading and checking tar file
     tar_str = Base64::decode64 repository["tar_file_base64"]
     tar_hash = repository["tar_file_fingerprint"]
     say "tar hash #{tar_hash}"
 
-    username, project_name = repo.split '/'
+    exit_now!("Failed download. Hash does not match.") unless hash_contents(tar_str) == tar_hash
 
     say "making dirs ..."
     # make repo dir in current directory
@@ -288,11 +292,12 @@ class LENSE
     # write tar file to .lense/temp/hash.tar
     tar_fname = "#{tar_hash}.tar"
     say "writing tar file ... #{tar_fname}"
-    File.open(File.join(temp_dir,tar_fname), 'w') { |f| f.write tar_str }
+    rel_tar_path = File.join temp_dir, tar_fname
+    File.open(rel_tar_path, 'w') { |f| f.write tar_str }
 
-    say "untaring"
     # cd into repo dir and untar
-    `cd #{project_name} && tar -x#{TARFLAGS}f #{tar_fname}`
+    say "untaring to ... #{rel_tar_path}"
+    `cd #{project_name} && tar -x#{TARFLAGS}f #{rel_tar_path}`
 
     say "done"
     # read lensefile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lense
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Manuel Zubieta