chillfile 0.0.1 → 0.0.2

data/Gemfile

@@ -7,6 +7,7 @@ group :default do
   gem "treedisha", "~> 0.0.2", :git => 'git://github.com/dpree/treedisha.git'
   gem "json"
   gem "thor"
+  gem "ruby-progressbar"
 end
 
 group :test do

data/Gemfile.lock

@@ -11,9 +11,9 @@ GIT
 
 GIT
   remote: git://github.com/dpree/treedisha.git
-  revision: 926c6bb92b24972da1cad1b8cf27c32c13096674
+  revision: bce76bfcb419b7308d6d1b062c607ecbcf9f8e37
   specs:
-    treedisha (0.0.1)
+    treedisha (0.0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -72,6 +72,7 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-progressbar (0.0.9)
     thor (0.14.6)
     tzinfo (0.3.23)
 
@@ -84,5 +85,6 @@ DEPENDENCIES
   jeweler
   json
   rspec
+  ruby-progressbar
   thor
-  treedisha!
+  treedisha (~> 0.0.2)!

data/bin/chillfile

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
-require "chillfile"
+#require "rubygems"
+#require "chillfile"
 
-#require File.join(File.dirname(__FILE__), "../lib/chillfile")
+require File.join(File.dirname(__FILE__), "../lib/chillfile")
 
 Chillfile::CLI.start

data/chillfile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chillfile}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dpree"]
@@ -39,13 +39,18 @@ Gem::Specification.new do |s|
     "spec/filesystem_after/bar.1.moved.untouched",
     "spec/filesystem_after/bar.2.moved.copy",
     "spec/filesystem_after/bar.3.moved.copy",
+    "spec/filesystem_after/baz.modified.single",
     "spec/filesystem_after/foo.fx.copy",
     "spec/filesystem_after/foo.untouched",
+    "spec/filesystem_after/modified/biz.0.modified.multi",
+    "spec/filesystem_after/modified/biz.1.modified.multi",
     "spec/filesystem_after/moo.new",
     "spec/filesystem_after/subdir_b/bar.4.moved.copy",
     "spec/filesystem_before/bar.0.moved.deleted",
     "spec/filesystem_before/bar.1.moved.untouched",
+    "spec/filesystem_before/baz.modified.single",
     "spec/filesystem_before/foo.untouched",
+    "spec/filesystem_before/modified/biz.0.modified.multi",
     "spec/filesystem_before/subdir/mii.deleted",
     "spec/filesystem_before/wuu.deleted",
     "spec/fixtures/filesystem_after.json",
