melon 0.7 → 0.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.0 2014-02-04
+* Major improvements
+  * 'add' commmand now follows up to two symlinks when used recursively
+
 === 0.7.0 2012-09-12
 * Major improvements
   * Added 'remove' command

data/features/add.feature

@@ -11,13 +11,13 @@ Feature: Adding files to the database
     """
 
   Scenario: Adding files to a melon database
-    When I run "melon -d test.db add test_file"
+    When I run `melon -d test.db add test_file`
     Then the output should contain a hash
     And the output should contain "test_file"
 
   Scenario: Adding a file that already exists
-    When I run "melon -d test.db add test_file"
-    And I run "melon -d test.db add test_file"
+    When I run `melon -d test.db add test_file`
+    And I run `melon -d test.db add test_file`
     Then it should fail with:
     """
     melon: path already present in database
@@ -25,14 +25,14 @@ Feature: Adding files to the database
 
   Scenario: Adding a directory itself
     Given a directory named "testo"
-    When I run "melon -d test.db add testo"
+    When I run `melon -d test.db add testo`
     Then it should fail with:
     """
     directory
     """
 
   Scenario: Adding a file that doesn't exist
-    When I run "melon -d test.db add nonexistant_file"
+    When I run `melon -d test.db add nonexistant_file`
     Then it should fail with:
     """
     melon: no such file: nonexistant_file
@@ -55,7 +55,7 @@ Feature: Adding files to the database
     """
     Test file that's not in the subfolder
     """
-    When I run "melon -d test.db add -r dir test_file"
+    When I run `melon -d test.db add -r dir test_file`
     Then the output should contain "dir/test1"
     And the output should contain "dir/test2"
     And the output should contain "dir/test/test3"
@@ -66,20 +66,20 @@ Feature: Adding files to the database
     """
     Also a test file
     """
-    And I run "melon -d test.db add -q test_file"
-    When I run "melon -d test.db add -u test2 test_file"
+    And I run `melon -d test.db add -q test_file`
+    When I run `melon -d test.db add -u test2 test_file`
     Then the output should contain "test2"
     And the output should not contain "test_file"
 
   Scenario: Adding a symlinked file
-    Given I run "ln -s test_file link"
-    When I run "melon -d test.db add link"
+    Given I run `ln -s test_file link`
+    When I run `melon -d test.db add link`
     Then the output should contain "test_file"
     And the output should not contain "link"
 
   Scenario: Adding a symlinked file, preserving symlinks
-    Given I run "ln -s test_file link"
-    When I run "melon -d test.db add -p link"
+    Given I run `ln -s test_file link`
+    When I run `melon -d test.db add -p link`
     Then the output should not contain "test_file"
     And the output should contain "link"
 

data/features/check.feature

@@ -10,17 +10,17 @@ Feature: Check
     """
 
   Scenario: Checking a file that is not in the database
-    When I run "melon -d test.db check test_file"
+    When I run `melon -d test.db check test_file`
     Then the output should contain "test_file"
     And the output should start with "/"
 
   Scenario: Checking a file that is in the database:
-    When I run "melon -d test.db add -q test_file"
-    And I run "melon -d test.db check test_file"
+    When I run `melon -d test.db add -q test_file`
+    And I run `melon -d test.db check test_file`
     Then the output should be empty
 
   Scenario: Checking a file that doesn't exist
-    When I run "melon -d test.db check nonexistant_file"
+    When I run `melon -d test.db check nonexistant_file`
     Then it should fail with:
     """
     melon: no such file: nonexistant_file
@@ -35,6 +35,6 @@ Feature: Check
     """
     Nothing to see here, folks
     """
-    When I run "melon -d test.db check -r dir"
+    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/features/edges.feature

@@ -5,15 +5,15 @@ Feature: Edge cases
     """
     This file is a test file
     """
-    When I run "cp test_file test_file_2"
-    And I run "melon -d test.db add test_file test_file_2"
+    When I run `cp test_file test_file_2`
+    And I run `melon -d test.db add test_file test_file_2`
     Then it should fail with:
     """
     melon: file exists elsewhere in the database
     """
 
   Scenario: Unrecognized command
-    When I run "melon whizzle bang"
+    When I run `melon whizzle bang`
     Then it should fail with:
     """
     melon: unrecognized command: whizzle

data/features/help.feature

@@ -4,12 +4,12 @@ Feature: Getting help
   I should be able to get help using melon
 
   Scenario: General help
