melon 0.8 → 0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f7e5abf0720c0cefa7003e002ac2e8b030315c4c
+  data.tar.gz: a3c411d1fe4f23f4142eb318a82f83861ddccd50
+SHA512:
+  metadata.gz: 2a20c1afbbaf02dd580de1ba9d3cbd572d8d236dfaf75c0fc1970969a8d2c7200867bd320a972aec0fcc9ad17da85b4ac91c1dd7bfdeccffde460afd5bfcdb32
+  data.tar.gz: e9eb9db4671084a7b23ccc8fceabb66e4346bd335934b28303b5b62ac0858aeac80fedd46d1a444498c19bb27bb0be9608e408af093b40c84c07573a4ae297d3

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 coverage
 *.db
 Gemfile.lock
+*.gem

data/lib/melon/commands/add.rb

@@ -35,8 +35,8 @@ module Melon
           self.args = recursively_expand(args)
         end
 
-        options.database.transaction do
-          args.each do |arg|
+        args.each do |arg|
+          options.database.transaction do
             filename = File.expand_path(arg)
             filename = resolve_symlinks(filename) unless options.preserve_symlinks
 

data/lib/melon/helpers.rb

@@ -47,14 +47,25 @@ module Melon
     end
 
     def recursively_expand(filelist)
-      filelist.collect do |arg|
-        if File.directory?(arg)
-          # follow 0,1,2 symlinks
-          Dir.glob("#{arg}/**{,/*/**,/*/**/*/**}/*")
-        else
-          arg
+      filelist.collect do |entry|
+        fileish = Pathname.new(entry)
+        if fileish.file?
+          fileish
+        elsif fileish.directory?
+          expand_dir(fileish)
         end
-      end.flatten.reject { |arg| File.directory?(arg) }
+      end.flatten(1)
+    end
+
+    def expand_dir(path)
+      path.children.collect do |child|
+        if child.file?
+          child
+        elsif child.directory?
+          expand_dir(child)
+        end
+      end.select { |x| x }.flatten(1)
+
     end
 
     def resolve_symlinks(file)

data/lib/melon/version.rb

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

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: melon
 version: !ruby/object:Gem::Version
-  version: '0.8'
-  prerelease: 
+  version: '0.9'
 platform: ruby
 authors:
 - Andrew Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digestif
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
   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
   prerelease: false
   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
   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
@@ -107,27 +100,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/aroberts/melon
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A media catalog
 test_files:
 - features/add.feature