lense 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78932afa4684c1fa18a26bdd2ca385ed01a5428b
-  data.tar.gz: 856b8ab670b7ddf023272d6f47d24de4832ddb45
+  metadata.gz: 81b7caa4fbcf410db3adf45c8e3f1a22dabae34e
+  data.tar.gz: 1aca957e23511a177e1f2c1ec8921e4bb9758092
 SHA512:
-  metadata.gz: 51a3491063476462500e1fd767b519be8874a3772f6c4191a0b2bbcfaac421869d0ca3a90ba02cec18907e921e953a9499b41ce7af187ff72b578eec6937c5c5
-  data.tar.gz: a7948351f0a1cc2fef9577b4e794d33493ba7aa3aecc2f65b1313cd48d652a4fd99310b4c6fa2d7d6a0ad6b75986109da2e0f4404d80f6592ec610fa0ec7222a
+  metadata.gz: 0ba1d8e4816d4a9ba15b423e21981a183e8bbffc9f6fca78036b6793ca44f5ebb752ebf2d8c345ad618d9ef9e9afeb3d6f73e3d721404cd742728347c125b5a4
+  data.tar.gz: c574851870ffeeef7a11f08aac229594253dce3ddb080454c1cbff9e86a122e6e351107975ab63661eb1ae39e2427891a3eda563bb0190ebc2c362de1ae3e827

data/bin/lense

@@ -47,7 +47,7 @@ command :search do |c|
 end
 
 command :up do |c|
-  c.action do |global_options,options,args|
+  c.action do
     LENSE_APP.run
   end
 end
@@ -64,34 +64,30 @@ command :destroy do |c|
   end
 end
 
-command :pull do |c|
-  c.action do
-    puts 'TODO implement retrieving new course'
+command :push do |c|
+  c.action do |global_options,options,args|
+    exit_now!('Must supply a LENSE repository.')  if args.count < 1
+    LENSE_APP.push args[0]
   end
 end
 
-command :push do |c|
-  c.action do
-    puts 'TODO implement uploading of current course'
+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]
   end
 end
 
-command :select do |c|
+command :clone do |c|
   c.action do |global_options,options,args|
-    exit_now!('Must supply course name.')  if args.count < 1
-    course = args[0]
-    res = LENSE_APP.select_course course
-    if res.nil?
-      puts "Staying on #{course}..."
-    else
-      puts "Switched to course: #{res}."
-    end
+    exit_now!('Must supply a LENSE repository.')  if args.count < 1
+    LENSE_APP.clone args[0]
   end
 end
 
 command :commit do |c|
   c.action do |global_options,options,args|
-    exit_now!('Must supply files.')  if args.count < 1
+    exit_now!('Must supply file.')  if args.count < 1
     LENSE_APP.commit args.join(' ')
   end
 end
@@ -111,14 +107,14 @@ end
 
 command :stage do |c|
   c.action do |global_options,options,args|
-    exit_now!('Must supply files.')  if args.count < 1
+    exit_now!('Must supply file.')  if args.count < 1
     LENSE_APP.stage args[0]
   end
 end
 
 command :unstage do |c|
   c.action do |global_options,options,args|
-    exit_now!('Must supply files.')  if args.count < 1
+    exit_now!('Must supply file.')  if args.count < 1
     LENSE_APP.unstage args[0]
   end
 end

data/lib/lense.rb

@@ -6,7 +6,7 @@ require 'sqlite3'
 class LENSE
   attr_reader :config, :current_course, :lense_file_hash
 
-  VERSION             = '0.2.2'
+  VERSION             = '0.2.3'
   LENSE_DIR           = File.join(ENV['HOME'],'.lense')
   COURSES_DIR         = File.join(LENSE_DIR,'courses')
   CURRENT_COURSE_FILE = File.join(LENSE_DIR,'current_course')
@@ -15,6 +15,8 @@ class LENSE
   REFS_DIR            = File.join(LOCAL_LENSE_DIR,'refs')
   CURRENT_REF_FILE    = File.join(REFS_DIR,'current')
   LENSE_FILE          = File.join(ENV['PWD'],'LENSEfile')
+  API_BASE            = 'http://lightweightnetsec.com'
+  TARFLAGS            = ''
 
   def initialize()
     Dir.mkdir(LENSE_DIR) unless File.directory?(LENSE_DIR)
@@ -57,7 +59,7 @@ class LENSE
 
   def search(term)
     puts "Searching course repository ..."
-    response = RestClient.get 'http://lightweightnetsec.com/lessons', { params: { format: 'json', text: term } }
+    response = RestClient.get "#{API_BASE}/lessons", { params: { format: 'json', text: term } }
     courses = JSON.parse(response)
     courses.each do |c|
       puts "---"
@@ -179,7 +181,7 @@ class LENSE
     end
 
     combined_hash = files.map {|f| f[:hash]}.join ''
-    commit_hash = Digest::SHA256.hexdigest "#{DateTime.now.to_s}#{combined_hash}"
+    commit_hash = hash_contents "#{DateTime.now.to_s}#{combined_hash}"
     @DB.execute 'insert into commits (hash,message,created_at) values (?,?,?);',[commit_hash,msg,DateTime.now.to_s]
     commit_id = @DB.last_insert_row_id
 
@@ -250,10 +252,57 @@ class LENSE
     end
   end
 
+  def push(repo)
+    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)
+    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)
+    tar_str = Base64::decode64 repository["tar_file_base64"]
+    tar_hash = repository["tar_file_fingerprint"]
+
+    username, project_name = repo.split '/'
+
+    # make repo dir in current directory
+    Dir.mkdir project_name unless Dir.directory? project_name
+
+    # make .lense dir and .lense/temp
+    proj_lense_dir = File.join project_name, '.lense'
+    Dir.mkdir proj_lense_dir unless Dir.directory? proj_lense_dir
+
+    temp_dir = File.join proj_lense_dir, 'temp'
+    Dir.mkdir temp_dir unless Dir.directory? temp_dir
+
+    # write tar file to .lense/temp/hash.tar
+    tar_fname = "#{tar_hash}.tar"
+    File.open(File.join(temp_dir,tar_fname), 'w') { |f| f.write tar_str }
+
+    # cd into repo dir and untar
+    `cd #{project_name} && tar -x#{TARFLAGS}f #{tar_fname}`
+
+    # read lensefile
+    # iterate over dependencies
+    # - download
+    # - verify w/ hash
+  end
+
   private
   def hash_file(file)
-    Digest::SHA256.hexdigest(File.read(file))
+    hash_contents File.read(file)
   end
+
+  def hash_contents(contents)
+    Digest::MD5.hexdigest contents
+  end
+
   def get_dependency(file)
     rows = @DB.execute("
       select d.id, d.path, d.added_at, r.hash, r.created_at, c.hash
@@ -266,9 +315,9 @@ class LENSE
       order by r.created_at desc
       limit 1;
     ", file)
+
     if rows.length > 0
       id, path, added_at, file_hash, saved_at, commit_hash = rows[0]
-
       {
         id: id,
         path: path,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lense
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Manuel Zubieta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake