lense 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec156c1811be9d14df4746757856bf6df747adbc
-  data.tar.gz: 3833cf6a368d6b0f795fc4a9783a0d6ea705dff1
+  metadata.gz: 48127f642dcb072a7efa9f4d06f27a2c3e876d37
+  data.tar.gz: d7d70a6dd8266744ea3f505cc584ff788d39dd8d
 SHA512:
-  metadata.gz: c977bc392c01f297c73303bd64cb28e7bbd1c6fc6243a7f65f1708bffb4ec2165a39e0da9d7dca0ea9b998103b2e972721ab5411221ae76a1477f85b4651328f
-  data.tar.gz: dd1bcafeb6e86a4204a96147cb40864c94a73598e6ad012ead7dc14a4d1191770b76a0e7177699e8f10a686ec0f59a0f053675e1d3d177d84c681971d8d1391a
+  metadata.gz: 155623f8e880665d2bc61ec35f9a628cab6d72867c3007f98340bca1477eded15d8fae7e064997cfa19268d42f36a00fb347835c72a9802dddcaace7cd16c7f1
+  data.tar.gz: 130d36f3322ed64512efa4a892088ff3233ca563ce5fbe273a76b45ba21705a24130c6f1f145f13f26400463868f427a438dcda680e28333bb81eb5242d5298b

data/bin/lense

@@ -74,14 +74,14 @@ end
 command :pull do |c|
   c.action do |global_options,options,args|
     exit_now!('Must supply a LENSE repository.')  if args.count < 1
-    LENSE_APP.pull args[0]
+    LENSE_APP.install_repo args[0], :pull
   end
 end
 
 command :clone do |c|
   c.action do |global_options,options,args|
     exit_now!('Must supply a LENSE repository.')  if args.count < 1
-    LENSE_APP.clone args[0]
+    LENSE_APP.install_repo args[0], :clone
   end
 end
 

data/lib/lense.rb

@@ -7,7 +7,7 @@ require 'base64'
 class LENSE
   attr_reader :config, :current_course, :lense_file_hash
 
-  VERSION             = '0.2.7'
+  VERSION             = '0.2.8'
   LENSE_DIR           = File.join(ENV['HOME'],'.lense')
   COURSES_DIR         = File.join(LENSE_DIR,'courses')
   CURRENT_COURSE_FILE = File.join(LENSE_DIR,'current_course')
@@ -257,18 +257,12 @@ class LENSE
     exit_now!("Invalid repo name.") unless repo =~ /\A\w+\/\w+\Z/
   end
 
-  def pull(repo)
-    exit_now!("Invalid repo name.") unless repo =~ /\A\w+\/\w+\Z/
-    response = RestClient.get "#{API_BASE}/#{repo}/pull", { params: { format: 'json' } }
-    repository = JSON.parse(response)
-  end
-
-  def clone(repo)
+  def install_repo(repo,action)
     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' } }
+    response = RestClient.get "#{API_BASE}/#{repo}/#{action.to_s}", { params: { format: 'json' } }
     repository = JSON.parse(response)
 
     # reading and checking tar file
@@ -278,16 +272,23 @@ class LENSE
 
     exit_now!("Failed download. Hash does not match.") unless hash_contents(tar_str) == tar_hash
 
-    say "making dirs ..."
-    # make repo dir in current directory
-    Dir.mkdir project_name unless File.directory? project_name
+    if action == :clone
+      say "making dirs ..."
+      # make repo dir in current directory
+      Dir.mkdir project_name unless File.directory? project_name
 
-    # make .lense dir and .lense/temp
-    proj_lense_dir = File.join project_name, '.lense'
-    Dir.mkdir proj_lense_dir unless File.directory? proj_lense_dir
+      # make .lense dir and .lense/temp
+      proj_lense_dir = File.join project_name, '.lense'
+      Dir.mkdir proj_lense_dir unless File.directory? proj_lense_dir
 
-    temp_dir = File.join proj_lense_dir, 'temp'
-    Dir.mkdir temp_dir unless File.directory? temp_dir
+      temp_dir = File.join proj_lense_dir, 'temp'
+      Dir.mkdir temp_dir unless File.directory? temp_dir
+
+      working_dir = "cd #{project_name} "
+    else
+      temp_dir = '.lense/temp'
+      working_dir = 'true'
+    end
 
     # write tar file to .lense/temp/hash.tar
     tar_fname = "#{tar_hash}.tar"
@@ -297,7 +298,7 @@ class LENSE
 
     # cd into repo dir and untar
     say "untaring to ... #{rel_tar_path}"
-    `cd #{project_name} && tar -x#{TARFLAGS}f .lense/temp/#{tar_fname}`
+    `#{working_dir} && tar -x#{TARFLAGS}f .lense/temp/#{tar_fname}`
 
     say "done"
     # read lensefile

metadata

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