lense 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c121069eb1ee2fbdfee54479be7b2be9fec63a3f
-  data.tar.gz: 875b065ea8d1f0f4f5ae1c63ac05bc0b16d7dcde
+  metadata.gz: d70caab50233ebeac96062c48b778c90ea58ed6a
+  data.tar.gz: 598f475c0ef9cf20a217452bb7571a4c7f887bc8
 SHA512:
-  metadata.gz: a60eb1b8c2484ccc3dbd7d8a952ff513e44c04a01d54d43e96b438a04c40fd63dfa8d1dfac7dff245eec1cf39bb869d514a9ea8f5fb53b44d1126b0dd1db19da
-  data.tar.gz: 8cf1ebaf4b5488c43f77151680c467d06a729c0d6317b7bd40d708971da92a6fa6e44cbc4316a4f982c7888ce4f9e6193d1e413d8e2142123b4752b052bc25dc
+  metadata.gz: 6af0ee9c28a139cb059a3684d55d58eb26affc4b8f5819a228cb590bd93638f311a315bf7ca8bc4090fa6a99644235a2819ddf376ee4b09fd26351c8c156f59b
+  data.tar.gz: 6f54d7b138ef4589ffeae3534f4ef3284841705f30a58aa4d8b65e28bb764733bcc038e58ce3aa24b26b7c1328e3d7c8beea0355c3344fca8188b3a96cdc6c07

data/data/mfwvl1.yaml

@@ -6,7 +6,12 @@ authors:
     email: lance.lacoste@gmail.com
 
 dependancies:
-  - data/my_memory_sample.vmem
+  - path: data/my_memory_sample.vmem
+    url: http://url.com/file
+    hash: fj13k4jkf15j
+  - path: docker-compose.yml
+    hash: fj13k4jkf15j
+
 
 # The final command to open in a new terminal.
 up:

data/lib/lense.rb

@@ -3,11 +3,12 @@ require 'highline/import'
 require 'digest'
 require 'sqlite3'
 require 'base64'
+require 'active_support/all'
 
 class LENSE
   attr_reader :config, :current_course, :lense_file_hash
 
-  VERSION             = '0.2.16'
+  VERSION             = '0.2.17'
   LENSE_DIR           = File.join(ENV['HOME'],'.lense')
   COURSES_DIR         = File.join(LENSE_DIR,'courses')
   CURRENT_COURSE_FILE = File.join(LENSE_DIR,'current_course')
@@ -17,7 +18,7 @@ class LENSE
   CURRENT_REF_FILE    = File.join(REFS_DIR,'current')
   LENSE_FILE          = File.join(ENV['PWD'],'LENSEfile')
   API_BASE            = 'http://lightweightnetsec.com'
-  TARFLAGS            = ''
+  TARFLAGS            = 'z'
 
   def initialize()
     Dir.mkdir(LENSE_DIR) unless File.directory?(LENSE_DIR)
@@ -138,11 +139,11 @@ class LENSE
   end
 
   def status()
-    #say "Hash : #{@lense_file_hash}"
     exit_now!("Not a LENSE project: .lense") unless File.directory?(LOCAL_LENSE_DIR)
 
-    say "Staged Files:\n"
-    @DB.execute("select path from staging;").each do |row|
+    rows = @DB.execute("select path from staging;")
+    say "Staged Files:\n" if rows.length > 0
+    rows.each do |row|
       path = row[0]
       dependency = get_dependency(path)
       action = dependency.nil? ? 'New File' : 'Modified'
@@ -158,11 +159,6 @@ class LENSE
       end
     end
 
-    # check changes in depenancy files
-    # - for each depenceny
-    # - - get the current file hash
-    # - - check against .lense/deps/#{rel_path_to_dep}
-    # - - output any ones that have changed
   end
 
   def commit(msg)
@@ -176,16 +172,21 @@ class LENSE
       }
     end
 
