lense 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48127f642dcb072a7efa9f4d06f27a2c3e876d37
-  data.tar.gz: d7d70a6dd8266744ea3f505cc584ff788d39dd8d
+  metadata.gz: 42f7d998c22de788c925711797f679392d9578bc
+  data.tar.gz: 8bbf0fd8898dbc9182faec13c981cad50a2aaca4
 SHA512:
-  metadata.gz: 155623f8e880665d2bc61ec35f9a628cab6d72867c3007f98340bca1477eded15d8fae7e064997cfa19268d42f36a00fb347835c72a9802dddcaace7cd16c7f1
-  data.tar.gz: 130d36f3322ed64512efa4a892088ff3233ca563ce5fbe273a76b45ba21705a24130c6f1f145f13f26400463868f427a438dcda680e28333bb81eb5242d5298b
+  metadata.gz: 9db174c14e17583408bf13c2a81fb2baafacbf05ac8489dca11f178b8f36b0a1435bdf6d9d4de748054a4ca91de65dcb4915b3ca88a4322166550cad64e3d8b2
+  data.tar.gz: 323b53f1507f408329e5eb89c33a3332f35f8184887050d2c6bb995ce1c1453263298cfe3bce180f9c0551e16eeae07e8e216830f928c387608a3e7fc9aec4ba

data/bin/lense

@@ -73,15 +73,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.install_repo args[0], :pull
+    LENSE_APP.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.install_repo args[0], :clone
+    LENSE_APP.clone args[0]
   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.8'
+  VERSION             = '0.2.9'
   LENSE_DIR           = File.join(ENV['HOME'],'.lense')
   COURSES_DIR         = File.join(LENSE_DIR,'courses')
   CURRENT_COURSE_FILE = File.join(LENSE_DIR,'current_course')
@@ -257,7 +257,39 @@ class LENSE
     exit_now!("Invalid repo name.") unless repo =~ /\A\w+\/\w+\Z/
   end
 
+  def pull()
+    exit_now!("Not in a lense project.") unless File.directory? '.lense'
+    exit_now!("No repo found.") unless File.file? ".lense/repository"
+    repo = File.read '.lense/repository'
+    exit_now!("Invalid repo name.") unless repo =~ /\A\w+\/\w+\Z/
+
+    install_repo repo, 'pull'
+  end
+
+  def clone(repo)
+    say "making dirs ..."
+    # make repo dir in current directory
+    Dir.mkdir project_name unless File.directory? project_name
+
+    # cd into project dir
+    Dir.chdir project_name
+
+    # make .lense dir and .lense/temp
+    proj_lense_dir = '.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
+
+    # write repository name
+    repo_file = File.join proj_lense_dir, 'repository'
+    File.open(repo_file, 'w') { |f| f.write repo } unless File.file? repo_file
+
+    install_repo repo, 'clone'
+  end
+
   def install_repo(repo,action)
+    puts caller
     exit_now!("Invalid repo name.") unless repo =~ /\A\w+\/\w+\Z/
     username, project_name = repo.split '/'
 
@@ -272,33 +304,15 @@ class LENSE
 
     exit_now!("Failed download. Hash does not match.") unless hash_contents(tar_str) == tar_hash
 
-    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
-
-      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"
     say "writing tar file ... #{tar_fname}"
-    rel_tar_path = File.join temp_dir, tar_fname
+
+    rel_tar_path = File.join '.lense', 'temp', tar_fname
     File.open(rel_tar_path, 'w') { |f| f.write tar_str }
 
-    # cd into repo dir and untar
+    # untar
     say "untaring to ... #{rel_tar_path}"
-    `#{working_dir} && tar -x#{TARFLAGS}f .lense/temp/#{tar_fname}`
+    `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.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Manuel Zubieta