lense 0.1.42 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e978b74147cbbcf5d6c8c6019c397b82a7b8a6
-  data.tar.gz: 40b26a3185024a18098e5d689d5da6c2b956c58d
+  metadata.gz: f42192d4855d217e54d3dfc54dc0de59450e7b42
+  data.tar.gz: 410af56c080571b1c261b431239121cb90822bc6
 SHA512:
-  metadata.gz: 7ea2f716dc8fa01f8864d8a7a270ca12e33b83f3a216a01392477bacb9c19136e34390f989efefa2d0a66a948a34646e923a2b03d9e672689c062ce3eb22e9f2
-  data.tar.gz: 996ba02669125f8f1a43c2eff232b1b013d7e3021d47751188e88d272dc2191f0063a12f1d0541c44f9e0040d486dd9f572a005ed1d629a179c04bcd47ee221e
+  metadata.gz: ea1a22f30d4addf2799d89b2beee9ff20da740814fb2391e7f5f70f8a911d41f2011c438f049207c4097bb3b7a62814bd0972cd5ff521d2746c9dcecc8b9fb07
+  data.tar.gz: 30299fc6253c6effab8171832d0cdfb4fdf7aa4274519c983f68707f5855721e1e9b7fa0f56bc3ee9ca00015b47be3ad76c4778c6a55b585d975c658e7ed4c0d

data/lib/lense.rb

@@ -6,7 +6,7 @@ require 'sqlite3'
 class LENSE
   attr_reader :config, :current_course, :lense_file_hash
 
-  VERSION             = '0.1.42'
+  VERSION             = '0.1.43'
   LENSE_DIR           = File.join(ENV['HOME'],'.lense')
   COURSES_DIR         = File.join(LENSE_DIR,'courses')
   CURRENT_COURSE_FILE = File.join(LENSE_DIR,'current_course')
@@ -28,7 +28,7 @@ class LENSE
 
     @current_course = File.read(CURRENT_COURSE_FILE).strip()
     @current_course = '> NOT SET <' if @current_course.empty?
-    @lense_file_hash = Digest::SHA256.hexdigest(File.read(LENSE_FILE)) if File.file?(LENSE_FILE)
+    @lense_file_hash = hash_file(LENSE_FILE) if File.file?(LENSE_FILE)
     @DB = SQLite3::Database.new File.join(LOCAL_LENSE_DIR,'db') if File.file? File.join(LOCAL_LENSE_DIR,'db')
   end
 
@@ -153,6 +153,39 @@ class LENSE
   def commit(msg)
     # check that we have items in staging
     rows = @DB.execute 'select path from staging;'
+    rows.map! do |r|
+      path = r[0]
+      {
+        path: path,
+        hash: hash_file(path)
+      }
+    end
+
+    files = rows.select do |file|
+      dependency = get_dependency(file[:path])
+      dependency.nil? || dependency.file_hash != file[:hash]
+    end
+
+    combined_hash = files.map {|f| f[:hash]}.join ''
+    commit_hash = Digest::SHA256.hexdigest "#{DateTime.now.to_s}#{combined_hash}"
+    @DB.execute 'insert into commits (dependency_id,hash,created_at) values (?,?,?);',[dependency_id,commit_hash,DateTime.now.to_s]
+    commit_id = @DB.last_insert_row_id
+
+    files.each do |file|
+      @DB.transaction
+      dependency = get_dependency(file[:path])
+      if dependency.nil?
+        @DB.execute 'insert into dependencies (path,added_at) values (?,?);',[file[:path],DateTime.now.to_s]
+        dependency_id = @DB.last_insert_row_id
+      else
+        dependency_id = dependency.id
+      end
+      @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
+    @DB.transaction
+    @DB.execute 'truncate 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
@@ -165,7 +198,7 @@ class LENSE
       if dependency.nil?
         should_stage = true
       else
-        current_hash = Digest::SHA256.hexdigest(File.read(file))
+        current_hash = hash_file(file)
         # is it modified?
         if dependency.file_hash == current_hash
           say "Not Staging because we've seen this file"
@@ -177,9 +210,13 @@ class LENSE
       end
 
       if should_stage
-        @DB.transaction
-        @DB.execute "insert into staging (path) values (?);", file
-        @DB.commit
+        begin
+          @DB.transaction
+          @DB.execute "insert into staging (path) values (?);", file
+          @DB.commit
+        rescue
+          say "File already staged!"
+        end
       end
     end
   end
@@ -196,6 +233,9 @@ class LENSE
   end
 
   private
+  def hash_file(file)
+    Digest::SHA256.hexdigest(File.read(file))
+  end
   def get_dependency(file)
     rows = @DB.execute("
       select d.id, d.path, d.added_at, r.hash, r.created_at, c.hash

metadata

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