+    # only select new or modified files
     files = rows.select do |file|
       dependency = get_dependency(file[:path])
       dependency.nil? || dependency[:file_hash] != file[:hash]
     end
 
+    # generate commit hash
     combined_hash = files.map {|f| f[:hash]}.join ''
     commit_hash = hash_contents "#{DateTime.now.to_s}#{combined_hash}"
+
+    # save to db
     @DB.execute 'insert into commits (hash,message,created_at) values (?,?,?);',[commit_hash,msg,DateTime.now.to_s]
     commit_id = @DB.last_insert_row_id
 
+    # add file revisions for all new/modified dependencies
     files.each do |file|
       @DB.transaction
       dependency = get_dependency(file[:path])
@@ -198,13 +199,11 @@ class LENSE
       @DB.execute 'insert into revisions (commit_id,dependency_id,hash,created_at) values (?,?,?,?);',[commit_id,dependency_id,file[:hash],DateTime.now.to_s]
       @DB.commit
     end
+
+    # empty staging
     @DB.transaction
     @DB.execute 'delete from staging;'
     @DB.commit
-    # add new files to dependancies
-    # create a hash for the commit and add to commits
-    # for all dependancies add current hashes to revisions
-    # truncate staging
   end
 
   def stage(file)
@@ -260,6 +259,8 @@ class LENSE
       output = `#{cmd}`
       say "<%= color(' => ',:blue) %> #{output}"
     end
+
+    run
   end
 
   def down
@@ -273,6 +274,35 @@ class LENSE
 
   def push(repo)
     repo = validate_in_repo
+    user, project = repo.split '/'
+    rows = @DB.execute "select path from dependencies where not deleted;"
+    rows.map! { |r| r[0] }
+
+    # only include files < 10 megabytes
+    deps = rows.select do |path|
+      File.size path <= 10.megabytes
+    end
+
+    db_hash = hash_file '.lense/db'
+    tar_fname = "#{user}_#{project}_#{db_hash}.tar"
+    tar_path = ".lense/temp/#{tar_fname}"
+
+    cmd = "tar -c#{TARFLAGS}f #{tar_path} .lense/db #{deps.join ' '}"
+    say "taring up with: #{cmd}"
+    `#{cmd}`
+
+    post_body =  {
+      params: {
+        format: 'json',
+        user_token: 'z5kqZTsKU_oXvC3d5j96',
+        tar_file_base64: Base64::encode64(File.read(tar_path)),
+        filename: tar_fname,
+        content_type: "application/x-tar"
+
+      }
+    }
+    response = RestClient.post "#{API_BASE}/#{repo}/push", post_body
+    say "response: #{response}"
   end
 
   def pull()
@@ -328,10 +358,33 @@ class LENSE
     `tar -x#{TARFLAGS}f #{rel_tar_path}`
 
     say "done"
-    # read lensefile
-    # iterate over dependencies
-    # - download
-    # - verify w/ hash
+    lense = read_lensefile
+    lense['dependencies'].each do |dep|
+      next unless dep['url']
+
+      # check if file already exists
+      if File.file? dep['path']
+        # skip if same hash
+        if dep['hash'] == hash_file(dep['path'])
+          say "Skipping #{dep['path']}"
+          next
+        # error if different
+        else
+          exit_now!("File already exists and has been modified: #{dep['path']}")
+        end
+      end
+
+      dirs, path = File.split dep['path']
+      FileUtils.mkdir_p dirs unless File.directory? dirs
+      begin
+        say "fetching #{dep['path']} from #{dep['url']}"
+        file_str = RestClient.get dep['url']
+        exit_now!("Problem downloading file: #{dep['path']}") unless dep['hash'] == hash_contents(file_str)
+        File.open(path,'w') { |f| f.write file_str }
+      rescue
+        exit_now!("Unable to fetch dependency: #{dep['url']}")
+      end
+    end
   end
 
   private

metadata

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