@@ -83,6 +88,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<treedisha>, ["~> 0.0.2"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-progressbar>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_runtime_dependency(%q<couchrest>, ["~> 1.0.1"])
       s.add_runtime_dependency(%q<treedisha>, ["~> 0.0.2"])
@@ -93,6 +99,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<treedisha>, ["~> 0.0.2"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<ruby-progressbar>, [">= 0"])
       s.add_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_dependency(%q<couchrest>, ["~> 1.0.1"])
       s.add_dependency(%q<treedisha>, ["~> 0.0.2"])
@@ -104,6 +111,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<treedisha>, ["~> 0.0.2"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<ruby-progressbar>, [">= 0"])
     s.add_dependency(%q<thor>, ["~> 0.14.6"])
     s.add_dependency(%q<couchrest>, ["~> 1.0.1"])
     s.add_dependency(%q<treedisha>, ["~> 0.0.2"])

data/lib/chillfile/cli.rb

@@ -14,12 +14,12 @@ module Chillfile
     
     class_option "couchdb_database",
             :default => "chillfile",
-            :aliases => '-db',
+            :aliases => '-d',
             :banner => "CouchDB Database name"
             
     class_option "couchdb_type_key",
             :default => "type",
-            :aliases => '-tk',
+            :aliases => '-k',
             :banner => "Attribute name of a CouchDB doc to describe its type"
     
     class_option "version",
@@ -47,7 +47,12 @@ module Chillfile
     
     desc 'sync', 'sync filesystem into db'
     def sync
-      Chillfile.sync!
+      progressbar = lambda do |info, notifier|
+        pbar = ::ProgressBar.new("#{info[:name]} (#{info[:size]})", info[:size])
+        notifier.call(lambda{ pbar.inc })
+        pbar.finish
+      end
+      Chillfile.sync!(progressbar)
     end
     
     desc 'fslist', 'json list of files in the filesystem'

data/lib/chillfile/sync.rb

@@ -1,49 +1,54 @@
 module Chillfile
   module Sync
     class << self      
-      def process!(comparator)
+      def process!(comparator, progressbar = nil)
+        @progressbar = progressbar
         
-        # created files
-        comparator.created.each do |checksum, path|
+        # deleted
+        process_list(comparator.deleted, "Delete") do |checksum, path|
           for_doc_with(checksum) do |doc|
-            if doc
-              update_doc_add_path(doc, path)
+            if doc.paths.size > 1
+              update_doc_paths(doc, [path])
             else
-              create_doc(checksum, path)
+              delete_doc(doc)
             end
           end
         end
-      
+        
         # moved files
-        comparator.moved.each do |checksum, paths|
+        process_list(comparator.moved, "Move") do |checksum, paths|
           for_doc_with(checksum) do |doc|
             update_doc_paths(doc, paths[:old_paths], paths[:new_paths])
           end
         end
       
         # modified files
-        comparator.modified.each do |path, checksums|
+        process_list(comparator.modified, "Modify") do |path, checksums|
           for_doc_with(checksums[:old_checksum]) do |doc|
-          
+            
             # split it up if there is more than one path
             if doc.paths.size > 1
-              base_doc = update_doc_paths(doc, [path]), 
-              forked_doc = create_doc(checksums[:new_checksum], path)
-            
-              [base_doc, forked_doc]
+              
+              # remove the old path from the list
+              base_doc = update_doc_paths(doc, [path])
+              
+              # new forked doc
+              fork_doc = create_doc(checksums[:new_checksum], path)
+              
+              [base_doc, fork_doc]
             else
-              update_doc_attachment(doc)  
+              update_doc_attachment(doc, checksums[:new_checksum])
             end          
           end
         end
-      
-        # deleted
-        comparator.deleted.each do |checksum, path|
+        
+        # created files
+        process_list(comparator.created, "Create") do |checksum, path|
           for_doc_with(checksum) do |doc|
-            if doc.paths.size > 1
-              update_doc_paths(doc, [path])
+            if doc
+              update_doc_add_path(doc, path)
             else
-              delete_doc(doc)
+              create_doc(checksum, path)
             end
           end
         end
@@ -66,12 +71,10 @@ module Chillfile
     
       # COPIED
       def update_doc_add_path(doc, path)
-        doc.paths << path
-        
-        doc
+        update_doc_paths(doc, [], [path])
       end
     
-      # MOVED
+      # MOVED/COPIED
       def update_doc_paths(doc, del_paths = [], add_paths = [])
         # del old paths
         del_paths.each do |path|
@@ -85,8 +88,8 @@ module Chillfile
       end
     
       # MODIFIED
-      def update_doc_attachment(doc)
-        doc.checksum = checksums[:new_checksum]
+      def update_doc_attachment(doc, new_checksum)
+        doc.checksum = new_checksum
         begin
           file = File.open(doc.paths.first)
           doc.update_attachment(:file => file, :name => "master")
@@ -101,7 +104,25 @@ module Chillfile
         doc.deleted = true
         doc.paths = []
         doc
-      end    
+      end
+      
+      # wrapper outer
+      def process_list(list, title, &block)
+        return true if list.empty?
+        
+        list_iterator = lambda do |notifier|
+          list.each do |args|
+            block.call(*args)
+          end
+          notifier.call if notifier
+        end
+        
+        if @progressbar
+          @progressbar.call({:name => title, :size => list.size}, list_iterator)
+        else
+          list_iterator.call(nil)
+        end
+      end
     
       # wrapper
       def for_doc_with(checksum, &block)

data/lib/chillfile.rb

@@ -1,11 +1,16 @@
 require "yaml"
 
 require 'rubygems'
+
+# LIB
 require "couchrest"
 require 'couchrest_model'
 require "treedisha"
 require "json"
+
+# CLI
 require "thor"
+require "progressbar"
 
 require File.join(File.dirname(__FILE__), "chillfile/config")
 require File.join(File.dirname(__FILE__), "chillfile/cli")
@@ -27,7 +32,7 @@ module Chillfile
       Chillfile::Model.load!
       true
     end
-    
+        
     def config
       @@config
     end
@@ -35,12 +40,12 @@ module Chillfile
       @@dbserver.default_database
     end
     
-    def sync!
+    def sync!(progressbar = nil)
       fs = fs_list
       db = db_list
       comparator = Treedisha::Comparator.new(fs_list, db_list)
       
-      Chillfile::Sync.process!(comparator)
+      Chillfile::Sync.process!(comparator, progressbar)
     end
   
     # filesystem

data/spec/filesystem_after/baz.modified.single

@@ -0,0 +1,2 @@
+i am a file to be modified
+AFTER

data/spec/filesystem_after/modified/biz.0.modified.multi

@@ -0,0 +1,2 @@
+i am part of several files modified
+AFTER

data/spec/filesystem_after/modified/biz.1.modified.multi

@@ -0,0 +1,2 @@
+i am part of several files modified
+AFTER

data/spec/filesystem_before/baz.modified.single

@@ -0,0 +1,2 @@
+i am a file to be modified
+BEFORE

data/spec/filesystem_before/modified/biz.0.modified.multi

@@ -0,0 +1,2 @@
+i am part of several files modified
+BEFORE

data/spec/fixtures/filesystem_after.json

@@ -1 +1,10 @@
-[["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./bar.1.moved.untouched"], ["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./bar.2.moved.copy"], ["da39a3ee5e6b4b0d3255bfef95601890afd80709", "./bar.3.moved.copy"], ["83a4f6db0964dd03480be5f781eec6c5c2f7f5f2", "./foo.fx.copy"], ["83a4f6db0964dd03480be5f781eec6c5c2f7f5f2", "./foo.untouched"], ["cd84598b6fcb747a2b1954934b964e5a5c27836e", "./moo.new"], ["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./subdir_b/bar.4.moved.copy"]]
+[["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./bar.1.moved.untouched"],
+["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./bar.2.moved.copy"],
+["da39a3ee5e6b4b0d3255bfef95601890afd80709", "./bar.3.moved.copy"],
+["83a4f6db0964dd03480be5f781eec6c5c2f7f5f2", "./foo.fx.copy"],
+["83a4f6db0964dd03480be5f781eec6c5c2f7f5f2", "./foo.untouched"],
+["cd84598b6fcb747a2b1954934b964e5a5c27836e", "./moo.new"],
+["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./subdir_b/bar.4.moved.copy"],
+["33772e8f45b1afd7b0cefa5bc39912a1e782c343", "./baz.modified.single"],
+["08a7dd9727c92398f3259a677c2b7e821606db4c", "./modified/biz.0.modified.multi"],
+["08a7dd9727c92398f3259a677c2b7e821606db4c", "./modified/biz.1.modified.multi"]]

data/spec/fixtures/filesystem_before.json

@@ -1 +1,7 @@
-[["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./bar.0.moved.deleted"], ["da39a3ee5e6b4b0d3255bfef95601890afd80709", "./bar.1.moved.untouched"], ["83a4f6db0964dd03480be5f781eec6c5c2f7f5f2", "./foo.untouched"], ["5ab7aa2b4aaa458fd89089ce4384102a33bf7765", "./subdir/mii.deleted"], ["c0ae0100acd4b0063535dd8fbbdf87919741e320", "./wuu.deleted"]]
+[["ab4b262b83ad979d10a2c3c633242bb222ba74e7", "./bar.0.moved.deleted"],
+["da39a3ee5e6b4b0d3255bfef95601890afd80709", "./bar.1.moved.untouched"],
+["83a4f6db0964dd03480be5f781eec6c5c2f7f5f2", "./foo.untouched"],
+["5ab7aa2b4aaa458fd89089ce4384102a33bf7765", "./subdir/mii.deleted"],
+["c0ae0100acd4b0063535dd8fbbdf87919741e320", "./wuu.deleted"],
+["236788602d9b00710e4ece24dc202165c28b7dc4", "./baz.modified.single"],
+["4e719bc39c20b4c2633265406a1074db39e88c65", "./modified/biz.0.modified.multi"]]

data/version.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 1
+:patch: 2
 :build: 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - dpree
@@ -85,8 +85,21 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: ruby-progressbar
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: thor
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,10 +111,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: couchrest
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,10 +126,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: treedisha
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,10 +141,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,7 +156,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 description: Let your files chill on the couch
 email: whiterabbit.init@gmail.com
 executables: 
@@ -174,13 +187,18 @@ files:
 - spec/filesystem_after/bar.1.moved.untouched
 - spec/filesystem_after/bar.2.moved.copy
 - spec/filesystem_after/bar.3.moved.copy
+- spec/filesystem_after/baz.modified.single
 - spec/filesystem_after/foo.fx.copy
 - spec/filesystem_after/foo.untouched
+- spec/filesystem_after/modified/biz.0.modified.multi
+- spec/filesystem_after/modified/biz.1.modified.multi
 - spec/filesystem_after/moo.new
 - spec/filesystem_after/subdir_b/bar.4.moved.copy
 - spec/filesystem_before/bar.0.moved.deleted
 - spec/filesystem_before/bar.1.moved.untouched
+- spec/filesystem_before/baz.modified.single
 - spec/filesystem_before/foo.untouched
+- spec/filesystem_before/modified/biz.0.modified.multi
 - spec/filesystem_before/subdir/mii.deleted
 - spec/filesystem_before/wuu.deleted
 - spec/fixtures/filesystem_after.json