melon 0.6.1 → 0.7

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.6.0 2011-02-10
+=== 0.7.0 2012-09-12
+* Major improvements
+  * Added 'remove' command
+
+=== 0.6.1 2011-02-10
 * Minor improvements
   * Fixed symlink-related bug
 

data/features/list.feature

@@ -3,7 +3,7 @@ Feature: List
   As a user
   I should be able to get a list of tracked files
 
-  Scenario: Listing files
+  Background:
     Given a file named "test_file" with:
     """
     Test file 1
@@ -13,6 +13,22 @@ Feature: List
     Test file 2
     """
     And I run "melon -d test.db add -q test_file file_test"
+
+
+  Scenario: Listing files
     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"
+    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"
+    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

@@ -0,0 +1,35 @@
+Feature: Remove file from the database
+  In order to get rid of crappy media
+  As a user
+  I should be able to delete from the database
+
+  Background:
+    Given a file named "test_file" with:
+    """
+    I am an unassuming test file
+    """
+    And a file named "same_file" with:
+    """
+    I am an unassuming test file
+    """
+    And a file named "different_file" with:
+    """
+    I am a unique flower
+    """
+    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"
+    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"
+    Then the output should contain "test_file"
+
+  Scenario: Attempting to removean untracked 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/step_definitions/basic_steps.rb