-    When I run "melon help"
+    When I run `melon help`
     Then the output should contain "Usage:"
     And the output should contain "Commands:"
     And the output should contain "Options:"
 
   Scenario: Help with a particular command
-    When I run "melon help add"
+    When I run `melon help add`
     Then the output should contain "Usage: melon add"
     And the output should contain "Options:"

data/features/list.feature

@@ -12,23 +12,23 @@ Feature: List
     """
     Test file 2
     """
-    And I run "melon -d test.db add -q test_file file_test"
+    And I run `melon -d test.db add -q test_file file_test`
 
 
   Scenario: Listing files
-    When I run "melon -d test.db list"
+    When I run `melon -d test.db list`
     Then the output should contain "test_file"
     And the output should contain "file_test"
     And the output should contain 2 hashes
 
   Scenario: Listing paths only
-    When I run "melon -d test.db list -p"
+    When I run `melon -d test.db list -p`
     Then the output should contain "test_file"
     And the output should contain "file_test"
     And the output should not contain a hash
 
   Scenario: Listing hashes only
-    When I run "melon -d test.db list -c"
+    When I run `melon -d test.db list -c`
     Then the output should not contain "test_file"
     And the output should not contain "file_test"
     And the output should contain 2 hashes

data/features/remove.feature

@@ -16,19 +16,19 @@ Feature: Remove file from the database
     """
     I am a unique flower
     """
-    And I run "melon -d test.db add -q test_file"
+    And I run `melon -d test.db add -q test_file`
 
   Scenario: Removing a tracked file
-    When I run "melon -d test.db remove test_file"
+    When I run `melon -d test.db remove test_file`
     Then the output should contain "test_file"
     # TODO: demand empty list
 
   Scenario: Removing a tracked file by hash
-    When I run "melon -d test.db remove same_file"
+    When I run `melon -d test.db remove same_file`
     Then the output should contain "test_file"
 
   Scenario: Attempting to removean untracked file
-    When I run "melon -d test.db remove different_file"
+    When I run `melon -d test.db remove different_file`
     Then the output should contain "untracked file"
     And the output should contain "different_file"
 

data/features/show.feature

@@ -8,20 +8,20 @@ Feature: Show
     """
     This file is a test file
     """
-    And I run "cp dir/test_file ."
+    And I run `cp dir/test_file .`
 
   Scenario: Showing a file that is not in the database
-    When I run "melon -d test.db show test_file"
+    When I run `melon -d test.db show test_file`
     Then the output should be empty
 
   Scenario: Showing a file that is in the database:
-    When I run "melon -d test.db add -q dir/test_file"
-    And I run "melon -d test.db show test_file"
+    When I run `melon -d test.db add -q dir/test_file`
+    And I run `melon -d test.db show test_file`
     Then the output should contain "dir/test_file"
     And the output should start with "/"
 
   Scenario: Showing a file that doesn't exist
-    When I run "melon -d test.db show nonexistant_file"
+    When I run `melon -d test.db show nonexistant_file`
     Then it should fail with:
     """
     melon: no such file: nonexistant_file

data/lib/melon/helpers.rb

@@ -49,7 +49,8 @@ module Melon
     def recursively_expand(filelist)
       filelist.collect do |arg|
         if File.directory?(arg)
-          Dir["#{arg}/**/*"]
+          # follow 0,1,2 symlinks
+          Dir.glob("#{arg}/**{,/*/**,/*/**/*/**}/*")
         else
           arg
         end

data/lib/melon/version.rb

@@ -1,6 +1,6 @@
 module Melon
   def self.version
-    "0.7"
+    "0.8"
   end
 
   def self.version_string

metadata

@@ -1,68 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: melon
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  version: "0.7"
+version: !ruby/object:Gem::Version
+  version: '0.8'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Andrew Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-12 00:00:00 -04:00
-default_executable: melon
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: digestif
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 4
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: A tool for tracking files based on content, aiming to scale to arbitrarily large files without slowing down
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A tool for tracking files based on content, aiming to scale to arbitrarily
+  large files without slowing down
 email: adroberts@gmail.com
-executables: 
+executables:
 - melon
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - History.txt
@@ -101,37 +105,31 @@ files:
 - spec/melon/fingerprint_spec.rb
 - spec/melon/parsed_arguments_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/aroberts/melon
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A media catalog
-test_files: 
+test_files:
 - features/add.feature
 - features/check.feature
 - features/edges.feature