lense 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d7d65178e1451e35da987d1506c2a4deebfc311
-  data.tar.gz: 88ae8045d093a1a8e0e205d389387f4aeef7fac2
+  metadata.gz: f8046ab388fd8787dd774068dbbd8cdd22cd24ca
+  data.tar.gz: 9c5db94e5ca701d53dc14948c6e3b184140beb44
 SHA512:
-  metadata.gz: b032fab4a714bc5506df1e6299dc9cb84cb7b2827508df14b5865b17ee4b1a8c2d65708e7596aa3a64cae1bd076c02416d6c5375ece7b637c534382f1c13252b
-  data.tar.gz: 69aa8053300cd931ae128c41438aaf95315c5e61bdab41f03020664bf0747b4922d91c2cd57c977a23a1e461d37f77b054a9727e64a3b3d20b6465374e8eb567
+  metadata.gz: 93caf439b7d324d6edda091945a0402dee0977cddd7c903bff1497e7884dca3c2d5da36553629c0a9ea69720afee14abc61832dab304453ca8aaedaf2799829b
+  data.tar.gz: 4b50ba8a0f1f43aca9223414530a3870a92c60a0f99b82a742495573809750561a509465e44438b3298f490520be9c6b37e4b085dc0e68de7c0e70d13172d453

data/bin/lense

@@ -90,8 +90,9 @@ command :select do |c|
 end
 
 command :commit do |c|
-  c.action do
-    LENSE_APP.commit
+  c.action do |global_options,options,args|
+    exit_now!('Must supply files.')  if args.count < 1
+    LENSE_APP.commit args.join(' ')
   end
 end
 

data/lib/lense.rb

@@ -6,7 +6,7 @@ require 'sqlite3'
 class LENSE
   attr_reader :config, :current_course, :lense_file_hash
 
-  VERSION             = '0.1.39'
+  VERSION             = '0.1.40'
   LENSE_DIR           = File.join(ENV['HOME'],'.lense')
   COURSES_DIR         = File.join(LENSE_DIR,'courses')
   CURRENT_COURSE_FILE = File.join(LENSE_DIR,'current_course')
@@ -150,7 +150,9 @@ class LENSE
     # - - output any ones that have changed
   end
 
-  def commit()
+  def commit(msg)
+    # check that we have items in staging
+    rows = @DB.execute 'select path from staging;'
     # add new files to dependancies
     # create a hash for the commit and add to commits
     # for all dependancies add current hashes to revisions
@@ -158,10 +160,28 @@ class LENSE
   end
 
   def stage(file)
-    if File.file?(file) # and new or modified
-      @DB.transaction
-      @DB.execute "insert into staging (path) values (?);", file
-      @DB.commit
+    if File.file?(file)
+      dependency = get_dependency(file)
+      if depenency.nil?
+        should_stage = true
+      else
+        current_hash = Digest::SHA256.hexdigest(File.read(file))
+        rows = @DB.execute "select "
+        # is it modified?
+        if rows.length == 0
+          say "Staging because we haven't seen this revision"
+          should_stage = true
+        else
+          say "Not Staging because we've seen this file"
+          should_stage = false
+        end
+      end
+
+      if should_stage
+        @DB.transaction
+        @DB.execute "insert into staging (path) values (?);", file
+        @DB.commit
+      end
     end
   end
 
@@ -177,27 +197,61 @@ class LENSE
   end
 
   private
+  def get_dependency(file)
+    rows = @DB.execute("
+      select d.id, d.path, d.added_at, r.hash, r.created_at, c.hash
+      from dependencies d
+      join revisions r on r.dependency_id = d.id
+      join commits c on c.id = r.commit_id
+      where
+        d.path = ?
+        and d.deleted = 0
+      order by r.created_at desc
+      limit 1;
+    ", file)
+    if rows.length > 0
+      id, path, added_at, file_hash, saved_at, commit_hash = row[0]
+
+      {
+        id: id,
+        path: path,
+        added_at: added_at,
+        file_hash: file_hash,
+        saved_at: saved_at,
+        commit_hash: commit_hash
+      }
+    else
+      nil
+    end
+  end
+
   def setup_db()
     @DB.execute <<-SQL
       CREATE TABLE IF NOT EXISTS dependencies (
         id integer primary key autoincrement,
         path text not null,
-        added_at datetime not null
+        added_at datetime not null,
+        deleted bool default false
       );
     SQL
+
     @DB.execute <<-SQL
       CREATE UNIQUE INDEX IF NOT EXISTS dependency_path_idx ON dependencies (path);
     SQL
+
     @DB.execute <<-SQL
       CREATE TABLE IF NOT EXISTS commits (
         id integer primary key autoincrement,
         hash text not null,
+        message text not null,
         created_at datetime not null
       );
     SQL
+
     @DB.execute <<-SQL
       CREATE INDEX IF NOT EXISTS commits_hash_idx ON commits (hash);
     SQL
+
     @DB.execute <<-SQL
       CREATE TABLE IF NOT EXISTS revisions (
         id integer primary key autoincrement,
@@ -207,21 +261,26 @@ class LENSE
         created_at datetime not null
       );
     SQL
+
     @DB.execute <<-SQL
       CREATE INDEX IF NOT EXISTS revisions_hash_idx ON revisions (hash);
     SQL
+
     @DB.execute <<-SQL
       CREATE INDEX IF NOT EXISTS revisions_dependency_id_idx ON revisions (dependency_id);
     SQL
+
     @DB.execute <<-SQL
       CREATE INDEX IF NOT EXISTS revisions_commit_id_idx ON revisions (commit_id);
     SQL
+
     @DB.execute <<-SQL
       CREATE TABLE IF NOT EXISTS staging (
         id integer primary key autoincrement,
         path text not null
       );
     SQL
+
     @DB.execute <<-SQL
       CREATE UNIQUE INDEX IF NOT EXISTS staging_path_idx ON staging (path);
     SQL

metadata

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