@@ -8,8 +8,3 @@ Then /^the output should start with "([^"]*)"$/ do |arg1|
   all_output.should match(/^#{arg1}/)
 end
 
-Then /^the output should contain a hash$/ do
-  all_output.should match(/[a-fA-F0-9]{20}/)
-end
-
-

data/features/step_definitions/hash_steps.rb

@@ -0,0 +1,15 @@
+require 'aruba/api'
+
+Then /^the output should contain (a|\d+) hash(?:es)?$/ do |count|
+  count = 1 if count == 'a'
+  count = count.to_i
+
+  lines = all_output.split("\n")
+  match_count = 0
+  lines.each { |line| match_count += 1 if line.match(/[a-f0-9]{40}/) }
+  match_count.should == count
+end
+
+Then /^the output should not contain a hash$/ do
+  all_output.split('\n').each { |l| l.should_not match(/[a-f0-9]{40}/) }
+end

data/lib/melon/commands.rb

@@ -20,16 +20,10 @@ module Melon
     end
 
 
-    # 1.0 list
-    # 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 attempts to remove it by hash
-    # TODO: list needs --paths(only) and --hashes(only)
-    #
     # 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/list.rb

@@ -8,11 +8,13 @@ module Melon
       end
 
       def parser_options(parser)
-          parser.on("-p", "--paths", "print only paths") do
+          parser.on("-p", "--paths", "Print only paths") do
             options.only_paths = true
           end
           # TODO: re-enable this as -h after help command goes in
-          # parser.on("--hashes", "print only hashes") { options.only_hashes = true }
+          parser.on("-c", "--checksums", "print only hashes") do
+            options.only_hashes = true 
+          end
       end
 
       def verify_args
@@ -24,7 +26,10 @@ module Melon
 
         options.database.transaction do
           options.database[:by_hash].each_pair do |hash, path|
-            puts "#{path}:#{hash}"
+            out = [path, hash]
+            out.delete(path) if options.only_hashes
+            out.delete(hash) if options.only_paths
+            puts out.join(":")
           end
         end
       end

data/lib/melon/commands/remove.rb

@@ -0,0 +1,65 @@
+require 'melon/commands/base'
+require 'melon/commands/common_options'
+
+module Melon
+  module Commands
+    class Remove < Base
+      def self.description
+        "Remove a file from the database"
+      end
+
+      def helptext
+        <<EOS
+For each argument, the database is checked for the path of that
+argument.  If present, it is removed.  If not, the database is
+checked for the hash of the argument.  Once again, the record
+in the database is removed if found.
+
+ If a file is found, the path that was in the database is printed.
+EOS
+      end
+
+      def usageargs
+        "FILE [FILE [FILE ...]]"
+      end
+
+      def parser_options(parser)
+        CommonOptions.recursive(parser, options)
+      end
+
+      def run
+        parse_options!
+
+        if options.recursive
+          self.args = recursively_expand(args)
+        end
+
+        options.database.transaction do
+          args.each do |arg|
+            filename = File.expand_path(arg)
+            filename = resolve_symlinks(filename)
+
+            if File.directory?(filename)
+              error "argument is a directory: #{arg}"
+            end
+
+            if options.database[:by_path][filename]
+              hash = options.database[:by_path].delete(filename)
+              options.database[:by_hash].delete(hash)
+              puts filename
+            else
+              hash = Hasher.digest(filename)
+              if options.database[:by_hash][hash]
+                filename = options.database[:by_hash].delete(hash)
+                options.database[:by_path].delete(filename)
+                puts filename
+              else
+                error("untracked file: #{arg}")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/melon/version.rb

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

metadata

@@ -1,13 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: melon
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - Andrew Roberts
@@ -15,18 +13,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -05:00
+date: 2012-09-12 00:00:00 -04:00
 default_executable: melon
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: digestif
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
@@ -38,11 +34,9 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,11 +46,9 @@ dependencies:
   name: aruba
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -83,8 +75,10 @@ files:
 - features/edges.feature
 - features/help.feature
 - features/list.feature
+- features/remove.feature
 - features/show.feature
 - features/step_definitions/basic_steps.rb
+- features/step_definitions/hash_steps.rb
 - features/support/env.rb
 - lib/melon.rb
 - lib/melon/cli.rb
@@ -95,8 +89,8 @@ files:
 - lib/melon/commands/common_options.rb
 - lib/melon/commands/help.rb
 - lib/melon/commands/list.rb
+- lib/melon/commands/remove.rb
 - lib/melon/commands/show.rb
-- lib/melon/example.rb
 - lib/melon/hasher.rb
 - lib/melon/helpers.rb
 - lib/melon/version.rb
@@ -117,27 +111,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A media catalog
@@ -147,8 +137,10 @@ test_files:
 - features/edges.feature
 - features/help.feature
 - features/list.feature
+- features/remove.feature
 - features/show.feature
 - features/step_definitions/basic_steps.rb
+- features/step_definitions/hash_steps.rb
 - features/support/env.rb
 - spec/melon/cli_spec.rb
 - spec/melon/database_spec.rb

data/lib/melon/example.rb

@@ -1,68 +0,0 @@
-require 'rubygems'
-require 'subcommand'
-
-require 'melon/version'
-
-module Melon
-  class CLI
-    def self.execute(arguments=[])
-      new(arguments).run
-    end
-
-    attr_accessor :arguments
-
-    def initialize(arguments)
-      self.arguments = arguments
-    end
-
-    def run
-      # command may be nil, if no command is given
-      command = parser.parse!(arguments)
-    end
-
-    def parser
-      @parser ||= OptionParser.new do |opts|
-        opts.banner = "Example of what option parsing should look like"
-
-        opts.on("-d", "--database=PATH", String,
-                "Path to Melon's sqlite database.",
-                "  (default ~/.melon/melon.db)") do |arg|
-          self.options[:database] = arg
-                end
-    
-        opts.on("-v", "--version",
-                "Display the program version.") { puts "0.0.0" }
-        opts.on("-h", "--help",
-                "Show this help message.") { puts parser }
-        opts.separator ""
-
-        opts.command :create, "description text" do |subopts|
-          subopts.banner "create: create a directory, somewhere"
-
-          subopts.on("-f" "--force",
-                     "Force creation.") { self.options[:force] = true }
-        end
-
-
-        opts.separator "To see a list of commands, use 'melon help commands'."
-        opts.separator "To get help with a specific command," +
-          " use 'melon help COMMAND'."
-      end
-
-      # OptionParser#command adds lazy option parsers to an array
-      # of subcommands
-      #
-      # melon help COMMAND prints the appropriate option
-      #
-      # PARSING:
-      # the option parser knows what the commands are at parse time
-      # so, scan the parse!() argument for the first command and pivot on
-      # it
-      #
-      # pre-cmd goes to the main option_parser.parse
-      # cmd goes into a string, is returned
-      # post-cmd goes to cmd parser.parse!()
-      #
-      # possibly implement that behavior for order! as well 
-  end
-end