melon 0.4.0 → 0.5.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.5.0 2011-02-09
+* Major improvements:
+  * Added --recursive option to 'check' subcommand
+  * Added --update option to 'add' subcommand
+
 === 0.4.0 2011-01-31
 * Major improvements:
   * Updated hashing strategy to be more robust against collisions

data/features/add.feature

@@ -60,3 +60,13 @@ Feature: Adding files to the database
     And the output should contain "dir/test2"
     And the output should contain "dir/test/test3"
     And the output should contain "test_file"
+    
+  Scenario: Adding as an update
+    Given a file named "test2" with:
+    """
+    Also a test file
+    """
+    And I run "melon -d test.db add -q test_file"
+    When I run "melon -d test.db add -u test_file test2"
+    Then the output should contain "test2"
+    And the output should not contain "test_file"

data/features/check.feature

@@ -25,3 +25,16 @@ Feature: Check
     """
     melon: no such file: nonexistant_file
     """
+
+  Scenario: Checking recursively
+    Given a file named "dir/test2" with:
+    """
+    Another test file
+    """
+    And a file named "dir/sub/test3" with:
+    """
+    Nothing to see here, folks
+    """
+    When I run "melon -d test.db check -r dir"
+    Then the output should contain "dir/test2"
+    And the output should contain "dir/sub/test3"

data/lib/melon/commands.rb

@@ -21,17 +21,21 @@ module Melon
 
 
     # 1.0 list
-    # TODO: needs a 'verify' command to check integrity of database
-    #   both internal 2-hash consistency (consistency) and db<->filesystem
-    #   matching up (integrity) [file exists, hashes match]
+    # TODO: check needs -r
     # TODO: needs a 'remove' command, or some way to deal with deletes/renames
     #   remove: given a tracked file, removes it
     #           given an untracked file, it hashes it
-    #             and removes it by hash
+    #             and attempts to remove it by hash
     # TODO: list needs --paths(only) and --hashes(only)
-    #            --count
-    # TODO: check needs -r
     # TODO: update- a function of add, ignore files that are already present in the db
     # TODO: handle moving a file somehow -- hopefully a function of update
+    #          could be:
+    #            1.  move file
+    #            2.  add new path to db
+    #            3.  some sort of cull cmd that removes untracked paths
+    # post-1.0
+    # TODO: needs a 'verify' command to check integrity of database
+    #   both internal 2-hash consistency (consistency) and db<->filesystem
+    #   matching up (integrity) [file exists, hashes match]
   end
 end

data/lib/melon/commands/add.rb

@@ -16,6 +16,11 @@ module Melon
         parser.on("-r", "--recursive", "Recursively add directory contents") do
           options.recursive = true
         end
+
+        parser.on("-u" "--update", 
+                  "Skip paths already present in the database") do
+          options.update = true
+                  end
       end
 
       def run
@@ -34,6 +39,7 @@ module Melon
             end
 
             if options.database[:by_path][filename]
+              next if options.update
               error "path already present in database: #{arg}"
             end
 

data/lib/melon/commands/check.rb

@@ -18,11 +18,25 @@ EOS
         "file [file [file ...]"
       end
 
+      def parser_options(parser)
+        parser.on("-r", "--recursive", "Recursively check directory contents") do
+          options.recursive = true
+        end
+      end
+
       def run
         parse_options!
 
+        if options.recursive
+          self.args = recursively_expand(args)
+        end
+
         options.database.transaction do
           args.each do |filename|
+            if File.directory?(filename)
+              error "argument is a directory: #{arg}"
+            end
+
             hash = Hasher.digest(filename)
             unless options.database[:by_hash][hash]
               puts File.expand_path(filename)

data/lib/melon/version.rb

@@ -1,6 +1,6 @@
 module Melon
   def self.version
-    "0.4.0"
+    "0.5.0"
   end
 
   def self.version_string

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: melon
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andrew Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -05:00
+date: 2011-02-09 00:00:00 -05:00
 default_executable: melon
 dependencies: 
 - !ruby/object:Gem::Dependency